fixes koles#45

AgencyPMG · Jan 31, 2017 · 2fa1479 · 2fa1479
1 parent 9999d7f
commit 2fa1479
Showing 1 changed file with 15 additions and 6 deletions.
diff --git a/lib/ya-csv.js b/lib/ya-csv.js
@@ -1,6 +1,6 @@
 var sys;
 try {
-  sys    = require('util'); 
+  sys    = require('util');
 } catch (e) {
   sys    = require('sys');
 }
@@ -38,6 +38,7 @@ var CsvReader = csv.CsvReader = function(readStream, options) {
         openRecord:    [],
         openField:     '',
         lastChar:      '',
+        escapeAtEnd:   false,
         quotedField:   false,
         commentedLine: false
     };
@@ -126,11 +127,19 @@ CsvReader.prototype.parse = function(data) {
                 if (c === this.escapechar) {
                     // double-quote at the field beginning does not count as an escape string`
                     if (c !== this.quotechar || ps.openField || ps.quotedField) {
-                       var nextChar = data.charAt(i + 1);
-                       if (this._isEscapable(nextChar)) {
-                           this._addCharacter(nextChar);
-                           i++;
-                           isEscape = true;
+                        var nextChar = data.charAt(i + 1);
+                        if (this._isEscapable(nextChar)) {
+                            this._addCharacter(nextChar);
+                            i++;
+                            isEscape = true;
+                            ps.escapeAtEnd = false;
+                        } else if (!nextChar) {
+                            ps.escapeAtEnd = true;
+                        } else if (i===0 && ps.escapeAtEnd && this._isEscapable(ps.lastChar)) {
+                            this._addCharacter(c);
+                            ps.escapeAtEnd = false;
+                        } else {
+                            ps.escapeAtEnd = false;
                         }
                     }
                 }