@archtx/utils 6.0.0 → 6.1.1

package/dist/exports.d.ts

@@ -1,29 +1,29 @@
-export * from './constants/millisecond-time.js';
-export * from './constants/second-time.js';
-export * from './array-values-or-undefined.js';
-export * from './bool-or-undefined.js';
-export * from './deep-clone.js';
-export * from './deep-equal.js';
-export * from './deep-freeze.js';
-export * from './deep-merge.js';
-export * from './ensure-array.js';
-export * from './format-decimal.js';
-export * from './is-hex-color.js';
-export * from './is-prod.js';
-export * from './object.js';
-export * from './object-diff-paths.js';
-export * from './object-values-to-dot-notation.js';
-export * from './random-color.js';
-export * from './sanitize-obj-props.js';
-export * from './sleep.js';
-export * from './timeout.js';
-export * from './undefined-default.js';
-export * from './strings/is-email.js';
-export * from './strings/is-url.js';
-export * from './strings/make-uuid.js';
-export * from './strings/obfuscate-string.js';
-export * from './strings/pluralize.js';
-export * from './strings/reproducible-hash.js';
-export * from './constants/millisecond-time.js';
-export * from './constants/second-time.js';
-export * from './datetime/iso-string.js';
+export * from './src/constants/millisecond-time.js';
+export * from './src/constants/second-time.js';
+export * from './src/array-values-or-undefined.js';
+export * from './src/bool-or-undefined.js';
+export * from './src/deep-clone.js';
+export * from './src/deep-equal.js';
+export * from './src/deep-freeze.js';
+export * from './src/deep-merge.js';
+export * from './src/ensure-array.js';
+export * from './src/format-decimal.js';
+export * from './src/is-hex-color.js';
+export * from './src/is-prod.js';
+export * from './src/object.js';
+export * from './src/object-diff-paths.js';
+export * from './src/object-values-to-dot-notation.js';
+export * from './src/random-color.js';
+export * from './src/sanitize-obj-props.js';
+export * from './src/sleep.js';
+export * from './src/timeout.js';
+export * from './src/undefined-default.js';
+export * from './src/strings/is-email.js';
+export * from './src/strings/is-url.js';
+export * from './src/strings/make-uuid.js';
+export * from './src/strings/obfuscate-string.js';
+export * from './src/strings/pluralize.js';
+export * from './src/strings/reproducible-hash.js';
+export * from './src/constants/millisecond-time.js';
+export * from './src/constants/second-time.js';
+export * from './src/datetime/iso-string.js';

package/dist/exports.js

@@ -1,32 +1,32 @@
-export * from './constants/millisecond-time.js';
-export * from './constants/second-time.js';
-export * from './array-values-or-undefined.js';
-export * from './bool-or-undefined.js';
-export * from './deep-clone.js';
-export * from './deep-equal.js';
-export * from './deep-freeze.js';
-export * from './deep-merge.js';
-export * from './ensure-array.js';
-export * from './format-decimal.js';
-export * from './is-hex-color.js';
-export * from './is-prod.js';
-export * from './object.js';
-export * from './object-diff-paths.js';
-export * from './object-values-to-dot-notation.js';
-export * from './random-color.js';
-export * from './sanitize-obj-props.js';
-export * from './sleep.js';
-export * from './timeout.js';
-export * from './undefined-default.js';
+export * from './src/constants/millisecond-time.js';
+export * from './src/constants/second-time.js';
+export * from './src/array-values-or-undefined.js';
+export * from './src/bool-or-undefined.js';
+export * from './src/deep-clone.js';
+export * from './src/deep-equal.js';
+export * from './src/deep-freeze.js';
+export * from './src/deep-merge.js';
+export * from './src/ensure-array.js';
+export * from './src/format-decimal.js';
+export * from './src/is-hex-color.js';
+export * from './src/is-prod.js';
+export * from './src/object.js';
+export * from './src/object-diff-paths.js';
+export * from './src/object-values-to-dot-notation.js';
+export * from './src/random-color.js';
+export * from './src/sanitize-obj-props.js';
+export * from './src/sleep.js';
+export * from './src/timeout.js';
+export * from './src/undefined-default.js';
 // strings
-export * from './strings/is-email.js';
-export * from './strings/is-url.js';
-export * from './strings/make-uuid.js';
-export * from './strings/obfuscate-string.js';
-export * from './strings/pluralize.js';
-export * from './strings/reproducible-hash.js';
+export * from './src/strings/is-email.js';
+export * from './src/strings/is-url.js';
+export * from './src/strings/make-uuid.js';
+export * from './src/strings/obfuscate-string.js';
+export * from './src/strings/pluralize.js';
+export * from './src/strings/reproducible-hash.js';
 // utils
-export * from './constants/millisecond-time.js';
-export * from './constants/second-time.js';
-export * from './datetime/iso-string.js';
+export * from './src/constants/millisecond-time.js';
+export * from './src/constants/second-time.js';
+export * from './src/datetime/iso-string.js';
 //# sourceMappingURL=exports.js.map

package/dist/exports.js.map

@@ -1 +1 @@
-{"version":3,"file":"exports.js","sourceRoot":"","sources":["../src/exports.ts"],"names":[],"mappings":"AAAA,cAAc,iCAAiC,CAAA;AAC/C,cAAc,4BAA4B,CAAA;AAC1C,cAAc,gCAAgC,CAAA;AAC9C,cAAc,wBAAwB,CAAA;AACtC,cAAc,iBAAiB,CAAA;AAC/B,cAAc,iBAAiB,CAAA;AAC/B,cAAc,kBAAkB,CAAA;AAChC,cAAc,iBAAiB,CAAA;AAC/B,cAAc,mBAAmB,CAAA;AACjC,cAAc,qBAAqB,CAAA;AACnC,cAAc,mBAAmB,CAAA;AACjC,cAAc,cAAc,CAAA;AAC5B,cAAc,aAAa,CAAA;AAC3B,cAAc,wBAAwB,CAAA;AACtC,cAAc,oCAAoC,CAAA;AAClD,cAAc,mBAAmB,CAAA;AACjC,cAAc,yBAAyB,CAAA;AACvC,cAAc,YAAY,CAAA;AAC1B,cAAc,cAAc,CAAA;AAC5B,cAAc,wBAAwB,CAAA;AAEtC,UAAU;AACV,cAAc,uBAAuB,CAAA;AACrC,cAAc,qBAAqB,CAAA;AACnC,cAAc,wBAAwB,CAAA;AACtC,cAAc,+BAA+B,CAAA;AAC7C,cAAc,wBAAwB,CAAA;AACtC,cAAc,gCAAgC,CAAA;AAE9C,QAAQ;AACR,cAAc,iCAAiC,CAAA;AAC/C,cAAc,4BAA4B,CAAA;AAC1C,cAAc,0BAA0B,CAAA"}
+{"version":3,"file":"exports.js","sourceRoot":"","sources":["../exports.ts"],"names":[],"mappings":"AAAA,cAAc,qCAAqC,CAAA;AACnD,cAAc,gCAAgC,CAAA;AAC9C,cAAc,oCAAoC,CAAA;AAClD,cAAc,4BAA4B,CAAA;AAC1C,cAAc,qBAAqB,CAAA;AACnC,cAAc,qBAAqB,CAAA;AACnC,cAAc,sBAAsB,CAAA;AACpC,cAAc,qBAAqB,CAAA;AACnC,cAAc,uBAAuB,CAAA;AACrC,cAAc,yBAAyB,CAAA;AACvC,cAAc,uBAAuB,CAAA;AACrC,cAAc,kBAAkB,CAAA;AAChC,cAAc,iBAAiB,CAAA;AAC/B,cAAc,4BAA4B,CAAA;AAC1C,cAAc,wCAAwC,CAAA;AACtD,cAAc,uBAAuB,CAAA;AACrC,cAAc,6BAA6B,CAAA;AAC3C,cAAc,gBAAgB,CAAA;AAC9B,cAAc,kBAAkB,CAAA;AAChC,cAAc,4BAA4B,CAAA;AAE1C,UAAU;AACV,cAAc,2BAA2B,CAAA;AACzC,cAAc,yBAAyB,CAAA;AACvC,cAAc,4BAA4B,CAAA;AAC1C,cAAc,mCAAmC,CAAA;AACjD,cAAc,4BAA4B,CAAA;AAC1C,cAAc,oCAAoC,CAAA;AAElD,QAAQ;AACR,cAAc,qCAAqC,CAAA;AACnD,cAAc,gCAAgC,CAAA;AAC9C,cAAc,8BAA8B,CAAA"}

package/dist/src/array-values-or-undefined.d.ts

@@ -0,0 +1 @@
+export declare function arrayValuesOrUndefined<T>(arr?: T[]): T[] | undefined;

package/dist/src/array-values-or-undefined.js

@@ -0,0 +1,6 @@
+export function arrayValuesOrUndefined(arr) {
+    if (Array.isArray(arr) && arr.length)
+        return arr;
+    return undefined;
+}
+//# sourceMappingURL=array-values-or-undefined.js.map

package/dist/src/array-values-or-undefined.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"array-values-or-undefined.js","sourceRoot":"","sources":["../../src/array-values-or-undefined.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,sBAAsB,CAAI,GAAS;IACjD,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,GAAG,CAAC,MAAM;QAAE,OAAO,GAAG,CAAA;IAEhD,OAAO,SAAS,CAAA;AAClB,CAAC"}

package/dist/src/bool-or-undefined.d.ts

@@ -0,0 +1 @@
+export declare const boolOrUndefined: (value?: boolean) => boolean | undefined;

package/dist/src/bool-or-undefined.js

@@ -0,0 +1,2 @@
+export const boolOrUndefined = (value) => typeof value === 'boolean' ? value : undefined;
+//# sourceMappingURL=bool-or-undefined.js.map

package/dist/src/bool-or-undefined.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"bool-or-undefined.js","sourceRoot":"","sources":["../../src/bool-or-undefined.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,KAAe,EAAE,EAAE,CACjD,OAAO,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAA"}

package/dist/src/constants/millisecond-time.d.ts

@@ -0,0 +1,7 @@
+export declare const ONE_MIN_MILLI = 60000;
+export declare const ONE_HR_MILLI: number;
+export declare const ONE_DAY_MILLI: number;
+export declare const ONE_WEEK_MILLI: number;
+export declare const ONE_MONTH_MILLI: number;
+export declare const FIVE_MIN_MILLI: number;
+export declare const TEN_MIN_MILLI: number;

package/dist/src/constants/millisecond-time.js

@@ -0,0 +1,8 @@
+export const ONE_MIN_MILLI = 60_000;
+export const ONE_HR_MILLI = 60_000 * 60;
+export const ONE_DAY_MILLI = ONE_HR_MILLI * 24;
+export const ONE_WEEK_MILLI = ONE_DAY_MILLI * 7;
+export const ONE_MONTH_MILLI = ONE_WEEK_MILLI * 4.3;
+export const FIVE_MIN_MILLI = ONE_MIN_MILLI * 5;
+export const TEN_MIN_MILLI = ONE_MIN_MILLI * 10;
+//# sourceMappingURL=millisecond-time.js.map

package/dist/src/constants/millisecond-time.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"millisecond-time.js","sourceRoot":"","sources":["../../../src/constants/millisecond-time.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,aAAa,GAAG,MAAM,CAAA;AACnC,MAAM,CAAC,MAAM,YAAY,GAAG,MAAM,GAAG,EAAE,CAAA;AACvC,MAAM,CAAC,MAAM,aAAa,GAAG,YAAY,GAAG,EAAE,CAAA;AAC9C,MAAM,CAAC,MAAM,cAAc,GAAG,aAAa,GAAG,CAAC,CAAA;AAC/C,MAAM,CAAC,MAAM,eAAe,GAAG,cAAc,GAAG,GAAG,CAAA;AACnD,MAAM,CAAC,MAAM,cAAc,GAAG,aAAa,GAAG,CAAC,CAAA;AAC/C,MAAM,CAAC,MAAM,aAAa,GAAG,aAAa,GAAG,EAAE,CAAA"}

package/dist/src/constants/second-time.d.ts

@@ -0,0 +1,6 @@
+export declare const ONE_HR_SECONDS: number;
+export declare const ONE_DAY_SECONDS: number;
+export declare const ONE_WEEK_SECONDS: number;
+export declare const ONE_MONTH_SECONDS: number;
+export declare const FIVE_MIN_SECONDS: number;
+export declare const TEN_MIN_SECONDS: number;

package/dist/src/constants/second-time.js

@@ -0,0 +1,7 @@
+export const ONE_HR_SECONDS = 60 * 60;
+export const ONE_DAY_SECONDS = ONE_HR_SECONDS * 24;
+export const ONE_WEEK_SECONDS = ONE_DAY_SECONDS * 7;
+export const ONE_MONTH_SECONDS = ONE_WEEK_SECONDS * 4.3;
+export const FIVE_MIN_SECONDS = 60 * 5;
+export const TEN_MIN_SECONDS = 60 * 10;
+//# sourceMappingURL=second-time.js.map

package/dist/src/constants/second-time.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"second-time.js","sourceRoot":"","sources":["../../../src/constants/second-time.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,cAAc,GAAG,EAAE,GAAG,EAAE,CAAA;AACrC,MAAM,CAAC,MAAM,eAAe,GAAG,cAAc,GAAG,EAAE,CAAA;AAClD,MAAM,CAAC,MAAM,gBAAgB,GAAG,eAAe,GAAG,CAAC,CAAA;AACnD,MAAM,CAAC,MAAM,iBAAiB,GAAG,gBAAgB,GAAG,GAAG,CAAA;AACvD,MAAM,CAAC,MAAM,gBAAgB,GAAG,EAAE,GAAG,CAAC,CAAA;AACtC,MAAM,CAAC,MAAM,eAAe,GAAG,EAAE,GAAG,EAAE,CAAA"}

package/dist/src/datetime/iso-string.d.ts

@@ -0,0 +1,2 @@
+export type DateISOString = string;
+export declare function dateISOString(date: string | Date | number): DateISOString;

package/dist/src/datetime/iso-string.js

@@ -0,0 +1,10 @@
+export function dateISOString(date) {
+    if (typeof date === 'string') {
+        return new Date(date).toISOString();
+    }
+    if (typeof date === 'number') {
+        return new Date(date).toISOString();
+    }
+    return date.toISOString();
+}
+//# sourceMappingURL=iso-string.js.map

package/dist/src/datetime/iso-string.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"iso-string.js","sourceRoot":"","sources":["../../../src/datetime/iso-string.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,aAAa,CAAC,IAA4B;IACxD,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE,CAAC;QAC7B,OAAO,IAAI,IAAI,CAAC,IAAI,CAAC,CAAC,WAAW,EAAE,CAAA;IACrC,CAAC;IACD,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE,CAAC;QAC7B,OAAO,IAAI,IAAI,CAAC,IAAI,CAAC,CAAC,WAAW,EAAE,CAAA;IACrC,CAAC;IACD,OAAO,IAAI,CAAC,WAAW,EAAE,CAAA;AAC3B,CAAC"}

package/dist/src/deep-clone.d.ts

@@ -0,0 +1 @@
+export declare function deepClone<T>(o: T): T;

package/dist/src/deep-clone.js

@@ -0,0 +1,27 @@
+// courtesy of unknown author found online in a benchmark test
+export function deepClone(o) {
+    let newO;
+    let i;
+    if (typeof o !== 'object') {
+        return o;
+    }
+    if (!o) {
+        return o;
+    }
+    if (Array.isArray(o)) {
+        newO = [];
+        for (i = 0; i < o.length; i += 1) {
+            newO[i] = deepClone(o[i]);
+        }
+        return newO;
+    }
+    newO = {};
+    for (i in o) {
+        if (o.hasOwnProperty(i)) {
+            // @ts-ignore
+            newO[i] = deepClone(o[i]);
+        }
+    }
+    return newO;
+}
+//# sourceMappingURL=deep-clone.js.map

package/dist/src/deep-clone.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"deep-clone.js","sourceRoot":"","sources":["../../src/deep-clone.ts"],"names":[],"mappings":"AAAA,8DAA8D;AAC9D,MAAM,UAAU,SAAS,CAAI,CAAI;IAC/B,IAAI,IAAS,CAAA;IACb,IAAI,CAAM,CAAA;IAEV,IAAI,OAAO,CAAC,KAAK,QAAQ,EAAE,CAAC;QAC1B,OAAO,CAAC,CAAA;IACV,CAAC;IACD,IAAI,CAAC,CAAC,EAAE,CAAC;QACP,OAAO,CAAC,CAAA;IACV,CAAC;IAED,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC;QACrB,IAAI,GAAG,EAAE,CAAA;QAET,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC;YACjC,IAAI,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;QAC3B,CAAC;QAED,OAAO,IAAS,CAAA;IAClB,CAAC;IAED,IAAI,GAAG,EAAE,CAAA;IAET,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;QACZ,IAAI,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE,CAAC;YACxB,aAAa;YACb,IAAI,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;QAC3B,CAAC;IACH,CAAC;IAED,OAAO,IAAS,CAAA;AAClB,CAAC"}

package/dist/src/deep-equal.d.ts

@@ -0,0 +1,7 @@
+/**
+ * Check if all primitive values are equal.
+ *
+ * @param a
+ * @param b
+ */
+export declare function deepEqual(a: any, b: any): boolean;

package/dist/src/deep-equal.js

@@ -0,0 +1,52 @@
+/**
+ * Check if all primitive values are equal.
+ *
+ * @param a
+ * @param b
+ */
+export function deepEqual(a, b) {
+    if (a === b)
+        return true;
+    if (a && b && typeof a === 'object' && typeof b === 'object') {
+        if (Array.isArray(a)) {
+            if (a.length !== b.length)
+                return false;
+            for (const [i, item] of a.entries()) {
+                if (!deepEqual(item, b[i]))
+                    return false;
+            }
+            return true;
+        }
+        else if (a instanceof Map && b instanceof Map) {
+            if (a.size !== b.size)
+                return false;
+            for (const [key, value] of a.entries()) {
+                if (!b.has(key) || !deepEqual(value, b.get(key)))
+                    return false;
+            }
+            return true;
+        }
+        else if (a instanceof Set && b instanceof Set) {
+            if (a.size !== b.size)
+                return false;
+            for (const item of a) {
+                if (!b.has(item))
+                    return false;
+            }
+            return true;
+        }
+        const aKeys = Object.keys(a);
+        const bKeys = Object.keys(b);
+        if (aKeys.length !== bKeys.length)
+            return false;
+        for (const key of aKeys) {
+            if (!(key in b) ||
+                !deepEqual(a[key], b[key])) {
+                return false;
+            }
+        }
+        return true;
+    }
+    return Number.isNaN(a) && Number.isNaN(b);
+}
+//# sourceMappingURL=deep-equal.js.map

package/dist/src/deep-equal.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"deep-equal.js","sourceRoot":"","sources":["../../src/deep-equal.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,MAAM,UAAU,SAAS,CAAC,CAAM,EAAE,CAAM;IACtC,IAAI,CAAC,KAAK,CAAC;QAAE,OAAO,IAAI,CAAA;IAExB,IAAI,CAAC,IAAI,CAAC,IAAI,OAAO,CAAC,KAAK,QAAQ,IAAI,OAAO,CAAC,KAAK,QAAQ,EAAE,CAAC;QAC7D,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC;YACrB,IAAI,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC,MAAM;gBAAE,OAAO,KAAK,CAAA;YACvC,KAAK,MAAM,CAAC,CAAC,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC;gBACpC,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;oBAAE,OAAO,KAAK,CAAA;YAC1C,CAAC;YACD,OAAO,IAAI,CAAA;QACb,CAAC;aAAM,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,YAAY,GAAG,EAAE,CAAC;YAChD,IAAI,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,IAAI;gBAAE,OAAO,KAAK,CAAA;YACnC,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC;gBACvC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;oBAAE,OAAO,KAAK,CAAA;YAChE,CAAC;YACD,OAAO,IAAI,CAAA;QACb,CAAC;aAAM,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,YAAY,GAAG,EAAE,CAAC;YAChD,IAAI,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,IAAI;gBAAE,OAAO,KAAK,CAAA;YACnC,KAAK,MAAM,IAAI,IAAI,CAAC,EAAE,CAAC;gBACrB,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC;oBAAE,OAAO,KAAK,CAAA;YAChC,CAAC;YACD,OAAO,IAAI,CAAA;QACb,CAAC;QAED,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;QAC5B,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;QAE5B,IAAI,KAAK,CAAC,MAAM,KAAK,KAAK,CAAC,MAAM;YAAE,OAAO,KAAK,CAAA;QAE/C,KAAK,MAAM,GAAG,IAAI,KAAK,EAAE,CAAC;YACxB,IACE,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC;gBACX,CAAC,SAAS,CACP,CAA6B,CAAC,GAAG,CAAC,EAClC,CAA6B,CAAC,GAAG,CAAC,CACpC,EACD,CAAC;gBACD,OAAO,KAAK,CAAA;YACd,CAAC;QACH,CAAC;QAED,OAAO,IAAI,CAAA;IACb,CAAC;IAED,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;AAC3C,CAAC"}

package/dist/src/deep-equal.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/src/deep-equal.test.js

@@ -0,0 +1,97 @@
+import assert from 'assert';
+import { deepEqual } from './deep-equal.js';
+describe('deep equal', () => {
+    it('different types', () => {
+        const o1 = 1;
+        const o2 = true;
+        const diff = deepEqual(o1, o2);
+        assert.deepEqual(diff, false);
+    });
+    it('empty objects', () => {
+        const o1 = {};
+        const o2 = {};
+        const diff = deepEqual(o1, o2);
+        assert.deepEqual(diff, true);
+    });
+    it('a single object entry is different', () => {
+        const o1 = {
+            a: {
+                b: {
+                    c: { s: 't' },
+                },
+            },
+        };
+        const o2 = { ...o1, a: { ...o1.a, b: { ...o1.a.b, d: 'e' } } };
+        const diff = deepEqual(o1, o2);
+        assert.deepEqual(diff, false);
+    });
+    it('null vs undefined', () => {
+        const o1 = {
+            foo: null,
+        };
+        const o2 = {
+            foo: undefined,
+        };
+        const diff = deepEqual(o1, o2);
+        assert.deepEqual(diff, false);
+    });
+    it('entries are missing/different from each objects', () => {
+        const o1 = {
+            a: {
+                b: {
+                    fn: () => 4,
+                    arr: [1, 2, 3],
+                    c: {
+                        s: 't',
+                        y: 'g',
+                    },
+                },
+            },
+        };
+        const o2 = {
+            ...o1,
+            a: {
+                ...o1.a,
+                b: {
+                    ...o1.a.b,
+                    fn: () => 4,
+                    arr: [1, 2, 3, 4, 5],
+                    c: { s: 'e', t: 'e' },
+                },
+            },
+        };
+        const diff = deepEqual(o1, o2);
+        assert.deepEqual(diff, false);
+    });
+    it('nested arrays', () => {
+        const o1 = {
+            a: {
+                arr: [
+                    1,
+                    [{ one: 1, two: 1 }],
+                    {
+                        foo: 'bar',
+                    },
+                    4,
+                ],
+            },
+        };
+        const o2 = {
+            ...o1,
+            a: {
+                ...o1.a,
+                arr: [
+                    1,
+                    [{ one: 2, two: 2 }],
+                    {
+                        foo: 'bar',
+                    },
+                    4,
+                ],
+            },
+        };
+        const diff = deepEqual(o1, o2);
+        assert.deepEqual(diff, false);
+    });
+});
+//# sourceMappingURL=deep-equal.test.js.map

package/dist/src/deep-equal.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"deep-equal.test.js","sourceRoot":"","sources":["../../src/deep-equal.test.ts"],"names":[],"mappings":"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"}

package/dist/src/deep-freeze.d.ts

@@ -0,0 +1,7 @@
+/**
+ * Recursively freeze an object.
+ *
+ * @param object Target object to freeze
+ * @param clone When true, the object itself and all nested objects are cloned so that the original object is not frozen
+ */
+export declare function deepFreeze(object: any, clone?: boolean): any;

package/dist/src/deep-freeze.js

@@ -0,0 +1,20 @@
+/**
+ * Recursively freeze an object.
+ *
+ * @param object Target object to freeze
+ * @param clone When true, the object itself and all nested objects are cloned so that the original object is not frozen
+ */
+export function deepFreeze(object, clone = true) {
+    // Retrieve the property names defined on object
+    const propNames = Object.getOwnPropertyNames(object);
+    // Freeze properties before freezing self
+    for (const name of propNames) {
+        const value = object[name];
+        // 'null' will equal 'object' bitches.
+        if (value && typeof value === 'object') {
+            deepFreeze(value, clone);
+        }
+    }
+    return Object.freeze(clone ? { ...object } : object);
+}
+//# sourceMappingURL=deep-freeze.js.map

package/dist/src/deep-freeze.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"deep-freeze.js","sourceRoot":"","sources":["../../src/deep-freeze.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,MAAM,UAAU,UAAU,CAAC,MAAW,EAAE,KAAK,GAAG,IAAI;IAClD,gDAAgD;IAChD,MAAM,SAAS,GAAG,MAAM,CAAC,mBAAmB,CAAC,MAAM,CAAC,CAAA;IAEpD,yCAAyC;IAEzC,KAAK,MAAM,IAAI,IAAI,SAAS,EAAE,CAAC;QAC7B,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,CAAA;QAE1B,sCAAsC;QACtC,IAAI,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;YACvC,UAAU,CAAC,KAAK,EAAE,KAAK,CAAC,CAAA;QAC1B,CAAC;IACH,CAAC;IAED,OAAO,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,GAAG,MAAM,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAA;AACtD,CAAC"}

package/dist/src/deep-merge.d.ts

@@ -0,0 +1 @@
+export declare function deepMerge<T extends Record<any, any>>(target: T, ...sources: Record<any, any>[]): T;

package/dist/src/deep-merge.js

@@ -0,0 +1,27 @@
+function isObject(item) {
+    return item && typeof item === 'object' && !Array.isArray(item);
+}
+export function deepMerge(target, ...sources) {
+    if (!sources.length)
+        return target;
+    const source = sources.shift();
+    if (isObject(target) && isObject(source)) {
+        for (const key in source) {
+            if (isObject(source[key])) {
+                // @ts-ignore
+                if (!target[key]) {
+                    // @ts-ignore
+                    Object.assign(target, { [key]: {} });
+                }
+                // @ts-ignore
+                deepMerge(target[key], source[key]);
+            }
+            else {
+                // @ts-ignore
+                Object.assign(target, { [key]: source[key] });
+            }
+        }
+    }
+    return deepMerge(target, ...sources);
+}
+//# sourceMappingURL=deep-merge.js.map

package/dist/src/deep-merge.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"deep-merge.js","sourceRoot":"","sources":["../../src/deep-merge.ts"],"names":[],"mappings":"AAAA,SAAS,QAAQ,CAAC,IAAS;IACzB,OAAO,IAAI,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;AACjE,CAAC;AAED,MAAM,UAAU,SAAS,CACvB,MAAS,EACT,GAAG,OAA2B;IAE9B,IAAI,CAAC,OAAO,CAAC,MAAM;QAAE,OAAO,MAAM,CAAA;IAElC,MAAM,MAAM,GAAQ,OAAO,CAAC,KAAK,EAAE,CAAA;IAEnC,IAAI,QAAQ,CAAC,MAAM,CAAC,IAAI,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;QACzC,KAAK,MAAM,GAAG,IAAI,MAAM,EAAE,CAAC;YACzB,IAAI,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC;gBAC1B,aAAa;gBACb,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC;oBACjB,aAAa;oBACb,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,EAAE,CAAC,GAAG,CAAC,EAAE,EAAE,EAAE,CAAC,CAAA;gBACtC,CAAC;gBAED,aAAa;gBACb,SAAS,CAAI,MAAM,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC,CAAA;YACxC,CAAC;iBAAM,CAAC;gBACN,aAAa;gBACb,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,EAAE,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;YAC/C,CAAC;QACH,CAAC;IACH,CAAC;IAED,OAAO,SAAS,CAAI,MAAM,EAAE,GAAG,OAAO,CAAC,CAAA;AACzC,CAAC"}

package/dist/src/ensure-array.d.ts

@@ -0,0 +1,16 @@
+/**
+ * Ensures that the given array contains unique truthy values.
+ *
+ * @param {T[]} arr - The array to ensure uniqueness and truthiness.
+ * @return {T[]} - The resulting array with unique truthy values.
+ */
+export declare function ensureUniqArrayWithTruthyValues<T>(arr?: T[]): T[];
+/**
+ * Ensures that the input is an array or undefined. If the input is already an array with values,
+ * it will return the input array as is. If the input is a value other than undefined, it will wrap
+ * the value in an array and return it. If the input is undefined, it will return undefined.
+ *
+ * @param {T[] | T} arr - The input value that needs to be checked.
+ * @returns {T[] | undefined} - An array or undefined based on the input value.
+ */
+export declare function ensureArrayValuesOrUndefined<T>(arr?: T[] | T): T[] | undefined;

package/dist/src/ensure-array.js

@@ -0,0 +1,26 @@
+import { uniq } from 'lodash-es';
+/**
+ * Ensures that the given array contains unique truthy values.
+ *
+ * @param {T[]} arr - The array to ensure uniqueness and truthiness.
+ * @return {T[]} - The resulting array with unique truthy values.
+ */
+export function ensureUniqArrayWithTruthyValues(arr) {
+    return (Array.isArray(arr) ? uniq(arr) : []).filter((x) => !!x);
+}
+/**
+ * Ensures that the input is an array or undefined. If the input is already an array with values,
+ * it will return the input array as is. If the input is a value other than undefined, it will wrap
+ * the value in an array and return it. If the input is undefined, it will return undefined.
+ *
+ * @param {T[] | T} arr - The input value that needs to be checked.
+ * @returns {T[] | undefined} - An array or undefined based on the input value.
+ */
+export function ensureArrayValuesOrUndefined(arr) {
+    if (Array.isArray(arr) && arr.length)
+        return arr;
+    if (typeof arr !== 'undefined')
+        return [arr];
+    return undefined;
+}
+//# sourceMappingURL=ensure-array.js.map

package/dist/src/ensure-array.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ensure-array.js","sourceRoot":"","sources":["../../src/ensure-array.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAA;AAEhC;;;;;GAKG;AACH,MAAM,UAAU,+BAA+B,CAAI,GAAS;IAC1D,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;AACjE,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,4BAA4B,CAC1C,GAAa;IAEb,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,GAAG,CAAC,MAAM;QAAE,OAAO,GAAG,CAAA;IAChD,IAAI,OAAO,GAAG,KAAK,WAAW;QAAE,OAAO,CAAC,GAAG,CAAQ,CAAA;IAEnD,OAAO,SAAS,CAAA;AAClB,CAAC"}

package/dist/src/format-decimal.d.ts

@@ -0,0 +1 @@
+export declare function formatDecimal(value: number, maxDecimals?: number): number;

package/dist/src/format-decimal.js

@@ -0,0 +1,9 @@
+export function formatDecimal(value, maxDecimals = 2) {
+    if (typeof value === 'number' && value % 1 !== 0) {
+        // The number is a decimal, round it to 2 decimal places
+        return +value.toFixed(maxDecimals);
+    }
+    // The value is not a decimal number, return it as is
+    return value;
+}
+//# sourceMappingURL=format-decimal.js.map

package/dist/src/format-decimal.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"format-decimal.js","sourceRoot":"","sources":["../../src/format-decimal.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,aAAa,CAAC,KAAa,EAAE,WAAW,GAAG,CAAC;IAC1D,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC;QACjD,wDAAwD;QACxD,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,CAAA;IACpC,CAAC;IAED,qDAAqD;IACrD,OAAO,KAAK,CAAA;AACd,CAAC"}

package/dist/src/is-hex-color.d.ts

@@ -0,0 +1 @@
+export declare function isHexColor(str: string): boolean;

package/dist/src/is-hex-color.js

@@ -0,0 +1,4 @@
+export function isHexColor(str) {
+    return /^#([0-9A-F]{3}){1,2}$/i.test(str);
+}
+//# sourceMappingURL=is-hex-color.js.map

package/dist/src/is-hex-color.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"is-hex-color.js","sourceRoot":"","sources":["../../src/is-hex-color.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,UAAU,CAAC,GAAW;IACpC,OAAO,wBAAwB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;AAC3C,CAAC"}

package/dist/src/is-prod.d.ts

@@ -0,0 +1 @@
+export declare const isProd: () => boolean;

package/dist/src/is-prod.js

@@ -0,0 +1,2 @@
+export const isProd = () => process.env.NODE_ENV === 'production';
+//# sourceMappingURL=is-prod.js.map

package/dist/src/is-prod.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"is-prod.js","sourceRoot":"","sources":["../../src/is-prod.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,MAAM,GAAG,GAAG,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,YAAY,CAAA"}

package/dist/src/make-uuid.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/src/make-uuid.test.js

@@ -0,0 +1,23 @@
+import { describe, test, expect } from 'vitest';
+import { makeUuid } from './strings/make-uuid.js';
+describe('makeUuid()', () => {
+    test('it works', () => {
+        const uuid = makeUuid();
+        expect(typeof uuid).toBe('string');
+        expect(uuid.length).toBeGreaterThan(10);
+    });
+    test('it accepts a prefix', () => {
+        const uuid = makeUuid('pRfiX');
+        const uuid2 = makeUuid('-0.*--');
+        const uuid3 = makeUuid(' - nospacesallowed - ');
+        expect(uuid).toContain('pRfiX');
+        expect(uuid2).toContain('-0--');
+        expect(uuid3).toContain('-nospacesallowed-');
+        expect(uuid.length).toBeGreaterThan(16);
+    });
+    test('it accepts an organizationId and is always appended to the uuid', () => {
+        const uuid = makeUuid('prefix', { postfix: 'abc123' });
+        expect(uuid.substr(uuid.length - 6)).toBe('abc123');
+    });
+});
+//# sourceMappingURL=make-uuid.test.js.map

package/dist/src/make-uuid.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"make-uuid.test.js","sourceRoot":"","sources":["../../src/make-uuid.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAC,IAAI,EAAC,MAAM,EAAE,MAAM,QAAQ,CAAA;AAC7C,OAAO,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAA;AAEjD,QAAQ,CAAC,YAAY,EAAE,GAAG,EAAE;IAC1B,IAAI,CAAC,UAAU,EAAE,GAAG,EAAE;QACpB,MAAM,IAAI,GAAG,QAAQ,EAAE,CAAA;QAEvB,MAAM,CAAC,OAAO,IAAI,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;QAClC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,eAAe,CAAC,EAAE,CAAC,CAAA;IACzC,CAAC,CAAC,CAAA;IAEF,IAAI,CAAC,qBAAqB,EAAE,GAAG,EAAE;QAC/B,MAAM,IAAI,GAAG,QAAQ,CAAC,OAAO,CAAC,CAAA;QAC9B,MAAM,KAAK,GAAG,QAAQ,CAAC,QAAQ,CAAC,CAAA;QAChC,MAAM,KAAK,GAAG,QAAQ,CAAC,uBAAuB,CAAC,CAAA;QAE/C,MAAM,CAAC,IAAI,CAAC,CAAC,SAAS,CAAC,OAAO,CAAC,CAAA;QAC/B,MAAM,CAAC,KAAK,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,CAAA;QAC/B,MAAM,CAAC,KAAK,CAAC,CAAC,SAAS,CAAC,mBAAmB,CAAC,CAAA;QAC5C,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,eAAe,CAAC,EAAE,CAAC,CAAA;IACzC,CAAC,CAAC,CAAA;IAEF,IAAI,CAAC,iEAAiE,EAAE,GAAG,EAAE;QAC3E,MAAM,IAAI,GAAG,QAAQ,CAAC,QAAQ,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC,CAAA;QAEtD,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;IACrD,CAAC,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA"}