Moved get type string to TypeHelperTypeScript.cs

Author: dan-silver

Templates/TypeScript/src/entity_types.ts.tt

@@ -22,7 +22,7 @@ declare module MicrosoftGraph {
 <#
             foreach(var prop in entityType.Properties.ToList()) {
 #>
-      <#=  prop.Name #>?: <#= writer.FullTypeName(prop) #>
+      <#=  prop.Name #>?: <#= prop.GetTypeString() #>
 <# } #>
     }
     <#
@@ -54,7 +54,7 @@ declare module MicrosoftGraph {
     foreach(var prop in complexType.Properties)
     {
 #>
-      <#= prop.Name #>?: <#= writer.FullTypeName(prop) #>
+      <#= prop.Name #>?: <#= prop.GetTypeString() #>
 <#
     }
 #>

src/GraphODataTemplateWriter/CodeHelpers/TypeScript/CodeWriterTypeScript.cs

@@ -30,48 +30,11 @@ public override String NewLineCharacter
         {
             get { return "\n"; }
         }
-        
-        public static string ConvertToJSTypes(string type)
-        {
-            switch (type)
-            {
-                case "Stream":
-                    return "any";
-                case "Int16":
-                case "Int32":
-                case "Int64":
-                case "Double":
-                case "Binary": // let binary: number = 0b1010;
-                    return "number";
-                case "Guid":
-                case "String":
-                    return "string"; //lowercase
-                case "DateTimeOffset":
-                    return "Date";
-                case "Boolean":
-                    return "boolean";
-                default:
-                    return type;
-            }
-        }
-
         public String UpperCaseFirstChar(String s)
         {
             return char.ToUpper(s[0]) + s.Substring(1);
         }
 
-        public String FullTypeName(OdcmProperty prop)
-        {
-            var Name = prop.Projection.Type.Name;
-            
-            // capitalize the first letter
-            Name = UpperCaseFirstChar(Name);
-            
-            // Needs to come after uppercase() because some native TS types need to be lowercase
-            Name = ConvertToJSTypes(Name);
-
-            return (prop.IsCollection) ? "[" + Name + "]" : Name;
-        }
     }
 
 }

src/GraphODataTemplateWriter/CodeHelpers/TypeScript/TypeHelperTypeScript.cs

@@ -2,8 +2,54 @@
 
 namespace Microsoft.Graph.ODataTemplateWriter.CodeHelpers.TypeScript
 {
+    using Vipr.Core.CodeModel;
+    using System;
+
     public static class TypeHelperTypeScript
     {
+        
+        public static string GetTypeString(this OdcmProperty prop)
+        {
+            OdcmType type = prop.Type;
+            string typeStr = UpperCaseFirstChar(type.Name);
+
+
+            if (type == null)
+            {
+                typeStr = "id";
+            }
+
+            switch (typeStr)
+            {
+                case "Stream":
+                    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;
+                case "DateTimeOffset":
+                    typeStr = "Date";
+                    break;
+                case "Boolean":
+                    typeStr = "boolean";
+                    break;
 
+            }
+            return (prop.IsCollection) ? "[" + typeStr + "]" : typeStr;
+            
+        }
+        public static String UpperCaseFirstChar(String s)
+        {
+            return char.ToUpper(s[0]) + s.Substring(1);
+        }
+        
     }
 }