mol_wire_pub 1.0.32 → 1.0.33

package/node.test.js

@@ -1928,8 +1928,9 @@ var $;
     $.$mol_wire_mem = $mol_wire_mem;
     function $mol_wire_mem_func(keys) {
         return (func) => {
+            const persist = $mol_wire_fiber.persist(func, keys);
             const wrapper = function (...args) {
-                let atom = $mol_wire_fiber.persist(this, func, ...args.slice(0, keys));
+                let atom = persist.call(this, ...args.slice(0, keys));
                 if (args.length <= keys || args[keys] === undefined)
                     return atom.sync();
                 try {
@@ -2503,36 +2504,37 @@ var $;
             }
             return new this(host, task, `${host?.[Symbol.toStringTag] ?? host}.${task.name}(#)`, ...args);
         }
-        static persist(host, task, ...args) {
+        static persist(task, keys) {
             const field = task.name + '()';
-            let dict, key, existen, fiber;
-            if (args.length) {
-                key = `${host?.[Symbol.toStringTag] ?? host}.${task.name}(${args.map(v => $mol_key(v)).join(',')})`;
-                dict = Object.getOwnPropertyDescriptor(host ?? task, field)?.value;
-                if (dict)
-                    existen = dict.get(key);
-                else
-                    dict = (host ?? task)[field] = new Map();
+            if (keys) {
+                return function $mol_wire_fiber_persist(...args) {
+                    let dict, key, fiber;
+                    key = `${this?.[Symbol.toStringTag] ?? this}.${task.name}(${args.map(v => $mol_key(v)).join(',')})`;
+                    dict = Object.getOwnPropertyDescriptor(this ?? task, field)?.value;
+                    if (dict) {
+                        const existen = dict.get(key);
+                        if (existen)
+                            return existen;
+                    }
+                    else {
+                        dict = (this ?? task)[field] = new Map();
+                    }
+                    fiber = new $mol_wire_fiber(this, task, key, ...args);
+                    dict.set(key, fiber);
+                    return fiber;
+                };
             }
             else {
-                key = `${host?.[Symbol.toStringTag] ?? host}.${field}`;
-                existen = Object.getOwnPropertyDescriptor(host ?? task, field)?.value;
-            }
-            reuse: if (existen) {
-                if (!(existen instanceof $mol_wire_fiber))
-                    break reuse;
-                if (existen.host !== host)
-                    break reuse;
-                if (existen.task !== task)
-                    break reuse;
-                return existen;
+                return function $mol_wire_fiber_persist(...args) {
+                    const existen = Object.getOwnPropertyDescriptor(this ?? task, field)?.value;
+                    if (existen)
+                        return existen;
+                    const key = `${this?.[Symbol.toStringTag] ?? this}.${field}`;
+                    const fiber = new $mol_wire_fiber(this, task, key, ...args);
+                    (this ?? task)[field] = fiber;
+                    return fiber;
+                };
             }
-            fiber = new this(host, task, key, ...args);
-            if (args.length)
-                dict.set(key, fiber);
-            else
-                (host ?? task)[field] = fiber;
-            return fiber;
         }
         static warm = true;
         static planning = [];