Generating path list

dan-silver · dan-silver · commit cb95148871b1 · 2016-09-01T13:08:10.000-07:00
diff --git a/GraphODataTemplateWriter.sln b/GraphODataTemplateWriter.sln
@@ -1,7 +1,7 @@
 ﻿
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
-VisualStudioVersion = 14.0.25123.0
+VisualStudioVersion = 14.0.25420.1
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{6ACF6CEE-A594-4DFE-9286-C7154E91738B}"
 	ProjectSection(SolutionItems) = preProject
@@ -17,15 +17,25 @@ EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
+		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
+		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{E6B5202F-4F66-428A-AB92-0AAA11BA81DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{E6B5202F-4F66-428A-AB92-0AAA11BA81DE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E6B5202F-4F66-428A-AB92-0AAA11BA81DE}.Debug|x86.ActiveCfg = Debug|x86
+		{E6B5202F-4F66-428A-AB92-0AAA11BA81DE}.Debug|x86.Build.0 = Debug|x86
 		{E6B5202F-4F66-428A-AB92-0AAA11BA81DE}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E6B5202F-4F66-428A-AB92-0AAA11BA81DE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E6B5202F-4F66-428A-AB92-0AAA11BA81DE}.Release|x86.ActiveCfg = Release|x86
+		{E6B5202F-4F66-428A-AB92-0AAA11BA81DE}.Release|x86.Build.0 = Release|x86
 		{5F526973-F69E-4C26-B8AD-612590A17A9E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5F526973-F69E-4C26-B8AD-612590A17A9E}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{5F526973-F69E-4C26-B8AD-612590A17A9E}.Debug|x86.Build.0 = Debug|Any CPU
 		{5F526973-F69E-4C26-B8AD-612590A17A9E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5F526973-F69E-4C26-B8AD-612590A17A9E}.Release|x86.ActiveCfg = Release|Any CPU
+		{5F526973-F69E-4C26-B8AD-612590A17A9E}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/Templates/Templates.csproj b/Templates/Templates.csproj
diff --git a/Templates/TypeScript/src/path_list.txt.tt b/Templates/TypeScript/src/path_list.txt.tt
@@ -0,0 +1,19 @@
+﻿<# // 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 complexTypes            = model.GetComplexTypes();
+	var entitySet               = model.EntityContainer.Properties;
+#>
+<# foreach(var es in entitySet) { #>
+<# foreach (var path in es.GetNavigationPaths("", entityTypes, 0)) { #>
+<#= path #>
+<# } #>
+
+
+<# } #>
diff --git a/src/GraphODataTemplateWriter/.config/TypeScriptSettings.json b/src/GraphODataTemplateWriter/.config/TypeScriptSettings.json
@@ -1,7 +1,8 @@
 {
     "TemplateMapping": {
       "TypeScript": [
-          { "Template": "entity_types", "SubProcessor": "Other", "Name": "entity_types" }
+          { "Template": "entity_types", "SubProcessor": "Other", "Name": "entity_types" },
+          { "Template": "path_list", "SubProcessor": "Other", "Name": "path_list" }
       ]
     }
 }
diff --git a/src/GraphODataTemplateWriter/CodeHelpers/CSharp/CodeWriterCSharp.cs b/src/GraphODataTemplateWriter/CodeHelpers/CSharp/CodeWriterCSharp.cs
@@ -3,6 +3,8 @@
 namespace Microsoft.Graph.ODataTemplateWriter.CodeHelpers.CSharp
 {
     using System;
+    using System.Collections.Generic;
+    using System.Linq;
     using Vipr.Core.CodeModel;
 
     public class CodeWriterCSharp : CodeWriterBase
@@ -25,5 +27,11 @@ public override string WriteInlineCommentChar()
         }
 
         public string jsonContentType = "application/json";
+
+
+        public static string GetPaths(OdcmProperty prop)
+        {
+            return "entities.First().Name";
+        }
     }
 }
diff --git a/src/GraphODataTemplateWriter/CodeHelpers/TypeScript/TypeHelperTypeScript.cs b/src/GraphODataTemplateWriter/CodeHelpers/TypeScript/TypeHelperTypeScript.cs
@@ -4,6 +4,8 @@ namespace Microsoft.Graph.ODataTemplateWriter.CodeHelpers.TypeScript
 {
     using Vipr.Core.CodeModel;
     using System;
+    using System.Collections.Generic;
+    using System.Linq;
 
     public static class TypeHelperTypeScript
     {
@@ -24,7 +26,8 @@ public static String GetEnumValues(this OdcmEnum _enum) {
 
             return enumVals;
         }
-        
+
+
         public static string GetTypeString(this OdcmProperty prop)
         {
             string typeStr = UpperCaseFirstChar(prop.Type.Name);
@@ -62,6 +65,47 @@ 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);
+            
+            foreach (var eprop in entity.Properties)
+            {
+                if (eprop.IsLink)
+                {
+                    paths.AddRange(GetNavigationPaths(eprop, newBase, entities, depth + 1));
+                }
+            }
+            return paths;
+        }
         
     }
 }
diff --git a/src/GraphODataTemplateWriter/GraphODataTemplateWriter.csproj b/src/GraphODataTemplateWriter/GraphODataTemplateWriter.csproj
@@ -31,6 +31,24 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x86\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
+    <OutputPath>bin\x86\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="Inflector">
       <HintPath>..\..\packages\Inflector.1.0.0.0\lib\net45\Inflector.dll</HintPath>
diff --git a/submodules/vipr b/submodules/vipr
@@ -1 +1 @@
-Subproject commit b53bb03d53450fc1b3335943d26f990934764854
+Subproject commit 9af0da1eb56ea4166b44af2ca1b4138f63f09c16

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,8 @@`
`1`	`1`	`{`
`2`	`2`	`"TemplateMapping": {`
`3`	`3`	`"TypeScript": [`
`4`		`- { "Template": "entity_types", "SubProcessor": "Other", "Name": "entity_types" }`
	`4`	`+ { "Template": "entity_types", "SubProcessor": "Other", "Name": "entity_types" },`
	`5`	`+ { "Template": "path_list", "SubProcessor": "Other", "Name": "path_list" }`
`5`	`6`	`]`
`6`	`7`	`}`
`7`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,8 @@`
`3`	`3`	`namespace Microsoft.Graph.ODataTemplateWriter.CodeHelpers.CSharp`
`4`	`4`	`{`
`5`	`5`	`using System;`
	`6`	`+ using System.Collections.Generic;`
	`7`	`+ using System.Linq;`
`6`	`8`	`using Vipr.Core.CodeModel;`
`7`	`9`
`8`	`10`	`public class CodeWriterCSharp : CodeWriterBase`
`@@ -25,5 +27,11 @@ public override string WriteInlineCommentChar()`
`25`	`27`	`}`
`26`	`28`
`27`	`29`	`public string jsonContentType = "application/json";`
	`30`	`+`
	`31`	`+`
	`32`	`+ public static string GetPaths(OdcmProperty prop)`
	`33`	`+ {`
	`34`	`+ return "entities.First().Name";`
	`35`	`+ }`
`28`	`36`	`}`
`29`	`37`	`}`