fix(hadron-document): do not throw when rendering invalid dates COMPA…

…SS-7749 (#5571)
mongodb-js · Mar 25, 2024 · 84fd461 · 84fd461
1 parent 5b5b85a
commit 84fd461
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 7 deletions.
diff --git a/packages/compass-crud/src/components/change-view/bson-utils.ts b/packages/compass-crud/src/components/change-view/bson-utils.ts
@@ -7,7 +7,11 @@ export function stringifyBSON(value: any) {
     return value.inspect();
   }
   if (value?.toISOString) {
-    return value.toISOString();
+    try {
+      return value.toISOString();
+    } catch {
+      return String(value);
+    }
   }
   return EJSON.stringify(value);
 }
@@ -29,7 +33,11 @@ export function unBSON(value: any | any[]): any | any[] {
     return value.toString();
   } else if (Object.prototype.toString.call(value) === '[object Date]') {
     // make sure dates are consistently strings when diffing
-    return value.toISOString();
+    try {
+      return value.toISOString();
+    } catch {
+      return String(value);
+    }
   } else {
     return value;
   }

diff --git a/packages/compass-import-export/src/csv/csv-utils.spec.ts b/packages/compass-import-export/src/csv/csv-utils.spec.ts
@@ -100,6 +100,9 @@ describe('stringifyCSVValue', function () {
     expect(
       stringifyCSVValue(new Date('2019-02-08T10:21:49.176Z'), options)
     ).to.equal('2019-02-08T10:21:49.176Z');
+    expect(stringifyCSVValue(new Date('NaN'), options)).to.equal(
+      'Invalid Date'
+    );
   });
 
   it('stringifies number', function () {

diff --git a/packages/compass-import-export/src/csv/csv-utils.ts b/packages/compass-import-export/src/csv/csv-utils.ts
@@ -95,7 +95,11 @@ export function stringifyCSVValue(
     }
 
     if (Object.prototype.toString.call(value) === '[object Date]') {
-      return value.toISOString();
+      try {
+        return value.toISOString();
+      } catch {
+        return String(value);
+      }
     }
 
     // When parsing with relaxed: false we won't see numbers here, but it is

diff --git a/packages/hadron-document/src/editor/date.ts b/packages/hadron-document/src/editor/date.ts
@@ -98,8 +98,13 @@ export default class DateEditor extends StandardEditor {
   }
 
   _formattedValue(): string {
-    return new Date(this.element.currentValue as any)
-      .toISOString()
-      .replace('Z', '+00:00');
+    // BSON Date are uint64_t ms, JS Date only supports float64 ms,
+    // so some valid BSON Dates are not representable in JS.
+    const date = new Date(this.element.currentValue as any);
+    try {
+      return date.toISOString().replace('Z', '+00:00');
+    } catch {
+      return String(date);
+    }
   }
 }
diff --git a/packages/hadron-document/test/editor/date.spec.ts b/packages/hadron-document/test/editor/date.spec.ts
@@ -6,7 +6,7 @@ describe('DateEditor', function () {
   describe('#start', function () {
     const formattedDateString = '2017-01-01T00:00:00.000+00:00';
     const date = new Date(formattedDateString);
-    const element = new Element('date', date, false);
+    const element = new Element('date', date);
 
     context('when the current type is valid (not yet edited)', function () {
       const dateEditor = new DateEditor(element);
@@ -22,6 +22,12 @@ describe('DateEditor', function () {
       it('sets the current value as valid', function () {
         expect(element.isCurrentTypeValid()).to.equal(true);
       });
+
+      it('handles invalid JS `Date` values well', function () {
+        const element = new Element('date', new Date(NaN));
+        new DateEditor(element).start();
+        expect(element.currentValue).to.equal('Invalid Date');
+      });
     });
 
     context(