csv-parse
Advanced tools
Comparing version 4.14.1 to 4.14.2
@@ -20,2 +20,8 @@ | ||
## Version 4.14.2 | ||
* fix(skip_lines_with_error): work with relax_column_count (#303) | ||
* sample: async iterator | ||
* sample: promises | ||
## Version 4.14.1 | ||
@@ -22,0 +28,0 @@ |
@@ -899,7 +899,7 @@ "use strict"; | ||
if (recordLength !== this.state.expectedRecordLength) { | ||
var err = columns === false ? this.__error( // Todo: rename CSV_INCONSISTENT_RECORD_LENGTH to | ||
var err = columns === false ? // Todo: rename CSV_INCONSISTENT_RECORD_LENGTH to | ||
// CSV_RECORD_INCONSISTENT_FIELDS_LENGTH | ||
new CsvError('CSV_INCONSISTENT_RECORD_LENGTH', ['Invalid Record Length:', "expect ".concat(this.state.expectedRecordLength, ","), "got ".concat(recordLength, " on line ").concat(this.info.lines)], this.options, this.__context(), { | ||
record: record | ||
})) : this.__error( // Todo: rename CSV_RECORD_DONT_MATCH_COLUMNS_LENGTH to | ||
}) : // Todo: rename CSV_RECORD_DONT_MATCH_COLUMNS_LENGTH to | ||
// CSV_RECORD_INCONSISTENT_COLUMNS | ||
@@ -909,3 +909,3 @@ new CsvError('CSV_RECORD_DONT_MATCH_COLUMNS_LENGTH', ['Invalid Record Length:', "columns length is ".concat(columns.length, ","), // rename columns | ||
record: record | ||
})); | ||
}); | ||
@@ -915,4 +915,6 @@ if (relax_column_count === true || relax_column_count_less === true && recordLength < this.state.expectedRecordLength || relax_column_count_more === true && recordLength > this.state.expectedRecordLength) { | ||
this.state.error = err; // Error is undefined with skip_lines_with_error | ||
} else if (err !== undefined) { | ||
return err; | ||
} else { | ||
var finalErr = this.__error(err); | ||
if (finalErr) return finalErr; | ||
} | ||
@@ -919,0 +921,0 @@ } |
@@ -750,25 +750,21 @@ | ||
const err = columns === false ? | ||
this.__error( | ||
// Todo: rename CSV_INCONSISTENT_RECORD_LENGTH to | ||
// CSV_RECORD_INCONSISTENT_FIELDS_LENGTH | ||
new CsvError('CSV_INCONSISTENT_RECORD_LENGTH', [ | ||
'Invalid Record Length:', | ||
`expect ${this.state.expectedRecordLength},`, | ||
`got ${recordLength} on line ${this.info.lines}`, | ||
], this.options, this.__context(), { | ||
record: record, | ||
}) | ||
) | ||
// Todo: rename CSV_INCONSISTENT_RECORD_LENGTH to | ||
// CSV_RECORD_INCONSISTENT_FIELDS_LENGTH | ||
new CsvError('CSV_INCONSISTENT_RECORD_LENGTH', [ | ||
'Invalid Record Length:', | ||
`expect ${this.state.expectedRecordLength},`, | ||
`got ${recordLength} on line ${this.info.lines}`, | ||
], this.options, this.__context(), { | ||
record: record, | ||
}) | ||
: | ||
this.__error( | ||
// Todo: rename CSV_RECORD_DONT_MATCH_COLUMNS_LENGTH to | ||
// CSV_RECORD_INCONSISTENT_COLUMNS | ||
new CsvError('CSV_RECORD_DONT_MATCH_COLUMNS_LENGTH', [ | ||
'Invalid Record Length:', | ||
`columns length is ${columns.length},`, // rename columns | ||
`got ${recordLength} on line ${this.info.lines}`, | ||
], this.options, this.__context(), { | ||
record: record, | ||
}) | ||
) | ||
// Todo: rename CSV_RECORD_DONT_MATCH_COLUMNS_LENGTH to | ||
// CSV_RECORD_INCONSISTENT_COLUMNS | ||
new CsvError('CSV_RECORD_DONT_MATCH_COLUMNS_LENGTH', [ | ||
'Invalid Record Length:', | ||
`columns length is ${columns.length},`, // rename columns | ||
`got ${recordLength} on line ${this.info.lines}`, | ||
], this.options, this.__context(), { | ||
record: record, | ||
}) | ||
if(relax_column_count === true || | ||
@@ -780,4 +776,5 @@ (relax_column_count_less === true && recordLength < this.state.expectedRecordLength) || | ||
// Error is undefined with skip_lines_with_error | ||
}else if(err !== undefined){ | ||
return err | ||
}else{ | ||
const finalErr = this.__error(err) | ||
if(finalErr) return finalErr | ||
} | ||
@@ -784,0 +781,0 @@ } |
{ | ||
"version": "4.14.1", | ||
"version": "4.14.2", | ||
"name": "csv-parse", | ||
@@ -4,0 +4,0 @@ "description": "CSV parsing implementing the Node.js `stream.Transform` API", |
159090
3080