adds null / undefined check to the core::joiner

adds additional tests to ensure funtionality of core::joiner
Pr301 · Oct 31, 2018 · b7673ac · b7673ac
1 parent 2cfc138
commit b7673ac
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 8 deletions.
diff --git a/cdn/react-csv-1.0.18.js b/cdn/react-csv-1.0.18.js
@@ -318,7 +318,8 @@ var elementOrEmpty = exports.elementOrEmpty = function elementOrEmpty(element) {
 var joiner = exports.joiner = function joiner(data) {
   var separator = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : ',';
   return data.map(function (row, index) {
-    return row.map(function (element) {
+    if (row == null) return null;
+    row.map(function (element) {
       return "\"" + elementOrEmpty(element) + "\"";
     }).join(separator);
   }).join("\n");

diff --git a/cdn/react-csv-1.0.18.min.js b/cdn/react-csv-1.0.18.min.js
diff --git a/cdn/react-csv-latest.js b/cdn/react-csv-latest.js
@@ -318,7 +318,8 @@ var elementOrEmpty = exports.elementOrEmpty = function elementOrEmpty(element) {
 var joiner = exports.joiner = function joiner(data) {
   var separator = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : ',';
   return data.map(function (row, index) {
-    return row.map(function (element) {
+    if (row == null) return null;
+    row.map(function (element) {
       return "\"" + elementOrEmpty(element) + "\"";
     }).join(separator);
   }).join("\n");

diff --git a/cdn/react-csv-latest.min.js b/cdn/react-csv-latest.min.js
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/core.js b/src/core.js
@@ -50,7 +50,10 @@ export const getHeaderValue = (property, obj) => {
 export const elementOrEmpty = (element) => element || element === 0 ? element : '';
 
 export const joiner = ((data,separator = ',') =>
- data.map((row, index) => row.map((element) => "\"" + elementOrEmpty(element) + "\"").join(separator)).join(`\n`)
+ data.map((row, index) => {
+  if(row == null) return null
+  return row.map((element) => "\"" + elementOrEmpty(element) + "\"").join(separator)
+  }).join(`\n`)
 );
 
 export const arrays2csv = ((data, headers, separator) =>

diff --git a/test/coreSpec.js b/test/coreSpec.js
@@ -9,7 +9,8 @@ import {
   jsons2csv,
   string2csv,
   toCSV,
-  buildURI
+  buildURI,
+  joiner
 } from '../src/core';
 
 describe('In browser environment', () => {
@@ -271,7 +272,7 @@ describe('In browser environment', () => {
         expect(() => toCSV(fixtures.string)).toNotThrow();
     });
 
-  });
+  })
 
   describe(`core::buildURI`, () =>{
     let fixtures;
@@ -305,4 +306,14 @@ describe('In browser environment', () => {
 
     });
   });
+  describe('core::joiner', () => {
+    const data = [null, undefined, [1, 2, 3, 5], ["hello hello"]];
+    it('does not throw upon receiving empty (null / undefined) indices in the data array', () => {
+      expect(joiner).toNotThrow(data)
+    })
+    it('does return the valid data contained between null and undefined values', () => {
+      expect(joiner(data)).toMatch('\n\n"1","2","3","5"\n"hello hello"')
+    })
+  })
+
 });