Merge pull request #24 from icapps/bugfix/return-plain-values-in-array

bugfix/return-plain-values-in-array
icapps · Apr 6, 2022 · 7662ab9 · 7662ab9
2 parents 04ede32 + a2330b7
commit 7662ab9
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 1 deletion.
diff --git a/lib/utils/data-construction.util.js b/lib/utils/data-construction.util.js
@@ -38,7 +38,7 @@ function getValue(data, key, config, options) {
     return config[key].apply(data, [data[key], data]);
   }
 
-  // if value is a string
+  // if value is a string, number, boolean or date
   if (isFlatValue(data[key])) {
     return data[key];
   }
@@ -68,6 +68,11 @@ function constructData(data, customConfig = { attributes: [] }, options = {}) {
   };
   const config = Object.assign({}, defaultConfig, customConfig);
 
+  // if value is a string, number, boolean or date
+  if (isFlatValue(data)) {
+    return data;
+  }
+
   // if the dataset is an array
   if (isArray(data)) {
     return data.map(item => constructData(item, config, options));

diff --git a/tests/serializer.test.js b/tests/serializer.test.js
@@ -63,4 +63,22 @@ describe('Serializer multiple resource', () => {
     expect(meta.totalCount).toEqual(99);
     expect(meta.planet).toEqual('earth');
   });
+
+  test('should return plain values', () => {
+    const date = new Date();
+    const rawData = [
+      { firstName: 'John', lastName: 'Doe', plainValues: [1, 'plain', true] },
+      { firstName: 'Jane', lastName: 'Doe', plainValues: [8, date, false] },
+    ];
+
+    const userSerializer = new Serializer('user', {
+      attributes: ['firstName', 'lastName', 'plainValues'],
+    });
+
+    const result = userSerializer.serialize(rawData);
+
+    const { data } = result;
+    expect(data[0].plainValues).toEqual([1, 'plain', true]);
+    expect(data[1].plainValues).toEqual([8, date, false]);
+  });
 });