Updated TypeScript template

Author: dan-silver

Templates/Templates.csproj

@@ -246,9 +246,6 @@
     <Content Include="Python\Request\EntityRequestBuilder.py.tt" />
     <Content Include="Python\Request\Method.py.tt" />
     <Content Include="Python\Request\Stream.py.tt" />
-    <Content Include="TypeScript\src\path_list.txt.tt">
-      <Generator>TextTemplatingFileGenerator</Generator>
-    </Content>
   </ItemGroup>
   <ItemGroup>
     <Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />

Templates/TypeScript/src/entity_types.ts.tt

@@ -16,21 +16,21 @@
 
 <#= writer.WriteHeader() #>
 
-declare module MicrosoftGraph {
+
 <# foreach(var enumType in enumTypes) { #>
-  type <#= writer.UpperCaseFirstChar(enumType.Name) #> = <#= enumType.GetEnumValues() #>
+export type <#= writer.UpperCaseFirstChar(enumType.Name) #> = <#= enumType.GetEnumValues() #>
 <# } #>
 <#
   foreach(var entityType in entityTypes)
     {
         var methods = entityType.Methods;
 #>
 
-  interface <#= writer.UpperCaseFirstChar(entityType.Name) #><# if (entityType.Base != null) { #> extends <#=  writer.UpperCaseFirstChar(entityType.Base.Name) #><# }#> {
+export interface <#= writer.UpperCaseFirstChar(entityType.Name) #><# if (entityType.Base != null) { #> extends <#=  writer.UpperCaseFirstChar(entityType.Base.Name) #><# }#> {
 <# foreach(var prop in entityType.Properties.ToList()) { #>
     <#=  prop.Name #>?: <#= prop.GetTypeString() #>
 <# } #>
-  }
+}
 <#
     }
 #>
@@ -39,14 +39,9 @@ declare module MicrosoftGraph {
   {
 #>
 
-  interface <#= writer.UpperCaseFirstChar(complexType.Name)#> {
+export interface <#= writer.UpperCaseFirstChar(complexType.Name)#> {
 <# foreach(var prop in complexType.Properties) { #>
       <#= prop.Name #>?: <#= prop.GetTypeString() #>
-<# } #>
-  }
 <# } #>
 }
-
-declare module "MicrosoftGraph" {
-    export = MicrosoftGraph;
-}
+<# } #>

Templates/TypeScript/src/path_list.txt.tt

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

src/GraphODataTemplateWriter/.config/TypeScriptSettings.json

@@ -35,6 +35,7 @@ public static string GetTypeString(this OdcmProperty prop)
             switch (typeStr)
             {
                 case "Stream":
+                case "Json":
                     typeStr = "any";
                     break;
                 case "Int16":
@@ -65,57 +66,7 @@ public static String UpperCaseFirstChar(String s)
         {
             return char.ToUpper(s[0]) + s.Substring(1);
         }
-
-        public static OdcmClass FindEntityByName(this IEnumerable<OdcmClass> entities, String name)
-        {
-            foreach (var entity in entities)
-            {
-                if (entity.Name.Equals(name))
-                {
-                    return entity;
-                }
-            }
-            return null;
-        }
-
-        public static List<string> GetNavigationPaths(this OdcmProperty prop, string baseString, IEnumerable<OdcmClass> entities, int depth)
-        {
-            List<String> paths = new List<string>();
-            if (depth > 5) return paths;
-            OdcmClass entity = entities.FindEntityByName(prop.Type.Name);
-
-            string newBase;
-            if (prop.IsCollection)
-            {
-                newBase = baseString + "/" + prop.Name + "/{" + prop.Type.Name + "Id}";
-                paths.Add(baseString + "/" + prop.Name);
-            }
-            else
-            {
-                newBase = baseString + "/" + prop.Name;
-         
-            }
-
-            paths.Add(newBase);
-            if (entity.Methods.Any()) // check for actions
-            {
-                foreach (var method in entity.Methods)
-                {
-                    paths.Add(newBase + "/" + method.Name);
-                }
-            }
-
-            foreach (var eprop in entity.Properties)
-            {
-                if (eprop.IsLink)
-                {
-                    paths.AddRange(GetNavigationPaths(eprop, newBase, entities, depth + 1));
-                }
-            }
-
-
-            return paths;
-        }
+        
 
     }
 }