revert Self -> ResourceObject change but also try swapping out a type…

…alias reference that seems to be confusing to the compiler for the thing that typealias references.
mattpolzin · Mar 7, 2021 · a8c4bf6 · a8c4bf6
1 parent 87d43cc
commit a8c4bf6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Sources/JSONAPI/Resource/Resource Object/ResourceObject+Replacing.swift b/Sources/JSONAPI/Resource/Resource Object/ResourceObject+Replacing.swift
@@ -15,7 +15,7 @@ public extension JSONAPI.ResourceObject {
     /// - parameters:
     ///     - replacement: A function that takes the existing `attributes` and returns the replacement.
     func replacingAttributes(_ replacement: (Description.Attributes) -> Description.Attributes) -> Self {
-        return ResourceObject(id: id,
+        return Self(id: id,
                     attributes: replacement(attributes),
                     relationships: relationships,
                     meta: meta,

diff --git a/Sources/JSONAPI/Resource/Resource Object/ResourceObject.swift b/Sources/JSONAPI/Resource/Resource Object/ResourceObject.swift
@@ -128,7 +128,7 @@ public struct ResourceObject<Description: JSONAPI.ResourceObjectDescription, Met
     /// the entity is being created clientside and the
     /// server is being asked to create a unique Id. Otherwise,
     /// this should be of a type conforming to `IdType`.
-    public let id: ResourceObject.Id
+    public let id: JSONAPI.Id<EntityRawIdType, Self>
 
     /// The JSON API compliant attributes of this `ResourceObject`.
     public let attributes: Description.Attributes