feat: Mainlines GraphQL

Author: NeedleInAJayStack

Examples/GraphQLDotOrg/Package.resolved

@@ -15,8 +15,7 @@ let package = Package(
     ],
     dependencies: [
         .package(name: "graphql-generator", path: "../.."),
-        // TODO: Mainline when merged: https://github.com/GraphQLSwift/GraphQL/pull/174
-        .package(url: "https://github.com/NeedleInAJayStack/GraphQL.git", revision: "42ac35a0f69b9ffffcf9d02398c0b13d0c0e71aa"),
+        .package(url: "https://github.com/GraphQLSwift/GraphQL.git", from: "4.1.0"),
     ],
     targets: [
         .target(

Examples/GraphQLDotOrg/Package.swift

@@ -9,8 +9,7 @@ let package = Package(
     ],
     dependencies: [
         .package(name: "graphql-generator", path: "../.."),
-        // TODO: Mainline when merged: https://github.com/GraphQLSwift/GraphQL/pull/174
-        .package(url: "https://github.com/NeedleInAJayStack/GraphQL.git", revision: "42ac35a0f69b9ffffcf9d02398c0b13d0c0e71aa"),
+        .package(url: "https://github.com/GraphQLSwift/GraphQL.git", from: "4.1.0"),
     ],
     targets: [
         .target(

Examples/HelloWorldServer/Package.resolved

@@ -21,7 +21,7 @@ let package = Package(
         ),
     ],
     dependencies: [
-        .package(url: "https://github.com/GraphQLSwift/GraphQL.git", from: "4.0.0"),
+        .package(url: "https://github.com/GraphQLSwift/GraphQL.git", from: "4.1.0"),
         .package(url: "https://github.com/apple/swift-argument-parser.git", from: "1.3.0"),
     ],
     targets: [

Examples/HelloWorldServer/Package.swift

@@ -96,82 +96,87 @@ package struct BuildGraphQLSchemaGenerator {
     }
 
     func generateInterfaceType(for type: GraphQLInterfaceType) throws -> String {
-        let variableName = nameGenerator.swiftMemberName(for: type.name)
+        let typeName = nameGenerator.swiftMemberName(for: type.name)
+        let variableName = "\(typeName)Fields"
 
         var output = """
 
-        let \(variableName)Fields = try (schema.typeMap["\(type.name)"] as? GraphQLInterfaceType)?.fields() ?? [:]
-        (schema.typeMap["\(type.name)"] as? GraphQLInterfaceType)?.fields = {
-            var fields = \(variableName)Fields
+        let \(typeName) = schema.typeMap["\(type.name)"] as? GraphQLObjectType
+        let \(variableName) = try \(typeName)?.fields() ?? [:]
         """
 
         // Generate fields
         let fields = try type.fields()
         for (fieldName, field) in fields {
-            output += try"""
+            output += try """
 
             \(generateResolverCallback(
+                variableName: variableName,
                 fieldName: fieldName,
                 field: field,
                 target: .parent,
                 parentType: type
-            ).indent(1))
+            ))
             """
         }
 
         output += """
 
-            return fields
+        \(typeName)?.fields = {
+            return \(variableName)
         }
         """
 
         return output
     }
 
     func generateObjectType(for type: GraphQLObjectType, target: ResolverTarget) throws -> String {
+        let typeName = nameGenerator.swiftMemberName(for: type.name)
         let variableName: String
         switch target {
         case .query:
-            variableName = "query"
+            variableName = "queryFields"
         case .mutation:
-            variableName = "mutation"
+            variableName = "mutationFields"
         case .subscription:
-            variableName = "subscription"
+            variableName = "subscriptionFields"
         case .parent:
-            variableName = nameGenerator.swiftMemberName(for: type.name)
+            variableName = "\(typeName)Fields"
         }
 
         var output = """
 
-        let \(variableName)Fields = try (schema.typeMap["\(type.name)"] as? GraphQLObjectType)?.fields() ?? [:]
-        (schema.typeMap["\(type.name)"] as? GraphQLObjectType)?.fields = {
-            var fields = \(variableName)Fields
+        let \(typeName) = schema.typeMap["\(type.name)"] as? GraphQLObjectType
+        let \(variableName) = try \(typeName)?.fields() ?? [:]
         """
 
         // Generate fields
         let fields = try type.fields()
         for (fieldName, field) in fields {
-            output += try"""
+            output += try """
 
             \(generateResolverCallback(
+                variableName: variableName,
                 fieldName: fieldName,
                 field: field,
                 target: target,
                 parentType: type
-            ).indent(1))
+            ))
             """
         }
 
         output += """
 
-            return fields
+        \(typeName)?.fields = {
+            return \(variableName)
         }
         """
 
         return output
     }
 
     func generateResolverCallback(
+        variableName: String,
         fieldName: String,
         field: GraphQLField,
         target: ResolverTarget,
@@ -181,16 +186,14 @@ package struct BuildGraphQLSchemaGenerator {
 
         if target == .subscription {
             output += """
-
-            fields["\(fieldName)"]?.resolve = { source, _, _, _ in
+            \(variableName)["\(fieldName)"]?.resolve = { source, _, _, _ in
                 return source
             }
-            fields["\(fieldName)"]?.subscribe = { source, args, context, info in
+            \(variableName)["\(fieldName)"]?.subscribe = { source, args, context, info in
             """
         } else {
             output += """
-
-            fields["\(fieldName)"]?.resolve = { source, args, context, info in
+            \(variableName)["\(fieldName)"]?.resolve = { source, args, context, info in
             """
         }