Refine assignHidden

MatAtBread · Jun 26, 2024 · 07b7294 · 07b7294
1 parent 08c2220
commit 07b7294
Show file tree

Hide file tree

Showing 8 changed files with 49 additions and 54 deletions.
diff --git a/module/dist/ai-ui.cjs b/module/dist/ai-ui.cjs
diff --git a/module/dist/ai-ui.js b/module/dist/ai-ui.js
diff --git a/module/dist/ai-ui.min.cjs b/module/dist/ai-ui.min.cjs
diff --git a/module/dist/ai-ui.min.js b/module/dist/ai-ui.min.js
diff --git a/module/dist/ai-ui.min.mjs b/module/dist/ai-ui.min.mjs
diff --git a/module/dist/ai-ui.mjs b/module/dist/ai-ui.mjs
diff --git a/module/esm/iterators.js b/module/esm/iterators.js
@@ -38,11 +38,10 @@ const asyncExtras = {
 };
 const extraKeys = [...Object.getOwnPropertySymbols(asyncExtras), ...Object.keys(asyncExtras)];
 // Like Object.assign, but the assigned properties are not enumerable
-function assignHidden(d, ...srcs) {
-    for (const s of srcs) {
-        for (const [k, pd] of Object.entries(Object.getOwnPropertyDescriptors(s))) {
-            Object.defineProperty(d, k, { ...pd, enumerable: false });
-        }
+function assignHidden(d, s) {
+    const keys = [...Object.getOwnPropertyNames(s), ...Object.getOwnPropertySymbols(s)];
+    for (const k of keys) {
+        Object.defineProperty(d, k, { ...Object.getOwnPropertyDescriptor(s, k), enumerable: false });
     }
     return d;
 }

diff --git a/module/src/iterators.ts b/module/src/iterators.ts
@@ -95,13 +95,12 @@ const asyncExtras = {
 const extraKeys = [...Object.getOwnPropertySymbols(asyncExtras), ...Object.keys(asyncExtras)] as (keyof typeof asyncExtras)[];
 
 // Like Object.assign, but the assigned properties are not enumerable
-function assignHidden<D extends {}, S extends {}>(d: D, ...srcs: S[]) {
-  for (const s of srcs) {
-    for (const [k,pd] of Object.entries(Object.getOwnPropertyDescriptors(s))) {
-      Object.defineProperty(d, k, {...pd, enumerable: false});
-    }
+function assignHidden<D extends {}, S extends {}>(d: D, s: S) {
+  const keys = [...Object.getOwnPropertyNames(s), ...Object.getOwnPropertySymbols(s)];
+  for (const k of keys) {
+    Object.defineProperty(d, k, { ...Object.getOwnPropertyDescriptor(s, k), enumerable: false});
   }
-  return d as D & S; 
+  return d as D & S;
 }
 
 const queue_pending = Symbol('pending');