types(share): correct the placement of relationships in deserialize type

lemredd · Sep 13, 2022 · 44488d4 · 44488d4
1 parent 3d8be45
commit 44488d4
Showing 1 changed file with 12 additions and 15 deletions.
diff --git a/shareable/types/documents/user.ts b/shareable/types/documents/user.ts
@@ -152,10 +152,19 @@ export type DeserializedUnreachableEmployeesResource = DeserializedResource<
 	DeserializedUnreachableEmployeesAttributes
 >
 
-export type DeserializedUserResource =
+export type DeserializedUserResource<
+	T extends UserRelationshipNames|undefined = undefined
+> = (
 	| DeserializedStudentResource
 	| DeserializedReachableEmployeesResource
 	| DeserializedUnreachableEmployeesResource
+) & PartialOrPickDeserializedRelationship<
+	UserRelationshipData<"read">,
+	DeserializedUserRelationships<"read">,
+	UserRelationshipNames,
+	T extends UserRelationshipNames ? true : false,
+	T extends UserRelationshipNames ? T : UserRelationshipNames
+>
 
 export type UserDocument<T extends Completeness = "read"> = ResourceDocument<
 	T,
@@ -176,27 +185,15 @@ export type DeserializedUserDocument<
 > = DeserializedResourceDocument<
 	UserResourceIdentifier<"read">,
 	DeserializedUserAttributes,
-	DeserializedUserResource
-> & PartialOrPickDeserializedRelationship<
-	UserRelationshipData<"read">,
-	DeserializedUserRelationships<"read">,
-	UserRelationshipNames,
-	T extends UserRelationshipNames ? true : false,
-	T extends UserRelationshipNames ? T : UserRelationshipNames
+	DeserializedUserResource<T>
 >
 
 export type DeserializedUserListDocument<
 	T extends UserRelationshipNames|undefined = undefined
 > = DeserializedResourceListDocument<
 	UserResourceIdentifier<"read">,
 	DeserializedUserAttributes,
-	DeserializedUserResource
-> & PartialOrPickDeserializedRelationship<
-	UserRelationshipData<"read">,
-	DeserializedUserRelationships<"read">,
-	UserRelationshipNames,
-	T extends UserRelationshipNames ? true : false,
-	T extends UserRelationshipNames ? T : UserRelationshipNames
+	DeserializedUserResource<T>
 >
 
 interface GeneralUserProfileMetaProperties extends Serializable {