prevent filename/operation name causing duplicate types

fixes #8

Author: tocsoft

Tocsoft.GraphQLCodeGen.Cli/Models/ViewModel.cs

@@ -99,16 +99,15 @@ private string GenerateType(SetSelection selection, string operationName = null)
 
             string name = FindBestName(operationName ?? selection.RootType.Name, "Result");
 
-            TypeViewModel type = new TypeViewModel(name)
-            {
-                Fields = selection.Fields.Select(x => new NamedTypeViewModel()
-                {
-                    Name = x.Name,
-                    Type = GenerateTypeReference(x)
-                }).ToList()
-            };
+            TypeViewModel type = new TypeViewModel(name);
+
             this.typeLookup.Add($"{operationName}_{selection.UniqueIdentifier}", type);
             this.typeCollection.Add(type);
+            type.Fields = selection.Fields.Select(x => new NamedTypeViewModel()
+            {
+                Name = x.Name,
+                Type = GenerateTypeReference(x)
+            }).ToList();
 
             return type.Name;
         }

Tocsoft.GraphQLCodeGen.Tests/Files/Issue_8/Quote.gql

@@ -0,0 +1,9 @@
+#! schema: Schema.gql
+#! class: Test
+#! output: test.cs
+
+query {
+    quote(id: "safsa"){
+        id
+    }
+}

Tocsoft.GraphQLCodeGen.Tests/Files/Issue_8/Schema.gql

@@ -0,0 +1,14 @@
+schema {
+  query: Query
+  mutation: Mutation
+}
+
+type Query {
+  quote(id: string!): Quote
+}
+
+type Quote {
+    id: Date!
+}
+
+scalar Date

…QLCodeGen.Tests/Files/Issue_9/Schema.gql …Gen.Tests/Files/Issue_9/Issue9Schema.gqlTocsoft.GraphQLCodeGen.Tests/Files/Issue_9/Schema.gql renamed to Tocsoft.GraphQLCodeGen.Tests/Files/Issue_9/Issue9Schema.gql Tocsoft.GraphQLCodeGen.Tests/Files/Issue_9/Schema.gql renamed to Tocsoft.GraphQLCodeGen.Tests/Files/Issue_9/Issue9Schema.gql

@@ -6,6 +6,7 @@
 type Query {
   test(id: string!): Droid
 }
+
 type Droid {
     nullable: Date
     nonnullable: Date!

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

@@ -1,8 +1,8 @@
-#! schema: Schema.gql
+#! schema: Issue9Schema.gql
 #! class: Test
 #! output: test.cs
 
-query{
+query q{
     test(id: "safsa"){
         nullable,
         nonnullable

Tocsoft.GraphQLCodeGen.Tests/Issue_8.cs

@@ -0,0 +1,36 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Xunit;
+using CodeGenerator = Tocsoft.GraphQLCodeGen.CodeGenerator;
+
+namespace Tocsoft.GraphQLCodeGen.Tests
+{
+    public class Issue_8
+    {
+        FakeLogger logger;
+        CodeGeneratorSettingsLoader settingsLoader;
+        public Issue_8()
+        {
+            logger = new FakeLogger();
+            settingsLoader = new CodeGeneratorSettingsLoader(logger);
+        }
+
+        [Fact]
+        public async Task TypeNamesShouldBeUnique()
+        {
+            var settings = settingsLoader.GenerateSettings(new[] { "./Files/Issue_8/Quote.gql" });
+
+            CodeGenerator generator = new CodeGenerator(logger, settings.Single());
+
+            await generator.LoadSource();
+            generator.Parse();
+
+            var model = generator.Model;
+
+            var resultType = Assert.Single(model.Types.Where(x => x.Name == "QuoteResult"));
+        }
+    }
+}

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

@@ -9,21 +9,29 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <None Remove="Files\Issue_8\Quote.gql" />
+    <None Remove="Files\Issue_9\Issue9Schema.gql" />
     <None Remove="Files\Issue_9\Query.gql" />
     <None Remove="Files\Issue_9\QueryGitHub.gql" />
-    <None Remove="Files\Issue_9\Schema.gql" />
+    <None Remove="Files\Issue_8\Schema.gql" />
   </ItemGroup>
 
   <ItemGroup>
+    <Content Include="Files\Issue_9\Query.gql">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
     <Content Include="Files\Issue_9\QueryGitHub.gql">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <Content Include="Files\Issue_9\Query.gql">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    <Content Include="Files\Issue_9\Issue9Schema.gql">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <Content Include="Files\Issue_9\Schema.gql">
+    <Content Include="Files\Issue_8\Quote.gql">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="Files\Issue_8\Schema.gql">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
   </ItemGroup>
 
   <ItemGroup>