fix(schemas): don't use schema to attribute mapping on singular array…

… schemas (paularmstrong#387)

Co-authored-by: Paul Armstrong <[email protected]>

src/schemas/Polymorphic.js

@@ -45,7 +45,7 @@ export default class PolymorphicSchema {
     if (!this.isSingleSchema && !schemaKey) {
       return value;
     }
-    const id = isImmutable(value) ? value.get('id') : value.id;
+    const id = this.isSingleSchema ? undefined : isImmutable(value) ? value.get('id') : value.id;
     const schema = this.isSingleSchema ? this.schema : this.schema[schemaKey];
     return unvisit(id || value, schema);
   }

src/schemas/__tests__/Array.test.js

@@ -192,5 +192,17 @@ describe(`${schema.Array.name} denormalization`, () => {
       expect(denormalize('123', taco, entities)).toMatchSnapshot();
       expect(denormalize('123', taco, fromJS(entities))).toMatchSnapshot();
     });
+
+    test('does not assume mapping of schema to attribute values when schemaAttribute is not set', () => {
+      const cats = new schema.Entity('cats');
+      const catRecord = new schema.Object({
+        cat: cats
+      });
+      const catList = new schema.Array(catRecord);
+      const input = [{ cat: { id: 1 }, id: 5 }, { cat: { id: 2 }, id: 6 }];
+      const output = normalize(input, catList);
+      expect(output).toMatchSnapshot();
+      expect(denormalize(output.result, catList, output.entities)).toEqual(input);
+    });
   });
 });

src/schemas/__tests__/__snapshots__/Array.test.js.snap

@@ -66,6 +66,31 @@ Array [
 ]
 `;
 
+exports[`ArraySchema denormalization Class does not assume mapping of schema to attribute values when schemaAttribute is not set 1`] = `
+Object {
+  "entities": Object {
+    "cats": Object {
+      "1": Object {
+        "id": 1,
+      },
+      "2": Object {
+        "id": 2,
+      },
+    },
+  },
+  "result": Array [
+    Object {
+      "cat": 1,
+      "id": 5,
+    },
+    Object {
+      "cat": 2,
+      "id": 6,
+    },
+  ],
+}
+`;
+
 exports[`ArraySchema denormalization Class returns the input value if is not an array 1`] = `
 Object {
   "fillings": Object {},