Merge pull request #156 from mrodrig/fix-155

Fix to properly handle empty last field values in csv2json.

Author: mrodrig

src/csv2json.js

@@ -124,6 +124,16 @@ const Csv2Json = function(options) {
                 stateVariables.startIndex = index + eolDelimiterLength;
                 stateVariables.parsingValue = true;
                 stateVariables.insideWrapDelimiter = charAfter === options.delimiter.wrap;
+            } else if (index === lastCharacterIndex && character === options.delimiter.field) {
+                // If we reach the end of the CSV and the current character is a field delimiter
+
+                // Parse the previously seen value and add it to the line
+                let parsedValue = csv.substring(stateVariables.startIndex, index);
+                splitLine.push(parsedValue);
+
+                // Then add an empty string to the line since the last character being a field delimiter indicates an empty field
+                splitLine.push('');
+                lines.push(splitLine);
             } else if (index === lastCharacterIndex || nextNChar === options.delimiter.eol &&
                 // if we aren't inside wrap delimiters or if we are but the character before was a wrap delimiter and we didn't just see two
                 (!stateVariables.insideWrapDelimiter ||

test/config/testCsvFilesList.js

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

test/config/testJsonFilesList.js

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

test/csv2json.js

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

test/data/csv/emptyLastFieldValue.csv

@@ -0,0 +1,3 @@
+data.uid,data.name
+,
+,

test/data/json/emptyLastFieldValue.json

@@ -0,0 +1,2 @@
+[ { "data":{ "uid": "", "name": "" } },
+  { "data":{ "uid": "", "name": "" } }]