Skip to content

Commit fb391c9

Browse files
wdavidwwdavidw
committed
refactor(csv-parse)!: rename RECORD_DONT_MATCH_COLUMNS_LENGTH
1 parent 0376af7 commit fb391c9

17 files changed

+22
-41
lines changed

‎packages/csv-parse/ROADMAP.md

-1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,5 @@ We invite you to join and contribute but create an issue before engaging any wor
1010
* encoding: new encoding_input and encoding_output options (medium)
1111
* `columns_duplicates_to_array`: this is just too long but I don't have much insipiration for a better name
1212
* `relax_column_count`: rename INCONSISTENT_RECORD_LENGTH to RECORD_INCONSISTENT_FIELDS_LENGTH (easy)
13-
* `relax_column_count`: rename RECORD_DONT_MATCH_COLUMNS_LENGTH to RECORD_INCONSISTENT_COLUMNS (easy)
1413
* `info`: remove the `parser.info` object and move its properties to `state`
1514
* `info`: rename the `info` related properties and functions to `context`

‎packages/csv-parse/dist/cjs/index.cjs

+1-3
Original file line numberDiff line numberDiff line change
@@ -5889,9 +5889,7 @@ class Parser extends Transform {
58895889
record: record,
58905890
})
58915891
:
5892-
// Todo: rename CSV_RECORD_DONT_MATCH_COLUMNS_LENGTH to
5893-
// CSV_RECORD_INCONSISTENT_COLUMNS
5894-
new CsvError('CSV_RECORD_DONT_MATCH_COLUMNS_LENGTH', [
5892+
new CsvError('CSV_RECORD_INCONSISTENT_COLUMNS', [
58955893
'Invalid Record Length:',
58965894
`columns length is ${columns.length},`, // rename columns
58975895
`got ${recordLength} on line ${this.info.lines}`,

‎packages/csv-parse/dist/cjs/index.d.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ export type CsvErrorCode =
254254
| 'CSV_NON_TRIMABLE_CHAR_AFTER_CLOSING_QUOTE'
255255
| 'CSV_QUOTE_NOT_CLOSED'
256256
| 'CSV_INCONSISTENT_RECORD_LENGTH'
257-
| 'CSV_RECORD_DONT_MATCH_COLUMNS_LENGTH'
257+
| 'CSV_RECORD_INCONSISTENT_COLUMNS'
258258
| 'CSV_OPTION_COLUMNS_MISSING_NAME'
259259

260260
export class CsvError extends Error {

‎packages/csv-parse/dist/cjs/sync.cjs

+1-3
Original file line numberDiff line numberDiff line change
@@ -5889,9 +5889,7 @@ class Parser extends Transform {
58895889
record: record,
58905890
})
58915891
:
5892-
// Todo: rename CSV_RECORD_DONT_MATCH_COLUMNS_LENGTH to
5893-
// CSV_RECORD_INCONSISTENT_COLUMNS
5894-
new CsvError('CSV_RECORD_DONT_MATCH_COLUMNS_LENGTH', [
5892+
new CsvError('CSV_RECORD_INCONSISTENT_COLUMNS', [
58955893
'Invalid Record Length:',
58965894
`columns length is ${columns.length},`, // rename columns
58975895
`got ${recordLength} on line ${this.info.lines}`,

‎packages/csv-parse/dist/esm/index.d.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ export type CsvErrorCode =
254254
| 'CSV_NON_TRIMABLE_CHAR_AFTER_CLOSING_QUOTE'
255255
| 'CSV_QUOTE_NOT_CLOSED'
256256
| 'CSV_INCONSISTENT_RECORD_LENGTH'
257-
| 'CSV_RECORD_DONT_MATCH_COLUMNS_LENGTH'
257+
| 'CSV_RECORD_INCONSISTENT_COLUMNS'
258258
| 'CSV_OPTION_COLUMNS_MISSING_NAME'
259259

260260
export class CsvError extends Error {

‎packages/csv-parse/dist/esm/index.js

+1-3
Original file line numberDiff line numberDiff line change
@@ -5885,9 +5885,7 @@ class Parser extends Transform {
58855885
record: record,
58865886
})
58875887
:
5888-
// Todo: rename CSV_RECORD_DONT_MATCH_COLUMNS_LENGTH to
5889-
// CSV_RECORD_INCONSISTENT_COLUMNS
5890-
new CsvError('CSV_RECORD_DONT_MATCH_COLUMNS_LENGTH', [
5888+
new CsvError('CSV_RECORD_INCONSISTENT_COLUMNS', [
58915889
'Invalid Record Length:',
58925890
`columns length is ${columns.length},`, // rename columns
58935891
`got ${recordLength} on line ${this.info.lines}`,

‎packages/csv-parse/dist/esm/sync.js

+1-3
Original file line numberDiff line numberDiff line change
@@ -5885,9 +5885,7 @@ class Parser extends Transform {
58855885
record: record,
58865886
})
58875887
:
5888-
// Todo: rename CSV_RECORD_DONT_MATCH_COLUMNS_LENGTH to
5889-
// CSV_RECORD_INCONSISTENT_COLUMNS
5890-
new CsvError('CSV_RECORD_DONT_MATCH_COLUMNS_LENGTH', [
5888+
new CsvError('CSV_RECORD_INCONSISTENT_COLUMNS', [
58915889
'Invalid Record Length:',
58925890
`columns length is ${columns.length},`, // rename columns
58935891
`got ${recordLength} on line ${this.info.lines}`,

‎packages/csv-parse/dist/iife/index.js

+1-3
Original file line numberDiff line numberDiff line change
@@ -5888,9 +5888,7 @@ var csv_parse = (function (exports) {
58885888
record: record,
58895889
})
58905890
:
5891-
// Todo: rename CSV_RECORD_DONT_MATCH_COLUMNS_LENGTH to
5892-
// CSV_RECORD_INCONSISTENT_COLUMNS
5893-
new CsvError('CSV_RECORD_DONT_MATCH_COLUMNS_LENGTH', [
5891+
new CsvError('CSV_RECORD_INCONSISTENT_COLUMNS', [
58945892
'Invalid Record Length:',
58955893
`columns length is ${columns.length},`, // rename columns
58965894
`got ${recordLength} on line ${this.info.lines}`,

‎packages/csv-parse/dist/iife/sync.js

+1-3
Original file line numberDiff line numberDiff line change
@@ -5888,9 +5888,7 @@ var csv_parse_sync = (function (exports) {
58885888
record: record,
58895889
})
58905890
:
5891-
// Todo: rename CSV_RECORD_DONT_MATCH_COLUMNS_LENGTH to
5892-
// CSV_RECORD_INCONSISTENT_COLUMNS
5893-
new CsvError('CSV_RECORD_DONT_MATCH_COLUMNS_LENGTH', [
5891+
new CsvError('CSV_RECORD_INCONSISTENT_COLUMNS', [
58945892
'Invalid Record Length:',
58955893
`columns length is ${columns.length},`, // rename columns
58965894
`got ${recordLength} on line ${this.info.lines}`,

‎packages/csv-parse/dist/umd/index.js

+1-3
Original file line numberDiff line numberDiff line change
@@ -5891,9 +5891,7 @@
58915891
record: record,
58925892
})
58935893
:
5894-
// Todo: rename CSV_RECORD_DONT_MATCH_COLUMNS_LENGTH to
5895-
// CSV_RECORD_INCONSISTENT_COLUMNS
5896-
new CsvError('CSV_RECORD_DONT_MATCH_COLUMNS_LENGTH', [
5894+
new CsvError('CSV_RECORD_INCONSISTENT_COLUMNS', [
58975895
'Invalid Record Length:',
58985896
`columns length is ${columns.length},`, // rename columns
58995897
`got ${recordLength} on line ${this.info.lines}`,

‎packages/csv-parse/dist/umd/sync.js

+1-3
Original file line numberDiff line numberDiff line change
@@ -5891,9 +5891,7 @@
58915891
record: record,
58925892
})
58935893
:
5894-
// Todo: rename CSV_RECORD_DONT_MATCH_COLUMNS_LENGTH to
5895-
// CSV_RECORD_INCONSISTENT_COLUMNS
5896-
new CsvError('CSV_RECORD_DONT_MATCH_COLUMNS_LENGTH', [
5894+
new CsvError('CSV_RECORD_INCONSISTENT_COLUMNS', [
58975895
'Invalid Record Length:',
58985896
`columns length is ${columns.length},`, // rename columns
58995897
`got ${recordLength} on line ${this.info.lines}`,

‎packages/csv-parse/lib/index.d.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ export type CsvErrorCode =
254254
| 'CSV_NON_TRIMABLE_CHAR_AFTER_CLOSING_QUOTE'
255255
| 'CSV_QUOTE_NOT_CLOSED'
256256
| 'CSV_INCONSISTENT_RECORD_LENGTH'
257-
| 'CSV_RECORD_DONT_MATCH_COLUMNS_LENGTH'
257+
| 'CSV_RECORD_INCONSISTENT_COLUMNS'
258258
| 'CSV_OPTION_COLUMNS_MISSING_NAME'
259259

260260
export class CsvError extends Error {

‎packages/csv-parse/lib/index.js

+1-3
Original file line numberDiff line numberDiff line change
@@ -889,9 +889,7 @@ class Parser extends Transform {
889889
record: record,
890890
})
891891
:
892-
// Todo: rename CSV_RECORD_DONT_MATCH_COLUMNS_LENGTH to
893-
// CSV_RECORD_INCONSISTENT_COLUMNS
894-
new CsvError('CSV_RECORD_DONT_MATCH_COLUMNS_LENGTH', [
892+
new CsvError('CSV_RECORD_INCONSISTENT_COLUMNS', [
895893
'Invalid Record Length:',
896894
`columns length is ${columns.length},`, // rename columns
897895
`got ${recordLength} on line ${this.info.lines}`,

‎packages/csv-parse/samples/option.relax_column_count.record_inconsistent_columns.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ const records = parse('1,2\nin:va:lid\n3,4', {
77
relax_column_count: true,
88
raw: true,
99
on_record: ({raw, record}, {error}) => {
10-
if(error && error.code === 'CSV_RECORD_DONT_MATCH_COLUMNS_LENGTH'){
10+
if(error && error.code === 'CSV_RECORD_INCONSISTENT_COLUMNS'){
1111
return raw.trim().split(':');
1212
} else {
1313
return record;

‎packages/csv-parse/test/option.columns.coffee

+6-6
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ describe 'Option `columns`', ->
179179
""", columns: ["a", "b", "c", "d"], (err) ->
180180
assert_error err,
181181
message: 'Invalid Record Length: columns length is 4, got 3 on line 1'
182-
code: 'CSV_RECORD_DONT_MATCH_COLUMNS_LENGTH'
182+
code: 'CSV_RECORD_INCONSISTENT_COLUMNS'
183183
next()
184184

185185
it 'validate options column length on last line', (next) ->
@@ -190,7 +190,7 @@ describe 'Option `columns`', ->
190190
""", columns: ["a", "b", "c", "d"], (err) ->
191191
assert_error err,
192192
message: 'Invalid Record Length: columns length is 4, got 3 on line 3'
193-
code: 'CSV_RECORD_DONT_MATCH_COLUMNS_LENGTH'
193+
code: 'CSV_RECORD_INCONSISTENT_COLUMNS'
194194
next()
195195

196196
it 'context column is null when cast force the context creation', (next) ->
@@ -201,15 +201,15 @@ describe 'Option `columns`', ->
201201
, (err) ->
202202
assert_error err,
203203
message: 'Invalid Record Length: columns length is 1, got 2 on line 2'
204-
code: 'CSV_RECORD_DONT_MATCH_COLUMNS_LENGTH'
204+
code: 'CSV_RECORD_INCONSISTENT_COLUMNS'
205205
column: null
206206
next()
207207

208208
it 'context column is null when columns number inferieur to record length, fix regression #259', (next) ->
209209
parse "a\nb,\n", columns: true, (err) ->
210210
assert_error err,
211211
message: 'Invalid Record Length: columns length is 1, got 2 on line 2'
212-
code: 'CSV_RECORD_DONT_MATCH_COLUMNS_LENGTH'
212+
code: 'CSV_RECORD_INCONSISTENT_COLUMNS'
213213
column: null
214214
next()
215215

@@ -268,14 +268,14 @@ describe 'Option `columns`', ->
268268
it 'last column value ignore when `null`', (next) ->
269269
# Trigger a bug where error is try to stringify and parse an undefined
270270
# value, conjointly triggered by a null column and a
271-
# CSV_RECORD_DONT_MATCH_COLUMNS_LENGTH error
271+
# CSV_RECORD_INCONSISTENT_COLUMNS error
272272
parse """
273273
col_a,col_b,col_c
274274
foo,bar
275275
foo,bar,baz
276276
"""
277277
, columns: ['a', 'b', null], (err) ->
278-
err.code.should.eql 'CSV_RECORD_DONT_MATCH_COLUMNS_LENGTH'
278+
err.code.should.eql 'CSV_RECORD_INCONSISTENT_COLUMNS'
279279
next()
280280

281281
describe 'function', ->

‎packages/csv-parse/test/option.relax_column_count.coffee

+1-1
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ describe 'Option `relax_column_count`', ->
168168
relax_column_count: true,
169169
raw: true,
170170
on_record: ({raw, record}, {error}) ->
171-
if error?.code is 'CSV_RECORD_DONT_MATCH_COLUMNS_LENGTH'
171+
if error?.code is 'CSV_RECORD_INCONSISTENT_COLUMNS'
172172
raw.trim().split ':'
173173
else
174174
record

‎packages/csv-parse/test/option.skip_records_with_error.coffee

+2-2
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ describe 'Option `skip_records_with_error`', ->
8585
'''
8686
parser.end()
8787

88-
it 'handle "CSV_RECORD_DONT_MATCH_COLUMNS_LENGTH"', (next) ->
88+
it 'handle "CSV_RECORD_INCONSISTENT_COLUMNS"', (next) ->
8989
errors = 0
9090
parser = parse skip_records_with_error: true, columns: ["a", "b", "c", "d"], (err, records) ->
9191
records.should.eql [
@@ -97,7 +97,7 @@ describe 'Option `skip_records_with_error`', ->
9797
parser.on 'skip', (err) ->
9898
assert_error err,
9999
message: 'Invalid Record Length: columns length is 4, got 3 on line 1'
100-
code: 'CSV_RECORD_DONT_MATCH_COLUMNS_LENGTH'
100+
code: 'CSV_RECORD_INCONSISTENT_COLUMNS'
101101
record: ['1', '2', '3']
102102
errors++
103103
parser.write '''

0 commit comments

Comments
 (0)