Fix: handle null and undefined values (#2)

* Fix: handle null and undefined

* Test: update fixtures and test for new fix

Author: aichbauer

src/modules/convert-array-of-arrays-to-csv.js

@@ -6,19 +6,21 @@ export const convertArrayOfArraysToCSV = (data, { header, separator }) => {
 
   if (header) {
     header.forEach((headerEl, i) => {
-      const includesSpecials = checkSpecialCharsAndEmpty(headerEl);
+      const thisHeaderEl = headerEl || '';
+      const includesSpecials = checkSpecialCharsAndEmpty(thisHeaderEl);
       csv +=
-        (includesSpecials ? `"${headerEl}"` : headerEl) +
+        (includesSpecials ? `"${thisHeaderEl}"` : thisHeaderEl) +
         (Object.entries(header).length - 1 === i ? '' : separator) +
         (Object.entries(header).length - 1 === i ? '\n' : '');
     });
   }
 
   array.forEach((row) => {
     row.forEach((value, i) => {
-      const includesSpecials = checkSpecialCharsAndEmpty(value);
+      const thisValue = value || '';
+      const includesSpecials = checkSpecialCharsAndEmpty(thisValue);
       csv +=
-        (includesSpecials ? `"${value}"` : value) +
+        (includesSpecials ? `"${thisValue}"` : thisValue) +
         (row.length - 1 === i ? '' : separator) +
         (row.length - 1 === i ? '\n' : '');
     });

src/modules/convert-array-of-objects-to-csv.js

@@ -17,7 +17,7 @@ export const convertArrayOfObjectsToCSV = (data, { header, separator }) => {
   array.forEach((row, idx) => {
     if (!header && idx === 0) {
       Object.entries(row).forEach((entry, i) => {
-        const key = entry[0];
+        const key = entry[0] ? entry[0] : '';
         const includesSpecials = checkSpecialCharsAndEmpty(key);
 
         csv +=
@@ -27,7 +27,7 @@ export const convertArrayOfObjectsToCSV = (data, { header, separator }) => {
       });
     }
     Object.entries(row).forEach((entry, i) => {
-      const value = entry[1];
+      const value = entry[1] ? entry[1] : '';
       const includesSpecials = checkSpecialCharsAndEmpty(value);
 
       csv +=

test/fixtures/data.js

@@ -8,6 +8,12 @@ const dataArray = [
   [3, 'Larry', 'the Bird', '@twitter'],
 ];
 
+const dataArrayWithNullAndUndefined = [
+  [1, 'Mark', null, '@mdo'],
+  [2, 'Jacob', 'Thornton', undefined],
+  [3, 'Larry', 'the Bird', '@twitter'],
+];
+
 const data = [
   {
     number: 1,
@@ -29,6 +35,27 @@ const data = [
   },
 ];
 
+const dataWithNullAndUndefined = [
+  {
+    number: 1,
+    first: 'Mark',
+    last: null,
+    handle: '@mdo',
+  },
+  {
+    number: 2,
+    first: 'Jacob',
+    last: 'Thornton',
+    handle: undefined,
+  },
+  {
+    number: 3,
+    first: 'Larry',
+    last: 'the Bird',
+    handle: '@twitter',
+  },
+];
+
 export const dataArrayWithHeader = [
   ...headerArray,
   ...dataArray,
@@ -41,3 +68,12 @@ export const dataArrayWithoutHeader = [
 export const dataObject = [
   ...data,
 ];
+
+export const dataObjectWithNullAndUndefined = [
+  ...dataWithNullAndUndefined,
+];
+
+export const dataArrayWithHeaderAndNullAndUndefined = [
+  ...headerArray,
+  ...dataArrayWithNullAndUndefined,
+];

test/fixtures/expected-results.js

@@ -4,6 +4,10 @@ export const expectedResultObjectNoOptions = 'number,first,last,handle\n1,Mark,O
 
 export const expectedResultObjectOnlyHeader = 'Number,First,Last,Handle\n1,Mark,Otto,@mdo\n2,Jacob,Thornton,@fat\n3,Larry,the Bird,@twitter\n';
 
+export const expectedResultObjectNullAndUndefined = 'Number,First,Last,Handle\n1,Mark,"",@mdo\n2,Jacob,Thornton,""\n3,Larry,the Bird,@twitter\n';
+
+export const expectedResultArrayNullAndUndefined = 'number,first,last,handle\n1,Mark,"",@mdo\n2,Jacob,Thornton,""\n3,Larry,the Bird,@twitter\n';
+
 export const expectedResultObjectHeaderSeparatorSemicolon = 'Number;First;Last;Handle\n1;Mark;Otto;@mdo\n2;Jacob;Thornton;@fat\n3;Larry;the Bird;@twitter\n';
 
 export const expectedResultObjecOnlySeparatorTab = 'number\tfirst\tlast\thandle\n1\tMark\tOtto\t@mdo\n2\tJacob\tThornton\t@fat\n3\tLarry\tthe Bird\t@twitter\n';

test/modules/convert-array-of-arrays-to-csv.spec.js

@@ -3,6 +3,7 @@ import { convertArrayOfArraysToCSV } from '../../lib/modules/convert-array-of-ar
 import {
   dataArrayWithHeader,
   dataArrayWithoutHeader,
+  dataArrayWithHeaderAndNullAndUndefined,
 } from '../fixtures/data';
 import {
   optionsHeaderSeperatorSemicolon,
@@ -17,6 +18,7 @@ import {
   expectedResultArrayOnlyHeader,
   expectedResultArrayHeaderSeparatorSemicolon,
   expectedResultArrayOnlySeparatorTab,
+  expectedResultArrayNullAndUndefined,
 } from '../fixtures/expected-results';
 
 test('convertArrayOfArraysToCSV | array of arrays | with default options', () => {
@@ -54,3 +56,9 @@ test('convertArrayOfArraysToCSV | array of arrays | options: default header + se
 
   expect(result).toBe(expectedResultArrayOnlySeparatorTab);
 });
+
+test('convertArrayOfArraysToCSV | array of arrays with values of null and undefined | options: header + default separator', () => {
+  const result = convertArrayOfArraysToCSV(dataArrayWithHeaderAndNullAndUndefined, optionsDefault);
+
+  expect(result).toBe(expectedResultArrayNullAndUndefined);
+});

test/modules/convert-array-of-objects-to-csv.spec.js

@@ -1,6 +1,9 @@
 import { convertArrayOfObjectsToCSV } from '../../lib/modules/convert-array-of-objects-to-csv';
 
-import { dataObject } from '../fixtures/data';
+import {
+  dataObject,
+  dataObjectWithNullAndUndefined,
+} from '../fixtures/data';
 import {
   optionsHeaderSeperatorSemicolon,
   optionsHeaderSeparatorDefault,
@@ -13,6 +16,7 @@ import {
   expectedResultObjectHeaderSeparatorSemicolon,
   expectedResultObjectOnlyHeader,
   expectedResultObjecOnlySeparatorTab,
+  expectedResultObjectNullAndUndefined,
 } from '../fixtures/expected-results';
 
 test('convertArrayOfObjectsToCSV | array of objects | with default options', () => {
@@ -38,3 +42,12 @@ test('convertArrayOfObjectsToCSV | array of objects | options: default header +
 
   expect(result).toBe(expectedResultObjecOnlySeparatorTab);
 });
+
+test('convertArrayOfObjectsToCSV | array of objects with values of null and undefined | options: header + default separator', () => {
+  const result = convertArrayOfObjectsToCSV(
+    dataObjectWithNullAndUndefined,
+    optionsHeaderSeparatorDefault,
+  );
+
+  expect(result).toBe(expectedResultObjectNullAndUndefined);
+});