add resolve path helper to alow easier relative file path generation

Author: tocsoft

Tocsoft.GraphQLCodeGen.Cli/CodeGenerator.cs

@@ -70,7 +70,7 @@ internal void Export()
 
         internal void Render()
         {
-            this.GeneratedCode = new TemplateEngine(this.settings.Templates, this.settings.TemplateSettings, logger).Generate(Model);
+            this.GeneratedCode = new TemplateEngine(this.settings.Templates, this.settings.TemplateSettings, logger, Model).Generate();
         }
 
         internal void Parse()

Tocsoft.GraphQLCodeGen.Cli/CodeGeneratorSettings.cs

@@ -13,6 +13,7 @@ public class CodeGeneratorSettings
 
         public IEnumerable<string> Templates { get; set; }
         public IDictionary<string, string> TemplateSettings { get; internal set; }
+        public string RootPath { get; internal set; }
         internal SchemaSource Schema { get; set; }
     }
 }

Tocsoft.GraphQLCodeGen.Cli/CodeGeneratorSettingsLoader.cs

@@ -78,6 +78,7 @@ public IEnumerable<CodeGeneratorSettings> GenerateSettings(CodeGeneratorSettings
                     ClassName = cn,
                     Namespace = nspc,
                     OutputPath = first.OutputPath,
+                    RootPath = first.RootPath,
                     TypeNameDirective = first.TypeNameDirective,
                     SourceFiles = x.Select(p => new NamedSource
                     {
@@ -326,6 +327,11 @@ private bool ExpandSettings(string path, SimpleSourceFile file)
                 }
             }
 
+            if (settings.Root)
+            {
+                file.RootPath = root;
+            }
+
             return settings.Root;
         }
     }

Tocsoft.GraphQLCodeGen.Cli/Models/ViewModel.cs

@@ -14,6 +14,8 @@ public class ViewModel
 
         public string Namespace { get; private set; }
         public string ClassName { get; private set; }
+        public string OutputPath { get; }
+        public string RootPath { get; }
 
         private Dictionary<string, TypeViewModel> typeLookup = new Dictionary<string, TypeViewModel>();
         private Dictionary<IGraphQLType, string> inputTypeLookup = new Dictionary<IGraphQLType, string>();
@@ -32,6 +34,8 @@ internal ViewModel(GraphQLDocument query, CodeGeneratorSettings settings)
             this.query = query;
             this.Namespace = settings.Namespace;
             this.ClassName = settings.ClassName;
+            this.OutputPath = settings.OutputPath;
+            this.RootPath = settings.RootPath;
 
             this.typeLookup = new Dictionary<string, TypeViewModel>();
             this.inputTypeLookup = new Dictionary<IGraphQLType, string>();

Tocsoft.GraphQLCodeGen.Cli/SimpleSourceFile.cs

@@ -18,6 +18,7 @@ internal class SimpleSourceFile
         public Dictionary<string, string> TemplateSettings { get; set; } = new Dictionary<string, string>();
         public List<string> Includes { get; set; } = new List<string>();
         public SchemaSource SchemaSource { get; set; }
+        public string RootPath { get; set; }
 
         internal string SettingsHash()
         {
@@ -27,6 +28,8 @@ internal string SettingsHash()
             sb.Append("~#~");
             sb.Append(OutputPath);
             sb.Append("~#~");
+            sb.Append(RootPath);
+            sb.Append("~#~");
             sb.Append(Format);
             sb.Append("~#~");
             sb.Append(TypeNameDirective);

Tocsoft.GraphQLCodeGen.Cli/TemplateEngine.cs

@@ -8,17 +8,20 @@
 using Tocsoft.GraphQLCodeGen.Cli;
 using System.Text.RegularExpressions;
 using System.Runtime.InteropServices.ComTypes;
+using Tocsoft.GraphQLCodeGen.Models;
 
 namespace Tocsoft.GraphQLCodeGen
 {
     public class TemplateEngine
     {
         private readonly ILogger logger;
+        private readonly ViewModel model;
         private IHandlebars engine;
 
-        public TemplateEngine(IEnumerable<string> templates, IDictionary<string, string> templateArguments, ILogger logger)
+        public TemplateEngine(IEnumerable<string> templates, IDictionary<string, string> templateArguments, ILogger logger, Models.ViewModel model)
         {
             this.logger = logger;
+            this.model = model;
             this.engine = HandlebarsDotNet.Handlebars.Create(new HandlebarsConfiguration
             {
                 ThrowOnUnresolvedBindingExpression = true,
@@ -47,6 +50,34 @@ public TemplateEngine(IEnumerable<string> templates, IDictionary<string, string>
                 writer.WriteSafeString(args[0].ToString().Replace(toReplace, toReplaceWith));
             });
 
+            this.engine.RegisterHelper("resolve", (writer, context, args) =>
+            {
+                string target = args[0].ToString();
+
+                var currentDirectory = Path.GetDirectoryName(model.OutputPath);
+                System.Uri uri1;
+                if (target.StartsWith("~/"))
+                {
+                    uri1 = new Uri(Path.GetFullPath(Path.Combine(model.RootPath, target.Substring(2))));
+                }
+                else
+                {
+                    uri1 = new Uri(target, UriKind.Relative);
+                }
+
+                System.Uri uri2 = new Uri(currentDirectory.TrimEnd() + "\\");
+
+                Uri relativeUri = uri2.MakeRelativeUri(uri1);
+
+                var path = relativeUri.ToString();
+                if (path[0] != '.')
+                {
+                    path = "./" + path;
+                }
+
+                writer.WriteSafeString(path);
+            });
+
             HandlebarsBlockHelper ifTemplateHelper = (output, options, context, args) =>
             {
                 var val = this.engine.Compile("{{> " + args[0].ToString() + "}}")((object)context)?.ToString()?.Trim();
@@ -115,7 +146,7 @@ public string Encode(string value)
 
         private Func<object, string> template;
 
-        public string Generate(object model)
+        public string Generate()
         {
             try
             {

Tocsoft.GraphQLCodeGen.Cli/Templates/ts/typescript.template

@@ -1,5 +1,7 @@
 {{!# Includes }}
 
+{{!# ClientClassDecorators }}
+
 {{!# Main}}
 /* tslint:disable */
 //----------------------
@@ -35,6 +37,7 @@ function {{pascalCase ClassName}}Error(message:string, httpResponse:Response, gr
 
 export { {{pascalCase ClassName}}Error }
 
+{{>ClientClassDecorators}}
 export default class {{pascalCase ClassName}}Client {
 
     constructor(public client: fetchClient, public url: string) { }
@@ -139,6 +142,12 @@ export class {{pascalCase Name}} {
 {{!# TypeReference_ID}}
 	{{~> RenderTypeReference  typename='string' isValueType=false fixCase=false isCollection=IsCollection nullable=CanValueBeNull collectionNullable=CanCollectionBeNull }}
 
+{{!# TypeReference_GUID}}
+	{{~> RenderTypeReference  typename='string' isValueType=false fixCase=false isCollection=IsCollection nullable=CanValueBeNull collectionNullable=CanCollectionBeNull }}
+
+{{!# TypeReference_Uuid}}
+	{{~> RenderTypeReference  typename='string' isValueType=false fixCase=false isCollection=IsCollection nullable=CanValueBeNull collectionNullable=CanCollectionBeNull }}
+
 {{!# TypeReference_Float}}
 	{{~> RenderTypeReference typename='number' isValueType=true fixCase=false isCollection=IsCollection nullable=CanValueBeNull collectionNullable=CanCollectionBeNull  }}
 
@@ -170,6 +179,12 @@ export class {{pascalCase Name}} {
 {{!# FieldSetter_ID}}
 	result.{{camelCase Name}} = json["{{camelCase Name}}"];
 
+{{!# FieldSetter_GUID}}
+	result.{{camelCase Name}} = json["{{camelCase Name}}"];
+
+{{!# FieldSetter_Uuid}}
+	result.{{camelCase Name}} = json["{{camelCase Name}}"];
+
 {{!# FieldSetter_Float}}
 	result.{{camelCase Name}} = json["{{camelCase Name}}"];
 

Tocsoft.GraphQLCodeGen.Tests/Files/SchemaFiles/Query.gql

@@ -0,0 +1,7 @@
+query q{
+    test(id: "safsa")
+	{
+        nullable,
+        nonnullable
+    }
+}

Tocsoft.GraphQLCodeGen.Tests/Files/SchemaFiles/gqlsettings.json

@@ -0,0 +1,10 @@
+{
+  "root": true,
+  "schema": "schema.gqlschema",
+  "output": "test.cs",
+  "class": "Sample.Client.Test",
+
+  "templateSettings": {
+    "interfaceBase": "IFooBase"
+  }
+}

Tocsoft.GraphQLCodeGen.Tests/Files/SchemaFiles/schema.gqlschema

@@ -0,0 +1,19 @@
+
+schema {
+  query: Query
+  mutation: Mutation
+}
+
+type Query {
+  test(id: string!): Droid
+}
+
+type Droid {
+    nullable: Date
+    nonnullable: Date!
+    name: String!
+}
+
+scalar Date
+
+scalar String