loosen the grip entity had on Ids

mattpolzin · mattpolzin · commit 1061283905ba · 2018-12-08T01:17:47.000-08:00
diff --git a/Sources/JSONAPI/Resource/Entity.swift b/Sources/JSONAPI/Resource/Entity.swift
@@ -112,10 +112,8 @@ public struct Entity<Description: JSONAPI.EntityDescription, MetaType: JSONAPI.M
 	}
 }
 
-extension Entity: IdentifiableEntityType, Relatable, OptionalRelatable where EntityRawIdType: JSONAPI.RawIdType {
+extension Entity: Identifiable, IdentifiableEntityType, Relatable where EntityRawIdType: JSONAPI.RawIdType {
 	public typealias Identifier = Entity.Id
-	public typealias Wrapped = Entity
-	public typealias WrappedId = Identifier
 }
 
 extension Entity: CustomStringConvertible {
@@ -432,14 +430,14 @@ public extension EntityProxy {
 	/// Access to an Id of a `ToOneRelationship`.
 	/// This allows you to write `entity ~> \.other` instead
 	/// of `entity.relationships.other.id`.
-	public static func ~><OtherEntity: OptionalRelatable, MType: JSONAPI.Meta, LType: JSONAPI.Links>(entity: Self, path: KeyPath<Description.Relationships, ToOneRelationship<OtherEntity, MType, LType>>) -> OtherEntity.WrappedId {
+	public static func ~><OtherEntity: Identifiable, MType: JSONAPI.Meta, LType: JSONAPI.Links>(entity: Self, path: KeyPath<Description.Relationships, ToOneRelationship<OtherEntity, MType, LType>>) -> OtherEntity.Identifier {
 		return entity.relationships[keyPath: path].id
 	}
 
 	/// Access to an Id of an optional `ToOneRelationship`.
 	/// This allows you to write `entity ~> \.other` instead
 	/// of `entity.relationships.other?.id`.
-	public static func ~><OtherEntity: OptionalRelatable, MType: JSONAPI.Meta, LType: JSONAPI.Links>(entity: Self, path: KeyPath<Description.Relationships, ToOneRelationship<OtherEntity, MType, LType>?>) -> OtherEntity.WrappedId where OtherEntity.WrappedId == OtherEntity.Wrapped.Identifier? {
+	public static func ~><OtherEntity: OptionalRelatable, MType: JSONAPI.Meta, LType: JSONAPI.Links>(entity: Self, path: KeyPath<Description.Relationships, ToOneRelationship<OtherEntity, MType, LType>?>) -> OtherEntity.Identifier {
 		// Implementation Note: This signature applies to `ToOneRelationship<E?, _, _>?`
 		// whereas the one below applies to `ToOneRelationship<E, _, _>?`
 		return entity.relationships[keyPath: path]?.id
@@ -448,7 +446,7 @@ public extension EntityProxy {
 	/// Access to an Id of an optional `ToOneRelationship`.
 	/// This allows you to write `entity ~> \.other` instead
 	/// of `entity.relationships.other?.id`.
-	public static func ~><OtherEntity: Relatable & OptionalRelatable, MType: JSONAPI.Meta, LType: JSONAPI.Links>(entity: Self, path: KeyPath<Description.Relationships, ToOneRelationship<OtherEntity, MType, LType>?>) -> OtherEntity.Identifier? where OtherEntity.WrappedId == OtherEntity.Identifier {
+	public static func ~><OtherEntity: Relatable, MType: JSONAPI.Meta, LType: JSONAPI.Links>(entity: Self, path: KeyPath<Description.Relationships, ToOneRelationship<OtherEntity, MType, LType>?>) -> OtherEntity.Identifier? {
 		// Implementation Note: This signature applies to `ToOneRelationship<E, _, _>?`
 		// whereas the one above applies to `ToOneRelationship<E?, _, _>?`
 		return entity.relationships[keyPath: path]?.id
diff --git a/Sources/JSONAPI/Resource/Id.swift b/Sources/JSONAPI/Resource/Id.swift
@@ -35,7 +35,7 @@ public struct Unidentified: MaybeRawId, CustomStringConvertible {
 }
 
 public protocol MaybeId: Codable {
-	associatedtype EntityType: JSONAPI.EntityProxy
+	associatedtype IdentifiableType: JSONAPI.JSONTyped
 	associatedtype RawType: MaybeRawId
 }
 
@@ -53,7 +53,7 @@ public protocol CreatableIdType: IdType {
 
 /// An Entity ID. These IDs can be encoded to or decoded from
 /// JSON API IDs.
-public struct Id<RawType: MaybeRawId, EntityType: JSONAPI.EntityProxy>: Codable, Equatable, MaybeId {
+public struct Id<RawType: MaybeRawId, IdentifiableType: JSONAPI.JSONTyped>: Codable, Equatable, MaybeId {
 
 	public let rawValue: RawType
 	
@@ -74,10 +74,6 @@ public struct Id<RawType: MaybeRawId, EntityType: JSONAPI.EntityProxy>: Codable,
 
 extension Id: Hashable, CustomStringConvertible, IdType where RawType: RawIdType {}
 
-extension Id: WrappedIdType where RawType: RawIdType {
-	public typealias Identifier = Id
-}
-
 extension Id: CreatableIdType where RawType: CreatableRawIdType {
 	public init() {
 		rawValue = .unique()
diff --git a/Sources/JSONAPI/Resource/Relationship.swift b/Sources/JSONAPI/Resource/Relationship.swift
@@ -17,46 +17,46 @@ public protocol RelationshipType: Codable {
 /// a JSON API "Resource Linkage."
 /// See https://jsonapi.org/format/#document-resource-object-linkage
 /// A convenient typealias might make your code much more legible: `One<EntityDescription>`
-public struct ToOneRelationship<OptionalRelatable: JSONAPI.OptionalRelatable, MetaType: JSONAPI.Meta, LinksType: JSONAPI.Links>: RelationshipType, Equatable {
+public struct ToOneRelationship<Identifiable: JSONAPI.Identifiable, MetaType: JSONAPI.Meta, LinksType: JSONAPI.Links>: RelationshipType, Equatable {
 
-	public let id: OptionalRelatable.WrappedId
+	public let id: Identifiable.Identifier
 
 	public let meta: MetaType
 	public let links: LinksType
 
-	public init(id: OptionalRelatable.WrappedId, meta: MetaType, links: LinksType) {
+	public init(id: Identifiable.Identifier, meta: MetaType, links: LinksType) {
 		self.id = id
 		self.meta = meta
 		self.links = links
 	}
 }
 
 extension ToOneRelationship where MetaType == NoMetadata, LinksType == NoLinks {
-	public init(id: OptionalRelatable.WrappedId) {
+	public init(id: Identifiable.Identifier) {
 		self.init(id: id, meta: .none, links: .none)
 	}
 }
 
 extension ToOneRelationship {
-	public init<E: EntityType>(entity: E, meta: MetaType, links: LinksType) where E.Id == OptionalRelatable.WrappedId {
+	public init<E: EntityType>(entity: E, meta: MetaType, links: LinksType) where E.Id == Identifiable.Identifier {
 		self.init(id: entity.id, meta: meta, links: links)
 	}
 }
 
 extension ToOneRelationship where MetaType == NoMetadata, LinksType == NoLinks {
-	public init<E: EntityType>(entity: E) where E.Id == OptionalRelatable.WrappedId {
+	public init<E: EntityType>(entity: E) where E.Id == Identifiable.Identifier {
 		self.init(id: entity.id, meta: .none, links: .none)
 	}
 }
 
-extension ToOneRelationship where OptionalRelatable.WrappedId == OptionalRelatable.Wrapped.Identifier? {
-	public init<E: EntityType>(entity: E?, meta: MetaType, links: LinksType) where E.Id == OptionalRelatable.Wrapped.Identifier {
+extension ToOneRelationship where Identifiable: OptionalRelatable {
+	public init<E: EntityType>(entity: E?, meta: MetaType, links: LinksType) where E.Id == Identifiable.Wrapped.Identifier {
 		self.init(id: entity?.id, meta: meta, links: links)
 	}
 }
 
-extension ToOneRelationship where OptionalRelatable.WrappedId == OptionalRelatable.Wrapped.Identifier?, MetaType == NoMetadata, LinksType == NoLinks {
-	public init<E: EntityType>(entity: E?) where E.Id == OptionalRelatable.Wrapped.Identifier {
+extension ToOneRelationship where Identifiable: OptionalRelatable, MetaType == NoMetadata, LinksType == NoLinks {
+	public init<E: EntityType>(entity: E?) where E.Id == Identifiable.Wrapped.Identifier {
 		self.init(id: entity?.id, meta: .none, links: .none)
 	}
 }
@@ -78,7 +78,7 @@ public struct ToManyRelationship<Relatable: JSONAPI.Relatable, MetaType: JSONAPI
 		self.links = links
 	}
 
-	public init<T: JSONAPI.OptionalRelatable>(pointers: [ToOneRelationship<T, NoMetadata, NoLinks>], meta: MetaType, links: LinksType) where T.WrappedId == Relatable.Identifier {
+	public init<T: JSONAPI.Identifiable>(pointers: [ToOneRelationship<T, NoMetadata, NoLinks>], meta: MetaType, links: LinksType) where T.Identifier == Relatable.Identifier {
 		ids = pointers.map { $0.id }
 		self.meta = meta
 		self.links = links
@@ -103,7 +103,7 @@ extension ToManyRelationship where MetaType == NoMetadata, LinksType == NoLinks
 		self.init(ids: ids, meta: .none, links: .none)
 	}
 
-	public init<T: JSONAPI.OptionalRelatable>(pointers: [ToOneRelationship<T, NoMetadata, NoLinks>]) where T.WrappedId == Relatable.Identifier {
+	public init<T: JSONAPI.Identifiable>(pointers: [ToOneRelationship<T, NoMetadata, NoLinks>]) where T.Identifier == Relatable.Identifier {
 		self.init(pointers: pointers, meta: .none, links: .none)
 	}
 
@@ -116,29 +116,23 @@ extension ToManyRelationship where MetaType == NoMetadata, LinksType == NoLinks
 	}
 }
 
+public protocol Identifiable: JSONTyped {
+	associatedtype Identifier: Equatable, Codable
+}
+
 /// The Relatable protocol describes anything that
 /// has an IdType Identifier
-public protocol Relatable: JSONTyped {
-	associatedtype Identifier: JSONAPI.IdType
+public protocol Relatable: Identifiable where Identifier: JSONAPI.IdType {
 }
 
 /// OptionalRelatable just describes an Optional
 /// with a Reltable Wrapped type.
-public protocol OptionalRelatable: JSONTyped {
+public protocol OptionalRelatable: Identifiable where Identifier == Wrapped.Identifier? {
 	associatedtype Wrapped: JSONAPI.Relatable
-	associatedtype WrappedId: WrappedIdType where WrappedId.Identifier == Wrapped.Identifier
-}
-
-public protocol WrappedIdType: Codable, Equatable {
-	associatedtype Identifier: JSONAPI.IdType
-}
-
-extension Optional: WrappedIdType where Wrapped: IdType {
-	public typealias Identifier = Wrapped
 }
 
-extension Optional: OptionalRelatable, JSONTyped where Wrapped: JSONAPI.Relatable {
-	public typealias WrappedId = Wrapped.Identifier?
+extension Optional: Identifiable, OptionalRelatable, JSONTyped where Wrapped: JSONAPI.Relatable {
+	public typealias Identifier = Wrapped.Identifier?
 
 	public static var type: String { return Wrapped.type }
 }
@@ -177,7 +171,7 @@ extension ToOneRelationship {
 		// type at which point we can store nil in `id`.
 		let anyNil: Any? = nil
 		if try container.decodeNil(forKey: .data),
-			let val = anyNil as? OptionalRelatable.WrappedId {
+			let val = anyNil as? Identifiable.Identifier {
 			id = val
 			return
 		}
@@ -186,11 +180,11 @@ extension ToOneRelationship {
 		
 		let type = try identifier.decode(String.self, forKey: .entityType)
 		
-		guard type == OptionalRelatable.type else {
-			throw JSONAPIEncodingError.typeMismatch(expected: OptionalRelatable.type, found: type)
+		guard type == Identifiable.type else {
+			throw JSONAPIEncodingError.typeMismatch(expected: Identifiable.type, found: type)
 		}
 		
-		id = try identifier.decode(OptionalRelatable.WrappedId.self, forKey: .id)
+		id = try identifier.decode(Identifiable.Identifier.self, forKey: .id)
 	}
 	
 	public func encode(to encoder: Encoder) throws {
@@ -211,7 +205,7 @@ extension ToOneRelationship {
 		var identifier = container.nestedContainer(keyedBy: ResourceIdentifierCodingKeys.self, forKey: .data)
 		
 		try identifier.encode(id, forKey: .id)
-		try identifier.encode(OptionalRelatable.type, forKey: .entityType)
+		try identifier.encode(Identifiable.type, forKey: .entityType)
 	}
 }
 
diff --git a/Sources/JSONAPITestLib/Relationship+Literal.swift b/Sources/JSONAPITestLib/Relationship+Literal.swift
@@ -7,34 +7,34 @@
 
 import JSONAPI
 
-extension ToOneRelationship: ExpressibleByNilLiteral where OptionalRelatable.WrappedId: ExpressibleByNilLiteral, MetaType == NoMetadata, LinksType == NoLinks {
+extension ToOneRelationship: ExpressibleByNilLiteral where Identifiable.Identifier: ExpressibleByNilLiteral, MetaType == NoMetadata, LinksType == NoLinks {
 	public init(nilLiteral: ()) {
 
-		self.init(id: OptionalRelatable.WrappedId(nilLiteral: ()))
+		self.init(id: Identifiable.Identifier(nilLiteral: ()))
 	}
 }
 
-extension ToOneRelationship: ExpressibleByUnicodeScalarLiteral where OptionalRelatable.WrappedId: ExpressibleByUnicodeScalarLiteral, MetaType == NoMetadata, LinksType == NoLinks {
-	public typealias UnicodeScalarLiteralType =  OptionalRelatable.WrappedId.UnicodeScalarLiteralType
+extension ToOneRelationship: ExpressibleByUnicodeScalarLiteral where Identifiable.Identifier: ExpressibleByUnicodeScalarLiteral, MetaType == NoMetadata, LinksType == NoLinks {
+	public typealias UnicodeScalarLiteralType =  Identifiable.Identifier.UnicodeScalarLiteralType
 
 	public init(unicodeScalarLiteral value: UnicodeScalarLiteralType) {
-		self.init(id: OptionalRelatable.WrappedId(unicodeScalarLiteral: value))
+		self.init(id: Identifiable.Identifier(unicodeScalarLiteral: value))
 	}
 }
 
-extension ToOneRelationship: ExpressibleByExtendedGraphemeClusterLiteral where OptionalRelatable.WrappedId: ExpressibleByExtendedGraphemeClusterLiteral, MetaType == NoMetadata, LinksType == NoLinks {
-	public typealias ExtendedGraphemeClusterLiteralType =  OptionalRelatable.WrappedId.ExtendedGraphemeClusterLiteralType
+extension ToOneRelationship: ExpressibleByExtendedGraphemeClusterLiteral where Identifiable.Identifier: ExpressibleByExtendedGraphemeClusterLiteral, MetaType == NoMetadata, LinksType == NoLinks {
+	public typealias ExtendedGraphemeClusterLiteralType =  Identifiable.Identifier.ExtendedGraphemeClusterLiteralType
 
 	public init(extendedGraphemeClusterLiteral value: ExtendedGraphemeClusterLiteralType) {
-		self.init(id: OptionalRelatable.WrappedId(extendedGraphemeClusterLiteral: value))
+		self.init(id: Identifiable.Identifier(extendedGraphemeClusterLiteral: value))
 	}
 }
 
-extension ToOneRelationship: ExpressibleByStringLiteral where OptionalRelatable.WrappedId: ExpressibleByStringLiteral, MetaType == NoMetadata, LinksType == NoLinks {
-	public typealias StringLiteralType = OptionalRelatable.WrappedId.StringLiteralType
+extension ToOneRelationship: ExpressibleByStringLiteral where Identifiable.Identifier: ExpressibleByStringLiteral, MetaType == NoMetadata, LinksType == NoLinks {
+	public typealias StringLiteralType = Identifiable.Identifier.StringLiteralType
 
 	public init(stringLiteral value: StringLiteralType) {
-		self.init(id: OptionalRelatable.WrappedId(stringLiteral: value))
+		self.init(id: Identifiable.Identifier(stringLiteral: value))
 	}
 }
 
diff --git a/Tests/JSONAPITests/NonJSONAPIRelatable/NonJSONAPIRelatableTests.swift b/Tests/JSONAPITests/NonJSONAPIRelatable/NonJSONAPIRelatableTests.swift
@@ -32,9 +32,9 @@ extension NonJSONAPIRelatableTests {
 //		typealias Relationships = NoRelationships
 //	}
 
-//	struct NonJSONAPIEntity: Relatable, OptionalRelatable {
-//		typealias Description = NonJSONAPIEntityDescription
-//		typealias EntityRawIdType = String
+//	struct NonJSONAPIEntity: Relatable, OptionalRelatable, JSONTyped {
+//		static var type: String { return "other" }
+//
 //		typealias Identifier = NonJSONAPIEntity.Id
 //		typealias WrappedIdentifier = NonJSONAPIEntity.Id
 //
@@ -44,13 +44,10 @@ extension NonJSONAPIRelatableTests {
 //		let relationships: NoRelationships
 //
 //		struct Id: IdType {
-//			var rawValue: NonJSONAPIRelatableTests.NonJSONAPIEntity.Id.RawType
-//
-//			typealias EntityType = <#type#>
+//			var rawValue: String
 //
+//			typealias IdentifiableType = NonJSONAPIEntity
 //			typealias RawType = String
-//
-//			let rawValue: String
 //		}
 //	}
 }

Original file line number	Diff line number	Diff line change
`@@ -17,46 +17,46 @@ public protocol RelationshipType: Codable {`
`17`	`17`	`/// a JSON API "Resource Linkage."`
`18`	`18`	`/// See https://jsonapi.org/format/#document-resource-object-linkage`
`19`	`19`	/// A convenient typealias might make your code much more legible: `One<EntityDescription>`
`20`		`-public struct ToOneRelationship<OptionalRelatable: JSONAPI.OptionalRelatable, MetaType: JSONAPI.Meta, LinksType: JSONAPI.Links>: RelationshipType, Equatable {`
	`20`	`+public struct ToOneRelationship<Identifiable: JSONAPI.Identifiable, MetaType: JSONAPI.Meta, LinksType: JSONAPI.Links>: RelationshipType, Equatable {`
`21`	`21`
`22`		`- public let id: OptionalRelatable.WrappedId`
	`22`	`+ public let id: Identifiable.Identifier`
`23`	`23`
`24`	`24`	`public let meta: MetaType`
`25`	`25`	`public let links: LinksType`
`26`	`26`
`27`		`- public init(id: OptionalRelatable.WrappedId, meta: MetaType, links: LinksType) {`
	`27`	`+ public init(id: Identifiable.Identifier, meta: MetaType, links: LinksType) {`
`28`	`28`	`self.id = id`
`29`	`29`	`self.meta = meta`
`30`	`30`	`self.links = links`
`31`	`31`	`}`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`extension ToOneRelationship where MetaType == NoMetadata, LinksType == NoLinks {`
`35`		`- public init(id: OptionalRelatable.WrappedId) {`
	`35`	`+ public init(id: Identifiable.Identifier) {`
`36`	`36`	`self.init(id: id, meta: .none, links: .none)`
`37`	`37`	`}`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`extension ToOneRelationship {`
`41`		`- public init<E: EntityType>(entity: E, meta: MetaType, links: LinksType) where E.Id == OptionalRelatable.WrappedId {`
	`41`	`+ public init<E: EntityType>(entity: E, meta: MetaType, links: LinksType) where E.Id == Identifiable.Identifier {`
`42`	`42`	`self.init(id: entity.id, meta: meta, links: links)`
`43`	`43`	`}`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`extension ToOneRelationship where MetaType == NoMetadata, LinksType == NoLinks {`
`47`		`- public init<E: EntityType>(entity: E) where E.Id == OptionalRelatable.WrappedId {`
	`47`	`+ public init<E: EntityType>(entity: E) where E.Id == Identifiable.Identifier {`
`48`	`48`	`self.init(id: entity.id, meta: .none, links: .none)`
`49`	`49`	`}`
`50`	`50`	`}`
`51`	`51`
`52`		`-extension ToOneRelationship where OptionalRelatable.WrappedId == OptionalRelatable.Wrapped.Identifier? {`
`53`		`- public init<E: EntityType>(entity: E?, meta: MetaType, links: LinksType) where E.Id == OptionalRelatable.Wrapped.Identifier {`
	`52`	`+extension ToOneRelationship where Identifiable: OptionalRelatable {`
	`53`	`+ public init<E: EntityType>(entity: E?, meta: MetaType, links: LinksType) where E.Id == Identifiable.Wrapped.Identifier {`
`54`	`54`	`self.init(id: entity?.id, meta: meta, links: links)`
`55`	`55`	`}`
`56`	`56`	`}`
`57`	`57`
`58`		`-extension ToOneRelationship where OptionalRelatable.WrappedId == OptionalRelatable.Wrapped.Identifier?, MetaType == NoMetadata, LinksType == NoLinks {`
`59`		`- public init<E: EntityType>(entity: E?) where E.Id == OptionalRelatable.Wrapped.Identifier {`
	`58`	`+extension ToOneRelationship where Identifiable: OptionalRelatable, MetaType == NoMetadata, LinksType == NoLinks {`
	`59`	`+ public init<E: EntityType>(entity: E?) where E.Id == Identifiable.Wrapped.Identifier {`
`60`	`60`	`self.init(id: entity?.id, meta: .none, links: .none)`
`61`	`61`	`}`
`62`	`62`	`}`
`@@ -78,7 +78,7 @@ public struct ToManyRelationship<Relatable: JSONAPI.Relatable, MetaType: JSONAPI`
`78`	`78`	`self.links = links`
`79`	`79`	`}`
`80`	`80`
`81`		`- public init<T: JSONAPI.OptionalRelatable>(pointers: [ToOneRelationship<T, NoMetadata, NoLinks>], meta: MetaType, links: LinksType) where T.WrappedId == Relatable.Identifier {`
	`81`	`+ public init<T: JSONAPI.Identifiable>(pointers: [ToOneRelationship<T, NoMetadata, NoLinks>], meta: MetaType, links: LinksType) where T.Identifier == Relatable.Identifier {`
`82`	`82`	`ids = pointers.map { $0.id }`
`83`	`83`	`self.meta = meta`
`84`	`84`	`self.links = links`
`@@ -103,7 +103,7 @@ extension ToManyRelationship where MetaType == NoMetadata, LinksType == NoLinks`
`103`	`103`	`self.init(ids: ids, meta: .none, links: .none)`
`104`	`104`	`}`
`105`	`105`
`106`		`- public init<T: JSONAPI.OptionalRelatable>(pointers: [ToOneRelationship<T, NoMetadata, NoLinks>]) where T.WrappedId == Relatable.Identifier {`
	`106`	`+ public init<T: JSONAPI.Identifiable>(pointers: [ToOneRelationship<T, NoMetadata, NoLinks>]) where T.Identifier == Relatable.Identifier {`
`107`	`107`	`self.init(pointers: pointers, meta: .none, links: .none)`
`108`	`108`	`}`
`109`	`109`
`@@ -116,29 +116,23 @@ extension ToManyRelationship where MetaType == NoMetadata, LinksType == NoLinks`
`116`	`116`	`}`
`117`	`117`	`}`
`118`	`118`
	`119`	`+public protocol Identifiable: JSONTyped {`
	`120`	`+ associatedtype Identifier: Equatable, Codable`
	`121`	`+}`
	`122`	`+`
`119`	`123`	`/// The Relatable protocol describes anything that`
`120`	`124`	`/// has an IdType Identifier`
`121`		`-public protocol Relatable: JSONTyped {`
`122`		`- associatedtype Identifier: JSONAPI.IdType`
	`125`	`+public protocol Relatable: Identifiable where Identifier: JSONAPI.IdType {`
`123`	`126`	`}`
`124`	`127`
`125`	`128`	`/// OptionalRelatable just describes an Optional`
`126`	`129`	`/// with a Reltable Wrapped type.`
`127`		`-public protocol OptionalRelatable: JSONTyped {`
	`130`	`+public protocol OptionalRelatable: Identifiable where Identifier == Wrapped.Identifier? {`
`128`	`131`	`associatedtype Wrapped: JSONAPI.Relatable`
`129`		`- associatedtype WrappedId: WrappedIdType where WrappedId.Identifier == Wrapped.Identifier`
`130`		`-}`
`131`		`-`
`132`		`-public protocol WrappedIdType: Codable, Equatable {`
`133`		`- associatedtype Identifier: JSONAPI.IdType`
`134`		`-}`
`135`		`-`
`136`		`-extension Optional: WrappedIdType where Wrapped: IdType {`
`137`		`- public typealias Identifier = Wrapped`
`138`	`132`	`}`
`139`	`133`
`140`		`-extension Optional: OptionalRelatable, JSONTyped where Wrapped: JSONAPI.Relatable {`
`141`		`- public typealias WrappedId = Wrapped.Identifier?`
	`134`	`+extension Optional: Identifiable, OptionalRelatable, JSONTyped where Wrapped: JSONAPI.Relatable {`
	`135`	`+ public typealias Identifier = Wrapped.Identifier?`
`142`	`136`
`143`	`137`	`public static var type: String { return Wrapped.type }`
`144`	`138`	`}`
`@@ -177,7 +171,7 @@ extension ToOneRelationship {`
`177`	`171`	// type at which point we can store nil in `id`.
`178`	`172`	`let anyNil: Any? = nil`
`179`	`173`	`if try container.decodeNil(forKey: .data),`
`180`		`- let val = anyNil as? OptionalRelatable.WrappedId {`
	`174`	`+ let val = anyNil as? Identifiable.Identifier {`
`181`	`175`	`id = val`
`182`	`176`	`return`
`183`	`177`	`}`
`@@ -186,11 +180,11 @@ extension ToOneRelationship {`
`186`	`180`
`187`	`181`	`let type = try identifier.decode(String.self, forKey: .entityType)`
`188`	`182`
`189`		`- guard type == OptionalRelatable.type else {`
`190`		`- throw JSONAPIEncodingError.typeMismatch(expected: OptionalRelatable.type, found: type)`
	`183`	`+ guard type == Identifiable.type else {`
	`184`	`+ throw JSONAPIEncodingError.typeMismatch(expected: Identifiable.type, found: type)`
`191`	`185`	`}`
`192`	`186`
`193`		`- id = try identifier.decode(OptionalRelatable.WrappedId.self, forKey: .id)`
	`187`	`+ id = try identifier.decode(Identifiable.Identifier.self, forKey: .id)`
`194`	`188`	`}`
`195`	`189`
`196`	`190`	`public func encode(to encoder: Encoder) throws {`
`@@ -211,7 +205,7 @@ extension ToOneRelationship {`
`211`	`205`	`var identifier = container.nestedContainer(keyedBy: ResourceIdentifierCodingKeys.self, forKey: .data)`
`212`	`206`
`213`	`207`	`try identifier.encode(id, forKey: .id)`
`214`		`- try identifier.encode(OptionalRelatable.type, forKey: .entityType)`
	`208`	`+ try identifier.encode(Identifiable.type, forKey: .entityType)`
`215`	`209`	`}`
`216`	`210`	`}`
`217`	`211`
Original file line number	Diff line number	Diff line change
`@@ -7,34 +7,34 @@`
`7`	`7`
`8`	`8`	`import JSONAPI`
`9`	`9`
`10`		`-extension ToOneRelationship: ExpressibleByNilLiteral where OptionalRelatable.WrappedId: ExpressibleByNilLiteral, MetaType == NoMetadata, LinksType == NoLinks {`
	`10`	`+extension ToOneRelationship: ExpressibleByNilLiteral where Identifiable.Identifier: ExpressibleByNilLiteral, MetaType == NoMetadata, LinksType == NoLinks {`
`11`	`11`	`public init(nilLiteral: ()) {`
`12`	`12`
`13`		`- self.init(id: OptionalRelatable.WrappedId(nilLiteral: ()))`
	`13`	`+ self.init(id: Identifiable.Identifier(nilLiteral: ()))`
`14`	`14`	`}`
`15`	`15`	`}`
`16`	`16`
`17`		`-extension ToOneRelationship: ExpressibleByUnicodeScalarLiteral where OptionalRelatable.WrappedId: ExpressibleByUnicodeScalarLiteral, MetaType == NoMetadata, LinksType == NoLinks {`
`18`		`- public typealias UnicodeScalarLiteralType = OptionalRelatable.WrappedId.UnicodeScalarLiteralType`
	`17`	`+extension ToOneRelationship: ExpressibleByUnicodeScalarLiteral where Identifiable.Identifier: ExpressibleByUnicodeScalarLiteral, MetaType == NoMetadata, LinksType == NoLinks {`
	`18`	`+ public typealias UnicodeScalarLiteralType = Identifiable.Identifier.UnicodeScalarLiteralType`
`19`	`19`
`20`	`20`	`public init(unicodeScalarLiteral value: UnicodeScalarLiteralType) {`
`21`		`- self.init(id: OptionalRelatable.WrappedId(unicodeScalarLiteral: value))`
	`21`	`+ self.init(id: Identifiable.Identifier(unicodeScalarLiteral: value))`
`22`	`22`	`}`
`23`	`23`	`}`
`24`	`24`
`25`		`-extension ToOneRelationship: ExpressibleByExtendedGraphemeClusterLiteral where OptionalRelatable.WrappedId: ExpressibleByExtendedGraphemeClusterLiteral, MetaType == NoMetadata, LinksType == NoLinks {`
`26`		`- public typealias ExtendedGraphemeClusterLiteralType = OptionalRelatable.WrappedId.ExtendedGraphemeClusterLiteralType`
	`25`	`+extension ToOneRelationship: ExpressibleByExtendedGraphemeClusterLiteral where Identifiable.Identifier: ExpressibleByExtendedGraphemeClusterLiteral, MetaType == NoMetadata, LinksType == NoLinks {`
	`26`	`+ public typealias ExtendedGraphemeClusterLiteralType = Identifiable.Identifier.ExtendedGraphemeClusterLiteralType`
`27`	`27`
`28`	`28`	`public init(extendedGraphemeClusterLiteral value: ExtendedGraphemeClusterLiteralType) {`
`29`		`- self.init(id: OptionalRelatable.WrappedId(extendedGraphemeClusterLiteral: value))`
	`29`	`+ self.init(id: Identifiable.Identifier(extendedGraphemeClusterLiteral: value))`
`30`	`30`	`}`
`31`	`31`	`}`
`32`	`32`
`33`		`-extension ToOneRelationship: ExpressibleByStringLiteral where OptionalRelatable.WrappedId: ExpressibleByStringLiteral, MetaType == NoMetadata, LinksType == NoLinks {`
`34`		`- public typealias StringLiteralType = OptionalRelatable.WrappedId.StringLiteralType`
	`33`	`+extension ToOneRelationship: ExpressibleByStringLiteral where Identifiable.Identifier: ExpressibleByStringLiteral, MetaType == NoMetadata, LinksType == NoLinks {`
	`34`	`+ public typealias StringLiteralType = Identifiable.Identifier.StringLiteralType`
`35`	`35`
`36`	`36`	`public init(stringLiteral value: StringLiteralType) {`
`37`		`- self.init(id: OptionalRelatable.WrappedId(stringLiteral: value))`
	`37`	`+ self.init(id: Identifiable.Identifier(stringLiteral: value))`
`38`	`38`	`}`
`39`	`39`	`}`
`40`	`40`