Add test for 'useDateIso8601Format' option, version 3.7.11

Author: mrodrig

README.md

@@ -124,6 +124,9 @@ Looking for examples? Check out the Wiki: [json-2-csv Wiki](https://github.com/m
       5cf7ca3616c91100018844bf,Cars,"[{""name"":""Supercharger""},{""name"":""Turbocharger""}]"
       ```
   	* Note: This may result in CSV output that does not map back exactly to the original JSON.
+  * `useDateIso8601Format` - Boolean - Should date values be converted to an ISO8601 date string?
+    * Default: `false`
+    * Note: If selected, values will be converted using `toISOString()` rather than `toString()` or `toLocaleString()` depending on the other options provided.
   * `useLocaleFormat` - Boolean - Should values be converted to a locale specific string?
     * Default: `false`
     * Note: If selected, values will be converted using `toLocaleString()` rather than `toString()`

package-lock.json

@@ -5,7 +5,7 @@
     },
     "name": "json-2-csv",
     "description": "A JSON to CSV and CSV to JSON converter that natively supports sub-documents and auto-generates the CSV heading.",
-    "version": "3.7.10",
+    "version": "3.7.11",
     "repository": {
         "type": "git",
         "url": "https://github.com/mrodrig/json-2-csv.git"

package.json

@@ -86,8 +86,7 @@ export interface IFullOptions extends ISharedOptions {
    * Should dates be output in ISO 8601 "Z" format:
    * @default false
    */
-   useDateIso8601Format?: boolean;
-
+  useDateIso8601Format?: boolean;
 }
 
 export function json2csv(data: object[],

src/converter.d.ts

@@ -272,15 +272,14 @@ const Json2Csv = function(options) {
      * @returns {*}
      */
     function recordFieldValueToString(fieldValue) {
-        const isD = utils.isDate(fieldValue); // store to avoid checking twice
-        if (Array.isArray(fieldValue) || utils.isObject(fieldValue) && !isD) {
+        const isDate = utils.isDate(fieldValue); // store to avoid checking twice
+
+        if (utils.isNull(fieldValue) || Array.isArray(fieldValue) || utils.isObject(fieldValue) && !isDate) {
             return JSON.stringify(fieldValue);
         } else if (utils.isUndefined(fieldValue)) {
             return 'undefined';
-        } else if (utils.isNull(fieldValue)) {
-            return 'null';
-        } else if (isD && options.useDateIso8601Format) {
-            return new Date(fieldValue).toISOString();
+        } else if (isDate && options.useDateIso8601Format) {
+            return fieldValue.toISOString();
         } else {
             return !options.useLocaleFormat ? fieldValue.toString() : fieldValue.toLocaleString();
         }

src/json2csv.js

@@ -453,6 +453,17 @@ function runTests(jsonTestData, csvTestData) {
                     done();
                 }, { useLocaleFormat: true, unwindArrays: true });
             });
+
+            it('should convert objects with dates to iso8601 format correctly', (done) => {
+                // Convert to a date since the `dob` value is imported as a string by default for some reason
+                jsonTestData.date.dob = new Date('1990-01-01T05:00:00.000Z');
+
+                converter.json2csv(jsonTestData.date, (err, csv) => {
+                    if (err) done(err);
+                    csv.should.equal(csvTestData.date);
+                    done();
+                }, { useDateIso8601Format: true });
+            });
         });
     });