Merge pull request #20 from cjp666/master

Resolves issue #19 where non-named mutations are not generated correctly

Author: tocsoft

Tocsoft.GraphQLCodeGen.Cli/AstPrinter.cs

@@ -396,16 +396,13 @@ private string PrintOperationDefinition(GraphQLOperationDefinition definition)
                 .ToString()
                 .ToLower();
 
-            return string.IsNullOrWhiteSpace(name) &&
-                string.IsNullOrWhiteSpace(name) &&
-                string.IsNullOrWhiteSpace(name) &&
-                definition.Operation != OperationType.Query
-                ? selectionSet
-                : this.Join(
+            var variables = string.IsNullOrWhiteSpace(name) ? variableDefinitions : this.Join(new[] { name, variableDefinitions });
+
+            return this.Join(
                     new[]
                     {
                         operation,
-                        this.Join(new[] { name, variableDefinitions }),
+                        variables,
                         directives,
                         selectionSet
                     },

Tocsoft.GraphQLCodeGen.Tests/Files/Issue_19/named.gql

@@ -0,0 +1,9 @@
+#! settings:./settings.json
+
+mutation IfNamedUseNameInstead ($repositoyId : ID!){
+  addStar(input :{clientMutationId : "123",  starrableId :$repositoyId }){
+    starrable {
+      viewerHasStarred
+    }
+  }
+}

Tocsoft.GraphQLCodeGen.Tests/Files/Issue_19/notNamed.gql

@@ -0,0 +1,9 @@
+#! settings:./settings.json
+
+mutation ($repositoyId : ID!){
+  addStar(input :{clientMutationId : "123",  starrableId :$repositoyId }){
+    starrable {
+      viewerHasStarred
+    }
+  }
+}

Tocsoft.GraphQLCodeGen.Tests/Files/Issue_19/settings.json

@@ -0,0 +1,5 @@
+{
+  "schema": "../GitHubSchema.json",
+  "output": "Client.cs",
+  "class": "Sample.Client.GitHub.GitHubClient"
+}

Tocsoft.GraphQLCodeGen.Tests/Issue_19.cs

@@ -0,0 +1,49 @@
+using System.Linq;
+using System.Threading.Tasks;
+using Xunit;
+
+namespace Tocsoft.GraphQLCodeGen.Tests
+{
+    public class Issue19
+    {
+        [Fact]
+        public async Task GenerateNamedMutationIsCorrect()
+        {
+            var logger = new FakeLogger();
+            var settingsLoader = new CodeGeneratorSettingsLoader(logger);
+
+            var paths = "./Files/Issue_19/named.gql";
+
+            var settings = settingsLoader.GenerateSettings(new CodeGeneratorSettingsLoaderDefaults(), new[] { paths });
+
+            var generator = new CodeGenerator(logger, settings.Single());
+
+            await generator.LoadSource();
+            generator.Parse();
+            generator.Render();
+            var code = generator.GeneratedCode;
+
+            Assert.Contains("mutation IfNamedUseNameInstead($repositoyId: ID!)", code);
+        }
+
+        [Fact]
+        public async Task GenerateNonNamedMutationIsCorrect()
+        {
+            var logger = new FakeLogger();
+            var settingsLoader = new CodeGeneratorSettingsLoader(logger);
+
+            var paths = "./Files/Issue_19/notNamed.gql";
+
+            var settings = settingsLoader.GenerateSettings(new CodeGeneratorSettingsLoaderDefaults(), new[] { paths });
+
+            var generator = new CodeGenerator(logger, settings.Single());
+
+            await generator.LoadSource();
+            generator.Parse();
+            generator.Render();
+            var code = generator.GeneratedCode;
+
+            Assert.Contains("mutation ($repositoyId: ID!)", code);
+        }
+    }
+}

Tocsoft.GraphQLCodeGen.Tests/Tocsoft.GraphQLCodeGen.Tests.csproj

@@ -93,6 +93,15 @@
   </ItemGroup>
 
   <ItemGroup>
+    <None Update="Files\Issue_19\notNamed.gql">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Update="Files\Issue_19\named.gql">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Update="Files\Issue_19\settings.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
     <None Update="Files\SchemaFiles\gqlsettings.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>