Merged typescript into master

Author: dan-silver

GraphODataTemplateWriter.sln

@@ -30,4 +30,4 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-EndGlobal
+EndGlobal

README.md

@@ -7,9 +7,9 @@ Source code writers for [VIPR][vipr-source-repo] utilizing T4 templates. The Gra
 Currently the following target languages are supported by this writer:
 - Android
 - CSharp
-- JavaScript
 - Objective-C
 - Python
+- TypeScript
 
 # Contents
 - [Prerequisites](#prerequisites)
@@ -44,7 +44,7 @@ By default, output source code will be put in a folder named "output" next to th
 ## Template Writer Settings
 ### Available Languages
 
-There are four languages to choose from at the moment.  Java, ObjC, CSharp, and Python.  Specify which language you want to generate in the `TargetLanguage` setting.
+There are five languages to choose from at the moment.  Java, ObjC, CSharp, TypeScript and Python.  Specify which language you want to generate in the `TargetLanguage` setting.
 
 ### Templates
 You must specify a template directory under the `TemplatesDirectory` Settings.  The directory can be a full path or relative to the running directory.  The directory must contain a sub directory for each platform you want to generate code for. See the Templates directory for an example.

Templates/TypeScript/src/entity_types.ts.tt

@@ -0,0 +1,47 @@
+<# // Copyright (c) Microsoft Corporation.  All Rights Reserved.  Licensed under the MIT License.  See License in the project root for license information. #>
+<#@ template debug="true" hostspecific="true" language="C#" #>
+<#@ output extension="\\" #>
+<#
+    CustomT4Host host           = (CustomT4Host) Host;
+    CodeWriterTypeScript writer = (CodeWriterTypeScript) host.CodeWriter;
+
+    var model                   = host.CurrentModel;
+    var entityTypes             = model.GetEntityTypes();
+    var enumTypes               = model.GetEnumTypes();
+    var complexTypes            = model.GetComplexTypes();
+#>
+// Type definitions for the Microsoft Graph API
+// Project: https://github.com/microsoftgraph/msgraph-typescript-typings
+// Definitions by: Microsoft Graph Team <https://github.com/microsoftgraph>
+
+<#= writer.WriteHeader() #>
+
+
+<# foreach(var enumType in enumTypes) { #>
+export type <#= enumType.Name.UpperCaseFirstChar() #> = <#= enumType.GetEnumValues() #>
+<# } #>
+<#
+  foreach(var entityType in entityTypes)
+    {
+        var methods = entityType.Methods;
+#>
+
+export interface <#= entityType.Name.UpperCaseFirstChar() #><# if (entityType.Base != null) { #> extends <#=  entityType.Base.Name.UpperCaseFirstChar() #><# }#> {
+<# foreach(var prop in entityType.Properties.ToList()) { #>
+    <#=  prop.Name #>?: <#= prop.GetTypeString() #>
+<# } #>
+}
+<#
+    }
+#>
+<#
+  foreach(var complexType in complexTypes)
+  {
+#>
+
+export interface <#= complexType.Name.UpperCaseFirstChar()#> {
+<# foreach(var prop in complexType.Properties) { #>
+      <#= prop.Name #>?: <#= prop.GetTypeString() #>
+<# } #>
+}
+<# } #>

src/GraphODataTemplateWriter/.config/TemplateWriterSettings.json

@@ -1,6 +1,6 @@
 {
-    "AvailableLanguages": [ "Android", "ObjC", "CSharp", "Python", "GraphEndpointList" ],
-    "TargetLanguage": "GraphEndpointList",
+    "AvailableLanguages": [ "Android", "ObjC", "CSharp", "Python", "TypeScript", "GraphEndpointList" ],
+    "TargetLanguage": "TypeScript",
     "Plugins": [ ],
     "PrimaryNamespaceName": "com",
     "NamespacePrefix": "com",

src/GraphODataTemplateWriter/.config/TypeScriptSettings.json

@@ -0,0 +1,7 @@
+{
+    "TemplateMapping": {
+      "TypeScript": [
+          { "Template": "entity_types", "SubProcessor": "Other", "Name": "entity_types" }
+      ]
+    }
+}

src/GraphODataTemplateWriter/CodeHelpers/TypeScript/CodeWriterTypeScript.cs

@@ -0,0 +1,36 @@
+// Copyright (c) Microsoft Corporation.  All Rights Reserved.  Licensed under the MIT License.  See License in the project root for license information.
+
+namespace Microsoft.Graph.ODataTemplateWriter.CodeHelpers.TypeScript
+{
+    using System;
+    using Vipr.Core.CodeModel;
+
+    public class CodeWriterTypeScript : CodeWriterBase
+    {
+        public CodeWriterTypeScript() : base() { }
+
+        public CodeWriterTypeScript(OdcmModel model) : base(model) { }
+
+        public override String WriteOpeningCommentLine()
+        {
+            return "//" + this.NewLineCharacter;
+        }
+
+        public override String WriteClosingCommentLine()
+        {
+            return "//" + this.NewLineCharacter;
+        }
+
+        public override string WriteInlineCommentChar()
+        {
+            return "// ";
+        }
+
+        public override String NewLineCharacter
+        {
+            get { return "\n"; }
+        }
+
+    }
+
+}

src/GraphODataTemplateWriter/CodeHelpers/TypeScript/TypeHelperTypeScript.cs

@@ -0,0 +1,59 @@
+// Copyright (c) Microsoft Corporation.  All Rights Reserved.  Licensed under the MIT License.  See License in the project root for license information.
+
+namespace Microsoft.Graph.ODataTemplateWriter.CodeHelpers.TypeScript
+{
+    using Vipr.Core.CodeModel;
+    using System;
+    using System.Linq;
+
+    public static class TypeHelperTypeScript
+    {
+
+        // enum value string, ex: "low" | "normal" | "high"
+        public static String GetEnumValues(this OdcmEnum _enum) {
+            return _enum.Members.Select(m => "\"" + m.Name + "\"").Aggregate((cur, next) =>  cur + " | " + next);
+        }
+
+
+        public static string GetTypeString(this OdcmProperty prop)
+        {
+            string typeStr = prop.Type.Name.UpperCaseFirstChar();
+
+            switch (typeStr)
+            {
+                case "Stream":
+                case "Json":
+                    typeStr = "any";
+                    break;
+                case "Int16":
+                case "Int32":
+                case "Int64":
+                case "Double":
+                case "Binary": // let binary: number = 0b1010;
+                    typeStr = "number";
+                    break;
+                case "Guid":
+                case "String":
+                    typeStr = "string"; //lowercase
+                    break;
+                // all dates need to be of type string so they can be wrapped in new Date(___)
+                case "DateTimeOffset": // ISO 8601 format in UTC time, ex 2014-01-01T00:00:00Z
+                case "Date":
+                    typeStr = "string";
+                    break;
+                case "Boolean":
+                    typeStr = "boolean";
+                    break;
+
+            }
+            return (prop.IsCollection) ? "[" + typeStr + "]" : typeStr;
+            
+        }
+        public static String UpperCaseFirstChar(this String s)
+        {
+            return char.ToUpper(s[0]) + s.Substring(1);
+        }
+        
+        
+    }
+}

src/GraphODataTemplateWriter/GraphODataTemplateWriter.csproj

@@ -55,13 +55,16 @@
     <Compile Include="CodeHelpers\CSharp\CodeWriterCSharp.cs" />
     <Compile Include="CodeHelpers\CSharp\TypeHelperCSharp.cs" />
     <Compile Include="CodeHelpers\Android\CodeWriterAndroid.cs" />
+    <Compile Include="CodeHelpers\TypeScript\CodeWriterTypeScript.cs" />
+    <Compile Include="CodeHelpers\TypeScript\TypeHelperTypeScript.cs" />
     <Compile Include="CodeHelpers\GraphEndpointList\CodeWriterGraphEndpointList.cs" />
     <Compile Include="CodeHelpers\GraphEndpointList\TypeHelperGraphEndpointList.cs" />
     <Compile Include="CodeHelpers\ObjC\CodeWriterObjC.cs" />
     <Compile Include="CodeHelpers\Python\CodeWriterPython.cs" />
     <Compile Include="CodeHelpers\Python\TypeHelperPython.cs" />
     <Compile Include="Extensions\FeatureExtensions.cs" />
     <Compile Include="PathWriters\CSharpPathWriter.cs" />
+    <Compile Include="PathWriters\TypeScriptPathWriter.cs" />
     <Compile Include="PathWriters\GraphEndpointListPathWriter.cs" />
     <Compile Include="PathWriters\PythonPathWriter.cs" />
     <Compile Include="TemplateProcessor\CustomT4Host.cs" />
@@ -92,6 +95,9 @@
     <None Include=".config\CSharpSettings.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <None Include=".config\TypeScriptSettings.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
     <None Include=".config\GraphEndpointListSettings.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>

src/GraphODataTemplateWriter/PathWriters/TypeScriptPathWriter.cs

@@ -0,0 +1,55 @@
+// Copyright (c) Microsoft Corporation.  All Rights Reserved.  Licensed under the MIT License.  See License in the project root for license information.
+
+namespace Microsoft.Graph.ODataTemplateWriter.PathWriters
+{
+    using System;
+    using System.IO;
+    using System.Linq;
+    using Microsoft.Graph.ODataTemplateWriter.Extensions;
+    using Microsoft.Graph.ODataTemplateWriter.Settings;
+    using Microsoft.Graph.ODataTemplateWriter.TemplateProcessor;
+
+    public class TypeScriptPathWriter : PathWriterBase
+    {
+
+        public override string WritePath(ITemplateInfo template, String baseFileName)
+        {
+            var theNamespace = this.CreateNamespace(template.OutputParentDirectory.ToLower());
+            var namespacePath = this.CreatePathFromNamespace(theNamespace);
+            var fileName = this.TransformFileName(template, baseFileName);
+            String filePath = Path.Combine(namespacePath, fileName);
+            return filePath;
+        }
+
+        private string CreateNamespace(string folderName)
+        {
+            var @namespace = this.Model.GetNamespace();
+            var prefix = ConfigurationService.Settings.NamespacePrefix;
+
+            if (String.IsNullOrEmpty(ConfigurationService.Settings.NamespaceOverride))
+            {
+                if (string.IsNullOrEmpty(folderName))
+                {
+                    return string.IsNullOrEmpty(prefix) ? @namespace
+                                                        : string.Format("{0}.{1}", prefix, @namespace);
+                }
+
+                return string.IsNullOrEmpty(prefix) ? string.Format("{0}.{1}", @namespace, folderName)
+                                                    : string.Format("{0}.{1}.{2}", prefix, @namespace, folderName);
+            }
+
+            @namespace = ConfigurationService.Settings.NamespaceOverride;
+            return folderName != null ? string.Format("{0}.{1}", @namespace, folderName)
+                                         : @namespace;
+        }
+
+        private string CreatePathFromNamespace(string @namespace)
+        {
+            var splitPaths = @namespace.Split('.');
+
+            var destinationPath = splitPaths.Aggregate(string.Empty, (current, path) =>
+                                  current + string.Format("{0}{1}", path, Path.DirectorySeparatorChar));
+            return destinationPath;
+        }
+    }
+}