on_record: catch and handle user errors

Author: wdavidw

CHANGELOG.md

@@ -10,6 +10,10 @@
 * promise: new API module
 * errors: finish normalisation of all errors
 
+## Trunk
+
+* on_record: catch and handle user errors
+
 ## Version 4.8.5
 
 * ts: fix `types` declaration

lib/es5/index.js

@@ -869,40 +869,64 @@ function (_Transform) {
 
           if (objname === undefined) {
             if (raw === true || info === true) {
-              this.__push(Object.assign({
+              var _err6 = this.__push(Object.assign({
                 record: obj
               }, raw === true ? {
                 raw: this.state.rawBuffer.toString()
               } : {}, info === true ? {
                 info: this.state.info
               } : {}));
+
+              if (_err6) {
+                return _err6;
+              }
             } else {
-              this.__push(obj);
+              var _err7 = this.__push(obj);
+
+              if (_err7) {
+                return _err7;
+              }
             }
           } else {
             if (raw === true || info === true) {
-              this.__push(Object.assign({
+              var _err8 = this.__push(Object.assign({
                 record: [obj[objname], obj]
               }, raw === true ? {
                 raw: this.state.rawBuffer.toString()
               } : {}, info === true ? {
                 info: this.state.info
               } : {}));
+
+              if (_err8) {
+                return _err8;
+              }
             } else {
-              this.__push([obj[objname], obj]);
+              var _err9 = this.__push([obj[objname], obj]);
+
+              if (_err9) {
+                return _err9;
+              }
             }
           }
         } else {
           if (raw === true || info === true) {
-            this.__push(Object.assign({
+            var _err10 = this.__push(Object.assign({
               record: record
             }, raw === true ? {
               raw: this.state.rawBuffer.toString()
             } : {}, info === true ? {
               info: this.state.info
             } : {}));
+
+            if (_err10) {
+              return _err10;
+            }
           } else {
-            this.__push(record);
+            var _err11 = this.__push(record);
+
+            if (_err11) {
+              return _err11;
+            }
           }
         }
       }
@@ -998,7 +1022,11 @@ function (_Transform) {
       if (on_record !== undefined) {
         var context = this.__context();
 
-        record = on_record.call(null, record, context);
+        try {
+          record = on_record.call(null, record, context);
+        } catch (err) {
+          return err;
+        }
 
         if (record === undefined || record === null) {
           return;

lib/index.js

@@ -733,34 +733,52 @@ class Parser extends Transform {
         const {objname} = this.options
         if(objname === undefined){
           if(raw === true || info === true){
-            this.__push(Object.assign(
+            const err = this.__push(Object.assign(
               {record: obj},
               (raw === true ? {raw: this.state.rawBuffer.toString()}: {}),
               (info === true ? {info: this.state.info}: {})
             ))
+            if(err){
+              return err
+            }
           }else{
-            this.__push(obj)
+            const err = this.__push(obj)
+            if(err){
+              return err
+            }
           }
         }else{
           if(raw === true || info === true){
-            this.__push(Object.assign(
+            const err = this.__push(Object.assign(
               {record: [obj[objname], obj]},
               raw === true ? {raw: this.state.rawBuffer.toString()}: {},
               info === true ? {info: this.state.info}: {}
             ))
+            if(err){
+              return err
+            }
           }else{
-            this.__push([obj[objname], obj])
+            const err = this.__push([obj[objname], obj])
+            if(err){
+              return err
+            }
           }
         }
       }else{
         if(raw === true || info === true){
-          this.__push(Object.assign(
+          const err = this.__push(Object.assign(
             {record: record},
             raw === true ? {raw: this.state.rawBuffer.toString()}: {},
             info === true ? {info: this.state.info}: {}
           ))
+          if(err){
+            return err
+          }
         }else{
-          this.__push(record)
+          const err = this.__push(record)
+          if(err){
+            return err
+          }
         }
       }
     }
@@ -828,7 +846,11 @@ class Parser extends Transform {
     const {on_record} = this.options
     if(on_record !== undefined){
       const context = this.__context()
-      record = on_record.call(null, record, context)
+      try{
+        record = on_record.call(null, record, context)
+      }catch(err){
+        return err
+      }
       if(record === undefined || record === null){ return }
     }
     this.push(record)

test/option.on_record.coffee

@@ -22,3 +22,11 @@ describe 'Option `on_record`', ->
       if lines is 2 then null else record
     , (err, records) ->
       records.should.eql [ ['a', 'b'], ['e', 'f'] ]
+        
+  it 'honors skip_lines_with_error', ->
+    parse "a,b\nc,d\ne,f",
+      on_record: (record, {lines}) ->
+        if lines is 2 then throw Error 'Error thrown on line 2' else record
+      skip_lines_with_error: true
+    , (err, records) ->
+      err.message.should.eql 'Error thrown on line 2'