Merge pull request #54 from mattpolzin/beta/3x

Beta/3x

JSONAPI.playground/Pages/Full Client & Server Example.xcplaygroundpage/Contents.swift

@@ -37,7 +37,7 @@ typealias ToManyRelationship<Entity: Relatable> = JSONAPI.ToManyRelationship<Ent
 // JSON:API Documents for this particular API to have Metadata, Links,
 // useful Errors, or an APIDescription (The *SPEC* calls this
 // "API Description" the "JSON:API Object").
-typealias Document<PrimaryResourceBody: JSONAPI.ResourceBody, IncludeType: JSONAPI.Include> = JSONAPI.Document<PrimaryResourceBody, NoMetadata, NoLinks, IncludeType, NoAPIDescription, BasicJSONAPIError<String>>
+typealias Document<PrimaryResourceBody: JSONAPI.CodableResourceBody, IncludeType: JSONAPI.Include> = JSONAPI.Document<PrimaryResourceBody, NoMetadata, NoLinks, IncludeType, NoAPIDescription, BasicJSONAPIError<String>>
 
 // MARK: Entity Definitions
 

JSONAPI.playground/Pages/Usage.xcplaygroundpage/Contents.swift

@@ -64,11 +64,11 @@ if case let .data(bodyData) = peopleResponse.body {
 
 // MARK: - Work in the abstract
 print("-----")
-func process<T: JSONAPIDocument>(document: T) {
-	guard case let .data(body) = document.body else {
+func process<T: CodableJSONAPIDocument>(document: T) {
+    guard let body = document.body.data else {
 		return
 	}
-	let x: T.Body.Data = body
+	let x: T.BodyData = body
 }
 process(document: peopleResponse)
 

Package.resolved

@@ -6,8 +6,8 @@
         "repositoryURL": "https://github.com/mattpolzin/Poly.git",
         "state": {
           "branch": null,
-          "revision": "b24fd3b41bf3126d4c6dede3708135182172af60",
-          "version": "2.2.0"
+          "revision": "0c9c08204142babc480938d704a23513d11420e5",
+          "version": "2.3.1"
         }
       }
     ]

Package.swift

@@ -18,7 +18,7 @@ let package = Package(
             targets: ["JSONAPITesting"])
     ],
     dependencies: [
-        .package(url: "https://github.com/mattpolzin/Poly.git", .upToNextMajor(from: "2.2.0")),
+        .package(url: "https://github.com/mattpolzin/Poly.git", .upToNextMajor(from: "2.3.1")),
     ],
     targets: [
         .target(

Sources/JSONAPI/Document/APIDescription.swift

@@ -7,58 +7,58 @@
 
 /// This is what the JSON API Spec calls the "JSON:API Object"
 public protocol APIDescriptionType: Codable, Equatable {
-	associatedtype Meta
+    associatedtype Meta
 }
 
 /// This is what the JSON API Spec calls the "JSON:API Object"
 public struct APIDescription<Meta: JSONAPI.Meta>: APIDescriptionType {
-	public let version: String
-	public let meta: Meta
+    public let version: String
+    public let meta: Meta
 
-	public init(version: String, meta: Meta) {
-		self.version = version
-		self.meta = meta
-	}
+    public init(version: String, meta: Meta) {
+        self.version = version
+        self.meta = meta
+    }
 }
 
 /// Can be used as `APIDescriptionType` for Documents that do not
 /// have any API Description (a.k.a. "JSON:API Object").
 public struct NoAPIDescription: APIDescriptionType, CustomStringConvertible {
-	public typealias Meta = NoMetadata
+    public typealias Meta = NoMetadata
 
-	public init() {}
+    public init() {}
 
-	public static var none: NoAPIDescription { return .init() }
+    public static var none: NoAPIDescription { return .init() }
 
-	public var description: String { return "No JSON:API Object" }
+    public var description: String { return "No JSON:API Object" }
 }
 
 extension APIDescription {
-	private enum CodingKeys: String, CodingKey {
-		case version
-		case meta
-	}
+    private enum CodingKeys: String, CodingKey {
+        case version
+        case meta
+    }
 
-	public init(from decoder: Decoder) throws {
-		let container = try decoder.container(keyedBy: CodingKeys.self)
+    public init(from decoder: Decoder) throws {
+        let container = try decoder.container(keyedBy: CodingKeys.self)
 
-		// The spec says that if a version is not specified, it should be assumed to be at least 1.0
-		version = (try? container.decode(String.self, forKey: .version)) ?? "1.0"
+        // The spec says that if a version is not specified, it should be assumed to be at least 1.0
+        version = (try? container.decode(String.self, forKey: .version)) ?? "1.0"
 
-		if let metaVal = NoMetadata() as? Meta {
-			meta = metaVal
-		} else {
-			meta = try container.decode(Meta.self, forKey: .meta)
-		}
-	}
+        if let metaVal = NoMetadata() as? Meta {
+            meta = metaVal
+        } else {
+            meta = try container.decode(Meta.self, forKey: .meta)
+        }
+    }
 
-	public func encode(to encoder: Encoder) throws {
-		var container = encoder.container(keyedBy: CodingKeys.self)
+    public func encode(to encoder: Encoder) throws {
+        var container = encoder.container(keyedBy: CodingKeys.self)
 
-		try container.encode(version, forKey: .version)
+        try container.encode(version, forKey: .version)
 
-		if Meta.self != NoMetadata.self {
-			try container.encode(meta, forKey: .meta)
-		}
-	}
+        if Meta.self != NoMetadata.self {
+            try container.encode(meta, forKey: .meta)
+        }
+    }
 }

Sources/JSONAPI/Document/DocumentDecodingError.swift

@@ -1,11 +1,73 @@
 //
-//  DocumentDecodingErro.swift
+//  DocumentDecodingError.swift
 //  
 //
 //  Created by Mathew Polzin on 10/20/19.
 //
 
-public enum JSONAPIDocumentDecodingError: Swift.Error {
+public enum DocumentDecodingError: Swift.Error, Equatable {
+    case primaryResource(error: ResourceObjectDecodingError, idx: Int?)
+    case primaryResourceMissing
+    case primaryResourcesMissing
+
+    case includes(error: IncludesDecodingError)
+
     case foundErrorDocumentWhenExpectingSuccess
     case foundSuccessDocumentWhenExpectingError
+
+    init(_ decodingError: ResourceObjectDecodingError) {
+        self = .primaryResource(error: decodingError, idx: nil)
+    }
+
+    init(_ decodingError: ManyResourceBodyDecodingError) {
+        self = .primaryResource(error: decodingError.error, idx: decodingError.idx)
+    }
+
+    init(_ decodingError: IncludesDecodingError) {
+        self = .includes(error: decodingError)
+    }
+
+    init?(_ decodingError: DecodingError) {
+        switch decodingError {
+        case .valueNotFound(let type, let context) where Location(context) == .data && type is AbstractResourceObject.Type:
+            self = .primaryResourceMissing
+        case .valueNotFound(let type, let context) where Location(context) == .data && type == UnkeyedDecodingContainer.self:
+            self = .primaryResourcesMissing
+        default:
+            return nil
+        }
+    }
+
+    private enum Location: Equatable {
+        case data
+
+        init?(_ context: DecodingError.Context) {
+            guard context.codingPath.contains(where: { $0.stringValue == "data" }) else {
+                return nil
+            }
+            self = .data
+        }
+    }
+}
+
+extension DocumentDecodingError: CustomStringConvertible {
+    public var description: String {
+        switch self {
+        case .primaryResource(error: let error, idx: let idx):
+            let idxString = idx.map { " \($0 + 1)" } ?? ""
+            return "Primary Resource\(idxString) failed to parse because \(error)"
+        case .primaryResourceMissing:
+            return "Primary Resource missing."
+        case .primaryResourcesMissing:
+            return "Primary Resources array missing."
+
+        case .includes(error: let error):
+            return "\(error)"
+
+        case .foundErrorDocumentWhenExpectingSuccess:
+            return "Expected a success document with a 'data' property but found an error document."
+        case .foundSuccessDocumentWhenExpectingError:
+            return "Expected an error document but found a success document with a 'data' property."
+        }
+    }
 }

Sources/JSONAPI/Document/Includes.swift

@@ -14,35 +14,35 @@ public typealias Include = EncodableJSONPoly
 ///
 /// If you have
 ///
-/// `let includes: Includes<Include2<Thing1, Thing2>> = ...`
+///     let includes: Includes<Include2<Thing1, Thing2>> = ...
 ///
 /// then you can access all `Thing1` included resources with
 ///
-/// `let includedThings = includes[Thing1.self]`
+///     let includedThings = includes[Thing1.self]
 public struct Includes<I: Include>: Encodable, Equatable {
-	public static var none: Includes { return .init(values: []) }
-	
-	let values: [I]
-	
-	public init(values: [I]) {
-		self.values = values
-	}
+    public static var none: Includes { return .init(values: []) }
 
-	public func encode(to encoder: Encoder) throws {
-		var container = encoder.unkeyedContainer()
+    public let values: [I]
 
-		guard I.self != NoIncludes.self else {
-			throw JSONAPIEncodingError.illegalEncoding("Attempting to encode Include0, which should be represented by the absense of an 'included' entry altogether.")
-		}
+    public init(values: [I]) {
+        self.values = values
+    }
 
-		for value in values {
-			try container.encode(value)
-		}
-	}
-	
-	public var count: Int {
-		return values.count
-	}
+    public func encode(to encoder: Encoder) throws {
+        var container = encoder.unkeyedContainer()
+
+        guard I.self != NoIncludes.self else {
+            throw JSONAPICodingError.illegalEncoding("Attempting to encode Include0, which should be represented by the absense of an 'included' entry altogether.", path: encoder.codingPath)
+        }
+
+        for value in values {
+            try container.encode(value)
+        }
+    }
+
+    public var count: Int {
+        return values.count
+    }
 }
 
 extension Includes: Decodable where I: Decodable {
@@ -56,8 +56,35 @@ extension Includes: Decodable where I: Decodable {
         }
 
         var valueAggregator = [I]()
+        var idx = 0
         while !container.isAtEnd {
-            valueAggregator.append(try container.decode(I.self))
+            do {
+                valueAggregator.append(try container.decode(I.self))
+                idx = idx + 1
+            } catch let error as PolyDecodeNoTypesMatchedError {
+                let errors: [ResourceObjectDecodingError] = error
+                    .individualTypeFailures
+                    .compactMap { decodingError in
+                        switch decodingError.error {
+                        case .typeMismatch(_, let context),
+                             .valueNotFound(_, let context),
+                             .keyNotFound(_, let context),
+                             .dataCorrupted(let context):
+                            return context.underlyingError as? ResourceObjectDecodingError
+                        @unknown default:
+                            return nil
+                        }
+                }
+                guard errors.count == error.individualTypeFailures.count else {
+                    throw IncludesDecodingError(error: error, idx: idx)
+                }
+                throw IncludesDecodingError(
+                    error: IncludeDecodingError(failures: errors),
+                    idx: idx
+                )
+            } catch let error {
+                throw IncludesDecodingError(error: error, idx: idx)
+            }
         }
 
         values = valueAggregator
@@ -65,25 +92,25 @@ extension Includes: Decodable where I: Decodable {
 }
 
 extension Includes {
-	public func appending(_ other: Includes<I>) -> Includes {
-		return Includes(values: values + other.values)
-	}
+    public func appending(_ other: Includes<I>) -> Includes {
+        return Includes(values: values + other.values)
+    }
 }
 
 public func +<I: Include>(_ left: Includes<I>, _ right: Includes<I>) -> Includes<I> {
-	return left.appending(right)
+    return left.appending(right)
 }
 
 extension Includes: CustomStringConvertible {
-	public var description: String {
-		return "Includes(\(String(describing: values))"
-	}
+    public var description: String {
+        return "Includes(\(String(describing: values))"
+    }
 }
 
 extension Includes where I == NoIncludes {
-	public init() {
-		values = []
-	}
+    public init() {
+        values = []
+    }
 }
 
 // MARK: - 0 includes
@@ -93,73 +120,73 @@ public typealias NoIncludes = Include0
 // MARK: - 1 include
 public typealias Include1 = Poly1
 extension Includes where I: _Poly1 {
-	public subscript(_ lookup: I.A.Type) -> [I.A] {
-		return values.compactMap { $0.a }
-	}
+    public subscript(_ lookup: I.A.Type) -> [I.A] {
+        return values.compactMap { $0.a }
+    }
 }
 
 // MARK: - 2 includes
 public typealias Include2 = Poly2
 extension Includes where I: _Poly2 {
-	public subscript(_ lookup: I.B.Type) -> [I.B] {
-		return values.compactMap { $0.b }
-	}
+    public subscript(_ lookup: I.B.Type) -> [I.B] {
+        return values.compactMap { $0.b }
+    }
 }
 
 // MARK: - 3 includes
 public typealias Include3 = Poly3
 extension Includes where I: _Poly3 {
-	public subscript(_ lookup: I.C.Type) -> [I.C] {
-		return values.compactMap { $0.c }
-	}
+    public subscript(_ lookup: I.C.Type) -> [I.C] {
+        return values.compactMap { $0.c }
+    }
 }
 
 // MARK: - 4 includes
 public typealias Include4 = Poly4
 extension Includes where I: _Poly4 {
-	public subscript(_ lookup: I.D.Type) -> [I.D] {
-		return values.compactMap { $0.d }
-	}
+    public subscript(_ lookup: I.D.Type) -> [I.D] {
+        return values.compactMap { $0.d }
+    }
 }
 
 // MARK: - 5 includes
 public typealias Include5 = Poly5
 extension Includes where I: _Poly5 {
-	public subscript(_ lookup: I.E.Type) -> [I.E] {
-		return values.compactMap { $0.e }
-	}
+    public subscript(_ lookup: I.E.Type) -> [I.E] {
+        return values.compactMap { $0.e }
+    }
 }
 
 // MARK: - 6 includes
 public typealias Include6 = Poly6
 extension Includes where I: _Poly6 {
-	public subscript(_ lookup: I.F.Type) -> [I.F] {
-		return values.compactMap { $0.f }
-	}
+    public subscript(_ lookup: I.F.Type) -> [I.F] {
+        return values.compactMap { $0.f }
+    }
 }
 
 // MARK: - 7 includes
 public typealias Include7 = Poly7
 extension Includes where I: _Poly7 {
-	public subscript(_ lookup: I.G.Type) -> [I.G] {
-		return values.compactMap { $0.g }
-	}
+    public subscript(_ lookup: I.G.Type) -> [I.G] {
+        return values.compactMap { $0.g }
+    }
 }
 
 // MARK: - 8 includes
 public typealias Include8 = Poly8
 extension Includes where I: _Poly8 {
-	public subscript(_ lookup: I.H.Type) -> [I.H] {
-		return values.compactMap { $0.h }
-	}
+    public subscript(_ lookup: I.H.Type) -> [I.H] {
+        return values.compactMap { $0.h }
+    }
 }
 
 // MARK: - 9 includes
 public typealias Include9 = Poly9
 extension Includes where I: _Poly9 {
-	public subscript(_ lookup: I.I.Type) -> [I.I] {
-		return values.compactMap { $0.i }
-	}
+    public subscript(_ lookup: I.I.Type) -> [I.I] {
+        return values.compactMap { $0.i }
+    }
 }
 
 // MARK: - 10 includes
@@ -177,3 +204,32 @@ extension Includes where I: _Poly11 {
         return values.compactMap { $0.k }
     }
 }
+
+// MARK: - DecodingError
+public struct IncludesDecodingError: Swift.Error, Equatable {
+    public let error: Swift.Error
+    public let idx: Int
+
+    public static func ==(lhs: Self, rhs: Self) -> Bool {
+        return lhs.idx == rhs.idx
+            && String(describing: lhs) == String(describing: rhs)
+    }
+}
+
+extension IncludesDecodingError: CustomStringConvertible {
+    public var description: String {
+        return "Include \(idx + 1) failed to parse: \(error)"
+    }
+}
+
+public struct IncludeDecodingError: Swift.Error, Equatable, CustomStringConvertible {
+    public let failures: [ResourceObjectDecodingError]
+
+    public var description: String {
+        return failures
+            .enumerated()
+            .map {
+                "\nCould not have been Include Type \($0.offset + 1) because:\n\($0.element)"
+        }.joined(separator: "\n")
+    }
+}

Sources/JSONAPI/Document/ResourceBody.swift

@@ -10,121 +10,132 @@
 /// array should be used for no results).
 public protocol OptionalEncodablePrimaryResource: Equatable, Encodable {}
 
-/// An `EncodablePrimaryResource` is a `PrimaryResource` that only supports encoding.
-/// This is actually more restrictave than `PrimaryResource`, which supports both encoding and
-/// decoding.
+/// An `EncodablePrimaryResource` is a `CodablePrimaryResource` that only supports encoding.
 public protocol EncodablePrimaryResource: OptionalEncodablePrimaryResource {}
 
 /// This protocol allows for `SingleResourceBody` to contain a `null`
 /// data object where `ManyResourceBody` cannot (because an empty
 /// array should be used for no results).
-public protocol OptionalPrimaryResource: OptionalEncodablePrimaryResource, Decodable {}
+public protocol OptionalCodablePrimaryResource: OptionalEncodablePrimaryResource, Decodable {}
 
-/// A `PrimaryResource` is a type that can be used in the body of a JSON API
+/// A `CodablePrimaryResource` is a type that can be used in the body of a JSON API
 /// document as the primary resource.
-public protocol PrimaryResource: EncodablePrimaryResource, OptionalPrimaryResource {}
+public protocol CodablePrimaryResource: EncodablePrimaryResource, OptionalCodablePrimaryResource {}
 
 extension Optional: OptionalEncodablePrimaryResource where Wrapped: EncodablePrimaryResource {}
 
-extension Optional: OptionalPrimaryResource where Wrapped: PrimaryResource {}
+extension Optional: OptionalCodablePrimaryResource where Wrapped: CodablePrimaryResource {}
 
 /// 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 {}
+public protocol EncodableResourceBody: Equatable, Encodable {
+    associatedtype PrimaryResource
+}
 
-/// A ResourceBody is a representation of the body of the JSON API Document.
+/// A `CodableResourceBody` is a representation of the body of the JSON:API Document.
 /// It can either be one resource (which can be specified as optional or not)
 /// or it can contain many resources (and array with zero or more entries).
-public protocol ResourceBody: Decodable, EncodableResourceBody {}
+public protocol CodableResourceBody: Decodable, EncodableResourceBody {}
 
 /// A `ResourceBody` that has the ability to take on more primary
 /// resources by appending another similarly typed `ResourceBody`.
-public protocol Appendable {
-	func appending(_ other: Self) -> Self
+public protocol ResourceBodyAppendable {
+    func appending(_ other: Self) -> Self
 }
 
-public func +<R: Appendable>(_ left: R, right: R) -> R {
-	return left.appending(right)
+public func +<R: ResourceBodyAppendable>(_ left: R, right: R) -> R {
+    return left.appending(right)
 }
 
 /// 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<Entity: JSONAPI.OptionalEncodablePrimaryResource>: EncodableResourceBody {
-	public let value: Entity
+public struct SingleResourceBody<PrimaryResource: JSONAPI.OptionalEncodablePrimaryResource>: EncodableResourceBody {
+    public let value: PrimaryResource
 
-	public init(resourceObject: Entity) {
-		self.value = resourceObject
-	}
+    public init(resourceObject: PrimaryResource) {
+        self.value = resourceObject
+    }
 }
 
 /// A type allowing for a document body containing 0 or more primary resources.
-public struct ManyResourceBody<Entity: JSONAPI.EncodablePrimaryResource>: EncodableResourceBody, Appendable {
-	public let values: [Entity]
+public struct ManyResourceBody<PrimaryResource: JSONAPI.EncodablePrimaryResource>: EncodableResourceBody, ResourceBodyAppendable {
+    public let values: [PrimaryResource]
 
-	public init(resourceObjects: [Entity]) {
-		values = resourceObjects
-	}
+    public init(resourceObjects: [PrimaryResource]) {
+        values = resourceObjects
+    }
 
-	public func appending(_ other: ManyResourceBody) -> ManyResourceBody {
-		return ManyResourceBody(resourceObjects: values + other.values)
-	}
+    public func appending(_ other: ManyResourceBody) -> ManyResourceBody {
+        return ManyResourceBody(resourceObjects: values + other.values)
+    }
 }
 
 /// Use NoResourceBody to indicate you expect a JSON API document to not
 /// contain a "data" top-level key.
-public struct NoResourceBody: ResourceBody {
-	public static var none: NoResourceBody { return NoResourceBody() }
+public struct NoResourceBody: CodableResourceBody {
+    public typealias PrimaryResource = Void
+
+    public static var none: NoResourceBody { return NoResourceBody() }
 }
 
 // MARK: Codable
 extension SingleResourceBody {
-	public func encode(to encoder: Encoder) throws {
-		var container = encoder.singleValueContainer()
+    public func encode(to encoder: Encoder) throws {
+        var container = encoder.singleValueContainer()
 
         let anyNil: Any? = nil
-        let nilValue = anyNil as? Entity
+        let nilValue = anyNil as? PrimaryResource
         guard value != nilValue else {
             try container.encodeNil()
             return
         }
 
-		try container.encode(value)
-	}
+        try container.encode(value)
+    }
 }
 
-extension SingleResourceBody: Decodable, ResourceBody where Entity: OptionalPrimaryResource {
+extension SingleResourceBody: Decodable, CodableResourceBody where PrimaryResource: OptionalCodablePrimaryResource {
     public init(from decoder: Decoder) throws {
         let container = try decoder.singleValueContainer()
 
         let anyNil: Any? = nil
         if container.decodeNil(),
-            let val = anyNil as? Entity {
+            let val = anyNil as? PrimaryResource {
             value = val
             return
         }
 
-        value = try container.decode(Entity.self)
+        value = try container.decode(PrimaryResource.self)
     }
 }
 
 extension ManyResourceBody {
-	public func encode(to encoder: Encoder) throws {
-		var container = encoder.unkeyedContainer()
+    public func encode(to encoder: Encoder) throws {
+        var container = encoder.unkeyedContainer()
 
-		for value in values {
-			try container.encode(value)
-		}
-	}
+        for value in values {
+            try container.encode(value)
+        }
+    }
 }
 
-extension ManyResourceBody: Decodable, ResourceBody where Entity: PrimaryResource {
+extension ManyResourceBody: Decodable, CodableResourceBody where PrimaryResource: CodablePrimaryResource {
     public init(from decoder: Decoder) throws {
         var container = try decoder.unkeyedContainer()
-        var valueAggregator = [Entity]()
+        var valueAggregator = [PrimaryResource]()
+        var idx = 0
         while !container.isAtEnd {
-            valueAggregator.append(try container.decode(Entity.self))
+            do {
+                valueAggregator.append(try container.decode(PrimaryResource.self))
+            } catch let error as ResourceObjectDecodingError {
+                throw ManyResourceBodyDecodingError(
+                    error: error,
+                    idx: idx
+                )
+            }
+            idx = idx + 1
         }
         values = valueAggregator
     }
@@ -133,13 +144,19 @@ extension ManyResourceBody: Decodable, ResourceBody where Entity: PrimaryResourc
 // MARK: CustomStringConvertible
 
 extension SingleResourceBody: CustomStringConvertible {
-	public var description: String {
-		return "PrimaryResourceBody(\(String(describing: value)))"
-	}
+    public var description: String {
+        return "PrimaryResourceBody(\(String(describing: value)))"
+    }
 }
 
 extension ManyResourceBody: CustomStringConvertible {
-	public var description: String {
-		return "PrimaryResourceBody(\(String(describing: values)))"
-	}
+    public var description: String {
+        return "PrimaryResourceBody(\(String(describing: values)))"
+    }
+}
+
+// MARK: - DecodingError
+public struct ManyResourceBodyDecodingError: Swift.Error, Equatable {
+    public let error: ResourceObjectDecodingError
+    public let idx: Int
 }

Sources/JSONAPI/EncodingError.swift

@@ -1,14 +0,0 @@
-//
-//  EncodingError.swift
-//  JSONAPI
-//
-//  Created by Mathew Polzin on 12/7/18.
-//
-
-public enum JSONAPIEncodingError: Swift.Error {
-	case typeMismatch(expected: String, found: String)
-	case illegalEncoding(String)
-	case illegalDecoding(String)
-	case missingOrMalformedMetadata
-	case missingOrMalformedLinks
-}

Sources/JSONAPI/Error/BasicJSONAPIError.swift

@@ -6,10 +6,12 @@
 //
 
 /// Most of the JSON:API Spec defined Error fields.
-public struct BasicJSONAPIErrorPayload<IdType: Codable & Equatable>: Codable, Equatable, ErrorDictType {
+public struct BasicJSONAPIErrorPayload<IdType: Codable & Equatable>: Codable, Equatable, ErrorDictType, CustomStringConvertible {
     /// a unique identifier for this particular occurrence of the problem
     public let id: IdType?
-//    public let links: Links? // we skip this for now to avoid adding complexity to using this basic type.
+
+    //    public let links: Links? // we skip this for now to avoid adding complexity to using this basic type.
+
     /// the HTTP status code applicable to this problem
     public let status: String?
     /// an application-specific error code
@@ -20,7 +22,8 @@ public struct BasicJSONAPIErrorPayload<IdType: Codable & Equatable>: Codable, Eq
     public let detail: String?
     /// an object containing references to the source of the error
     public let source: Source?
-//    public let meta: Meta? // we skip this for now to avoid adding complexity to using this basic type
+
+    //    public let meta: Meta? // we skip this for now to avoid adding complexity to using this basic type
 
     public init(id: IdType? = nil,
                 status: String? = nil,
@@ -61,6 +64,10 @@ public struct BasicJSONAPIErrorPayload<IdType: Codable & Equatable>: Codable, Eq
             ].compactMap { $0 }
         return Dictionary(uniqueKeysWithValues: keysAndValues)
     }
+
+    public var description: String {
+        return definedFields.map { "\($0.key): \($0.value)" }.sorted().joined(separator: ", ")
+    }
 }
 
 /// `BasicJSONAPIError` optionally decodes many possible fields

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 {
+public enum GenericJSONAPIError<ErrorPayload: Codable & Equatable>: JSONAPIError, CustomStringConvertible {
     case unknownError
     case error(ErrorPayload)
 
@@ -35,6 +35,15 @@ public enum GenericJSONAPIError<ErrorPayload: Codable & Equatable>: JSONAPIError
     public static var unknown: Self {
         return .unknownError
     }
+
+    public var description: String {
+        switch self {
+        case .unknownError:
+            return "unknown error"
+        case .error(let payload):
+            return String(describing: payload)
+        }
+    }
 }
 
 public extension GenericJSONAPIError {

Sources/JSONAPI/Error/JSONAPIError.swift

@@ -6,7 +6,7 @@
 //
 
 public protocol JSONAPIError: Swift.Error, Equatable, Codable {
-	static var unknown: Self { get }
+    static var unknown: Self { get }
 }
 
 /// `UnknownJSONAPIError` can actually be used in any sitaution
@@ -16,18 +16,18 @@ public protocol JSONAPIError: Swift.Error, Equatable, Codable {
 /// information the server might be providing in the error payload,
 /// use `BasicJSONAPIError` instead.
 public enum UnknownJSONAPIError: JSONAPIError {
-	case unknownError
-	
-	public init(from decoder: Decoder) throws {
-		self = .unknown
-	}
+    case unknownError
 
-	public func encode(to encoder: Encoder) throws {
-		var container = encoder.singleValueContainer()
-		try container.encode("unknown")
-	}
-	
-	public static var unknown: Self {
-		return .unknownError
-	}
+    public init(from decoder: Decoder) throws {
+        self = .unknown
+    }
+
+    public func encode(to encoder: Encoder) throws {
+        var container = encoder.singleValueContainer()
+        try container.encode("unknown")
+    }
+
+    public static var unknown: Self {
+        return .unknownError
+    }
 }

Sources/JSONAPI/JSONAPICodingError.swift

@@ -0,0 +1,27 @@
+//
+//  JSONAPICodingError.swift
+//  JSONAPI
+//
+//  Created by Mathew Polzin on 12/7/18.
+//
+
+public enum JSONAPICodingError: Swift.Error {
+    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 {
+        case one
+        case many
+
+        public var other: Quantity {
+            switch self {
+            case .one: return .many
+            case .many: return .one
+            }
+        }
+    }
+}

Sources/JSONAPI/Meta/Links.swift

@@ -5,63 +5,63 @@
 //  Created by Mathew Polzin on 11/24/18.
 //
 
-/// A Links structure should contain nothing but JSONAPI.Link properties.
+/// A Links structure should contain nothing but `JSONAPI.Link` properties.
 public protocol Links: Codable, Equatable {}
 
 /// Use NoLinks where no links should belong to a JSON API component
 public struct NoLinks: Links, CustomStringConvertible {
-	public static var none: NoLinks { return NoLinks() }
-	public init() {}
-
-	public var description: String { return "No Links" }
+    public static var none: NoLinks { return NoLinks() }
+    public init() {}
+    
+    public var description: String { return "No Links" }
 }
 
 public protocol JSONAPIURL: Codable, Equatable {}
 
 public struct Link<URL: JSONAPI.JSONAPIURL, Meta: JSONAPI.Meta>: Equatable, Codable {
-	public let url: URL
-	public let meta: Meta
-
-	public init(url: URL, meta: Meta) {
-		self.url = url
-		self.meta = meta
-	}
+    public let url: URL
+    public let meta: Meta
+    
+    public init(url: URL, meta: Meta) {
+        self.url = url
+        self.meta = meta
+    }
 }
 
 extension Link where Meta == NoMetadata {
-	public init(url: URL) {
-		self.init(url: url, meta: .none)
-	}
+    public init(url: URL) {
+        self.init(url: url, meta: .none)
+    }
 }
 
 public extension Link {
-	private enum CodingKeys: String, CodingKey {
-		case href
-		case meta
-	}
-
-	init(from decoder: Decoder) throws {
-		guard Meta.self == NoMetadata.self,
-			let noMeta = NoMetadata() as? Meta else {
-				let container = try decoder.container(keyedBy: CodingKeys.self)
-				meta = try container.decode(Meta.self, forKey: .meta)
-				url = try container.decode(URL.self, forKey: .href)
-				return
-		}
-		let container = try decoder.singleValueContainer()
-		url = try container.decode(URL.self)
-		meta = noMeta
-	}
-
-	func encode(to encoder: Encoder) throws {
-		guard Meta.self == NoMetadata.self else {
-			var container = encoder.container(keyedBy: CodingKeys.self)
-			try container.encode(url, forKey: .href)
-			try container.encode(meta, forKey: .meta)
-			return
-		}
-		var container = encoder.singleValueContainer()
-
-		try container.encode(url)
-	}
+    private enum CodingKeys: String, CodingKey {
+        case href
+        case meta
+    }
+    
+    init(from decoder: Decoder) throws {
+        guard Meta.self == NoMetadata.self,
+            let noMeta = NoMetadata() as? Meta else {
+                let container = try decoder.container(keyedBy: CodingKeys.self)
+                meta = try container.decode(Meta.self, forKey: .meta)
+                url = try container.decode(URL.self, forKey: .href)
+                return
+        }
+        let container = try decoder.singleValueContainer()
+        url = try container.decode(URL.self)
+        meta = noMeta
+    }
+    
+    func encode(to encoder: Encoder) throws {
+        guard Meta.self == NoMetadata.self else {
+            var container = encoder.container(keyedBy: CodingKeys.self)
+            try container.encode(url, forKey: .href)
+            try container.encode(meta, forKey: .meta)
+            return
+        }
+        var container = encoder.singleValueContainer()
+        
+        try container.encode(url)
+    }
 }

Sources/JSONAPI/Meta/Meta.swift

@@ -6,25 +6,25 @@
 //
 
 /// Conform a type to this protocol to indicate it can be encoded to or decoded from
-/// the meta data attached to a component of a JSON API document. Different meta data
+/// the meta data attached to a component of a JSON:API document. Different meta data
 /// can be stored all over the place: On the root document, on a resource object, on
 /// link objects, etc.
 ///
-/// JSON API Metadata is totally open ended. It can take whatever JSON-compliant structure
+/// 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 {
 }
 
-// We make Optional a Meta if it wraps a Meta so that Metadata can be specified as
-// nullable.
+// We make Optional a Meta if it wraps a Meta so that
+// Metadata can be specified as nullable.
 extension Optional: Meta where Wrapped: Meta {}
 
 /// Use this type when you want to specify not to encode or decode any metadata
 /// for a type.
 public struct NoMetadata: Meta, CustomStringConvertible {
-	public static var none: NoMetadata { return NoMetadata() }
+    public static var none: NoMetadata { return NoMetadata() }
 
-	public init() { }
+    public init() { }
 
-	public var description: String { return "No Metadata" }
+    public var description: String { return "No Metadata" }
 }

Sources/JSONAPI/Resource/Attribute+Functor.swift

@@ -6,31 +6,31 @@
 //
 
 public extension TransformedAttribute {
-	/// Map an Attribute to a new wrapped type.
-	/// Note that the resulting Attribute will have no transformer, even if the
-	/// source Attribute has a transformer.
-	/// You are mapping the output of the source transform into
-	/// the RawValue of a new transformerless Attribute.
-	///
-	/// Generally, this is the most useful operation. The transformer gives you
-	/// control over the decoding of the Attribute, but once the Attribute exists,
-	/// mapping on it is most useful for creating computed Attribute properties.
-	func map<T: Codable>(_ transform: (Transformer.To) throws -> T) rethrows -> Attribute<T> {
-		return Attribute<T>(value: try transform(value))
-	}
+    /// Map an Attribute to a new wrapped type.
+    /// Note that the resulting Attribute will have no transformer, even if the
+    /// source Attribute has a transformer.
+    /// You are mapping the output of the source transform into
+    /// the RawValue of a new transformerless Attribute.
+    ///
+    /// Generally, this is the most useful operation. The transformer gives you
+    /// control over the decoding of the Attribute, but once the Attribute exists,
+    /// mapping on it is most useful for creating computed Attribute properties.
+    func map<T: Codable>(_ transform: (Transformer.To) throws -> T) rethrows -> Attribute<T> {
+        return Attribute<T>(value: try transform(value))
+    }
 }
 
 public extension Attribute {
-	/// Map an Attribute to a new wrapped type.
-	/// Note that the resulting Attribute will have no transformer, even if the
-	/// source Attribute has a transformer.
-	/// You are mapping the output of the source transform into
-	/// the RawValue of a new transformerless Attribute.
-	///
-	/// Generally, this is the most useful operation. The transformer gives you
-	/// control over the decoding of the Attribute, but once the Attribute exists,
-	/// mapping on it is most useful for creating computed Attribute properties.
-	func map<T: Codable>(_ transform: (ValueType) throws -> T) rethrows -> Attribute<T> {
-		return Attribute<T>(value: try transform(value))
-	}
+    /// Map an Attribute to a new wrapped type.
+    /// Note that the resulting Attribute will have no transformer, even if the
+    /// source Attribute has a transformer.
+    /// You are mapping the output of the source transform into
+    /// the RawValue of a new transformerless Attribute.
+    ///
+    /// Generally, this is the most useful operation. The transformer gives you
+    /// control over the decoding of the Attribute, but once the Attribute exists,
+    /// mapping on it is most useful for creating computed Attribute properties.
+    func map<T: Codable>(_ transform: (ValueType) throws -> T) rethrows -> Attribute<T> {
+        return Attribute<T>(value: try transform(value))
+    }
 }

Sources/JSONAPI/Resource/Attribute.swift

@@ -5,50 +5,58 @@
 //  Created by Mathew Polzin on 11/13/18.
 //
 
-public protocol AttributeType: Codable {
-	associatedtype RawValue: Codable
-	associatedtype ValueType
+public protocol AbstractAttributeType {
+    var rawValueType: Any.Type { get }
+}
 
-	var value: ValueType { get }
+public protocol AttributeType: Codable, AbstractAttributeType {
+    associatedtype RawValue: Codable
+    associatedtype ValueType
+
+    var value: ValueType { get }
+}
+
+extension AttributeType {
+    public var rawValueType: Any.Type { return RawValue.self }
 }
 
 // MARK: TransformedAttribute
 
 /// A TransformedAttribute takes a Codable type and attempts to turn it into another type.
 public struct TransformedAttribute<RawValue: Codable, Transformer: JSONAPI.Transformer>: AttributeType where Transformer.From == RawValue {
-	public let rawValue: RawValue
+    public let rawValue: RawValue
 
-	public let value: Transformer.To
+    public let value: Transformer.To
 
-	public init(rawValue: RawValue) throws {
-		self.rawValue = rawValue
-		value = try Transformer.transform(rawValue)
-	}
+    public init(rawValue: RawValue) throws {
+        self.rawValue = rawValue
+        value = try Transformer.transform(rawValue)
+    }
 }
 
 extension TransformedAttribute where Transformer == IdentityTransformer<RawValue> {
-	// If we are using the identity transform, we can skip the transform and guarantee no
-	// error is thrown.
-	public init(value: RawValue) {
-		rawValue = value
-		self.value = value
-	}
+    // If we are using the identity transform, we can skip the transform and guarantee no
+    // error is thrown.
+    public init(value: RawValue) {
+        rawValue = value
+        self.value = value
+    }
 }
 
 extension TransformedAttribute where Transformer: ReversibleTransformer {
-	/// Initialize a TransformedAttribute from its transformed value. The
-	/// RawValue, which is what gets encoded/decoded, is determined using
-	/// The Transformer's reverse function.
-	public init(transformedValue: Transformer.To) throws {
-		self.value = transformedValue
-		rawValue = try Transformer.reverse(value)
-	}
+    /// Initialize a TransformedAttribute from its transformed value. The
+    /// RawValue, which is what gets encoded/decoded, is determined using
+    /// The Transformer's reverse function.
+    public init(transformedValue: Transformer.To) throws {
+        self.value = transformedValue
+        rawValue = try Transformer.reverse(value)
+    }
 }
 
 extension TransformedAttribute: CustomStringConvertible {
-	public var description: String {
-		return "Attribute<\(String(describing: Transformer.From.self)) -> \(String(describing: Transformer.To.self))>(\(String(describing: value)))"
-	}
+    public var description: String {
+        return "Attribute<\(String(describing: Transformer.From.self)) -> \(String(describing: Transformer.To.self))>(\(String(describing: value)))"
+    }
 }
 
 extension TransformedAttribute: Equatable where Transformer.From: Equatable, Transformer.To: Equatable {}
@@ -63,85 +71,86 @@ public typealias ValidatedAttribute<RawValue: Codable, Validator: JSONAPI.Valida
 
 /// An Attribute simply represents a type that can be encoded and decoded.
 public struct Attribute<RawValue: Codable>: AttributeType {
-	let attribute: TransformedAttribute<RawValue, IdentityTransformer<RawValue>>
+    let attribute: TransformedAttribute<RawValue, IdentityTransformer<RawValue>>
 
-	public var value: RawValue {
-		return attribute.value
-	}
+    public var value: RawValue {
+        return attribute.value
+    }
 
-	public init(value: RawValue) {
-		attribute = .init(value: value)
-	}
+    public init(value: RawValue) {
+        attribute = .init(value: value)
+    }
 }
 
 extension Attribute: CustomStringConvertible {
-	public var description: String {
-		return "Attribute<\(String(describing: RawValue.self))>(\(String(describing: value)))"
-	}
+    public var description: String {
+        return "Attribute<\(String(describing: RawValue.self))>(\(String(describing: value)))"
+    }
 }
 
 extension Attribute: Equatable where RawValue: Equatable {}
 
 // MARK: - Codable
 extension TransformedAttribute {
-	public init(from decoder: Decoder) throws {
-		let container = try decoder.singleValueContainer()
-		
-		let rawVal: RawValue
-		
-		// A little trickery follows. If the value is nil, the
-		// container.decode(Value.self) will fail even if Value
-		// is Optional. However, we can check if decoding nil
-		// succeeds and then attempt to coerce nil to a Value
-		// type at which point we can store nil in `value`.
-		let anyNil: Any? = nil
-		if container.decodeNil(),
-			let val = anyNil as? Transformer.From {
-				rawVal = val
-		} else {
-			rawVal = try container.decode(Transformer.From.self)
-		}
-		
-		rawValue = rawVal
-		value = try Transformer.transform(rawVal)
-	}
-	
-	public func encode(to encoder: Encoder) throws {
-		var container = encoder.singleValueContainer()
+    public init(from decoder: Decoder) throws {
+        let container = try decoder.singleValueContainer()
 
-		try container.encode(rawValue)
-	}
+        let rawVal: RawValue
+
+        // A little trickery follows. If the value is nil, the
+        // container.decode(Value.self) will fail even if Value
+        // is Optional. However, we can check if decoding nil
+        // succeeds and then attempt to coerce nil to a Value
+        // type at which point we can store nil in `value`.
+        let anyNil: Any? = nil
+        if container.decodeNil(),
+            let val = anyNil as? Transformer.From {
+            rawVal = val
+        } else {
+            rawVal = try container.decode(Transformer.From.self)
+        }
+
+        rawValue = rawVal
+        value = try Transformer.transform(rawVal)
+    }
+
+    public func encode(to encoder: Encoder) throws {
+        var container = encoder.singleValueContainer()
+
+        try container.encode(rawValue)
+    }
 }
 
 extension Attribute {
-	public init(from decoder: Decoder) throws {
-		let container = try decoder.singleValueContainer()
+    public init(from decoder: Decoder) throws {
+        let container = try decoder.singleValueContainer()
 
-		// A little trickery follows. If the value is nil, the
-		// container.decode(Value.self) will fail even if Value
-		// is Optional. However, we can check if decoding nil
-		// succeeds and then attempt to coerce nil to a Value
-		// type at which point we can store nil in `value`.
-		let anyNil: Any? = nil
-		if container.decodeNil(),
-			let val = anyNil as? RawValue {
-			attribute = .init(value: val)
-		} else {
-			attribute = try container.decode(TransformedAttribute<RawValue, IdentityTransformer<RawValue>>.self)
-		}
-	}
+        // A little trickery follows. If the value is nil, the
+        // container.decode(Value.self) will fail even if Value
+        // is Optional. However, we can check if decoding nil
+        // succeeds and then attempt to coerce nil to a Value
+        // type at which point we can store nil in `value`.
+        let anyNil: Any? = nil
+        if container.decodeNil(),
+            let val = anyNil as? RawValue {
+            attribute = .init(value: val)
+        } else {
+            attribute = try container.decode(TransformedAttribute<RawValue, IdentityTransformer<RawValue>>.self)
+        }
+    }
 
-	public func encode(to encoder: Encoder) throws {
-		var container = encoder.singleValueContainer()
+    public func encode(to encoder: Encoder) throws {
+        var container = encoder.singleValueContainer()
 
-		try container.encode(attribute)
-	}
+        try container.encode(attribute)
+    }
 }
 
 // MARK: Attribute decoding and encoding defaults
 
 extension AttributeType {
-	public static func defaultDecoding<Container: KeyedDecodingContainerProtocol>(from container: Container, forKey key: Container.Key) throws -> Self {
-		return try container.decode(Self.self, forKey: key)
-	}
+    public static func defaultDecoding<Container: KeyedDecodingContainerProtocol>(from container: Container,
+                                                                                  forKey key: Container.Key) throws -> Self {
+        return try container.decode(Self.self, forKey: key)
+    }
 }

Sources/JSONAPI/Resource/Id.swift

@@ -23,7 +23,7 @@ public protocol RawIdType: MaybeRawId, Hashable {}
 /// Conformances for `String` and `UUID`
 /// are given in the README for this library.
 public protocol CreatableRawIdType: RawIdType {
-	static func unique() -> Self
+    static func unique() -> Self
 }
 
 extension String: RawIdType {}
@@ -32,80 +32,83 @@ extension String: RawIdType {}
 /// 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 init() {}
-	
-	public var description: String { return "Unidentified" }
+    public init() {}
+
+    public var description: String { return "Unidentified" }
 }
 
 public protocol OptionalId: Codable {
-	associatedtype IdentifiableType: JSONAPI.JSONTyped
-	associatedtype RawType: MaybeRawId
+    associatedtype IdentifiableType: JSONAPI.JSONTyped
+    associatedtype RawType: MaybeRawId
 
-	var rawValue: RawType { get }
-	init(rawValue: RawType)
+    var rawValue: RawType { get }
+    init(rawValue: RawType)
 }
 
-public protocol IdType: OptionalId, CustomStringConvertible, Hashable where RawType: RawIdType {}
+/// marker protocol
+public protocol AbstractId {}
+
+public protocol IdType: AbstractId, OptionalId, CustomStringConvertible, Hashable where RawType: RawIdType {}
 
 extension Optional: MaybeRawId where Wrapped: Codable & Equatable {}
 extension Optional: OptionalId where Wrapped: IdType {
-	public typealias IdentifiableType = Wrapped.IdentifiableType
-	public typealias RawType = Wrapped.RawType?
+    public typealias IdentifiableType = Wrapped.IdentifiableType
+    public typealias RawType = Wrapped.RawType?
 
-	public var rawValue: Wrapped.RawType? {
-		guard case .some(let value) = self else {
-			return nil
-		}
-		return value.rawValue
-	}
+    public var rawValue: Wrapped.RawType? {
+        guard case .some(let value) = self else {
+            return nil
+        }
+        return value.rawValue
+    }
 
-	public init(rawValue: Wrapped.RawType?) {
-		self = rawValue.map { Wrapped(rawValue: $0) }
-	}
+    public init(rawValue: Wrapped.RawType?) {
+        self = rawValue.map { Wrapped(rawValue: $0) }
+    }
 }
 
 public extension IdType {
-	var description: String { return "Id(\(String(describing: rawValue)))" }
+    var description: String { return "Id(\(String(describing: rawValue)))" }
 }
 
 public protocol CreatableIdType: IdType {
-	init()
+    init()
 }
 
 /// 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 let rawValue: RawType
-	
-	public init(rawValue: RawType) {
-		self.rawValue = rawValue
-	}
+    public let rawValue: RawType
 
-	public init(from decoder: Decoder) throws {
-		let container = try decoder.singleValueContainer()
-		let rawValue = try container.decode(RawType.self)
-		self.init(rawValue: rawValue)
-	}
+    public init(rawValue: RawType) {
+        self.rawValue = rawValue
+    }
 
-	public func encode(to encoder: Encoder) throws {
-		var container = encoder.singleValueContainer()
-		try container.encode(rawValue)
-	}
+    public init(from decoder: Decoder) throws {
+        let container = try decoder.singleValueContainer()
+        let rawValue = try container.decode(RawType.self)
+        self.init(rawValue: rawValue)
+    }
+
+    public func encode(to encoder: Encoder) throws {
+        var container = encoder.singleValueContainer()
+        try container.encode(rawValue)
+    }
 }
 
-extension Id: Hashable, CustomStringConvertible, IdType where RawType: RawIdType {
-	public static func id(from rawValue: RawType) -> Id<RawType, IdentifiableType> {
-		return Id(rawValue: rawValue)
-	}
+extension Id: Hashable, CustomStringConvertible, AbstractId, IdType where RawType: RawIdType {
+    public static func id(from rawValue: RawType) -> Id<RawType, IdentifiableType> {
+        return Id(rawValue: rawValue)
+    }
 }
 
 extension Id: CreatableIdType where RawType: CreatableRawIdType {
-	public init() {
-		rawValue = .unique()
-	}
+    public init() {
+        rawValue = .unique()
+    }
 }
 
 extension Id where RawType == Unidentified {
-	public static var unidentified: Id { return .init(rawValue: Unidentified()) }
+    public static var unidentified: Id { return .init(rawValue: Unidentified()) }
 }