pacc 9.2.10 → 9.2.12

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "pacc",
-  "version": "9.2.10",
+  "version": "9.2.12",
   "publishConfig": {
     "access": "public",
     "provenance": true
   },
-  "packageManager": "npm@11.13.0",
+  "packageManager": "npm@11.16.0",
   "types": "./types/module.d.mts",
   "exports": {
     ".": {
@@ -43,6 +43,7 @@
   },
   "devDependencies": {
     "@mitata/counters": "^0.0.8",
+    "aggregated-map": "^1.0.3",
     "ava": "^8.0.1",
     "browser-ava": "^2.3.61",
     "c8": "^11.0.0",

package/src/expand.mjs

@@ -103,63 +103,66 @@ export function expand(object, context) {
         return object;
     }
 
-    if (object === null || object instanceof Number || object instanceof Date) {
-      // TODO: find a better way to identify special cases
+    if (object === null) {
       return object;
     }
 
-    if (object instanceof Map) {
-      const r = new object.constructor();
-      for (const [key, value] of object.entries()) {
-        const path2 = [
+    if (Array.isArray(object)) {
+      const copy = new object.constructor[Symbol.species](object.length);
+
+      for (let index = 0; index < object.length; index++) {
+        const o = object[index];
+        const r = _expand(o, [
           ...path,
           {
-            key,
-            value
+            key: index,
+            value: o
           }
-        ];
-
-        r.set(_expand(key, path2), _expand(value, path2));
+        ]);
+        if (r instanceof Promise) {
+          promises.push(r);
+          r.then(f => (copy[index] = f));
+        }
+        copy[index] = r;
       }
 
-      return r;
+      return copy;
     }
 
-    if (object instanceof Set) {
-      const r = new object.constructor();
+    if (typeof object.add === "function") {
+      const copy = new object.constructor[Symbol.species]();
       for (const value of object.values()) {
-        r.add(_expand(value, [...path, { value }]));
+        copy.add(_expand(value, [...path, { value }]));
       }
 
-      return r;
+      return copy;
     }
 
-    if (Array.isArray(object)) {
-      const array = new Array(object.length);
-
-      for (let index = 0; index < object.length; index++) {
-        const o = object[index];
-        const r = _expand(o, [
+    if (typeof object.entries === "function") {
+      const copy = new object.constructor[Symbol.species]();
+      for (const [key, value] of object.entries()) {
+        const path2 = [
           ...path,
           {
-            key: index,
-            value: o
+            key,
+            value
           }
-        ]);
-        if (r instanceof Promise) {
-          promises.push(r);
-          r.then(f => (array[index] = f));
-        }
-        array[index] = r;
+        ];
+
+        copy.set(_expand(key, path2), _expand(value, path2));
       }
 
-      return array;
+      return copy;
     }
 
     if (context.stopClass && object instanceof context.stopClass) {
       return object;
     }
 
+    if (typeof object.valueOf === "function") {
+      return object;
+    }
+
     let newObject = {};
 
     for (let [key, value] of Object.entries(object)) {
@@ -182,6 +185,7 @@ export function expand(object, context) {
       }
     }
 
+    console.log(newObject);
     return newObject;
   }