@solidjs/signals 2.0.0-rc.3 → 2.0.0-rc.5

package/dist/prod/store/next/projection.js

@@ -56,6 +56,7 @@ import { wrapNext, storeSetterNext } from "./store.js";
  * driven from inside an enclosing authoritative-write scope (next-store
  * optimistic derives), and a hard `false` would clobber it mid-derive.
  */ function wrapDraft(e, t, r) {
+    const write = e => r ? r(e) : e();
     const i = {
         get(i, o) {
             let n;
@@ -84,31 +85,33 @@ import { wrapNext, storeSetterNext } from "./store.js";
             }
             return i;
         },
-        set(i, o, n) {
+        set(r, i, o) {
             if (t && !t()) return true;
-            const c = projectionWriteActive;
+            const n = projectionWriteActive;
             setWriteOverride(true);
             setProjectionWriteActive(true);
             try {
-                e[o] = n;
-                r?.();
+                write(() => {
+                    e[i] = o;
+                });
             } finally {
                 setWriteOverride(false);
-                setProjectionWriteActive(c);
+                setProjectionWriteActive(n);
             }
             return true;
         },
-        deleteProperty(i, o) {
+        deleteProperty(r, i) {
             if (t && !t()) return true;
-            const n = projectionWriteActive;
+            const o = projectionWriteActive;
             setWriteOverride(true);
             setProjectionWriteActive(true);
             try {
-                delete e[o];
-                r?.();
+                write(() => {
+                    delete e[i];
+                });
             } finally {
                 setWriteOverride(false);
-                setProjectionWriteActive(n);
+                setProjectionWriteActive(o);
             }
             return true;
         },
@@ -140,17 +143,18 @@ import { wrapNext, storeSetterNext } from "./store.js";
                         if (i) i.configurable = true;
             return i;
         },
-        defineProperty(i, o, n) {
+        defineProperty(r, i, o) {
             if (t && !t()) return true;
-            const c = projectionWriteActive;
+            const n = projectionWriteActive;
             setWriteOverride(true);
             setProjectionWriteActive(true);
             try {
-                Reflect.defineProperty(e, o, n);
-                r?.();
+                write(() => {
+                    Reflect.defineProperty(e, i, o);
+                });
             } finally {
                 setWriteOverride(false);
-                setProjectionWriteActive(c);
+                setProjectionWriteActive(n);
             }
             return true;
         }
@@ -211,8 +215,8 @@ function runProjectionComputedNext(e, t, r, i, o) {
     // for the whole first flight — the derive works a detached shadow of the
     // seed so draft writes cannot tear through to readers (#2988). Every commit
     // point reconciles the shadow through the normal commit path.
-        const u = n.Ie ? JSON.parse(JSON.stringify(e[$TARGET][STORE_VALUE])) : null;
-    const l = wrapDraft(e, () => !c || n.o?.Ee === s, o);
+        const u = n.Ne ? JSON.parse(JSON.stringify(e[$TARGET][STORE_VALUE])) : null;
+    const l = wrapDraft(e, () => !c || n.o?.Ie === s, o);
     storeSetterNext(l, o => {
         s = t(u ?? o);
         c = true;
@@ -223,10 +227,10 @@ function runProjectionComputedNext(e, t, r, i, o) {
             if (u && (t === undefined || t === u)) t = JSON.parse(JSON.stringify(u));
             if (t === o || t === undefined) return;
             const write = () => storeSetterNext(e, e => reconcileNextState(t, e, r, true), false);
-            i ? i(write) : write();
+            i ? i(write, t) : write();
         };
         const l = handleAsync(n, s, commit);
-        if (!n.Ie) commit(l);
+        if (!n.Ne) commit(l);
     }, false);
     return n;
 }