@contrail/util 1.1.15 → 1.1.16

package/lib/object-util/cloneDeep/cloneDeep.d.ts

@@ -1 +1,5 @@
-export declare function cloneDeep<T>(obj: T): T | null;
+export declare function cloneDeep<T>(obj: T): DatesAsStrings<T> | null;
+type DatesAsStrings<T> = T extends Date ? string : T extends (infer U)[] ? DatesAsStrings<U>[] : T extends object ? {
+    [K in keyof T]: DatesAsStrings<T[K]>;
+} : T;
+export {};

package/lib/object-util/cloneDeep/cloneDeep.js

@@ -2,14 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.cloneDeep = cloneDeep;
 function cloneDeep(obj) {
-    if (obj === null || obj === undefined)
+    if (obj == null)
         return null;
-    return JSON.parse(JSON.stringify(obj), (_key, value) => {
-        if (typeof value === 'string' && /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}.\d{3}Z$/.test(value)) {
-            const date = new Date(value);
-            if (!isNaN(date.getTime()))
-                return date;
-        }
-        return value;
-    });
+    return JSON.parse(JSON.stringify(obj));
 }

package/lib/object-util/cloneDeepPreserveDates/cloneDeepPreserveDates.d.ts

@@ -0,0 +1,6 @@
+export declare function cloneDeepPreserveDates<T>(obj: T): T | null;
+declare const DATE_TAG = "__$date";
+export declare function tagDates(input: unknown): unknown;
+export declare function reviveTaggedDates(_key: string, value: unknown): unknown;
+export declare function isTaggedDate(v: unknown): v is Record<typeof DATE_TAG, string>;
+export {};

package/lib/object-util/cloneDeepPreserveDates/cloneDeepPreserveDates.js

@@ -0,0 +1,37 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.cloneDeepPreserveDates = cloneDeepPreserveDates;
+exports.tagDates = tagDates;
+exports.reviveTaggedDates = reviveTaggedDates;
+exports.isTaggedDate = isTaggedDate;
+function cloneDeepPreserveDates(obj) {
+    if (obj == null)
+        return null;
+    const tagged = tagDates(obj);
+    const json = JSON.stringify(tagged);
+    return JSON.parse(json, reviveTaggedDates);
+}
+const DATE_TAG = '__$date';
+function tagDates(input) {
+    if (input instanceof Date)
+        return { [DATE_TAG]: input.toISOString() };
+    if (Array.isArray(input))
+        return input.map(tagDates);
+    if (input && typeof input === 'object') {
+        const out = {};
+        for (const [k, v] of Object.entries(input))
+            out[k] = tagDates(v);
+        return out;
+    }
+    return input;
+}
+function reviveTaggedDates(_key, value) {
+    return isTaggedDate(value) ? new Date(value[DATE_TAG]) : value;
+}
+function isTaggedDate(v) {
+    return (!!v &&
+        typeof v === 'object' &&
+        v !== null &&
+        DATE_TAG in v &&
+        typeof v[DATE_TAG] === 'string');
+}

package/lib/object-util/object-util.d.ts

@@ -1,4 +1,5 @@
 import { cloneDeep } from './cloneDeep/cloneDeep';
+import { cloneDeepPreserveDates } from './cloneDeepPreserveDates/cloneDeepPreserveDates';
 import { isObject } from './isObject/isObject';
 import { mergeDeep } from './mergeDeep/mergeDeep';
 import { getObjectDiffs } from './compareDeep/compareDeep';
@@ -14,6 +15,7 @@ export declare class ObjectUtil {
     static isObject: typeof isObject;
     static mergeDeep: typeof mergeDeep;
     static cloneDeep: typeof cloneDeep;
+    static cloneDeepPreserveDates: typeof cloneDeepPreserveDates;
     static compareDeep: typeof getObjectDiffs;
     static applyChangesIfEqual: typeof applyChangesIfEqual;
     static determineChangesIfEqual: typeof determineChangesIfEqual;

package/lib/object-util/object-util.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ObjectUtil = void 0;
 const cloneDeep_1 = require("./cloneDeep/cloneDeep");
+const cloneDeepPreserveDates_1 = require("./cloneDeepPreserveDates/cloneDeepPreserveDates");
 const isObject_1 = require("./isObject/isObject");
 const mergeDeep_1 = require("./mergeDeep/mergeDeep");
 const compareDeep_1 = require("./compareDeep/compareDeep");
@@ -80,6 +81,7 @@ exports.ObjectUtil = ObjectUtil;
 ObjectUtil.isObject = isObject_1.isObject;
 ObjectUtil.mergeDeep = mergeDeep_1.mergeDeep;
 ObjectUtil.cloneDeep = cloneDeep_1.cloneDeep;
+ObjectUtil.cloneDeepPreserveDates = cloneDeepPreserveDates_1.cloneDeepPreserveDates;
 ObjectUtil.compareDeep = compareDeep_1.getObjectDiffs;
 ObjectUtil.applyChangesIfEqual = applyChangesIfEqual_1.applyChangesIfEqual;
 ObjectUtil.determineChangesIfEqual = applyChangesIfEqual_1.determineChangesIfEqual;

package/lib/object-util/retainOnlyProperties/retainOnlyProperties.js

@@ -25,6 +25,6 @@ function retainOnlyProperties(obj, keysToKeep, options = {}) {
         }
         return target;
     };
-    const objToModify = options.shouldDeleteInPlace ? obj : object_util_1.ObjectUtil.cloneDeep(obj);
+    const objToModify = options.shouldDeleteInPlace ? obj : object_util_1.ObjectUtil.cloneDeepPreserveDates(obj);
     return retain(objToModify);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contrail/util",
-  "version": "1.1.15",
+  "version": "1.1.16",
   "description": "General JavaScript utilities",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",