Skip to content

Commit 2ca7921

Browse files
wdavidwwdavidw
committed
refactor(csv-parse): remove commented line
1 parent 39a4388 commit 2ca7921

File tree

17 files changed

+296
-297
lines changed

17 files changed

+296
-297
lines changed

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

-1
Original file line numberDiff line numberDiff line change
@@ -5514,7 +5514,6 @@ class Parser extends Transform {
55145514
error: undefined,
55155515
enabled: options.from_line === 1,
55165516
escaping: false,
5517-
// escapeIsQuote: options.escape === options.quote,
55185517
escapeIsQuote: isBuffer(options.escape) && isBuffer(options.quote) && Buffer.compare(options.escape, options.quote) === 0,
55195518
// columns can be `false`, `true`, `Array`
55205519
expectedRecordLength: Array.isArray(options.columns) ? options.columns.length : undefined,

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

-1
Original file line numberDiff line numberDiff line change
@@ -5514,7 +5514,6 @@ class Parser extends Transform {
55145514
error: undefined,
55155515
enabled: options.from_line === 1,
55165516
escaping: false,
5517-
// escapeIsQuote: options.escape === options.quote,
55185517
escapeIsQuote: isBuffer(options.escape) && isBuffer(options.quote) && Buffer.compare(options.escape, options.quote) === 0,
55195518
// columns can be `false`, `true`, `Array`
55205519
expectedRecordLength: Array.isArray(options.columns) ? options.columns.length : undefined,

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

-1
Original file line numberDiff line numberDiff line change
@@ -5510,7 +5510,6 @@ class Parser extends Transform {
55105510
error: undefined,
55115511
enabled: options.from_line === 1,
55125512
escaping: false,
5513-
// escapeIsQuote: options.escape === options.quote,
55145513
escapeIsQuote: isBuffer(options.escape) && isBuffer(options.quote) && Buffer.compare(options.escape, options.quote) === 0,
55155514
// columns can be `false`, `true`, `Array`
55165515
expectedRecordLength: Array.isArray(options.columns) ? options.columns.length : undefined,

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

-1
Original file line numberDiff line numberDiff line change
@@ -5510,7 +5510,6 @@ class Parser extends Transform {
55105510
error: undefined,
55115511
enabled: options.from_line === 1,
55125512
escaping: false,
5513-
// escapeIsQuote: options.escape === options.quote,
55145513
escapeIsQuote: isBuffer(options.escape) && isBuffer(options.quote) && Buffer.compare(options.escape, options.quote) === 0,
55155514
// columns can be `false`, `true`, `Array`
55165515
expectedRecordLength: Array.isArray(options.columns) ? options.columns.length : undefined,

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

-1
Original file line numberDiff line numberDiff line change
@@ -5513,7 +5513,6 @@ var csv_parse = (function (exports) {
55135513
error: undefined,
55145514
enabled: options.from_line === 1,
55155515
escaping: false,
5516-
// escapeIsQuote: options.escape === options.quote,
55175516
escapeIsQuote: isBuffer(options.escape) && isBuffer(options.quote) && Buffer.compare(options.escape, options.quote) === 0,
55185517
// columns can be `false`, `true`, `Array`
55195518
expectedRecordLength: Array.isArray(options.columns) ? options.columns.length : undefined,

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

-1
Original file line numberDiff line numberDiff line change
@@ -5513,7 +5513,6 @@ var csv_parse_sync = (function (exports) {
55135513
error: undefined,
55145514
enabled: options.from_line === 1,
55155515
escaping: false,
5516-
// escapeIsQuote: options.escape === options.quote,
55175516
escapeIsQuote: isBuffer(options.escape) && isBuffer(options.quote) && Buffer.compare(options.escape, options.quote) === 0,
55185517
// columns can be `false`, `true`, `Array`
55195518
expectedRecordLength: Array.isArray(options.columns) ? options.columns.length : undefined,

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

-1
Original file line numberDiff line numberDiff line change
@@ -5516,7 +5516,6 @@
55165516
error: undefined,
55175517
enabled: options.from_line === 1,
55185518
escaping: false,
5519-
// escapeIsQuote: options.escape === options.quote,
55205519
escapeIsQuote: isBuffer(options.escape) && isBuffer(options.quote) && Buffer.compare(options.escape, options.quote) === 0,
55215520
// columns can be `false`, `true`, `Array`
55225521
expectedRecordLength: Array.isArray(options.columns) ? options.columns.length : undefined,

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

-1
Original file line numberDiff line numberDiff line change
@@ -5516,7 +5516,6 @@
55165516
error: undefined,
55175517
enabled: options.from_line === 1,
55185518
escaping: false,
5519-
// escapeIsQuote: options.escape === options.quote,
55205519
escapeIsQuote: isBuffer(options.escape) && isBuffer(options.quote) && Buffer.compare(options.escape, options.quote) === 0,
55215520
// columns can be `false`, `true`, `Array`
55225521
expectedRecordLength: Array.isArray(options.columns) ? options.columns.length : undefined,

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

-1
Original file line numberDiff line numberDiff line change
@@ -514,7 +514,6 @@ class Parser extends Transform {
514514
error: undefined,
515515
enabled: options.from_line === 1,
516516
escaping: false,
517-
// escapeIsQuote: options.escape === options.quote,
518517
escapeIsQuote: Buffer.isBuffer(options.escape) && Buffer.isBuffer(options.quote) && Buffer.compare(options.escape, options.quote) === 0,
519518
// columns can be `false`, `true`, `Array`
520519
expectedRecordLength: Array.isArray(options.columns) ? options.columns.length : undefined,

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

+37-36
Original file line numberDiff line numberDiff line change
@@ -5629,9 +5629,20 @@ class Parser extends Transform {
56295629
throw new Error(`Invalid Option: objname must be a non empty string`);
56305630
}
56315631
// Great, nothing to do
5632-
}else {
5632+
}else if(typeof options.objname === 'number');else {
56335633
throw new Error(`Invalid Option: objname must be a string or a buffer, got ${options.objname}`);
56345634
}
5635+
if(options.objname !== undefined){
5636+
if(typeof options.objname === 'number'){
5637+
if(options.columns !== false){
5638+
throw Error('Invalid Option: objname index cannot be combined with columns or be defined as a field');
5639+
}
5640+
}else { // A string or a buffer
5641+
if(options.columns === false){
5642+
throw Error('Invalid Option: objname field must be combined with columns or be defined as an index');
5643+
}
5644+
}
5645+
}
56355646
// Normalize option `on_record`
56365647
if(options.on_record === undefined || options.on_record === null){
56375648
options.on_record = undefined;
@@ -5790,7 +5801,6 @@ class Parser extends Transform {
57905801
error: undefined,
57915802
enabled: options.from_line === 1,
57925803
escaping: false,
5793-
// escapeIsQuote: options.escape === options.quote,
57945804
escapeIsQuote: isBuffer$1(options.escape) && isBuffer$1(options.quote) && Buffer.compare(options.escape, options.quote) === 0,
57955805
// columns can be `false`, `true`, `Array`
57965806
expectedRecordLength: Array.isArray(options.columns) ? options.columns.length : undefined,
@@ -6169,6 +6179,7 @@ class Parser extends Transform {
61696179
}
61706180
this.info.records++;
61716181
if(from === 1 || this.info.records >= from){
6182+
const {objname} = this.options;
61726183
// With columns, records are object
61736184
if(columns !== false){
61746185
const obj = {};
@@ -6186,55 +6197,45 @@ class Parser extends Transform {
61866197
obj[columns[i].name] = record[i];
61876198
}
61886199
}
6189-
const {objname} = this.options;
61906200
// Without objname (default)
6191-
if(objname === undefined){
6192-
if(raw === true || info === true){
6193-
const err = this.__push(Object.assign(
6194-
{record: obj},
6195-
(raw === true ? {raw: this.state.rawBuffer.toString(encoding)}: {}),
6196-
(info === true ? {info: this.__infoRecord()}: {})
6197-
));
6198-
if(err){
6199-
return err;
6200-
}
6201-
}else {
6202-
const err = this.__push(obj);
6203-
if(err){
6204-
return err;
6205-
}
6201+
if(raw === true || info === true){
6202+
const extRecord = Object.assign(
6203+
{record: obj},
6204+
(raw === true ? {raw: this.state.rawBuffer.toString(encoding)}: {}),
6205+
(info === true ? {info: this.__infoRecord()}: {})
6206+
);
6207+
const err = this.__push(
6208+
objname === undefined ? extRecord : [obj[objname], extRecord]
6209+
);
6210+
if(err){
6211+
return err;
62066212
}
6207-
// With objname (default)
62086213
}else {
6209-
if(raw === true || info === true){
6210-
const err = this.__push(Object.assign(
6211-
{record: [obj[objname], obj]},
6212-
raw === true ? {raw: this.state.rawBuffer.toString(encoding)}: {},
6213-
info === true ? {info: this.__infoRecord()}: {}
6214-
));
6215-
if(err){
6216-
return err;
6217-
}
6218-
}else {
6219-
const err = this.__push([obj[objname], obj]);
6220-
if(err){
6221-
return err;
6222-
}
6214+
const err = this.__push(
6215+
objname === undefined ? obj : [obj[objname], obj]
6216+
);
6217+
if(err){
6218+
return err;
62236219
}
62246220
}
62256221
// Without columns, records are array
62266222
}else {
62276223
if(raw === true || info === true){
6228-
const err = this.__push(Object.assign(
6224+
const extRecord = Object.assign(
62296225
{record: record},
62306226
raw === true ? {raw: this.state.rawBuffer.toString(encoding)}: {},
62316227
info === true ? {info: this.__infoRecord()}: {}
6232-
));
6228+
);
6229+
const err = this.__push(
6230+
objname === undefined ? extRecord : [record[objname], extRecord]
6231+
);
62336232
if(err){
62346233
return err;
62356234
}
62366235
}else {
6237-
const err = this.__push(record);
6236+
const err = this.__push(
6237+
objname === undefined ? record : [record[objname], record]
6238+
);
62386239
if(err){
62396240
return err;
62406241
}

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

+37-36
Original file line numberDiff line numberDiff line change
@@ -5626,9 +5626,20 @@ class Parser extends Transform {
56265626
throw new Error(`Invalid Option: objname must be a non empty string`);
56275627
}
56285628
// Great, nothing to do
5629-
}else {
5629+
}else if(typeof options.objname === 'number');else {
56305630
throw new Error(`Invalid Option: objname must be a string or a buffer, got ${options.objname}`);
56315631
}
5632+
if(options.objname !== undefined){
5633+
if(typeof options.objname === 'number'){
5634+
if(options.columns !== false){
5635+
throw Error('Invalid Option: objname index cannot be combined with columns or be defined as a field');
5636+
}
5637+
}else { // A string or a buffer
5638+
if(options.columns === false){
5639+
throw Error('Invalid Option: objname field must be combined with columns or be defined as an index');
5640+
}
5641+
}
5642+
}
56325643
// Normalize option `on_record`
56335644
if(options.on_record === undefined || options.on_record === null){
56345645
options.on_record = undefined;
@@ -5787,7 +5798,6 @@ class Parser extends Transform {
57875798
error: undefined,
57885799
enabled: options.from_line === 1,
57895800
escaping: false,
5790-
// escapeIsQuote: options.escape === options.quote,
57915801
escapeIsQuote: isBuffer$1(options.escape) && isBuffer$1(options.quote) && Buffer.compare(options.escape, options.quote) === 0,
57925802
// columns can be `false`, `true`, `Array`
57935803
expectedRecordLength: Array.isArray(options.columns) ? options.columns.length : undefined,
@@ -6166,6 +6176,7 @@ class Parser extends Transform {
61666176
}
61676177
this.info.records++;
61686178
if(from === 1 || this.info.records >= from){
6179+
const {objname} = this.options;
61696180
// With columns, records are object
61706181
if(columns !== false){
61716182
const obj = {};
@@ -6183,55 +6194,45 @@ class Parser extends Transform {
61836194
obj[columns[i].name] = record[i];
61846195
}
61856196
}
6186-
const {objname} = this.options;
61876197
// Without objname (default)
6188-
if(objname === undefined){
6189-
if(raw === true || info === true){
6190-
const err = this.__push(Object.assign(
6191-
{record: obj},
6192-
(raw === true ? {raw: this.state.rawBuffer.toString(encoding)}: {}),
6193-
(info === true ? {info: this.__infoRecord()}: {})
6194-
));
6195-
if(err){
6196-
return err;
6197-
}
6198-
}else {
6199-
const err = this.__push(obj);
6200-
if(err){
6201-
return err;
6202-
}
6198+
if(raw === true || info === true){
6199+
const extRecord = Object.assign(
6200+
{record: obj},
6201+
(raw === true ? {raw: this.state.rawBuffer.toString(encoding)}: {}),
6202+
(info === true ? {info: this.__infoRecord()}: {})
6203+
);
6204+
const err = this.__push(
6205+
objname === undefined ? extRecord : [obj[objname], extRecord]
6206+
);
6207+
if(err){
6208+
return err;
62036209
}
6204-
// With objname (default)
62056210
}else {
6206-
if(raw === true || info === true){
6207-
const err = this.__push(Object.assign(
6208-
{record: [obj[objname], obj]},
6209-
raw === true ? {raw: this.state.rawBuffer.toString(encoding)}: {},
6210-
info === true ? {info: this.__infoRecord()}: {}
6211-
));
6212-
if(err){
6213-
return err;
6214-
}
6215-
}else {
6216-
const err = this.__push([obj[objname], obj]);
6217-
if(err){
6218-
return err;
6219-
}
6211+
const err = this.__push(
6212+
objname === undefined ? obj : [obj[objname], obj]
6213+
);
6214+
if(err){
6215+
return err;
62206216
}
62216217
}
62226218
// Without columns, records are array
62236219
}else {
62246220
if(raw === true || info === true){
6225-
const err = this.__push(Object.assign(
6221+
const extRecord = Object.assign(
62266222
{record: record},
62276223
raw === true ? {raw: this.state.rawBuffer.toString(encoding)}: {},
62286224
info === true ? {info: this.__infoRecord()}: {}
6229-
));
6225+
);
6226+
const err = this.__push(
6227+
objname === undefined ? extRecord : [record[objname], extRecord]
6228+
);
62306229
if(err){
62316230
return err;
62326231
}
62336232
}else {
6234-
const err = this.__push(record);
6233+
const err = this.__push(
6234+
objname === undefined ? record : [record[objname], record]
6235+
);
62356236
if(err){
62366237
return err;
62376238
}

0 commit comments

Comments
 (0)