fix: unwind transform issue with nested arrays (#549)

zemirco · Jan 4, 2022 · 485ea77 · 485ea77
1 parent f0ca2c2
commit 485ea77
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 16 deletions.
diff --git a/lib/utils.js b/lib/utils.js
@@ -7,8 +7,10 @@ function getProp(obj, path, defaultValue) {
 function setProp(obj, path, value) {
   const pathArray = Array.isArray(path) ? path : path.split('.');
   const [key, ...restPath] = pathArray;
-  const newValue = pathArray.length > 1 ? setProp(obj[key] || {}, restPath, value) : value;
-  return Object.assign({}, obj, { [key]: newValue });
+  return {
+    ...obj,
+    [key]: pathArray.length > 1 ? setProp(obj[key] || {}, restPath, value) : value
+  };
 }
 
 function unsetProp(obj, path) {
@@ -27,7 +29,11 @@ function unsetProp(obj, path) {
       .reduce((acc, prop) => Object.assign(acc, { [prop]: obj[prop] }), {});
   }
 
-  return unsetProp(obj[key], restPath);
+  return Object.keys(obj)
+    .reduce((acc, prop) => ({
+      ...acc,
+      [prop]: prop !== key ? obj[prop] : unsetProp(obj[key], restPath),
+    }), {});
 }
 
 function flattenReducer(acc, arr) {

diff --git a/test/CLI.js b/test/CLI.js
@@ -843,7 +843,7 @@ module.exports = (testRunner, jsonFixtures, csvFixtures) => {
   });
 
   testRunner.add('should unwind complex objects using the unwind transform', (t) => {
-    const opts = '--fields carModel,price,extras.items.name,extras.items.items.position,extras.items.items.color,extras.items.items,name,color,extras.items.color'
+    const opts = '--fields carModel,price,extras.items.name,extras.items.items.position,extras.items.items.color,extras.items.color'
       + ' --unwind extras.items,extras.items.items --flatten-objects --flatten-arrays';
 
     exec(`${cli} -i "${getFixturePath('/json/unwindComplexObject.json')}" ${opts}`, (err, stdout, stderr) => {

diff --git a/test/JSON2CSVAsyncParser.js b/test/JSON2CSVAsyncParser.js
@@ -1278,7 +1278,7 @@ module.exports = (testRunner, jsonFixtures, csvFixtures, inMemoryJsonFixtures) =
 
   testRunner.add('should unwind complex objects using the unwind transform', async (t) => {
     const opts = {
-      fields: ["carModel", "price", "extras.items.name", "extras.items.items.position", "extras.items.items.color", "extras.items.items", "name", "color", "extras.items.color"],
+      fields: ["carModel", "price", "extras.items.name", "extras.items.items.position", "extras.items.items.color", "extras.items.color"],
       transforms: [unwind({ paths: ['extras.items', 'extras.items.items'] }), flatten()],
     };
 

diff --git a/test/JSON2CSVParser.js b/test/JSON2CSVParser.js
@@ -25,9 +25,8 @@ module.exports = (testRunner, jsonFixtures, csvFixtures) => {
     t.end();
   });
 
-  testRunner.add('should not modify the JSON object passed passed', (t) => {
+  testRunner.add('should not modify the JSON object passed', (t) => {
     const opts = {
-      fields: ["carModel", "price", "extras.items.name", "extras.items.items.position", "extras.items.items.color", "extras.items.items", "name", "color", "extras.items.color"],
       transforms: [unwind({ paths: ['extras.items', 'extras.items.items'] }), flatten()],
     };
     const parser = new Json2csvParser(opts);

diff --git a/test/JSON2CSVTransform.js b/test/JSON2CSVTransform.js
@@ -1317,9 +1317,9 @@ module.exports = (testRunner, jsonFixtures, csvFixtures, inMemoryJsonFixtures) =
   });
 
 
-  testRunner.add('should unwind complex objects using the unwind transform', async (t) => {
+  testRunner.add('should unwind complex objects using the unwind transform', (t) => {
     const opts = {
-      fields: ["carModel", "price", "extras.items.name", "extras.items.items.position", "extras.items.items.color", "extras.items.items", "name", "color", "extras.items.color"],
+      fields: ["carModel", "price", "extras.items.name", "extras.items.items.position", "extras.items.items.color", "extras.items.color"],
       transforms: [unwind({ paths: ['extras.items', 'extras.items.items'] }), flatten()],
     };
 

diff --git a/test/fixtures/csv/unwindComplexObject.csv b/test/fixtures/csv/unwindComplexObject.csv
@@ -1,6 +1,6 @@
-"carModel","price","extras.items.name","extras.items.items.position","extras.items.items.color","extras.items.items","name","color","extras.items.color"
-"Porsche",30000,"airbag","left","white",,,,
-"Porsche",30000,"airbag","right","gray",,,,
-"Porsche",30000,"dashboard",,,"none",,,
-,,,,,,"airbag","white",
-"BMW",15000,"dashboard",,,,,,"black"
+"carModel","price","extras.items.name","extras.items.items.position","extras.items.items.color","extras.items.color"
+"Porsche",30000,"airbag","left","white",
+"Porsche",30000,"airbag","right","gray",
+"Porsche",30000,"dashboard",,,
+"BMW",15000,"airbag",,,"white"
+"BMW",15000,"dashboard",,,"black"
diff --git a/test/fixtures/json/unwindComplexObject.json b/test/fixtures/json/unwindComplexObject.json
@@ -18,7 +18,7 @@
         },
         {
           "name": "dashboard",
-          "items": "none"
+          "items": []
         }
       ]
     }