context: null column when columns number inferieur to record length

Author: wdavidw

CHANGELOG.md

@@ -8,6 +8,10 @@
 * promise: new API module
 * errors: finish normalisation of all errors
 
+## Trunk
+
+* context: null column when columns number inferieur to record length
+
 ## Version 4.6.1
 
 * src: set const in for loop

lib/es5/index.js

@@ -1133,7 +1133,7 @@ function (_Transform) {
       var columns = this.options.columns;
       var isColumns = Array.isArray(columns);
       return {
-        column: isColumns === true ? columns[this.state.record.length].name : this.state.record.length,
+        column: isColumns === true ? columns.length >= this.state.record.length ? columns[this.state.record.length].name : null : this.state.record.length,
         empty_lines: this.info.empty_lines,
         header: columns === true,
         index: this.state.record.length,

lib/index.js

@@ -891,7 +891,10 @@ class Parser extends Transform {
     const isColumns = Array.isArray(columns)
     return {
       column: isColumns === true ?
-        columns[this.state.record.length].name :
+        ( columns.length >= this.state.record.length ?
+          columns[this.state.record.length].name :
+          null
+        ) :
         this.state.record.length,
       empty_lines: this.info.empty_lines,
       header: columns === true,

test/option.columns.coffee

@@ -106,7 +106,9 @@ describe 'Option `columns`', ->
       4,5,6,x
       7,8,9,x
       """, columns: ["a", "b", "c", "d"], (err, data) ->
-        err.message.should.eql 'Invalid Record Length: header length is 4, got 3 on line 1'
+        assert_error
+          message: 'Invalid Record Length: header length is 4, got 3 on line 1'
+          code: 'CSV_INVALID_RECORD_LENGTH_DONT_MATCH_COLUMNS'
         next()
 
     it 'validate options column length on last line', (next) ->
@@ -115,7 +117,17 @@ describe 'Option `columns`', ->
       4,5,6,x
       7,8,9
       """, columns: ["a", "b", "c", "d"], (err, data) ->
-        err.message.should.eql 'Invalid Record Length: header length is 4, got 3 on line 3'
+        assert_error
+          message: 'Invalid Record Length: header length is 4, got 3 on line 3'
+          code: 'CSV_INVALID_RECORD_LENGTH_DONT_MATCH_COLUMNS'
+        next()
+
+    it 'null context column when columns number inferieur to record length, fix regression #259', (next) ->
+      parse "a\nb,\n", columns: true, (err, data) ->
+        assert_error
+          message: 'Invalid Record Length: header length is 1, got 2 on line 2'
+          code: 'CSV_INVALID_RECORD_LENGTH_DONT_MATCH_COLUMNS'
+          column: null
         next()
 
     it 'skips column names defined as undefined', (next) ->