nozzlegear · nozzlegear · Aug 26, 2025 · Sep 29, 2025 · Oct 3, 2025 · Oct 23, 2025
diff --git a/ShopifySharp.GraphQL.Parser.CLI/GenerateCommand.cs b/ShopifySharp.GraphQL.Parser.CLI/GenerateCommand.cs
@@ -16,19 +16,29 @@ public async Task<int> ExecuteAsync(GenerateOptions options, CancellationToken c
             return 1;
         }
 
-        if (!Directory.Exists(options.Output))
-            Directory.CreateDirectory(options.Output);
+        if (!Directory.Exists(options.TypesPath))
+            Directory.CreateDirectory(options.TypesPath);
+
+        if (!Directory.Exists(options.QueryBuildersPath))
+            Directory.CreateDirectory(options.QueryBuildersPath);
 
         var casingType = options.CasingType switch
         {
             "camel" => Casing.Camel,
             _ => Casing.Pascal
         };
-        var destination = FileSystemDestination.NewDirectory(options.Output);
+        var typesDestination = FileSystemDestination.NewDirectory(options.TypesPath);
+        var queryBuildersDestination = FileSystemDestination.NewDirectory(options.QueryBuildersPath);
 
         var mem = (await File.ReadAllTextAsync(options.GraphqlFilePath, cancellationToken)).AsMemory();
 
-        await Parser.ParseAndWriteAsync(destination, casingType, options.Nullability == true, mem, CancellationToken.None);
+        await Parser.ParseAndWriteAsync(
+            typesDestination,
+            queryBuildersDestination,
+            casingType,
+            options.Nullability == true,
+            mem,
+            CancellationToken.None);
 
         return 0;
     }

diff --git a/ShopifySharp.GraphQL.Parser.CLI/GenerateOptions.cs b/ShopifySharp.GraphQL.Parser.CLI/GenerateOptions.cs
@@ -7,8 +7,11 @@ namespace ShopifySharp.GraphQL.Parser.CLI;
 [Verb("parse", aliases: ["generate"], HelpText = "Reads a .graphql file and generates C# classes, enums and input types compatible with ShopifySharp.")]
 public record GenerateOptions
 {
-    [Option('o', "output", Required = true, HelpText = "Output directory for generated C# files")]
-    public required string Output { get; init; }
+    [Option('t', "types-dir", Required = true, HelpText = "Output directory for generated type files")]
+    public required string TypesPath { get; init; }
+
+    [Option('b', "builders-dir", Required = true, HelpText = "Output directory for generated QueryBuilder files")]
+    public required string QueryBuildersPath { get; init; }
 
     [Value(0, MetaName = "<schema.graphql>", HelpText = "Path to the GraphQL schema file to convert. Both JSON and GraphQL are accepted.")]
     public required string GraphqlFilePath { get; init; }

diff --git a/ShopifySharp.GraphQL.Parser.Tests/DomainTests.fs b/ShopifySharp.GraphQL.Parser.Tests/DomainTests.fs
@@ -1,14 +1,20 @@
 module ShopifySharp.GraphQL.Parser.Tests.DomainTests
 
 open System.Threading
-open FakeItEasy
 open Faqt
 open Faqt.Operators
 open GraphQLParser.Visitors
 open Xunit
 open ShopifySharp.GraphQL.Parser
 
 type DomainTests() =
+    let schema = """
+        type TestType {
+            id: ID!
+            name: String
+        }
+    """
+    let document = GraphQLParser.Parser.Parse(schema)
 
     [<Theory>]
     [<CombinatorialData>]
@@ -35,7 +41,7 @@ type DomainTests() =
     member _.``ParserContext.CancellationToken should return correct token``() =
         // Setup
         let cancellationToken = CancellationToken()
-        let sut = ParserContext(Pascal, false, cancellationToken)
+        let sut = ParserContext(Pascal, false, document, cancellationToken)
 
         // Act & Assert
         %sut.CancellationToken.Should().Be(cancellationToken)
@@ -53,7 +59,7 @@ type DomainTests() =
             | "camel" -> Camel
             | _ -> failwithf $"Unhandled {nameof casingType} value \"{casingType}\""
         let cancellationToken = CancellationToken.None
-        let sut = ParserContext(casing, false, cancellationToken)
+        let sut = ParserContext(casing, false, document, cancellationToken)
 
         // Act & Assert
         %sut.CasingType.Should().Be(casing)
@@ -65,7 +71,7 @@ type DomainTests() =
     ) =
         // Setup
         let cancellationToken = CancellationToken.None
-        let sut = ParserContext(Pascal, assumeNullability, cancellationToken)
+        let sut = ParserContext(Pascal, assumeNullability, document, cancellationToken)
         let context = sut :> IParsedContext
 
         // Act & Assert
@@ -75,7 +81,7 @@ type DomainTests() =
     member _.``ParserContext SetVisitedType should add type to collection``() =
         // Setup
         let cancellationToken = CancellationToken.None
-        let sut = ParserContext(Pascal, false, cancellationToken)
+        let sut = ParserContext(Pascal, false, document, cancellationToken)
         let testClass = VisitedTypes.Class {
             Name = "TestClass"
             XmlSummary = [||]
@@ -95,59 +101,11 @@ type DomainTests() =
         | VisitedTypes.Class c -> %c.Name.Should().Be("TestClass")
         | _ -> failwith "Expected Class type"
 
-    [<Fact>]
-    member _.``ParserContext AddUnionRelationship should add relationship``() =
-        // Setup
-        let cancellationToken = CancellationToken.None
-        let sut = ParserContext(Pascal, false, cancellationToken)
-        let context = sut :> IParsedContext
-        let unionName = "TestUnion"
-        let unionCases = [| "Case1"; "Case2" |]
-
-        // Act
-        sut.AddUnionRelationship unionName unionCases
-
-        // Assert
-        for unionCase in unionCases do
-            %context.TypeIsKnownUnionCase(unionCase).Should().BeTrue()
-
-    [<Fact>]
-    member _.``ParserContext TryFindUnionRelationship should return relationship when exists``() =
-        // Setup
-        let cancellationToken = CancellationToken.None
-        let sut = ParserContext(Pascal, false, cancellationToken)
-        let context = sut :> IParsedContext
-        let unionName = "TestUnion"
-        let unionCase = "TestCase"
-
-        sut.AddUnionRelationship unionName [| unionCase |]
-
-        // Act
-        let result = context.TryFindUnionRelationship unionCase
-
-        // Assert
-        %result.Should().BeSome()
-        %result.Value.UnionTypeName.Should().Be(unionName)
-        %result.Value.UnionCaseName.Should().Be(unionCase)
-
-    [<Fact>]
-    member _.``ParserContext TryFindUnionRelationship should return None when not exists``() =
-        // Setup
-        let cancellationToken = CancellationToken.None
-        let sut = ParserContext(Pascal, false, cancellationToken)
-        let context = sut :> IParsedContext
-
-        // Act
-        let result = context.TryFindUnionRelationship "NonExistentCase"
-
-        // Assert
-        %result.Should().BeNone()
-
     [<Fact>]
     member _.``ParserContext AddNamedType should add type``() =
         // Setup
         let cancellationToken = CancellationToken.None
-        let sut = ParserContext(Pascal, false, cancellationToken)
+        let sut = ParserContext(Pascal, false, document, cancellationToken)
         let context = sut :> IParsedContext
         let namedType = NamedType.Class "TestClass"
 
@@ -161,7 +119,7 @@ type DomainTests() =
     member _.``ParserContext IsNamedType should return false when type not added``() =
         // Setup
         let cancellationToken = CancellationToken.None
-        let sut = ParserContext(Pascal, false, cancellationToken)
+        let sut = ParserContext(Pascal, false, document, cancellationToken)
         let context = sut :> IParsedContext
         let namedType = NamedType.Class "TestClass"
 
@@ -172,7 +130,7 @@ type DomainTests() =
     member _.``ParserContext TypeIsKnownUnionCase should return false when case not added``() =
         // Setup
         let cancellationToken = CancellationToken.None
-        let sut = ParserContext(Pascal, false, cancellationToken)
+        let sut = ParserContext(Pascal, false, document, cancellationToken)
         let context = sut :> IParsedContext
 
         // Act & Assert

diff --git a/ShopifySharp.GraphQL.Parser.Tests/IntegrationTests.fs b/ShopifySharp.GraphQL.Parser.Tests/IntegrationTests.fs
@@ -70,6 +70,7 @@ type IntegrationTests() =
             | VisitedTypes.Enum e -> e.Name
             | VisitedTypes.InputObject io -> io.Name
             | VisitedTypes.UnionType u -> u.Name
+            | Operation o -> o.Name
         )
 
         %typeNames.Should().Contain("INode")

diff --git a/ShopifySharp.GraphQL.Parser.Tests/ParserTests.fs b/ShopifySharp.GraphQL.Parser.Tests/ParserTests.fs
@@ -82,6 +82,7 @@ type ParserTests() =
             | VisitedTypes.Enum e -> e.Name
             | VisitedTypes.InputObject io -> io.Name
             | VisitedTypes.UnionType u -> u.Name
+            | Operation o -> o.Name
         )
         %typeNames.Should().Contain("User")
         %typeNames.Should().Contain("UserStatus")
@@ -114,6 +115,7 @@ type ParserTests() =
             | VisitedTypes.Enum e -> e.Name
             | VisitedTypes.InputObject io -> io.Name
             | VisitedTypes.UnionType u -> u.Name
+            | VisitedTypes.Operation o -> o.Name
         )
 
         %typeNames.Should().Contain("INode")