Merge pull request #90 from orzarchi/master

Will now apply configured 'default value' to null data fields
zemirco · Jan 2, 2016 · e4faf8d · e4faf8d
2 parents 334e433 + 9bcf0fd
commit e4faf8d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/lib/json2csv.js b/lib/json2csv.js
@@ -152,7 +152,11 @@ function createColumnContent(params, str) {
 
         if (fieldElement && (typeof fieldElement === 'string' || typeof fieldElement.value === 'string')) {
           var path = (typeof fieldElement === 'string') ? fieldElement : fieldElement.value;
-          val = lodashGet(dataElement, path, fieldElement.default || params.defaultValue);
+          var defaultValue = fieldElement.default || params.defaultValue;
+          val = lodashGet(dataElement, path, defaultValue);
+          if (val === null && defaultValue !== undefined){
+            val = defaultValue;
+          }
         } else if (fieldElement && typeof fieldElement.value === 'function') {
           val = fieldElement.value(dataElement) || fieldElement.default;
         }

diff --git a/test/fixtures/csv/defaultValueEmpty.csv b/test/fixtures/csv/defaultValueEmpty.csv
@@ -2,4 +2,4 @@
 "Audi",0
 "BMW",15000
 "Mercedes",""
-"Porsche",30000
+"Porsche",30000