bunshin-clone 2.0.3 → 2.0.5

package/dist/index.bundle.cjs

@@ -147,11 +147,8 @@ function cloneMap(map, settings, refs) {
   return result;
 }
 var OWN_DESCS = Object.getOwnPropertyDescriptors;
-function OWN_ENUM_KEYS(object, symbol) {
-  return typeof symbol !== "boolean" || !symbol ? OWN_ENUM_STRING_KEYS(object) : [
-    ...OWN_ENUM_STRING_KEYS(object),
-    ...OWN_ENUM_SYMBOL_KEYS(object)
-  ];
+function OWN_ENUM_KEYS(object) {
+  return [...OWN_ENUM_STRING_KEYS(object), ...OWN_ENUM_SYMBOL_KEYS(object)];
 }
 function OWN_ENUM_STRING_KEYS(object) {
   const keys = Object.keys(object);
@@ -171,11 +168,8 @@ function OWN_ENUM_SYMBOL_KEYS(object) {
   }
   return keys;
 }
-function OWN_KEYS(object, symbol) {
-  return typeof symbol !== "boolean" || !symbol ? OWN_STRING_KEYS(object) : [
-    ...OWN_STRING_KEYS(object),
-    ...OWN_SYMBOL_KEYS(object)
-  ];
+function OWN_KEYS(object) {
+  return [...OWN_STRING_KEYS(object), ...OWN_SYMBOL_KEYS(object)];
 }
 function OWN_STRING_KEYS(object) {
   const keys = Object.getOwnPropertyNames(object);
@@ -195,8 +189,22 @@ function isUnsafeKey(key) {
 function clonePlainObject(object, settings, refs) {
   const result = Object.create(Object.getPrototypeOf(object));
   refs.set(object, result);
-  for (const key of OWN_ENUM_KEYS(object, settings.preserveSymbolKeys)) {
-    result[key] = clone(object[key], settings, refs);
+  const { preserveDescriptors, preserveSymbolKeys } = settings;
+  if (!preserveDescriptors) {
+    for (const key of (!preserveSymbolKeys ? OWN_ENUM_STRING_KEYS : OWN_ENUM_KEYS)(object)) {
+      result[key] = clone(object[key], settings, refs);
+    }
+    return result;
+  }
+  const descs = OWN_DESCS(object);
+  for (const key of (!preserveSymbolKeys ? OWN_STRING_KEYS : OWN_KEYS)(
+    object
+  )) {
+    const desc = { ...descs[key] };
+    if ("value" in desc) {
+      desc.value = clone(desc.value, settings, refs);
+    }
+    Object.defineProperty(result, key, desc);
   }
   return result;
 }
@@ -247,21 +255,6 @@ function cloneURLSearchParams(params, refs) {
   return result;
 }
 
-// src/clone/with-descriptors.ts
-function cloneWithDescriptors(object, settings, refs) {
-  const result = Object.create(Object.getPrototypeOf(object));
-  refs.set(object, result);
-  const descs = OWN_DESCS(object);
-  for (const key of OWN_KEYS(object, settings.preserveSymbolKeys)) {
-    const desc = { ...descs[key] };
-    if ("value" in desc) {
-      desc.value = clone(desc.value, settings, refs);
-    }
-    Object.defineProperty(result, key, desc);
-  }
-  return result;
-}
-
 // src/index.ts
 function bunshinClone(value, options = {}) {
   return clone(value, resolveOptions(options), /* @__PURE__ */ new WeakMap());
@@ -273,14 +266,10 @@ function clone(value, settings, refs) {
   if (refs.has(value)) {
     return refs.get(value);
   }
-  const isClonePlainObject = isPlainObject(value);
-  if (settings.preserveDescriptors && isClonePlainObject) {
-    return cloneWithDescriptors(value, settings, refs);
-  }
   if (Array.isArray(value)) {
     return cloneArray(value, settings, refs);
   }
-  if (isClonePlainObject) {
+  if (isPlainObject(value)) {
     return clonePlainObject(value, settings, refs);
   }
   if (value instanceof Map) {

package/dist/index.bundle.js

@@ -145,11 +145,8 @@ function cloneMap(map, settings, refs) {
   return result;
 }
 var OWN_DESCS = Object.getOwnPropertyDescriptors;
-function OWN_ENUM_KEYS(object, symbol) {
-  return typeof symbol !== "boolean" || !symbol ? OWN_ENUM_STRING_KEYS(object) : [
-    ...OWN_ENUM_STRING_KEYS(object),
-    ...OWN_ENUM_SYMBOL_KEYS(object)
-  ];
+function OWN_ENUM_KEYS(object) {
+  return [...OWN_ENUM_STRING_KEYS(object), ...OWN_ENUM_SYMBOL_KEYS(object)];
 }
 function OWN_ENUM_STRING_KEYS(object) {
   const keys = Object.keys(object);
@@ -169,11 +166,8 @@ function OWN_ENUM_SYMBOL_KEYS(object) {
   }
   return keys;
 }
-function OWN_KEYS(object, symbol) {
-  return typeof symbol !== "boolean" || !symbol ? OWN_STRING_KEYS(object) : [
-    ...OWN_STRING_KEYS(object),
-    ...OWN_SYMBOL_KEYS(object)
-  ];
+function OWN_KEYS(object) {
+  return [...OWN_STRING_KEYS(object), ...OWN_SYMBOL_KEYS(object)];
 }
 function OWN_STRING_KEYS(object) {
   const keys = Object.getOwnPropertyNames(object);
@@ -193,8 +187,22 @@ function isUnsafeKey(key) {
 function clonePlainObject(object, settings, refs) {
   const result = Object.create(Object.getPrototypeOf(object));
   refs.set(object, result);
-  for (const key of OWN_ENUM_KEYS(object, settings.preserveSymbolKeys)) {
-    result[key] = clone(object[key], settings, refs);
+  const { preserveDescriptors, preserveSymbolKeys } = settings;
+  if (!preserveDescriptors) {
+    for (const key of (!preserveSymbolKeys ? OWN_ENUM_STRING_KEYS : OWN_ENUM_KEYS)(object)) {
+      result[key] = clone(object[key], settings, refs);
+    }
+    return result;
+  }
+  const descs = OWN_DESCS(object);
+  for (const key of (!preserveSymbolKeys ? OWN_STRING_KEYS : OWN_KEYS)(
+    object
+  )) {
+    const desc = { ...descs[key] };
+    if ("value" in desc) {
+      desc.value = clone(desc.value, settings, refs);
+    }
+    Object.defineProperty(result, key, desc);
   }
   return result;
 }
@@ -245,21 +253,6 @@ function cloneURLSearchParams(params, refs) {
   return result;
 }
 
-// src/clone/with-descriptors.ts
-function cloneWithDescriptors(object, settings, refs) {
-  const result = Object.create(Object.getPrototypeOf(object));
-  refs.set(object, result);
-  const descs = OWN_DESCS(object);
-  for (const key of OWN_KEYS(object, settings.preserveSymbolKeys)) {
-    const desc = { ...descs[key] };
-    if ("value" in desc) {
-      desc.value = clone(desc.value, settings, refs);
-    }
-    Object.defineProperty(result, key, desc);
-  }
-  return result;
-}
-
 // src/index.ts
 function bunshinClone(value, options = {}) {
   return clone(value, resolveOptions(options), /* @__PURE__ */ new WeakMap());
@@ -271,14 +264,10 @@ function clone(value, settings, refs) {
   if (refs.has(value)) {
     return refs.get(value);
   }
-  const isClonePlainObject = isPlainObject(value);
-  if (settings.preserveDescriptors && isClonePlainObject) {
-    return cloneWithDescriptors(value, settings, refs);
-  }
   if (Array.isArray(value)) {
     return cloneArray(value, settings, refs);
   }
-  if (isClonePlainObject) {
+  if (isPlainObject(value)) {
     return clonePlainObject(value, settings, refs);
   }
   if (value instanceof Map) {

package/dist/index.cjs

@@ -151,8 +151,22 @@ function cloneMap(map, settings, refs) {
 function clonePlainObject(object, settings, refs) {
   const result = Object.create(Object.getPrototypeOf(object));
   refs.set(object, result);
-  for (const key of own.OWN_ENUM_KEYS(object, settings.preserveSymbolKeys)) {
-    result[key] = clone(object[key], settings, refs);
+  const { preserveDescriptors, preserveSymbolKeys } = settings;
+  if (!preserveDescriptors) {
+    for (const key of (!preserveSymbolKeys ? own.OWN_ENUM_STRING_KEYS : own.OWN_ENUM_KEYS)(object)) {
+      result[key] = clone(object[key], settings, refs);
+    }
+    return result;
+  }
+  const descs = own.OWN_DESCS(object);
+  for (const key of (!preserveSymbolKeys ? own.OWN_STRING_KEYS : own.OWN_KEYS)(
+    object
+  )) {
+    const desc = { ...descs[key] };
+    if ("value" in desc) {
+      desc.value = clone(desc.value, settings, refs);
+    }
+    Object.defineProperty(result, key, desc);
   }
   return result;
 }
@@ -202,19 +216,6 @@ function cloneURLSearchParams(params, refs) {
   refs.set(params, result);
   return result;
 }
-function cloneWithDescriptors(object, settings, refs) {
-  const result = Object.create(Object.getPrototypeOf(object));
-  refs.set(object, result);
-  const descs = own.OWN_DESCS(object);
-  for (const key of own.OWN_KEYS(object, settings.preserveSymbolKeys)) {
-    const desc = { ...descs[key] };
-    if ("value" in desc) {
-      desc.value = clone(desc.value, settings, refs);
-    }
-    Object.defineProperty(result, key, desc);
-  }
-  return result;
-}
 
 // src/index.ts
 function bunshinClone(value, options = {}) {
@@ -227,14 +228,10 @@ function clone(value, settings, refs) {
   if (refs.has(value)) {
     return refs.get(value);
   }
-  const isClonePlainObject = isPlainObject(value);
-  if (settings.preserveDescriptors && isClonePlainObject) {
-    return cloneWithDescriptors(value, settings, refs);
-  }
   if (Array.isArray(value)) {
     return cloneArray(value, settings, refs);
   }
-  if (isClonePlainObject) {
+  if (isPlainObject(value)) {
     return clonePlainObject(value, settings, refs);
   }
   if (value instanceof Map) {

package/dist/index.js

@@ -1,4 +1,4 @@
-import { OWN_DESCS, OWN_KEYS, OWN_ENUM_KEYS } from '@y14e/own';
+import { OWN_ENUM_STRING_KEYS, OWN_ENUM_KEYS, OWN_DESCS, OWN_STRING_KEYS, OWN_KEYS } from '@y14e/own';
 
 // src/utils.ts
 function isObject(value) {
@@ -149,8 +149,22 @@ function cloneMap(map, settings, refs) {
 function clonePlainObject(object, settings, refs) {
   const result = Object.create(Object.getPrototypeOf(object));
   refs.set(object, result);
-  for (const key of OWN_ENUM_KEYS(object, settings.preserveSymbolKeys)) {
-    result[key] = clone(object[key], settings, refs);
+  const { preserveDescriptors, preserveSymbolKeys } = settings;
+  if (!preserveDescriptors) {
+    for (const key of (!preserveSymbolKeys ? OWN_ENUM_STRING_KEYS : OWN_ENUM_KEYS)(object)) {
+      result[key] = clone(object[key], settings, refs);
+    }
+    return result;
+  }
+  const descs = OWN_DESCS(object);
+  for (const key of (!preserveSymbolKeys ? OWN_STRING_KEYS : OWN_KEYS)(
+    object
+  )) {
+    const desc = { ...descs[key] };
+    if ("value" in desc) {
+      desc.value = clone(desc.value, settings, refs);
+    }
+    Object.defineProperty(result, key, desc);
   }
   return result;
 }
@@ -200,19 +214,6 @@ function cloneURLSearchParams(params, refs) {
   refs.set(params, result);
   return result;
 }
-function cloneWithDescriptors(object, settings, refs) {
-  const result = Object.create(Object.getPrototypeOf(object));
-  refs.set(object, result);
-  const descs = OWN_DESCS(object);
-  for (const key of OWN_KEYS(object, settings.preserveSymbolKeys)) {
-    const desc = { ...descs[key] };
-    if ("value" in desc) {
-      desc.value = clone(desc.value, settings, refs);
-    }
-    Object.defineProperty(result, key, desc);
-  }
-  return result;
-}
 
 // src/index.ts
 function bunshinClone(value, options = {}) {
@@ -225,14 +226,10 @@ function clone(value, settings, refs) {
   if (refs.has(value)) {
     return refs.get(value);
   }
-  const isClonePlainObject = isPlainObject(value);
-  if (settings.preserveDescriptors && isClonePlainObject) {
-    return cloneWithDescriptors(value, settings, refs);
-  }
   if (Array.isArray(value)) {
     return cloneArray(value, settings, refs);
   }
-  if (isClonePlainObject) {
+  if (isPlainObject(value)) {
     return clonePlainObject(value, settings, refs);
   }
   if (value instanceof Map) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bunshin-clone",
-  "version": "2.0.3",
+  "version": "2.0.5",
   "description": "High-performance deep clone utility with descriptor support",
   "keywords": [
     "array",
@@ -81,6 +81,6 @@
     "esbuild": true
   },
   "dependencies": {
-    "@y14e/own": "^1.0.2"
+    "@y14e/own": "^1.0.3"
   }
 }