fix swift 6 errors

mattpolzin · mattpolzin · commit 1e137c089611 · 2025-09-11T10:41:00.000-05:00
diff --git a/Package.resolved b/Package.resolved
diff --git a/Package.swift b/Package.swift
@@ -17,7 +17,7 @@ let package = Package(
             targets: ["JSONAPITesting"])
     ],
     dependencies: [
-        .package(url: "https://github.com/mattpolzin/Poly.git", .upToNextMajor(from: "2.8.0")),
+        .package(url: "https://github.com/mattpolzin/Poly.git", .upToNextMajor(from: "3.0.0")),
     ],
     targets: [
         .target(
diff --git a/Sources/JSONAPI/Document/APIDescription.swift b/Sources/JSONAPI/Document/APIDescription.swift
@@ -6,8 +6,8 @@
 //
 
 /// This is what the JSON API Spec calls the "JSON:API Object"
-public protocol APIDescriptionType: Codable, Equatable {
-    associatedtype Meta
+public protocol APIDescriptionType: Codable, Equatable, Sendable {
+    associatedtype Meta: Sendable
 }
 
 /// This is what the JSON API Spec calls the "JSON:API Object"
diff --git a/Sources/JSONAPI/Document/Document.swift b/Sources/JSONAPI/Document/Document.swift
@@ -7,7 +7,7 @@
 
 import Poly
 
-public protocol DocumentBodyDataContext {
+public protocol DocumentBodyDataContext: Sendable {
     associatedtype PrimaryResourceBody: JSONAPI.EncodableResourceBody
     associatedtype MetaType: JSONAPI.Meta
     associatedtype LinksType: JSONAPI.Links
@@ -147,7 +147,7 @@ public protocol CodableJSONAPIDocument: EncodableJSONAPIDocument, Decodable wher
 /// API uses snake case, you will want to use
 /// a conversion such as the one offerred by the
 /// Foundation JSONEncoder/Decoder: `KeyDecodingStrategy`
-public struct Document<PrimaryResourceBody: JSONAPI.EncodableResourceBody, MetaType: JSONAPI.Meta, LinksType: JSONAPI.Links, IncludeType: JSONAPI.Include, APIDescription: APIDescriptionType, Error: JSONAPIError>: EncodableJSONAPIDocument, SucceedableJSONAPIDocument, FailableJSONAPIDocument {
+public struct Document<PrimaryResourceBody: JSONAPI.EncodableResourceBody, MetaType: JSONAPI.Meta, LinksType: JSONAPI.Links, IncludeType: JSONAPI.Include, APIDescription: APIDescriptionType, Error: JSONAPIError>: EncodableJSONAPIDocument, SucceedableJSONAPIDocument, FailableJSONAPIDocument, Sendable {
     public typealias Include = IncludeType
     public typealias BodyData = Body.Data
 
diff --git a/Sources/JSONAPI/Document/Includes.swift b/Sources/JSONAPI/Document/Includes.swift
@@ -5,7 +5,7 @@
 //  Created by Mathew Polzin on 11/10/18.
 //
 
-import Poly
+@preconcurrency import Poly
 
 public typealias Include = EncodableJSONPoly
 
@@ -19,7 +19,7 @@ public typealias Include = EncodableJSONPoly
 /// then you can access all `Thing1` included resources with
 ///
 ///     let includedThings = includes[Thing1.self]
-public struct Includes<I: Include>: Encodable, Equatable {
+public struct Includes<I: Include>: Encodable, Equatable, Sendable {
     public static var none: Includes { return .init(values: []) }
 
     public let values: [I]
diff --git a/Sources/JSONAPI/Document/ResourceBody.swift b/Sources/JSONAPI/Document/ResourceBody.swift
@@ -29,8 +29,8 @@ extension Optional: OptionalCodablePrimaryResource where Wrapped: CodablePrimary
 /// An `EncodableResourceBody` is a `ResourceBody` that only supports being
 /// encoded. It is actually weaker than `ResourceBody`, which supports both encoding
 /// and decoding.
-public protocol EncodableResourceBody: Equatable, Encodable {
-    associatedtype PrimaryResource
+public protocol EncodableResourceBody: Equatable, Encodable, Sendable {
+    associatedtype PrimaryResource: Sendable
 }
 
 /// A `CodableResourceBody` is a representation of the body of the JSON:API Document.
@@ -57,7 +57,7 @@ public protocol SingleResourceBodyProtocol: EncodableResourceBody {
 /// A type allowing for a document body containing 1 primary resource.
 /// If the `Entity` specialization is an `Optional` type, the body can contain
 /// 0 or 1 primary resources.
-public struct SingleResourceBody<PrimaryResource: JSONAPI.OptionalEncodablePrimaryResource>: SingleResourceBodyProtocol {
+public struct SingleResourceBody<PrimaryResource: JSONAPI.OptionalEncodablePrimaryResource & Sendable>: SingleResourceBodyProtocol {
     public let value: PrimaryResource
 
     public init(resourceObject: PrimaryResource) {
@@ -72,7 +72,7 @@ public protocol ManyResourceBodyProtocol: EncodableResourceBody {
 }
 
 /// A type allowing for a document body containing 0 or more primary resources.
-public struct ManyResourceBody<PrimaryResource: JSONAPI.EncodablePrimaryResource>: ManyResourceBodyProtocol, ResourceBodyAppendable {
+public struct ManyResourceBody<PrimaryResource: JSONAPI.EncodablePrimaryResource & Sendable>: ManyResourceBodyProtocol, ResourceBodyAppendable {
     public let values: [PrimaryResource]
 
     public init(resourceObjects: [PrimaryResource]) {
diff --git a/Sources/JSONAPI/Error/BasicJSONAPIError.swift b/Sources/JSONAPI/Error/BasicJSONAPIError.swift
@@ -6,7 +6,7 @@
 //
 
 /// Most of the JSON:API Spec defined Error fields.
-public struct BasicJSONAPIErrorPayload<IdType: Codable & Equatable>: Codable, Equatable, ErrorDictType, CustomStringConvertible {
+public struct BasicJSONAPIErrorPayload<IdType: Codable & Equatable & Sendable>: Codable, Equatable, ErrorDictType, CustomStringConvertible, Sendable {
     /// a unique identifier for this particular occurrence of the problem
     public let id: IdType?
 
@@ -39,7 +39,7 @@ public struct BasicJSONAPIErrorPayload<IdType: Codable & Equatable>: Codable, Eq
         self.source = source
     }
 
-    public struct Source: Codable, Equatable {
+    public struct Source: Codable, Equatable, Sendable {
         /// a JSON Pointer [RFC6901] to the associated entity in the request document [e.g. "/data" for a primary data object, or "/data/attributes/title" for a specific attribute].
         public let pointer: String?
         /// which URI query parameter caused the error
@@ -100,4 +100,4 @@ public struct BasicJSONAPIErrorPayload<IdType: Codable & Equatable>: Codable, Eq
 ///     with non-nil values in a flattened way. There will be no `source` key
 ///     but there will be `pointer` and `parameter` keys (if those values
 ///     are non-nil).
-public typealias BasicJSONAPIError<IdType: Codable & Equatable> = GenericJSONAPIError<BasicJSONAPIErrorPayload<IdType>>
+public typealias BasicJSONAPIError<IdType: Codable & Equatable & Sendable> = GenericJSONAPIError<BasicJSONAPIErrorPayload<IdType>>
diff --git a/Sources/JSONAPI/Error/GenericJSONAPIError.swift b/Sources/JSONAPI/Error/GenericJSONAPIError.swift
@@ -8,7 +8,7 @@
 /// `GenericJSONAPIError` can be used to specify whatever error
 /// payload you expect to need to parse in responses and handle any
 /// other payload structure as `.unknownError`.
-public enum GenericJSONAPIError<ErrorPayload: Codable & Equatable>: JSONAPIError, CustomStringConvertible {
+public enum GenericJSONAPIError<ErrorPayload: Codable & Equatable & Sendable>: JSONAPIError, CustomStringConvertible {
     case unknownError
     case error(ErrorPayload)
 
diff --git a/Sources/JSONAPI/Error/JSONAPIError.swift b/Sources/JSONAPI/Error/JSONAPIError.swift
@@ -5,7 +5,7 @@
 //  Created by Mathew Polzin on 11/10/18.
 //
 
-public protocol JSONAPIError: Swift.Error, Equatable, Codable {
+public protocol JSONAPIError: Swift.Error, Equatable, Codable, Sendable {
     static var unknown: Self { get }
 }
 
diff --git a/Sources/JSONAPI/JSONAPICodingError.swift b/Sources/JSONAPI/JSONAPICodingError.swift
@@ -5,15 +5,15 @@
 //  Created by Mathew Polzin on 12/7/18.
 //
 
-public enum JSONAPICodingError: Swift.Error {
+public enum JSONAPICodingError: Swift.Error, Sendable {
     case typeMismatch(expected: String, found: String, path: [CodingKey])
     case quantityMismatch(expected: Quantity, path: [CodingKey])
     case illegalEncoding(String, path: [CodingKey])
     case illegalDecoding(String, path: [CodingKey])
     case missingOrMalformedMetadata(path: [CodingKey])
     case missingOrMalformedLinks(path: [CodingKey])
 
-    public enum Quantity: String, Equatable {
+    public enum Quantity: String, Equatable, Sendable {
         case one
         case many
 
diff --git a/Sources/JSONAPI/Meta/Links.swift b/Sources/JSONAPI/Meta/Links.swift
@@ -6,7 +6,7 @@
 //
 
 /// A Links structure should contain nothing but `JSONAPI.Link` properties.
-public protocol Links: Codable, Equatable {}
+public protocol Links: Codable, Equatable, Sendable {}
 
 /// Use NoLinks where no links should belong to a JSON API component
 public struct NoLinks: Links, CustomStringConvertible {
diff --git a/Sources/JSONAPI/Meta/Meta.swift b/Sources/JSONAPI/Meta/Meta.swift
@@ -12,7 +12,7 @@
 ///
 /// JSON:API Metadata is totally open ended. It can take whatever JSON-compliant structure
 /// the server and client agree upon.
-public protocol Meta: Codable, Equatable {
+public protocol Meta: Codable, Equatable, Sendable {
 }
 
 // We make Optional a Meta if it wraps a Meta so that
diff --git a/Sources/JSONAPI/Resource/Id.swift b/Sources/JSONAPI/Resource/Id.swift
@@ -31,7 +31,7 @@ extension String: RawIdType {}
 /// A type that can be used as the `MaybeRawId` for a `ResourceObject` that does not
 /// have an Id (most likely because it was created by a client and the server will be responsible
 /// for assigning it an Id).
-public struct Unidentified: MaybeRawId, CustomStringConvertible {
+public struct Unidentified: MaybeRawId, CustomStringConvertible, Sendable {
     public init() {}
 
     public var description: String { return "Unidentified" }
@@ -77,7 +77,7 @@ public protocol CreatableIdType: IdType {
 
 /// An ResourceObject ID. These IDs can be encoded to or decoded from
 /// JSON API IDs.
-public struct Id<RawType: MaybeRawId, IdentifiableType: JSONAPI.JSONTyped>: Equatable, OptionalId {
+public struct Id<RawType: MaybeRawId & Sendable, IdentifiableType: JSONAPI.JSONTyped>: Equatable, OptionalId, Sendable {
 
     public let rawValue: RawType
 
diff --git a/Sources/JSONAPI/Resource/Poly+PrimaryResource.swift b/Sources/JSONAPI/Resource/Poly+PrimaryResource.swift
@@ -15,12 +15,12 @@ import Poly
 /// disparate types under one roof for
 /// the purposes of JSON API compliant
 /// encoding or decoding.
-public typealias EncodableJSONPoly = Poly & EncodablePrimaryResource
+public typealias EncodableJSONPoly = Poly & EncodablePrimaryResource & Sendable
 
 public typealias EncodablePolyWrapped = Encodable & Equatable
 public typealias CodablePolyWrapped = EncodablePolyWrapped & Decodable
 
-extension Poly0: CodablePrimaryResource {
+extension Poly0: @retroactive Encodable, @retroactive Decodable {
     public init(from decoder: Decoder) throws {
         throw JSONAPICodingError.illegalDecoding("Attempted to decode Poly0, which should represent a thing that is not expected to be found in a document.", path: decoder.codingPath)
     }
@@ -30,6 +30,8 @@ extension Poly0: CodablePrimaryResource {
     }
 }
 
+extension Poly0: CodablePrimaryResource {}
+
 // MARK: - 1 type
 extension Poly1: EncodablePrimaryResource, OptionalEncodablePrimaryResource
     where A: EncodablePolyWrapped {}
diff --git a/Sources/JSONAPI/Resource/Resource Object/ResourceObject.swift b/Sources/JSONAPI/Resource/Resource Object/ResourceObject.swift
@@ -9,11 +9,11 @@
 /// A JSON API structure within an ResourceObject that contains
 /// named properties of types `MetaRelationship`, `ToOneRelationship`
 /// and `ToManyRelationship`.
-public protocol Relationships: Codable & Equatable {}
+public protocol Relationships: Codable & Equatable & Sendable {}
 
 /// A JSON API structure within an ResourceObject that contains
 /// properties of any types that are JSON encodable.
-public protocol Attributes: Codable & Equatable {}
+public protocol Attributes: Codable & Equatable & Sendable {}
 
 /// CodingKeys must be `CodingKey` and `Equatable` in order
 /// to support Sparse Fieldsets.
@@ -69,7 +69,7 @@ public protocol ResourceObjectDescription: ResourceObjectProxyDescription where
 /// types that _act_ like ResourceObject but cannot be encoded
 /// or decoded as ResourceObjects.
 @dynamicMemberLookup
-public protocol ResourceObjectProxy: Equatable, JSONTyped {
+public protocol ResourceObjectProxy: Equatable, JSONTyped, Sendable {
     associatedtype Description: ResourceObjectProxyDescription
     associatedtype EntityRawIdType: JSONAPI.MaybeRawId
 
@@ -119,7 +119,7 @@ public protocol IdentifiableResourceObjectType: ResourceObjectType, Relatable wh
 /// encoded to or decoded from a JSON API
 /// "Resource Object."
 /// See https://jsonapi.org/format/#document-resource-objects
-public struct ResourceObject<Description: JSONAPI.ResourceObjectDescription, MetaType: JSONAPI.Meta, LinksType: JSONAPI.Links, EntityRawIdType: JSONAPI.MaybeRawId>: ResourceObjectType {
+public struct ResourceObject<Description: JSONAPI.ResourceObjectDescription, MetaType: JSONAPI.Meta, LinksType: JSONAPI.Links, EntityRawIdType: JSONAPI.MaybeRawId & Sendable>: ResourceObjectType {
 
     public typealias Meta = MetaType
     public typealias Links = LinksType
diff --git a/Sources/JSONAPI/Resource/Resource Object/ResourceObjectDecodingError.swift b/Sources/JSONAPI/Resource/Resource Object/ResourceObjectDecodingError.swift
@@ -13,7 +13,7 @@ public struct ResourceObjectDecodingError: Swift.Error, Equatable {
 
     static let entireObject = "entire object"
 
-    public enum Cause: Equatable {
+    public enum Cause: Equatable, Sendable {
         case keyNotFound
         case valueNotFound
         case typeMismatch(expectedTypeName: String)
@@ -26,7 +26,7 @@ public struct ResourceObjectDecodingError: Swift.Error, Equatable {
         }
     }
 
-    public enum Location: String, Equatable {
+    public enum Location: String, Equatable, Sendable {
         case attributes
         case relationships
         case relationshipType
diff --git a/Sources/JSONAPI/SparseFields/SparseFieldset.swift b/Sources/JSONAPI/SparseFields/SparseFieldset.swift
@@ -12,7 +12,7 @@ public struct SparseFieldset<
     Description: JSONAPI.ResourceObjectDescription,
     MetaType: JSONAPI.Meta,
     LinksType: JSONAPI.Links,
-    EntityRawIdType: JSONAPI.MaybeRawId
+    EntityRawIdType: JSONAPI.MaybeRawId & Sendable
 >: EncodablePrimaryResource where Description.Attributes: SparsableAttributes {
 
     /// The `ResourceObject` type this `SparseFieldset` is capable of modifying.

Original file line number	Diff line number	Diff line change
`@@ -6,8 +6,8 @@`
`6`	`6`	`//`
`7`	`7`
`8`	`8`	`/// This is what the JSON API Spec calls the "JSON:API Object"`
`9`		`-public protocol APIDescriptionType: Codable, Equatable {`
`10`		`- associatedtype Meta`
	`9`	`+public protocol APIDescriptionType: Codable, Equatable, Sendable {`
	`10`	`+ associatedtype Meta: Sendable`
`11`	`11`	`}`
`12`	`12`
`13`	`13`	`/// This is what the JSON API Spec calls the "JSON:API Object"`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`// Created by Mathew Polzin on 11/10/18.`
`6`	`6`	`//`
`7`	`7`
`8`		`-public protocol JSONAPIError: Swift.Error, Equatable, Codable {`
	`8`	`+public protocol JSONAPIError: Swift.Error, Equatable, Codable, Sendable {`
`9`	`9`	`static var unknown: Self { get }`
`10`	`10`	`}`
`11`	`11`