fix: handle empty column names properly

fix #275
adaltas · Apr 26, 2021 · eee7e93 · eee7e93
1 parent f03c5f6
commit eee7e93
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 25 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -19,6 +19,7 @@ Please join and contribute:
 
 ## Trunk
 
+* fix: handle empty column names properly
 * feat: enforce usage of columns with columns_duplicates_to_array
 * fix: update error message with invalid column type
 

diff --git a/lib/browser/index.js b/lib/browser/index.js
@@ -1009,7 +1009,7 @@ var Parser = /*#__PURE__*/function (_Transform) {
       var recordLength = record.length;
 
       if (columns === true) {
-        if (isRecordEmpty(record)) {
+        if (skip_lines_with_empty_values === true && isRecordEmpty(record)) {
           this.__resetRecord();
 
           return;
@@ -1044,12 +1044,10 @@ var Parser = /*#__PURE__*/function (_Transform) {
         }
       }
 
-      if (skip_lines_with_empty_values === true) {
-        if (isRecordEmpty(record)) {
-          this.__resetRecord();
+      if (skip_lines_with_empty_values === true && isRecordEmpty(record)) {
+        this.__resetRecord();
 
-          return;
-        }
+        return;
       }
 
       if (this.state.recordHasError === true) {

diff --git a/lib/browser/sync.js b/lib/browser/sync.js
@@ -1009,7 +1009,7 @@ var Parser = /*#__PURE__*/function (_Transform) {
       var recordLength = record.length;
 
       if (columns === true) {
-        if (isRecordEmpty(record)) {
+        if (skip_lines_with_empty_values === true && isRecordEmpty(record)) {
           this.__resetRecord();
 
           return;
@@ -1044,12 +1044,10 @@ var Parser = /*#__PURE__*/function (_Transform) {
         }
       }
 
-      if (skip_lines_with_empty_values === true) {
-        if (isRecordEmpty(record)) {
-          this.__resetRecord();
+      if (skip_lines_with_empty_values === true && isRecordEmpty(record)) {
+        this.__resetRecord();
 
-          return;
-        }
+        return;
       }
 
       if (this.state.recordHasError === true) {

diff --git a/lib/es5/index.js b/lib/es5/index.js
@@ -901,7 +901,7 @@ var Parser = /*#__PURE__*/function (_Transform) {
       var recordLength = record.length;
 
       if (columns === true) {
-        if (isRecordEmpty(record)) {
+        if (skip_lines_with_empty_values === true && isRecordEmpty(record)) {
           this.__resetRecord();
 
           return;
@@ -936,12 +936,10 @@ var Parser = /*#__PURE__*/function (_Transform) {
         }
       }
 
-      if (skip_lines_with_empty_values === true) {
-        if (isRecordEmpty(record)) {
-          this.__resetRecord();
+      if (skip_lines_with_empty_values === true && isRecordEmpty(record)) {
+        this.__resetRecord();
 
-          return;
-        }
+        return;
       }
 
       if (this.state.recordHasError === true) {

diff --git a/lib/index.js b/lib/index.js
@@ -704,7 +704,6 @@ class Parser extends Transform {
           if(err !== undefined) return err
         }
       }
-
       const lappend = ltrim === false || this.state.quoting === true || this.state.field.length !== 0 || !this.__isCharTrimable(chr)
       // rtrim in non quoting is handle in __onField
       const rappend = rtrim === false || this.state.wasQuoting === false
@@ -761,7 +760,7 @@ class Parser extends Transform {
     // Convert the first line into column names
     const recordLength = record.length
     if(columns === true){
-      if(isRecordEmpty(record)){
+      if(skip_lines_with_empty_values === true && isRecordEmpty(record)){
         this.__resetRecord()
         return
       }
@@ -802,11 +801,9 @@ class Parser extends Transform {
         if(finalErr) return finalErr
       }
     }
-    if(skip_lines_with_empty_values === true){
-      if(isRecordEmpty(record)){
-        this.__resetRecord()
-        return
-      }
+    if(skip_lines_with_empty_values === true && isRecordEmpty(record)){
+      this.__resetRecord()
+      return
     }
     if(this.state.recordHasError === true){
       this.__resetRecord()

diff --git a/test/option.columns.coffee b/test/option.columns.coffee
@@ -76,6 +76,18 @@ describe 'Option `columns`', ->
           {a: '7', b: '6', c: '8'}
         ] unless err
         next err
+
+    it 'lines with empty column names', (next) ->
+      parse '''
+      ,,,
+      1,2,3,4
+      5,6,7,8
+      ''', columns: true, (err, data) ->
+        data.should.eql [
+          {'': '4'}
+          {'': '8'}
+        ] unless err
+        next err
 
   describe 'boolean', ->