fix: correctly serialize input array as array (#84)

mathematic-inc · Apr 17, 2024 · 37becd6 · 37becd6
1 parent 064ead8
commit 37becd6
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 7 deletions.
diff --git a/src/classes/polymorphic-serialiser.ts b/src/classes/polymorphic-serialiser.ts
@@ -30,8 +30,18 @@ export default class PolymorphicSerializer<
   ): Promise<Partial<DataDocument<PrimaryType>>> {
     if (Array.isArray(data)) {
       const documents = await Promise.all(
-        data.map((d) => {
-          return this.serializeSingle(d, options);
+        Object.values(
+          data.reduce((acc, d) => {
+            // group data by type
+            const type = d[this.key];
+            if (!acc[type]) {
+              acc[type] = [];
+            }
+            acc[type].push(d);
+            return acc;
+          }, {} as Record<keyof PrimaryType, PrimaryType[]>)
+        ).map((d) => {
+          return this.serializeType(d, options);
         })
       );
 
@@ -46,7 +56,7 @@ export default class PolymorphicSerializer<
         return result;
       });
     } else if (data) {
-      return this.serializeSingle(data, options);
+      return this.serializeType(data, options);
     }
 
     return Object.values(this.serialisers)[0].serialize(data, options);
@@ -76,11 +86,11 @@ export default class PolymorphicSerializer<
     return super.createResource(data, options, helpers, relatorDataCache);
   }
 
-  private async serializeSingle(
-    data: PrimaryType,
-    options?: Partial<SerializerOptions<PrimaryType>>
+  private async serializeType<T extends PrimaryType>(
+    data: SingleOrArray<T>,
+    options?: Partial<SerializerOptions<T>>
   ) {
-    const serializer = this.getSerializerForData(data);
+    const serializer = this.getSerializerForData(Array.isArray(data) ? data[0] : data);
     if (serializer) {
       return serializer.serialize(data, options);
     }

diff --git a/test/issue-80.test.ts b/test/issue-80.test.ts
@@ -55,4 +55,25 @@ describe('Issue #80 - Polymorphic serializer', () => {
     expect(data.data[2].id).toEqual('3');
     expect(data.data[2].type).toEqual('Model');
   });
+
+  it('should serialize array as array', async () => {
+    const model1: Model1 = new Model1('1', 'model1');
+
+    const Model1Serializer = new Serializer<Model1>('Model1');
+    const Model2Serializer = new Serializer<Model2>('Model2');
+
+    const PolySerializer = new PolymorphicSerializer<Model>('Model', 'type', {
+      'type:Model1': Model1Serializer,
+      'type:Model2': Model2Serializer,
+    });
+
+    const data = (await PolySerializer.serialize([model1])) as {
+      data: Resource<Model>;
+    };
+
+    expect(data.data).toBeInstanceOf(Array);
+    expect(data.data).toHaveLength(1);
+    expect(data.data[0].id).toEqual('1');
+    expect(data.data[0].type).toEqual('Model1');
+  });
 });