Merge pull request #154 from pustovitDmytro/stable

Handle wrap in first column for multiline eol (#153)

Author: mrodrig

src/csv2json.js

@@ -148,7 +148,7 @@ const Csv2Json = function(options) {
                 stateVariables.insideWrapDelimiter = false;
                 stateVariables.parsingValue = false;
                 // Next iteration will substring, add the value to the line, and push the line onto the array of lines
-            } else if (character === options.delimiter.wrap && (index === 0 || utils.getNCharacters(csv, index - 1, eolDelimiterLength) === options.delimiter.eol)) {
+            } else if (character === options.delimiter.wrap && (index === 0 || utils.getNCharacters(csv, index - eolDelimiterLength, eolDelimiterLength) === options.delimiter.eol)) {
                 // If the line starts with a wrap delimiter (ie. "*)
 
                 stateVariables.insideWrapDelimiter = true;

test/config/testCsvFilesList.js

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

test/config/testJsonFilesList.js

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

test/csv2json.js

@@ -308,6 +308,17 @@ function runTests(jsonTestData, csvTestData) {
                 });
             });
 
+            // Test case for #153
+            it('should wrap first column with crlf line break', (done) => {
+                converter.csv2json(csvTestData.firstColumnWrapCRLF, (err, json) => {
+                    if (err) done(err);
+                    json.should.deepEqual(jsonTestData.firstColumnWrapCRLF);
+                    done();
+                }, {
+                    delimiter: { eol: '\r\n' }
+                });
+            });
+
             it('should strip the excel byte order mark character, if specified, and convert to json', (done) => {
                 converter.csv2json(csvTestData.excelBOM, (err, json) => {
                     if (err) done(err);

test/data/csv/firstColumnWrapCRLF.csv

@@ -0,0 +1,2 @@
+column 1,column 2,column 3
+"A,B","C,D","E,F"

test/data/json/firstColumnWrapCRLF.json

@@ -0,0 +1 @@
+[ { "column 1": "A,B", "column 2": "C,D", "column 3": "E,F" } ]