allow configuring the generation timeout via msbuild properties

Author: tocsoft

Samples/ClientSample/Client/DllIntrospection/gqlsettings.json

@@ -0,0 +1,9 @@
+#! schema:../../GraphQLApiSample/GraphQLApiSample/bin/Debug/netcoreapp1.0/GraphQLApiSample.dll
+#! output: Client.cs
+#! class: Sample.Client.GitHub.Tmp
+
+query  {
+  viewer {
+    name
+  }
+}

Samples/ClientSample/Client/DllIntrospection/single.gql

@@ -5,6 +5,7 @@
     <OutputType>Exe</OutputType>
     <TargetFramework>netcoreapp2.0</TargetFramework>
     <RunGraphQLCodeGen>true</RunGraphQLCodeGen>
+    <GraphQLCodeGenTimeOut>10000</GraphQLCodeGenTimeOut>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">

Samples/ClientSample/Client/GitHub/single.gql2

@@ -67,7 +67,7 @@ public async Task<bool> GenerateAsync()
 
             Models.ViewModel model = new Models.ViewModel(doc, this.settings);
 
-            string fileResult = new TemplateEngine(this.settings.Templates).Generate(model);
+            string fileResult = new TemplateEngine(this.settings.Templates, logger).Generate(model);
 
             Directory.CreateDirectory(Path.GetDirectoryName(this.settings.OutputPath));
             File.WriteAllText(this.settings.OutputPath, fileResult);

Samples/ClientSample/Sample.csproj

@@ -17,8 +17,8 @@ internal class GraphQLConventionsRequestHandlerBuilder
         public GraphQLConventionsRequestHandlerBuilder( Assembly conventionsAssembly)
         {
             var allTypes = conventionsAssembly.AllLoadableTypes();
-            var builderType = allTypes.Single(x=>x.FullName == "GraphQL.Conventions.Web.RequestHandler+RequestHandlerBuilder");
-            var rootHandler = allTypes.Single(x => x.FullName == "GraphQL.Conventions.Web.RequestHandler");
+            var builderType = allTypes.SingleOrDefault(x=>x.FullName == "GraphQL.Conventions.Web.RequestHandler+RequestHandlerBuilder");
+            var rootHandler = allTypes.SingleOrDefault(x => x.FullName == "GraphQL.Conventions.Web.RequestHandler");
             var newBuidlerMethod = rootHandler.GetMethod("New");
 
             this.builder = newBuidlerMethod.Invoke(null, new object[0]);

Tocsoft.GraphQLCodeGen.Cli/CodeGenerator.cs

@@ -5,16 +5,19 @@
 using System.IO;
 using System.Reflection;
 using System.Linq;
+using Tocsoft.GraphQLCodeGen.Cli;
+using System.Text.RegularExpressions;
 
 namespace Tocsoft.GraphQLCodeGen
 {
     public class TemplateEngine
     {
+        private readonly ILogger logger;
         private IHandlebars engine;
 
-        public TemplateEngine(IEnumerable<string> templates)
+        public TemplateEngine(IEnumerable<string> templates, ILogger logger)
         {
-
+            this.logger = logger;
             this.engine = HandlebarsDotNet.Handlebars.Create(new HandlebarsConfiguration
             {
                 ThrowOnUnresolvedBindingExpression = true
@@ -79,8 +82,17 @@ public string Encode(string value)
 
         public string Generate(object model)
         {
-            Func<object, string> template = this.engine.Compile("{{> Main}}");
-            return template.Invoke(model);
+            try
+            {
+                Func<object, string> template = this.engine.Compile("{{> Main}}");
+                return template.Invoke(model);
+            }
+            catch (Exception ex)
+            {
+                logger.Error(ex.ToString());
+                //throw ex;
+                return "";
+            }
         }
 
 

Tocsoft.GraphQLCodeGen.Cli/RelectionHelpers/GraphQLConventionsRequestHandlerBuilder.cs

@@ -152,6 +152,9 @@ namespace {{Namespace}}
 {{!# TypeReference_DateTime}}
 	{{~> RenderTypeReference name='DateTime' isValueType=true fixCase=false isCollection=IsCollection nullable=CanValueBeNull }}
 
+{{!# TypeReference_GUID}}
+	{{~> RenderTypeReference name='Guid' isValueType=true fixCase=false isCollection=IsCollection nullable=CanValueBeNull }}
+	
 {{!# RenderTypeReference}}
 	{{~#if isCollection }}IEnumerable<{{/if~}}
 	{{#if fixCase}}{{pascalCase name}}{{/if}}{{#unless fixCase}}{{name}}{{/unless}}

Tocsoft.GraphQLCodeGen.Cli/TemplateEngine.cs

@@ -24,6 +24,9 @@ public class GenerateGraphQLClient : Task
         [Required]
         public string IntermediateOutputDirectory { get; set; }
 
+        [Required]
+        public string Timeout { get; set; }
+
         [Output]
         public ITaskItem[] GeneratedCompile { get; set; }
 
@@ -78,7 +81,22 @@ public override bool Execute()
                     RedirectStandardOutput = true,
                     RedirectStandardError = true
                 });
-                process.WaitForExit(5000);
+
+                Debugger.Launch();
+                // default timeout of 5 seconds
+                int timeout = 5000;
+                if (!int.TryParse(this.Timeout, out timeout))
+                {
+                    timeout = 5000;
+                }
+
+                // min timeout of 5 seconds
+                if (timeout < 5000)
+                {
+                    timeout = 5000;
+                }
+
+                process.WaitForExit(timeout);
                 if (!process.HasExited)
                 {
                     process.Kill();

Tocsoft.GraphQLCodeGen.Cli/Templates/cs/CSharp.template

@@ -7,6 +7,7 @@
 
     <GraphQLCodeGenAssembly>$(GraphQLCodeGenAssemblyFolder)\Tocsoft.GraphQLCodeGen.MsBuild.dll</GraphQLCodeGenAssembly>
     <RunGraphQLCodeGen Condition="'$(RunGraphQLCodeGen)' == ''">true</RunGraphQLCodeGen>
+    <GraphQLCodeGenTimeOut Condition="'$(GraphQLCodeGenTimeOut)' == ''">5000</GraphQLCodeGenTimeOut>
   </PropertyGroup>
 
   <ItemDefinitionGroup>