Correctly emit errors thrown when we attempt to parse a line.

koles · Feb 7, 2014 · 8f5091f · 8f5091f
1 parent 821ef45
commit 8f5091f
Showing 1 changed file with 13 additions and 1 deletion.
diff --git a/lib/ya-csv.js b/lib/ya-csv.js
@@ -30,6 +30,7 @@ var csv = exports;
  */
 var CsvReader = csv.CsvReader = function(readStream, options) {
     var self = this;
+    var hasEnded = false;
     _setOptions(self, options);
 
     self.parsingStatus = {
@@ -42,7 +43,18 @@ var CsvReader = csv.CsvReader = function(readStream, options) {
     };
 
     if (readStream) {
-        readStream.addListener('data', this.parse.bind(this));
+        readStream.addListener('data', function (data) {
+            if (hasEnded) {
+                return;
+            }
+
+            try {
+                self.parse(data);
+            } catch (e) {
+                hasEnded = true;
+                self.emit('error', e);
+            }
+        });
         readStream.addListener('error', this.emit.bind(this, 'error'));
         readStream.addListener('end', this.end.bind(this));