Refactor: add append element and separator or line break functions (closes #8) (#11)

Author: aichbauer

src/helpers/append-element.js

@@ -0,0 +1,18 @@
+
+import { checkSpecialCharsAndEmpty } from './check-special-chars-and-empty';
+
+const separatorOrLineBreak = (length, elementIdx, separator) => (
+  length - 1 === elementIdx ? '\n' : separator
+);
+
+const appendElement = (element, lineLength, elementIdx, separator) => {
+  const includesSpecials = checkSpecialCharsAndEmpty(element);
+
+  return (
+    includesSpecials
+      ? `"${element}"${separatorOrLineBreak(lineLength, elementIdx, separator)}`
+      : `${element}${separatorOrLineBreak(lineLength, elementIdx, separator)}`
+  );
+};
+
+export { appendElement };

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

@@ -1,4 +1,6 @@
-import { checkSpecialCharsAndEmpty } from '../helpers/check-special-chars-and-empty';
+// import { checkSpecialCharsAndEmpty } from '../helpers/check-special-chars-and-empty';
+
+import { appendElement } from '../helpers/append-element';
 
 export const convertArrayOfArraysToCSV = (data, { header, separator }) => {
   const array = [...data];
@@ -7,22 +9,16 @@ export const convertArrayOfArraysToCSV = (data, { header, separator }) => {
   if (header) {
     header.forEach((headerEl, i) => {
       const thisHeaderEl = headerEl || '';
-      const includesSpecials = checkSpecialCharsAndEmpty(thisHeaderEl);
-      csv
-        += (includesSpecials ? `"${thisHeaderEl}"` : thisHeaderEl)
-        + (Object.keys(header).length - 1 === i ? '' : separator)
-        + (Object.keys(header).length - 1 === i ? '\n' : '');
+
+      csv += appendElement(thisHeaderEl, header.length, i, separator);
     });
   }
 
   array.forEach((row) => {
     row.forEach((value, i) => {
       const thisValue = value || (value === 0 ? 0 : '');
-      const includesSpecials = checkSpecialCharsAndEmpty(thisValue);
-      csv
-        += (includesSpecials ? `"${thisValue}"` : thisValue)
-        + (row.length - 1 === i ? '' : separator)
-        + (row.length - 1 === i ? '\n' : '');
+
+      csv += appendElement(thisValue, row.length, i, separator);
     });
   });
 

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

@@ -1,39 +1,31 @@
-import { checkSpecialCharsAndEmpty } from '../helpers/check-special-chars-and-empty';
+import { appendElement } from '../helpers/append-element';
 
 export const convertArrayOfObjectsToCSV = (data, { header, separator }) => {
   const array = [...data];
   let csv = '';
 
   if (header) {
     header.forEach((headerEl, i) => {
-      const includesSpecials = checkSpecialCharsAndEmpty(headerEl);
-      csv
-        += (includesSpecials ? `"${headerEl}"` : headerEl)
-        + (Object.keys(header).length - 1 === i ? '' : separator)
-        + (Object.keys(header).length - 1 === i ? '\n' : '');
+      const thisHeaderEl = headerEl || '';
+
+      csv += appendElement(thisHeaderEl, header.length, i, separator);
     });
   }
 
   array.forEach((row, idx) => {
+    const thisRow = Object.keys(row);
     if (!header && idx === 0) {
-      Object.keys(row).forEach((key, i) => {
+      thisRow.forEach((key, i) => {
         const value = key || '';
-        const includesSpecials = checkSpecialCharsAndEmpty(value);
 
-        csv
-          += (includesSpecials ? `"${value}"` : value)
-          + (Object.keys(row).length - 1 === i ? '' : separator)
-          + (Object.keys(row).length - 1 === i ? '\n' : '');
+        csv += appendElement(value, thisRow.length, i, separator);
       });
     }
-    Object.keys(row).forEach((key, i) => {
+
+    thisRow.forEach((key, i) => {
       const value = row[key] || '';
-      const includesSpecials = checkSpecialCharsAndEmpty(value);
 
-      csv
-        += (includesSpecials ? `"${value}"` : value)
-        + (Object.keys(row).length - 1 === i ? '' : separator)
-        + (Object.keys(row).length - 1 === i ? '\n' : '');
+      csv += appendElement(value, thisRow.length, i, separator);
     });
   });