Change small details as requested

zemirco · Jul 10, 2017 · 2c1b159 · 2c1b159
1 parent 976d04f
commit 2c1b159
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 39 deletions.
diff --git a/README.md b/README.md
@@ -327,46 +327,45 @@ var fs = require('fs');
 var fields = ['carModel', 'price', 'items.name', 'items.color', 'items.items.position', 'items.items.color'];
 var myCars = [
   {
-      "carModel": "BMW",
-      "price": 15000,
-      "items": [
+    "carModel": "BMW",
+    "price": 15000,
+    "items": [
+      {
+        "name": "airbag",
+        "color": "white"
+      }, {
+        "name": "dashboard",
+        "color": "black"
+      }
+    ]
+  }, {
+    "carModel": "Porsche",
+    "price": 30000,
+    "items": [
+      {
+        "name": "airbag",
+        "items": [
           {
-              "name": "airbag",
-              "color": "white"
+            "position": "left",
+            "color": "white"
           }, {
-              "name": "dashboard",
-              "color": "black"
+            "position": "right",
+            "color": "gray"
           }
-      ]
-  }, {
-      "carModel": "Porsche",
-      "price": 30000,
-      "items": [
+        ]
+      }, {
+        "name": "dashboard",
+        "items": [
           {
-              "name": "airbag",
-              "items": [
-                  {
-                      "position": "left",
-                      "color": "white"
-                  }, {
-                      "position": "right",
-                      "color": "gray"
-                  }
-              ]
-          },
-          {
-              "name": "dashboard",
-              "items": [
-                  {
-                      "position": "left",
-                      "color": "gray"
-                  }, {
-                      "position": "right",
-                      "color": "black"
-                  }
-              ]
+            "position": "left",
+            "color": "gray"
+          }, {
+            "position": "right",
+            "color": "black"
           }
-      ]
+        ]
+      }
+    ]
   }
 ];
 var csv = json2csv({ data: myCars, fields: fields, unwindPath: ['items', 'items.items'] });

diff --git a/lib/json2csv.js b/lib/json2csv.js
@@ -99,7 +99,7 @@ function checkParams(params) {
       return Object.keys(item);
     });
 
-    dataFields = lodashFlatten(dataFields);//_.flattenDeep(params.data);//
+    dataFields = lodashFlatten(dataFields);
     params.fields = lodashUniq(dataFields);
   }
 
@@ -294,10 +294,8 @@ function createColumnContent(params, str) {
  * @returns {Array} Array of objects containing all rows after unwind of chosen paths
  */
 function createDataRows(originalData, unwindPaths) {
-  var dataRows = originalData;
+  var dataRows = [];
   if (unwindPaths.length) {
-    dataRows = [];
-
     originalData.forEach(function(dataElement) {
       var dataRow = [dataElement];
 
@@ -307,6 +305,8 @@ function createDataRows(originalData, unwindPaths) {
 
       Array.prototype.push.apply(dataRows, dataRow);
     });
+  } else {
+    dataRows = originalData;
   }
 
   return dataRows;