feat(csv-parse): cast_date as a function (fix #342)

wdavidw · wdavidw · commit 2807d292c898 · 2022-06-14T16:04:28.000+02:00
diff --git a/packages/csv-parse/dist/cjs/index.cjs b/packages/csv-parse/dist/cjs/index.cjs
@@ -208,7 +208,7 @@ const normalize_options = function(opts){
       const date = Date.parse(value);
       return !isNaN(date) ? new Date(date) : value;
     };
-  }else {
+  }else if (typeof options.cast_date !== 'function'){
     throw new CsvError('CSV_INVALID_OPTION_CAST_DATE', [
       'Invalid option cast_date:', 'cast_date must be true or a function,',
       `got ${JSON.stringify(options.cast_date)}`
diff --git a/packages/csv-parse/dist/cjs/sync.cjs b/packages/csv-parse/dist/cjs/sync.cjs
@@ -206,7 +206,7 @@ const normalize_options = function(opts){
       const date = Date.parse(value);
       return !isNaN(date) ? new Date(date) : value;
     };
-  }else {
+  }else if (typeof options.cast_date !== 'function'){
     throw new CsvError('CSV_INVALID_OPTION_CAST_DATE', [
       'Invalid option cast_date:', 'cast_date must be true or a function,',
       `got ${JSON.stringify(options.cast_date)}`
diff --git a/packages/csv-parse/dist/esm/index.js b/packages/csv-parse/dist/esm/index.js
@@ -5264,7 +5264,7 @@ const normalize_options = function(opts){
       const date = Date.parse(value);
       return !isNaN(date) ? new Date(date) : value;
     };
-  }else {
+  }else if (typeof options.cast_date !== 'function'){
     throw new CsvError('CSV_INVALID_OPTION_CAST_DATE', [
       'Invalid option cast_date:', 'cast_date must be true or a function,',
       `got ${JSON.stringify(options.cast_date)}`
diff --git a/packages/csv-parse/dist/esm/sync.js b/packages/csv-parse/dist/esm/sync.js
@@ -2174,7 +2174,7 @@ const normalize_options = function(opts){
       const date = Date.parse(value);
       return !isNaN(date) ? new Date(date) : value;
     };
-  }else {
+  }else if (typeof options.cast_date !== 'function'){
     throw new CsvError('CSV_INVALID_OPTION_CAST_DATE', [
       'Invalid option cast_date:', 'cast_date must be true or a function,',
       `got ${JSON.stringify(options.cast_date)}`
diff --git a/packages/csv-parse/dist/iife/index.js b/packages/csv-parse/dist/iife/index.js
@@ -5267,7 +5267,7 @@ var csv_parse = (function (exports) {
                   const date = Date.parse(value);
                   return !isNaN(date) ? new Date(date) : value;
                 };
-              }else {
+              }else if (typeof options.cast_date !== 'function'){
                 throw new CsvError('CSV_INVALID_OPTION_CAST_DATE', [
                   'Invalid option cast_date:', 'cast_date must be true or a function,',
                   `got ${JSON.stringify(options.cast_date)}`
diff --git a/packages/csv-parse/dist/iife/sync.js b/packages/csv-parse/dist/iife/sync.js
@@ -2177,7 +2177,7 @@ var csv_parse_sync = (function (exports) {
                   const date = Date.parse(value);
                   return !isNaN(date) ? new Date(date) : value;
                 };
-              }else {
+              }else if (typeof options.cast_date !== 'function'){
                 throw new CsvError('CSV_INVALID_OPTION_CAST_DATE', [
                   'Invalid option cast_date:', 'cast_date must be true or a function,',
                   `got ${JSON.stringify(options.cast_date)}`
diff --git a/packages/csv-parse/dist/umd/index.js b/packages/csv-parse/dist/umd/index.js
@@ -5270,7 +5270,7 @@
                   const date = Date.parse(value);
                   return !isNaN(date) ? new Date(date) : value;
                 };
-              }else {
+              }else if (typeof options.cast_date !== 'function'){
                 throw new CsvError('CSV_INVALID_OPTION_CAST_DATE', [
                   'Invalid option cast_date:', 'cast_date must be true or a function,',
                   `got ${JSON.stringify(options.cast_date)}`
diff --git a/packages/csv-parse/dist/umd/sync.js b/packages/csv-parse/dist/umd/sync.js
@@ -2180,7 +2180,7 @@
                   const date = Date.parse(value);
                   return !isNaN(date) ? new Date(date) : value;
                 };
-              }else {
+              }else if (typeof options.cast_date !== 'function'){
                 throw new CsvError('CSV_INVALID_OPTION_CAST_DATE', [
                   'Invalid option cast_date:', 'cast_date must be true or a function,',
                   `got ${JSON.stringify(options.cast_date)}`
diff --git a/packages/csv-parse/lib/api/normalize_options.js b/packages/csv-parse/lib/api/normalize_options.js
@@ -53,7 +53,7 @@ const normalize_options = function(opts){
       const date = Date.parse(value);
       return !isNaN(date) ? new Date(date) : value;
     };
-  }else{
+  }else if (typeof options.cast_date !== 'function'){
     throw new CsvError('CSV_INVALID_OPTION_CAST_DATE', [
       'Invalid option cast_date:', 'cast_date must be true or a function,',
       `got ${JSON.stringify(options.cast_date)}`
diff --git a/packages/csv-parse/test/api.types.ts b/packages/csv-parse/test/api.types.ts
@@ -143,6 +143,9 @@ describe('API Types', () => {
       const options: Options = {}
       options.cast_date = true
       options.castDate = true
+      options.cast_date = (value: string, context: CastingContext) => {
+        return new Date(`${value} ${context.index}`)
+      }
     })
       
     it('columns', () => {
diff --git a/packages/csv-parse/test/option.cast_date.coffee b/packages/csv-parse/test/option.cast_date.coffee
@@ -25,6 +25,24 @@ describe 'Option `cast_date`', ->
       ]
       next err
   
+  it 'as a function', (next) ->
+    # Current implementation rely on `isNaN(Date.parse(value))`
+    # While it return `NaN` in Firefox, Node.js return a timestamp for
+    # `Date.parse('Test 1')`
+    parser = parse """
+    2000-01-01
+    2050-11-27
+    """,
+      cast: true
+      cast_date: (value, context) ->
+        new Date( (new Date(value)).getTime() + context.lines*60*60*1000)
+    , (err, records) ->
+      records.should.eql [
+        [ new Date('2000-01-01T01:00:00.000Z') ],
+        [ new Date('2050-11-27T02:00:00.000Z') ]
+      ]
+      next err
+  
   it 'value end with space and number (issue #342)', (next) ->
     # Current implementation rely on `isNaN(Date.parse(value))`
     # While it return `NaN` in Firefox, Node.js return a timestamp for
