Merge 3f45e13 into a20d535

paularmstrong · Sep 28, 2017 · 490ff39 · 490ff39
2 parents a20d535 + 3f45e13
commit 490ff39
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/__tests__/index.test.js b/src/__tests__/index.test.js
@@ -165,6 +165,8 @@ describe('denormalize', () => {
     const user = new schema.Entity('users');
     const comment = new schema.Entity('comments', {
       user: user
+    }, {
+      idAttribute: (value, parent, key) => `${value.id}-${parent.id}-${key}`
     });
     const article = new schema.Entity('articles', {
       author: user,

diff --git a/src/index.js b/src/index.js
@@ -53,14 +53,12 @@ export const normalize = (input, schema) => {
   return { entities, result };
 };
 
-const unvisitEntity = (input, schema, unvisit, getEntity, cache) => {
-  const entity = getEntity(input, schema);
+const unvisitEntity = (id, schema, unvisit, getEntity, cache) => {
+  const entity = getEntity(id, schema);
   if (typeof entity !== 'object' || entity === null) {
     return entity;
   }
 
-  const id = schema.getId(entity);
-
   if (!cache[schema.key]) {
     cache[schema.key] = {};
   }