Merge pull request #162 from mrodrig/fix-161

Handle scenario where CSV has no EOL and last character is a field delimiter

Author: mrodrig

package-lock.json

@@ -5,7 +5,7 @@
     },
     "name": "json-2-csv",
     "description": "A JSON to CSV and CSV to JSON converter that natively supports sub-documents and auto-generates the CSV heading.",
-    "version": "3.7.6",
+    "version": "3.7.7",
     "repository": {
         "type": "git",
         "url": "https://github.com/mrodrig/json-2-csv.git"
@@ -37,8 +37,8 @@
         "cli"
     ],
     "dependencies": {
-        "deeks": "2.2.6",
-        "doc-path": "2.0.4"
+        "deeks": "2.2.7",
+        "doc-path": "2.1.0"
     },
     "devDependencies": {
         "babel-eslint": "10.1.0",

package.json

@@ -106,13 +106,16 @@ const Csv2Json = function(options) {
 
                 // If the start index is the current index (and since the previous character is a comma),
                 //   then the value being parsed is an empty value accordingly, add an empty string
-                let parsedValue = nextNChar === options.delimiter.eol && stateVariables.startIndex === index
-                    ? ''
+                if (nextNChar === options.delimiter.eol && stateVariables.startIndex === index) {
+                    splitLine.push('');
+                } else if (character === options.delimiter.field) {
+                    // If we reached the end of the CSV, there's no new line, and the current character is a comma
+                    // then add an empty string for the current value
+                    splitLine.push('');
+                } else {
                     // Otherwise, there's a valid value, and the start index isn't the current index, grab the whole value
-                    : csv.substr(stateVariables.startIndex);
-
-                // Push the value for the field that we were parsing
-                splitLine.push(parsedValue);
+                    splitLine.push(csv.substr(stateVariables.startIndex));
+                }
 
                 // Since the last character is a comma, there's still an additional implied field value trailing the comma.
                 //   Since this value is empty, we push an extra empty value

src/csv2json.js

@@ -35,7 +35,8 @@ const fs = require('fs'),
         {key: 'localeFormat', file: '../data/csv/localeFormat.csv'},
         {key: 'invalidParsedValues', file: '../data/csv/invalidParsedValues.csv'},
         {key: 'firstColumnWrapCRLF', file: '../data/csv/firstColumnWrapCRLF.csv'},
-        {key: 'emptyLastFieldValue', file: '../data/csv/emptyLastFieldValue.csv'}
+        {key: 'emptyLastFieldValue', file: '../data/csv/emptyLastFieldValue.csv'},
+        {key: 'emptyLastFieldValueNoEol', file: '../data/csv/emptyLastFieldValueNoEol.csv'}
     ];
 
 function readCsvFile(filePath) {

test/config/testCsvFilesList.js

@@ -27,5 +27,6 @@ module.exports = {
     localeFormat: require('../data/json/localeFormat'),
     invalidParsedValues: require('../data/json/invalidParsedValues'),
     firstColumnWrapCRLF: require('../data/json/firstColumnWrapCRLF.json'),
-    emptyLastFieldValue: require('../data/json/emptyLastFieldValue.json')
+    emptyLastFieldValue: require('../data/json/emptyLastFieldValue.json'),
+    emptyLastFieldValueNoEol: require('../data/json/emptyLastFieldValueNoEol.json')
 };

test/config/testJsonFilesList.js

@@ -180,6 +180,15 @@ function runTests(jsonTestData, csvTestData) {
                     done();
                 });
             });
+
+            // Test case for #161
+            it('should properly convert empty field values if they occur at the end of the csv with no EOL at the end', (done) => {
+                converter.csv2json(csvTestData.emptyLastFieldValueNoEol, (err, json) => {
+                    if (err) done(err);
+                    json.should.deepEqual(jsonTestData.emptyLastFieldValueNoEol);
+                    done();
+                });
+            });
         });
 
         describe('Error Handling', () => {

test/csv2json.js

@@ -0,0 +1,3 @@
+param,20/9/27,20/9/28
+c,2,2
+d,,

test/data/csv/emptyLastFieldValueNoEol.csv

@@ -0,0 +1,4 @@
+[
+  { "param": "c", "20/9/27": 2, "20/9/28": 2 },
+  { "param": "d", "20/9/27": "", "20/9/28": "" }
+]