Use modelInstanceCreator for fromJSON

aws-amplify · Apr 17, 2020 · 644a5f1 · 644a5f1
1 parent 4733b5c
commit 644a5f1
Showing 1 changed file with 1 addition and 11 deletions.
diff --git a/packages/datastore/src/datastore/datastore.ts b/packages/datastore/src/datastore/datastore.ts
@@ -329,17 +329,7 @@ const createModelClass = <T extends PersistentModel>(
 				return json.map(init => this.fromJSON(init));
 			}
 
-			const { id, ...init } = json;
-
-			// ! This is a double-init because `id` can't be provided via `new`.
-			return produce(
-				new clazz(init as ModelInit<T>),
-				(draft: Draft<T & ModelInstanceMetadata>) => {
-					initializeInstance(init, modelDefinition, draft);
-
-					draft.id = id;
-				}
-			);
+			return modelInstanceCreator(clazz, json);
 		}
 	});