fix #130: pass absolute line-number to data-invalid handler (adapted …

…test)
C2FO · Jul 28, 2019 · c8865f7 · c8865f7
1 parent 06bffe5
commit c8865f7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/src/parser/CsvParserStream.ts b/src/parser/CsvParserStream.ts
@@ -106,7 +106,6 @@ export default class CsvParserStream extends Transform {
                     return cb(new Error('expected transform result'));
                 }
                 if (!transformResult.isValid) {
-                    this.rowCount -= 1;
                     this.emit('data-invalid', transformResult.row, nextRowCount, transformResult.reason);
                 } else if (!transformResult.row) {
                     this.rowCount -= 1;

diff --git a/test/parser/CsvParsingStream.test.ts b/test/parser/CsvParsingStream.test.ts
@@ -211,7 +211,7 @@ describe('CsvParserStream', () => {
             .then(({ count, rows, invalidRows }) => {
                 assert.deepStrictEqual(rows, expectedRows);
                 assert.deepStrictEqual(invalidRows, expectedInvalidRows);
-                assert.strictEqual(count, rows.length);
+                assert.strictEqual(count, rows.length + invalidRows.length);
             });
     });
 
@@ -280,7 +280,7 @@ describe('CsvParserStream', () => {
                 .then(({ count, rows, invalidRows }) => {
                     assert.deepStrictEqual(invalidRows, invalidValid[1]);
                     assert.deepStrictEqual(rows, invalidValid[0]);
-                    assert.strictEqual(count, invalidValid[0].length);
+                    assert.strictEqual(count, invalidValid[0].length + invalidValid[1].length);
                 });
         });
 
@@ -294,7 +294,7 @@ describe('CsvParserStream', () => {
                 .then(({ count, rows, invalidRows }) => {
                     assert.deepStrictEqual(invalidRows, invalidValid[1]);
                     assert.deepStrictEqual(rows, invalidValid[0]);
-                    assert.strictEqual(count, invalidValid[0].length);
+                    assert.strictEqual(count, invalidValid[0].length + invalidValid[1].length);
                 });
         });