Merge branch 'master' into editable_retroactive

Author: strazto

Diff for: .circleci/config.yml

@@ -3,7 +3,7 @@ version: 2.1
 executors:
   node:
     docker:
-      - image: circleci/node:12.18
+      - image: circleci/node:12.19
     working_directory: ~/repo
     environment:
       GIT_AUTHOR_EMAIL: [email protected]

Diff for: lib/util.js

@@ -11,7 +11,7 @@ import moment from "moment";
 // for example '/Date(1198908717056)/' or '/Date(1198908717056-0700)/'
 // code from http://momentjs.com/
 const ASPDateRegex = /^\/?Date\((-?\d+)/i;
-
+const NumericRegex = /^\d+$/;
 /**
  * Convert an object into another type
  *
@@ -59,26 +59,17 @@ export function convert(object, type) {
       return String(object);
 
     case "Date":
-      if (isNumber(object)) {
-        return new Date(object);
+      try {
+        return convert(object, "Moment").toDate();
       }
-      if (object instanceof Date) {
-        return new Date(object.valueOf());
-      } else if (moment.isMoment(object)) {
-        return new Date(object.valueOf());
-      }
-      if (isString(object)) {
-        match = ASPDateRegex.exec(object);
-        if (match) {
-          // object is an ASP date
-          return new Date(Number(match[1])); // parse number
+      catch(e){
+        if (e instanceof TypeError) {
+          throw new TypeError(
+            "Cannot convert object of type " + getType(object) + " to type " + type
+          );
         } else {
-          return moment(new Date(object)).toDate(); // parse string
+          throw e;
         }
-      } else {
-        throw new Error(
-          "Cannot convert object of type " + getType(object) + " to type Date"
-        );
       }
 
     case "Moment":
@@ -95,12 +86,17 @@ export function convert(object, type) {
         if (match) {
           // object is an ASP date
           return moment(Number(match[1])); // parse number
-        } else {
-          return moment(object); // parse string
+        } 
+        match = NumericRegex.exec(object);
+
+        if (match) {
+          return moment(Number(object));
         }
+        
+        return moment(object); // parse string
       } else {
-        throw new Error(
-          "Cannot convert object of type " + getType(object) + " to type Date"
+        throw new TypeError(
+          "Cannot convert object of type " + getType(object) + " to type " + type
         );
       }