dateFormat now handles bad dates a little better

diff --git a/lib/template-helper.js b/lib/template-helper.js
index 7e1693c857758c127d1063d30804c6c5fab9b2e6..deb3a37fc183a4af3cecdea6dda250d4d8193bab 100644 (file)
--- a/lib/template-helper.js
+++ b/lib/template-helper.js
@@ -29,7 +29,9 @@ const dateOrNot = (date, otherwise) => {
 
 /**
  * Why is rendering a Date as a string this complicated?
- * @param {Date|Number} date
+ * We handle the infinities because pg-promise might provide those in
+ * lieu of a Date object from timestamp fields.
+ * @param {Date|Number|String} date
  * @param {String=} pInf
  * @param {String=} nInf
  * @param {String=} otherwise
@@ -43,6 +45,7 @@ const dateFormat = (date, pInf = 'Never', nInf = 'Forever', otherwise = '') => {
       return nInf;
     default:
       if (!date
+      ||  Number.isNaN(date.valueOf())
       ||  (!(date instanceof Date) && !isDatableType)) {
         return otherwise;
       }

diff --git a/test/lib/template-helper.js b/test/lib/template-helper.js
index c0cd94851343de6a757fd7912ed85b72b7a4a6c7..a21b141eaeec7e37c3429fa9b1ea2d268fd4bbcc 100644 (file)
--- a/test/lib/template-helper.js
+++ b/test/lib/template-helper.js
@@ -56,6 +56,11 @@ describe('Template Helper', function () {
       const result = th.dateFormat(undefined, undefined, undefined, expected);
       assert.strictEqual(result, expected);
     });
+    it('handles invalid date', function () {
+      const expected = 'otherwise';
+      const result = th.dateFormat(new Date('bad date'), undefined, undefined, expected);
+      assert.strictEqual(result, expected);
+    });
     it('renders Infinity', function () {
       const expected = 'end of time';
       const result = th.dateFormat(Infinity, expected);