@solidjs/signals 2.0.0-rc.14 → 2.0.0-rc.16

package/dist/prod/store/reconcile.js

@@ -2,7 +2,9 @@ import { isEqual } from "../core/core.js";
 
 import { isOwned, $OWNER, storeLookup, lookupTarget } from "./target.js";
 
-import { userWriting, optHooks, unwrapValue, adoptPB, sameKey, materializePB, notifyFold, targetsEqual, bumpDeep, notifyKeyValue, notifyKeyDiff, notifyFoldTail, hasAccessorFlag } from "./store.js";
+import { userWriting, unwrapValue, adoptPB, sameKey, materializePB, notifyFold, sameRow, targetsEqual, bumpDeep, notifyKeyValue, notifyKeyDiff, notifyFoldTail, hasAccessorFlag } from "./store.js";
+
+import { optHooks } from "./hooks.js";
 
 import { $TARGET, markRawIngest, isWrappable, rawValuesUsed, isRawValue } from "./types.js";
 
@@ -73,33 +75,33 @@ import { $TARGET, markRawIngest, isWrappable, rawValuesUsed, isRawValue } from "
     // — key matching from the arrangement the guesses made (R28), so a row
     // the guess added keeps its proxy when the server returns it.
         const i = l?.opt === true ? optHooks.view(e, f) : f;
-    const u = Array.isArray(n);
-    const s = e.s === true;
+    const s = Array.isArray(n);
+    const u = e.s === true;
     const r = f;
     adoptPB(e, n, false);
-    if (s) markRawIngest(n);
-    if (Array.isArray(i) !== u) {
+    if (u) markRawIngest(n);
+    if (Array.isArray(i) !== s) {
         notifyFold(e, r, n);
         return;
     }
-    if (u) {
+    if (s) {
         const f = i;
-        const u = n;
+        const s = n;
         const a = e.n;
         let c = 0;
-        if (t && !s) {
+        if (t && !u) {
             const i = f.length;
-            const s = u.length;
+            const u = s.length;
             let d = false;
             let p = 0;
             // Aligned prefix: same row (by reference or key) at the same index.
-                        for (const y = Math.min(i, s); p < y; p++) {
-                const i = u[p];
-                const s = f[p];
-                if (s !== i && !(s !== null && typeof s === "object" && i !== null && typeof i === "object" && sameKey(t(s), t(i)))) break;
+                        for (const y = Math.min(i, u); p < y; p++) {
+                const i = s[p];
+                const u = f[p];
+                if (u !== i && !sameRow(u, i, t)) break;
  // misaligned: fall to the keyed remainder below
-                                if ((s !== i || i !== null && typeof i === "object" && isOwned(i)) && i !== null && typeof i === "object") descend(unwrapValue(s), i, t, l, o);
-                if (e.dk !== null && !d && !(i !== null && typeof i === "object" ? targetsEqual(s, i) : isEqual(s, i))) {
+                                if ((u !== i || i !== null && typeof i === "object" && isOwned(i)) && i !== null && typeof i === "object") descend(unwrapValue(u), i, t, l, o);
+                if (e.dk !== null && !d && !(i !== null && typeof i === "object" ? targetsEqual(u, i) : isEqual(u, i))) {
                     bumpDeep(e);
                     d = true;
                 }
@@ -111,12 +113,12 @@ import { $TARGET, markRawIngest, isWrappable, rawValuesUsed, isRawValue } from "
                     }
                 }
             }
-            if (e.dk !== null && !d && p < u.length) bumpDeep(e);
+            if (e.dk !== null && !d && p < s.length) bumpDeep(e);
             const y = p;
  // misalignment point (== nlen on aligned ticks)
                         let w = null;
-            for (;p < u.length; p++) {
-                const e = u[p];
+            for (;p < s.length; p++) {
+                const e = s[p];
                 if (e !== null && typeof e === "object") {
                     const n = t(e);
                     let i;
@@ -156,12 +158,12 @@ import { $TARGET, markRawIngest, isWrappable, rawValuesUsed, isRawValue } from "
                 }
             }
         } else {
-            const i = Math.min(f.length, u.length);
-            const d = u.length;
+            const i = Math.min(f.length, s.length);
+            const d = s.length;
             let p = false;
             for (let y = 0; y < d; y++) {
-                const d = u[y];
-                if (!s && y < i && d !== null && typeof d === "object") descend(unwrapValue(f[y]), d, t, l, o);
+                const d = s[y];
+                if (!u && y < i && d !== null && typeof d === "object") descend(unwrapValue(f[y]), d, t, l, o);
                 if (e.dk !== null && !p && !(d !== null && typeof d === "object" ? targetsEqual(f[y], d) : isEqual(f[y], d))) {
                     bumpDeep(e);
                     p = true;
@@ -179,7 +181,7 @@ import { $TARGET, markRawIngest, isWrappable, rawValuesUsed, isRawValue } from "
                 if (a !== null && c < e.nc) {
             for (const e of Reflect.ownKeys(a)) {
                 const t = typeof e === "string" ? +e : NaN;
-                if (!(t >= 0 && t < u.length)) notifyKeyDiff(a[e], e, r, n, false);
+                if (!(t >= 0 && t < s.length)) notifyKeyDiff(a[e], e, r, n, false);
             }
         }
         notifyFoldTail(e, r, n);
@@ -189,15 +191,15 @@ import { $TARGET, markRawIngest, isWrappable, rawValuesUsed, isRawValue } from "
     let c = 0;
     let d = false;
     for (const f in n) {
-        const u = n[f];
+        const s = n[f];
         const p = r[f];
-        const y = u !== null && typeof u === "object";
-        if (p === u && (!y || !isOwned(u)) && (a === null || a[f] === undefined || !hasAccessorFlag(a[f]))) {
+        const y = s !== null && typeof s === "object";
+        if (p === s && (!y || !isOwned(s)) && (a === null || a[f] === undefined || !hasAccessorFlag(a[f]))) {
             if (a !== null && a[f] !== undefined) c++;
             continue;
         }
-        if (y && !s) descend(unwrapValue(i[f]), u, t, l, o);
-        if (e.dk !== null && !d && !(y ? targetsEqual(p, u) : isEqual(p, u))) {
+        if (y && !u) descend(unwrapValue(i[f]), s, t, l, o);
+        if (e.dk !== null && !d && !(y ? targetsEqual(p, s) : isEqual(p, s))) {
             bumpDeep(e);
             d = true;
         }
@@ -205,7 +207,7 @@ import { $TARGET, markRawIngest, isWrappable, rawValuesUsed, isRawValue } from "
             const e = a[f];
             if (e !== undefined) {
                 c++;
-                notifyKeyValue(e, f, p, u, r, n);
+                notifyKeyValue(e, f, p, s, r, n);
             }
         }
     }
@@ -214,7 +216,7 @@ import { $TARGET, markRawIngest, isWrappable, rawValuesUsed, isRawValue } from "
         const f = p[e];
         if (f === $OWNER) continue;
         const i = n[f];
-        if (!s && i !== null && typeof i === "object") descend(unwrapValue(r[f]), i, t, l, o);
+        if (!u && i !== null && typeof i === "object") descend(unwrapValue(r[f]), i, t, l, o);
         if (a !== null) {
             const e = a[f];
             if (e !== undefined) {