@e-mc/types 0.13.3 → 0.13.4

package/README.md

@@ -9,7 +9,7 @@
 
 ## Interface
 
-* [View Source](https://www.unpkg.com/@e-mc/types@0.13.3/index.d.ts)
+* [View Source](https://www.unpkg.com/@e-mc/types@0.13.4/index.d.ts)
 
 ```typescript
 import type { LogArguments } from "./lib/logger";
@@ -60,7 +60,8 @@ function formatSize(value: number, options?: BytesOptions): string;
 function alignSize(value: unknown, kb?: number, factor?: number): number;
 function cascadeObject(data: object, query: string, fallback?: unknown): unknown;
 function cloneObject(data: unknown, deep: boolean): unknown;
-function cloneObject(data: unknown, deepIgnore: WeakSet<object>): unknown;
+/** @deprecated WeakMap<object> */
+function cloneObject<T>(data: T, deepIgnore: WeakSet<object> | WeakMap<object, object>): T;
 function cloneObject(data: unknown, options?: CloneObjectOptions<unknown>): unknown;
 function coerceObject(data: unknown, cache: boolean): unknown;
 function coerceObject(data: unknown, parseString?: (...args: [string]) => unknown, cache?: boolean): unknown;
@@ -207,10 +208,10 @@ const IMPORT_MAP: Record<string, string | undefined>;
 
 ## References
 
-- https://www.unpkg.com/@e-mc/types@0.13.3/index.d.ts
-- https://www.unpkg.com/@e-mc/types@0.13.3/lib/logger.d.ts
-- https://www.unpkg.com/@e-mc/types@0.13.3/lib/module.d.ts
-- https://www.unpkg.com/@e-mc/types@0.13.3/lib/node.d.ts
+- https://www.unpkg.com/@e-mc/types@0.13.4/index.d.ts
+- https://www.unpkg.com/@e-mc/types@0.13.4/lib/logger.d.ts
+- https://www.unpkg.com/@e-mc/types@0.13.4/lib/module.d.ts
+- https://www.unpkg.com/@e-mc/types@0.13.4/lib/node.d.ts
 
 * https://developer.mozilla.org/en-US/docs/Web/API/DOMException
 * https://www.npmjs.com/package/@types/bytes

package/constant.d.ts

@@ -1,5 +1,5 @@
 export const enum INTERNAL {
-    VERSION = '0.13.3',
+    VERSION = '0.13.4',
     TEMP_DIR = 'tmp',
     CJS = '__cjs__'
 }

package/index.d.ts

@@ -269,7 +269,8 @@ declare namespace types {
     interface CloneObjectOptions<T = unknown> {
         target?: T;
         deep?: boolean;
-        deepIgnore?: WeakSet<object>;
+        /** @deprecated WeakSet<object> */
+        deepIgnore?: WeakSet<object> | WeakMap<object, object>;
         freezeDepth?: number | boolean;
         mergeArray?: MergeArrayMethod;
         mergeDepth?: number;
@@ -328,7 +329,8 @@ declare namespace types {
     function alignSize(value: unknown, kb?: number, factor?: number): number;
     function cascadeObject<T = unknown>(data: object, query: string, fallback?: unknown): T;
     function cloneObject<T>(data: T, deep: boolean): T;
-    function cloneObject<T>(data: T, deepIgnore: WeakSet<object>): T;
+    /** @deprecated WeakMap<object> */
+    function cloneObject<T>(data: T, deepIgnore: WeakSet<object> | WeakMap<object, object>): T;
     function cloneObject<T, U>(data: T, options?: CloneObjectOptions<U>): T;
     function coerceObject<T = unknown>(data: T, cache: boolean): T;
     function coerceObject<T = unknown>(data: T, parseString?: FunctionArgs<[string]>, cache?: boolean): T;

package/index.js

@@ -888,7 +888,7 @@ function cloneObject(data, options) {
     if (options === true) {
         deep = true;
     }
-    else if (options instanceof WeakSet) {
+    else if (options instanceof WeakSet || options instanceof WeakMap) {
         deep = true;
         structured = true;
         deepIgnore = options;
@@ -907,11 +907,13 @@ function cloneObject(data, options) {
     }
     let nested;
     if (deep || freezeDepth > 0) {
-        deepIgnore ||= new WeakSet();
+        deepIgnore ||= new WeakMap();
         nested = { deep, deepIgnore, freezeDepth, mergeArray, mergeDepth, typedArray, structured, preserve };
     }
     if (Array.isArray(data)) {
-        deepIgnore?.add(data);
+        if (deepIgnore instanceof WeakSet) {
+            deepIgnore.add(data);
+        }
         const length = data.length;
         if (Array.isArray(target)) {
             if (mergeArray && mergeDepth >= 0 && !(mergeArray === 'join' || Array.isArray(mergeArray) && mergeArray[0] === 'join')) {
@@ -925,18 +927,33 @@ function cloneObject(data, options) {
         else {
             target = new Array(length);
         }
-        for (let i = 0; i < length; ++i) {
+        for (let i = 0, merge; i < length; ++i) {
             const value = data[i];
             if (deepIgnore) {
-                target[i] = (Array.isArray(value) || isPlainObject(value)) && !deepIgnore.has(value) ? cloneObject(value, nested) : fromObject(value, typedArray, structured, shared);
+                const found = deepIgnore.has(value);
+                if (found && deepIgnore instanceof WeakMap) {
+                    merge = deepIgnore.get(value);
+                }
+                else if (!found && (Array.isArray(value) || isPlainObject(value))) {
+                    merge = cloneObject(value, nested);
+                    if (deepIgnore instanceof WeakMap) {
+                        deepIgnore.set(value, merge);
+                    }
+                }
+                else {
+                    merge = fromObject(value, typedArray, structured, shared);
+                }
             }
             else {
-                target[i] = Array.isArray(value) ? value.slice(0) : value;
+                merge = Array.isArray(value) ? value.slice(0) : value;
             }
+            target[i] = merge;
         }
     }
     else if (isObject(data)) {
-        deepIgnore?.add(data);
+        if (deepIgnore instanceof WeakSet) {
+            deepIgnore.add(data);
+        }
         if (!isObject(target)) {
             target = {};
         }
@@ -944,7 +961,19 @@ function cloneObject(data, options) {
             const value = data[attr];
             let merge;
             if (deepIgnore) {
-                merge = (Array.isArray(value) || isPlainObject(value)) && !deepIgnore.has(value) ? cloneObject(value, nested) : fromObject(value, typedArray, structured, shared);
+                const found = deepIgnore.has(value);
+                if (found && deepIgnore instanceof WeakMap) {
+                    merge = deepIgnore.get(value);
+                }
+                else if (!found && (Array.isArray(value) || isPlainObject(value))) {
+                    merge = cloneObject(value, nested);
+                    if (deepIgnore instanceof WeakMap) {
+                        deepIgnore.set(value, merge);
+                    }
+                }
+                else {
+                    merge = fromObject(value, typedArray, structured, shared);
+                }
             }
             else {
                 merge = Array.isArray(value) ? value.slice(0) : value;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@e-mc/types",
-  "version": "0.13.3",
+  "version": "0.13.4",
   "description": "Type definitions for E-mc.",
   "main": "index.js",
   "types": "index.d.ts",