cast: ensure column is a string and not an array

adaltas · Dec 6, 2018 · 8477d8c · 8477d8c
1 parent 40d1fee
commit 8477d8c
Show file tree

Hide file tree

Showing 4 changed files with 60 additions and 14 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,9 +6,11 @@
 New features:
 
 * options: accept camelize and underscore forms
+* cast: dont call cast for non column-mappable fields
 
 Fix:
 
+* cast: ensure column is a string and not an array
 * stream: handle empty input streams
 * cast: function may return non-string values
 * stream: pass stream options without modification

diff --git a/lib/es5/index.js b/lib/es5/index.js
@@ -764,8 +764,14 @@ function (_Transform) {
   }, {
     key: "__cast",
     value: function __cast(field) {
+      var isColumns = Array.isArray(this.options.columns); // Dont loose time calling cast if the field wont be part of the final record
+
+      if (isColumns === true && this.options.columns.length <= this.state.record.length) {
+        return [undefined, undefined];
+      }
+
       var context = {
-        column: Array.isArray(this.options.columns) === true ? this.options.columns[this.state.record.length] : this.state.record.length,
+        column: isColumns === true ? this.options.columns[this.state.record.length].name : this.state.record.length,
         empty_lines: this.info.empty_lines,
         header: this.options.columns === true,
         index: this.state.record.length,

diff --git a/lib/index.js b/lib/index.js
@@ -549,8 +549,15 @@ class Parser extends Transform {
     this.state.wasQuoting = false
   }
   __cast(field){
+    const isColumns = Array.isArray(this.options.columns)
+    // Dont loose time calling cast if the field wont be part of the final record
+    if( isColumns === true && this.options.columns.length <= this.state.record.length ){
+      return [undefined, undefined]
+    }
     const context = {
-      column: Array.isArray(this.options.columns) === true ? this.options.columns[this.state.record.length] : this.state.record.length,
+      column: isColumns === true ?
+        this.options.columns[this.state.record.length].name :
+        this.state.record.length,
       empty_lines: this.info.empty_lines,
       header: this.options.columns === true,
       index: this.state.record.length,

diff --git a/test/option.cast.coffee b/test/option.cast.coffee
@@ -18,7 +18,7 @@ describe 'Option `cast`', ->
       28392898392,1974,8.8392926e7,8E2,DEF,23,2050-11-27
       """
       parser.on 'readable', ->
-        while(d = parser.read())
+        while d = parser.read()
           data.push d
       parser.on 'error', (err) ->
         next err
@@ -54,16 +54,47 @@ describe 'Option `cast`', ->
       , (err, records) ->
         records.should.eql [
           [ '2000-01-01T05:00:00.000Z', {
-            quoting: false, index: 1, column: 1, empty_lines: 0, lines: 1, 
-            header: false, invalid_field_length: 0, records: 0
+            column: 1, empty_lines: 0, header: false, index: 1, 
+            invalid_field_length: 0, lines: 1, quoting: false, records: 0
           } ]
           [ '2050-11-27T05:00:00.000Z', {
-            quoting: false, index: 1, column: 1, empty_lines: 0, lines: 2, 
-            header: false, invalid_field_length: 0, records: 1
+            column: 1, empty_lines: 0, header: false, index: 1, 
+            invalid_field_length: 0, lines: 2, quoting: false, records: 1
           } ]
         ] unless err
         next err
 
+    it 'column is a string', (next) ->
+      parse """
+      1,2
+      3,4,5
+      6
+      """,
+        columns: ['a', 'b']
+        relax_column_count: true
+        cast: (value, {header, column}) ->
+          typeof column
+      , (err, records) ->
+        records.should.eql [
+          {a: 'string', b: 'string'}
+          {a: 'string', b: 'string'}
+          {a: 'string'}
+        ] unless err
+        next err
+
+    it 'dont call cast on unreferenced columns', (next) ->
+      parse """
+      1,2
+      3,4,5,6
+      7
+      """,
+        columns: ['a', 'b']
+        relax_column_count: true
+        cast: (value, {header, column}) ->
+          throw Error 'Oh no' if value > 4 and value < 7
+      , (err, records) ->
+        next err
+
     it 'custom function with quoting context', (next) ->
       parse """
       "2000-01-01",date1
@@ -88,8 +119,8 @@ describe 'Option `cast`', ->
       4,5,6
       """,
         max_record_size: 10
-        cast: (value, context) ->
-          switch context.index
+        cast: (value, {index}) ->
+          switch index
             when 0
               undefined
             when 1
@@ -109,8 +140,8 @@ describe 'Option `cast`', ->
       4,5,6
       """,
         columns: true
-        cast: (value, context) ->
-          if context.header then value else parseInt value
+        cast: (value, {header}) ->
+          if header then value else parseInt value
       , (err, records) ->
         records.should.eql [
           {a: 1, b: 2, c: 3}
@@ -124,8 +155,8 @@ describe 'Option `cast`', ->
       4,5,6
       """,
         columns: ['a', 'b', 'c']
-        cast: (value, context) ->
-          context.header.should.be.false()
+        cast: (value, {header}) ->
+          header.should.be.false()
           parseInt value
       , (err, records) ->
         records.should.eql [
@@ -141,7 +172,7 @@ describe 'Option `cast`', ->
       4,5,6
       """,
         columns: true
-        cast: (value, context) ->
+        cast: (value) ->
           value
       , (err, records) ->
         next err