feat!: Conforms to strict concurrency

NeedleInAJayStack · NeedleInAJayStack · commit 0423662bba94 · 2025-08-11T00:02:56.000-06:00
diff --git a/Package.swift b/Package.swift
@@ -15,5 +15,6 @@ let package = Package(
         .testTarget(name: "GraphitiTests", dependencies: ["Graphiti"], resources: [
             .copy("FederationTests/GraphQL"),
         ]),
-    ]
+    ],
+    swiftLanguageVersions: [.v5, .version("6")]
 )
diff --git a/Sources/Graphiti/API/API.swift b/Sources/Graphiti/API/API.swift
@@ -1,8 +1,8 @@
 import GraphQL
 
 public protocol API {
-    associatedtype Resolver
-    associatedtype ContextType
+    associatedtype Resolver: Sendable
+    associatedtype ContextType: Sendable
     var resolver: Resolver { get }
     var schema: Schema<Resolver, ContextType> { get }
 }
diff --git a/Sources/Graphiti/Argument/NoArguments.swift b/Sources/Graphiti/Argument/NoArguments.swift
@@ -1,3 +1,3 @@
-public struct NoArguments: Decodable {
+public struct NoArguments: Decodable, Sendable {
     public init() {}
 }
diff --git a/Sources/Graphiti/Coder/Coders.swift b/Sources/Graphiti/Coder/Coders.swift
@@ -3,7 +3,7 @@ import GraphQL
 
 /// Struct containing a MapEncoder and MapDecoder. These decoders are passed through to the Schema objects and used in
 /// all encoding and decoding from maps.
-public struct Coders {
+public struct Coders: Sendable {
     public let decoder = MapDecoder()
     public let encoder = MapEncoder()
 
diff --git a/Sources/Graphiti/Component/Component.swift b/Sources/Graphiti/Component/Component.swift
@@ -1,6 +1,6 @@
 import GraphQL
 
-open class Component<Resolver, Context> {
+open class Component<Resolver: Sendable, Context: Sendable> {
     let name: String
     var description: String?
     var componentType: ComponentType
diff --git a/Sources/Graphiti/Connection/Connection.swift b/Sources/Graphiti/Connection/Connection.swift
@@ -1,7 +1,7 @@
 import Foundation
 import GraphQL
 
-public struct Connection<Node> {
+public struct Connection<Node: Sendable>: Sendable {
     public let edges: [Edge<Node>]
     public let pageInfo: PageInfo
 }
@@ -16,7 +16,7 @@ public extension Connection where Node: Identifiable, Node.ID: LosslessStringCon
     }
 }
 
-public extension Sequence where Element: Identifiable,
+public extension Sequence where Element: Sendable, Element: Identifiable,
 Element.ID: LosslessStringConvertible {
     func connection(from arguments: Paginatable) throws -> Connection<Element> {
         try connection(from: arguments, makeCursor: Connection<Element>.cursor)
@@ -31,7 +31,7 @@ Element.ID: LosslessStringConvertible {
     }
 }
 
-public extension Sequence {
+public extension Sequence where Element: Sendable {
     func connection(
         from arguments: Paginatable,
         makeCursor: @escaping (Element) throws -> String
diff --git a/Sources/Graphiti/Connection/ConnectionType.swift b/Sources/Graphiti/Connection/ConnectionType.swift
@@ -1,9 +1,9 @@
 import GraphQL
 
 public final class ConnectionType<
-    Resolver,
-    Context,
-    ObjectType
+    Resolver: Sendable,
+    Context: Sendable,
+    ObjectType: Sendable
 >: TypeComponent<
     Resolver,
     Context
diff --git a/Sources/Graphiti/Connection/Edge.swift b/Sources/Graphiti/Connection/Edge.swift
@@ -1,10 +1,10 @@
-protocol Edgeable {
+protocol Edgeable: Sendable {
     associatedtype Node
     var node: Node { get }
     var cursor: String { get }
 }
 
-public struct Edge<Node>: Edgeable {
+public struct Edge<Node: Sendable>: Edgeable {
     public let node: Node
     public let cursor: String
 }
diff --git a/Sources/Graphiti/Connection/PageInfo.swift b/Sources/Graphiti/Connection/PageInfo.swift
@@ -1,4 +1,4 @@
-public struct PageInfo: Codable {
+public struct PageInfo: Codable, Sendable {
     public let hasPreviousPage: Bool
     public let hasNextPage: Bool
     public let startCursor: String?
diff --git a/Sources/Graphiti/Connection/PagniationArguments/PaginationArguments.swift b/Sources/Graphiti/Connection/PagniationArguments/PaginationArguments.swift
@@ -1,6 +1,6 @@
 public protocol Paginatable: ForwardPaginatable, BackwardPaginatable {}
 
-public struct PaginationArguments: Paginatable {
+public struct PaginationArguments: Paginatable, Sendable {
     public let first: Int?
     public let last: Int?
     public let after: String?
diff --git a/Sources/Graphiti/Enum/Enum.swift b/Sources/Graphiti/Enum/Enum.swift
@@ -1,8 +1,8 @@
 import GraphQL
 
 public final class Enum<
-    Resolver,
-    Context,
+    Resolver: Sendable,
+    Context: Sendable,
     EnumType: Encodable & RawRepresentable
 >: TypeComponent<
     Resolver,
diff --git a/Sources/Graphiti/Federation/Key/Key.swift b/Sources/Graphiti/Federation/Key/Key.swift
@@ -1,10 +1,15 @@
 import GraphQL
 
-public class Key<ObjectType, Resolver, Context, Arguments: Codable>: KeyComponent<
+public class Key<
+    ObjectType: Sendable,
+    Resolver: Sendable,
+    Context: Sendable,
+    Arguments: Codable & Sendable
+>: KeyComponent<
     ObjectType,
     Resolver,
     Context
-> {
+>, @unchecked Sendable {
     let arguments: [ArgumentComponent<Arguments>]
     let resolve: AsyncResolve<Resolver, Context, Arguments, ObjectType?>
 
@@ -18,7 +23,7 @@ public class Key<ObjectType, Resolver, Context, Arguments: Codable>: KeyComponen
         context: Context,
         map: Map,
         coders: Coders
-    ) async throws -> Any? {
+    ) async throws -> (any Sendable)? {
         let arguments = try coders.decoder.decode(Arguments.self, from: map)
         return try await resolve(resolver)(context, arguments)
     }
diff --git a/Sources/Graphiti/Federation/Key/KeyComponent.swift b/Sources/Graphiti/Federation/Key/KeyComponent.swift
@@ -1,6 +1,6 @@
 import GraphQL
 
-public class KeyComponent<ObjectType, Resolver, Context> {
+public class KeyComponent<ObjectType, Resolver, Context>: @unchecked Sendable {
     func mapMatchesArguments(_: Map, coders _: Coders) -> Bool {
         fatalError()
     }
@@ -10,7 +10,7 @@ public class KeyComponent<ObjectType, Resolver, Context> {
         context _: Context,
         map _: Map,
         coders _: Coders
-    ) async throws -> Any? {
+    ) async throws -> (any Sendable)? {
         fatalError()
     }
 
diff --git a/Sources/Graphiti/Federation/Key/Type+Key.swift b/Sources/Graphiti/Federation/Key/Type+Key.swift
@@ -9,7 +9,7 @@ public extension Type {
     ///   - _:  The key value. The name of this argument must match a Type field.
     /// - Returns: Self for chaining.
     @discardableResult
-    func key<Arguments: Codable>(
+    func key<Arguments: Codable & Sendable>(
         at function: @escaping AsyncResolve<Resolver, Context, Arguments, ObjectType?>,
         @ArgumentComponentBuilder<Arguments> _ argument: () -> ArgumentComponent<Arguments>
     ) -> Self {
@@ -25,7 +25,7 @@ public extension Type {
     ///   - _:  The key values. The names of these arguments must match Type fields.
     /// - Returns: Self for chaining.
     @discardableResult
-    func key<Arguments: Codable>(
+    func key<Arguments: Codable & Sendable>(
         at function: @escaping AsyncResolve<Resolver, Context, Arguments, ObjectType?>,
         @ArgumentComponentBuilder<Arguments> _ arguments: ()
             -> [ArgumentComponent<Arguments>] = { [] }
@@ -42,7 +42,7 @@ public extension Type {
     ///   - _:  The key value. The name of this argument must match a Type field.
     /// - Returns: Self for chaining.
     @discardableResult
-    func key<Arguments: Codable>(
+    func key<Arguments: Codable & Sendable>(
         at function: @escaping SyncResolve<Resolver, Context, Arguments, ObjectType?>,
         @ArgumentComponentBuilder<Arguments> _ arguments: ()
             -> [ArgumentComponent<Arguments>] = { [] }
@@ -59,7 +59,7 @@ public extension Type {
     ///   - _:  The key values. The names of these arguments must match Type fields.
     /// - Returns: Self for chaining.
     @discardableResult
-    func key<Arguments: Codable>(
+    func key<Arguments: Codable & Sendable>(
         at function: @escaping SyncResolve<Resolver, Context, Arguments, ObjectType?>,
         @ArgumentComponentBuilder<Arguments> _ argument: () -> ArgumentComponent<Arguments>
     ) -> Self {
diff --git a/Sources/Graphiti/Federation/Queries.swift b/Sources/Graphiti/Federation/Queries.swift
@@ -26,8 +26,8 @@ func entitiesQuery(
         ],
         resolve: { source, args, context, info in
             let arguments = try coders.decoder.decode(EntityArguments.self, from: args)
-            return try await withThrowingTaskGroup(of: (Int, Any?).self) { group in
-                var results: [Any?] = arguments.representations.map { _ in nil }
+            return try await withThrowingTaskGroup(of: (Int, (any Sendable)?).self) { group in
+                var results: [(any Sendable)?] = arguments.representations.map { _ in nil }
                 for (index, representationMap) in arguments.representations.enumerated() {
                     group.addTask {
                         let representation = try coders.decoder.decode(
diff --git a/Sources/Graphiti/Field/Field/Field.swift b/Sources/Graphiti/Field/Field/Field.swift
@@ -1,17 +1,23 @@
 import GraphQL
 
-public class Field<ObjectType, Context, FieldType, Arguments: Decodable>: FieldComponent<
+public class Field<
+    ObjectType: Sendable,
+    Context: Sendable,
+    FieldType: Sendable,
+    Arguments: Decodable & Sendable
+>: FieldComponent<
     ObjectType,
     Context
 > {
     let name: String
     let arguments: [ArgumentComponent<Arguments>]
-    let resolve: AsyncResolve<ObjectType, Context, Arguments, Any?>
+    let resolve: AsyncResolve<ObjectType, Context, Arguments, (any Sendable)?>
 
     override func field(
         typeProvider: TypeProvider,
         coders: Coders
     ) throws -> (String, GraphQLField) {
+        let resolve = self.resolve
         let field = try GraphQLField(
             type: typeProvider.getOutputType(from: FieldType.self, field: name),
             description: description,
@@ -31,7 +37,7 @@ public class Field<ObjectType, Context, FieldType, Arguments: Decodable>: FieldC
                 }
 
                 let a = try coders.decoder.decode(Arguments.self, from: arguments)
-                return try await self.resolve(s)(c, a)
+                return try await resolve(s)(c, a)
             }
         )
 
@@ -52,27 +58,27 @@ public class Field<ObjectType, Context, FieldType, Arguments: Decodable>: FieldC
     init(
         name: String,
         arguments: [ArgumentComponent<Arguments>],
-        resolve: @escaping AsyncResolve<ObjectType, Context, Arguments, Any?>
+        resolve: @escaping AsyncResolve<ObjectType, Context, Arguments, (any Sendable)?>
     ) {
         self.name = name
         self.arguments = arguments
         self.resolve = resolve
     }
 
-    convenience init<ResolveType>(
+    convenience init<ResolveType: Sendable>(
         name: String,
         arguments: [ArgumentComponent<Arguments>],
         asyncResolve: @escaping AsyncResolve<ObjectType, Context, Arguments, ResolveType>
     ) {
-        let resolve: AsyncResolve<ObjectType, Context, Arguments, Any?> = { type in
+        let resolve: AsyncResolve<ObjectType, Context, Arguments, (any Sendable)?> = { type in
             { context, arguments in
                 try await asyncResolve(type)(context, arguments)
             }
         }
         self.init(name: name, arguments: arguments, resolve: resolve)
     }
 
-    convenience init<ResolveType>(
+    convenience init<ResolveType: Sendable>(
         name: String,
         arguments: [ArgumentComponent<Arguments>],
         syncResolve: @escaping SyncResolve<ObjectType, Context, Arguments, ResolveType>
@@ -143,3 +149,8 @@ public extension Field where Arguments == NoArguments {
         self.init(name: name, arguments: [], syncResolve: syncResolve)
     }
 }
+
+// We must conform KeyPath to unchecked sendable to allow keypath-based resolvers.
+// Despite the warning, we cannot add `@retroactive` and keep Swift 5 support.
+// Remove when support transitions to Swift 6.
+extension KeyPath: @unchecked Sendable {}
diff --git a/Sources/Graphiti/Input/Input.swift b/Sources/Graphiti/Input/Input.swift
@@ -1,8 +1,8 @@
 import GraphQL
 
 public final class Input<
-    Resolver,
-    Context,
+    Resolver: Sendable,
+    Context: Sendable,
     InputObjectType
 >: TypeComponent<
     Resolver,
diff --git a/Sources/Graphiti/InputField/InputField.swift b/Sources/Graphiti/InputField/InputField.swift
@@ -2,7 +2,7 @@ import GraphQL
 
 public class InputField<
     InputObjectType,
-    Context,
+    Context: Sendable,
     FieldType
 >: InputFieldComponent<
     InputObjectType,
diff --git a/Sources/Graphiti/Interface/Interface.swift b/Sources/Graphiti/Interface/Interface.swift
@@ -1,6 +1,10 @@
 import GraphQL
 
-public final class Interface<Resolver, Context, InterfaceType>: TypeComponent<
+public final class Interface<
+    Resolver: Sendable,
+    Context: Sendable,
+    InterfaceType
+>: TypeComponent<
     Resolver,
     Context
 > {
diff --git a/Sources/Graphiti/Mutation/Mutation.swift b/Sources/Graphiti/Mutation/Mutation.swift
@@ -1,6 +1,6 @@
 import GraphQL
 
-public final class Mutation<Resolver, Context>: Component<Resolver, Context> {
+public final class Mutation<Resolver: Sendable, Context: Sendable>: Component<Resolver, Context> {
     let fields: [FieldComponent<Resolver, Context>]
 
     let isTypeOf: GraphQLIsTypeOf = { source, _ in
diff --git a/Sources/Graphiti/Query/Query.swift b/Sources/Graphiti/Query/Query.swift
@@ -1,6 +1,6 @@
 import GraphQL
 
-public final class Query<Resolver, Context>: Component<Resolver, Context> {
+public final class Query<Resolver: Sendable, Context: Sendable>: Component<Resolver, Context> {
     let fields: [FieldComponent<Resolver, Context>]
 
     let isTypeOf: GraphQLIsTypeOf = { source, _ in
diff --git a/Sources/Graphiti/Scalar/Scalar.swift b/Sources/Graphiti/Scalar/Scalar.swift
diff --git a/Sources/Graphiti/Schema/Schema.swift b/Sources/Graphiti/Schema/Schema.swift
diff --git a/Sources/Graphiti/SchemaBuilders/PartialSchema.swift b/Sources/Graphiti/SchemaBuilders/PartialSchema.swift
diff --git a/Sources/Graphiti/SchemaBuilders/SchemaBuilder.swift b/Sources/Graphiti/SchemaBuilders/SchemaBuilder.swift
diff --git a/Sources/Graphiti/Subscription/SubscribeField.swift b/Sources/Graphiti/Subscription/SubscribeField.swift
diff --git a/Sources/Graphiti/Subscription/Subscription.swift b/Sources/Graphiti/Subscription/Subscription.swift
diff --git a/Sources/Graphiti/Type/Type.swift b/Sources/Graphiti/Type/Type.swift
diff --git a/Sources/Graphiti/Union/Union.swift b/Sources/Graphiti/Union/Union.swift
diff --git a/Sources/Graphiti/Validation/NoIntrospectionRule.swift b/Sources/Graphiti/Validation/NoIntrospectionRule.swift
diff --git a/UsageGuide.md b/UsageGuide.md

Original file line number	Diff line number	Diff line change
`@@ -15,5 +15,6 @@ let package = Package(`
`15`	`15`	`.testTarget(name: "GraphitiTests", dependencies: ["Graphiti"], resources: [`
`16`	`16`	`.copy("FederationTests/GraphQL"),`
`17`	`17`	`]),`
`18`		`- ]`
	`18`	`+ ],`
	`19`	`+ swiftLanguageVersions: [.v5, .version("6")]`
`19`	`20`	`)`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`		`-public struct NoArguments: Decodable {`
	`1`	`+public struct NoArguments: Decodable, Sendable {`
`2`	`2`	`public init() {}`
`3`	`3`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`import Foundation`
`2`	`2`	`import GraphQL`
`3`	`3`
`4`		`-public struct Connection<Node> {`
	`4`	`+public struct Connection<Node: Sendable>: Sendable {`
`5`	`5`	`public let edges: [Edge<Node>]`
`6`	`6`	`public let pageInfo: PageInfo`
`7`	`7`	`}`
`@@ -16,7 +16,7 @@ public extension Connection where Node: Identifiable, Node.ID: LosslessStringCon`
`16`	`16`	`}`
`17`	`17`	`}`
`18`	`18`
`19`		`-public extension Sequence where Element: Identifiable,`
	`19`	`+public extension Sequence where Element: Sendable, Element: Identifiable,`
`20`	`20`	`Element.ID: LosslessStringConvertible {`
`21`	`21`	`func connection(from arguments: Paginatable) throws -> Connection<Element> {`
`22`	`22`	`try connection(from: arguments, makeCursor: Connection<Element>.cursor)`
`@@ -31,7 +31,7 @@ Element.ID: LosslessStringConvertible {`
`31`	`31`	`}`
`32`	`32`	`}`
`33`	`33`
`34`		`-public extension Sequence {`
	`34`	`+public extension Sequence where Element: Sendable {`
`35`	`35`	`func connection(`
`36`	`36`	`from arguments: Paginatable,`
`37`	`37`	`makeCursor: @escaping (Element) throws -> String`
Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,10 @@`
`1`		`-protocol Edgeable {`
	`1`	`+protocol Edgeable: Sendable {`
`2`	`2`	`associatedtype Node`
`3`	`3`	`var node: Node { get }`
`4`	`4`	`var cursor: String { get }`
`5`	`5`	`}`
`6`	`6`
`7`		`-public struct Edge<Node>: Edgeable {`
	`7`	`+public struct Edge<Node: Sendable>: Edgeable {`
`8`	`8`	`public let node: Node`
`9`	`9`	`public let cursor: String`
`10`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-public struct PageInfo: Codable {`
	`1`	`+public struct PageInfo: Codable, Sendable {`
`2`	`2`	`public let hasPreviousPage: Bool`
`3`	`3`	`public let hasNextPage: Bool`
`4`	`4`	`public let startCursor: String?`