@solidjs/signals 2.0.0-beta.26 → 2.0.0-beta.27

package/dist/prod/store/projection.js

@@ -12,16 +12,16 @@ import "../core/effect.js";
 
 import { CONFIG_AUTO_DISPOSE } from "../core/constants.js";
 
-import { reconcile } from "./reconcile.js";
+import { reconcileState } from "./reconcile.js";
 
 import { storeSetter, $TARGET, STORE_WRAP, createStoreProxy, storeTraps, setWriteOverride, STORE_LOOKUP, STORE_SHALLOW, markRawIngest, STORE_VALUE, STORE_FIREWALL } from "./store.js";
 
-function createProjectionInternal(e, r, t) {
+function createProjectionInternal(e, t, r) {
     let o;
     const n = new WeakMap;
     // A shallow projection's children are raw and never wrapped, so the
     // wrapper only ever runs for the root — flagging unconditionally is safe.
-        const i = !!t?.shallow;
+        const i = !!r?.shallow;
     const wrapper = e => {
         e[STORE_WRAP] = wrapProjection;
         e[STORE_LOOKUP] = n;
@@ -39,14 +39,14 @@ function createProjectionInternal(e, r, t) {
     const wrapProjection = e => {
         if (n.has(e)) return n.get(e);
         if (e[$TARGET]?.[STORE_WRAP] === wrapProjection) return e;
-        const r = createStoreProxy(e, storeTraps, wrapper);
-        n.set(e, r);
-        return r;
+        const t = createStoreProxy(e, storeTraps, wrapper);
+        n.set(e, t);
+        return t;
     };
-    const c = wrapProjection(r);
+    const c = wrapProjection(t);
     o = computed(() => {
         if (!o) o = getOwner();
-        runProjectionComputed(c, e, t?.key || "id");
+        runProjectionComputed(c, e, r?.key === undefined ? "id" : r.key);
     }, undefined);
     o.T &= ~CONFIG_AUTO_DISPOSE;
     return {
@@ -63,6 +63,10 @@ function createProjectionInternal(e, r, t) {
  * items keep their proxy identity — only added/removed items are
  * created/disposed.
  *
+ * If the derive returns a different entity than the one currently held (the
+ * `/users/1` → `/users/2` shape), the store swaps to it rather than merging,
+ * and nothing below it is treated as surviving.
+ *
  * Returns the projected store directly (no setter — reads only).
  *
  * Use this when you want the structural-sharing / per-property tracking
@@ -75,7 +79,8 @@ function createProjectionInternal(e, r, t) {
  * @param seed the backing store value to wrap and reconcile into
  * @param options `ProjectionOptions` — `name`, `key`. `key` defaults to
  *   `"id"`; specify it only when your data uses a different identity field
- *   (e.g. `{ key: "uuid" }` or `{ key: u => u.slug }`).
+ *   (e.g. `{ key: "uuid" }` or `{ key: u => u.slug }`), or `null` to merge
+ *   positionally with no keyed pass.
  *
  * @example
  * ```ts
@@ -97,8 +102,8 @@ function createProjectionInternal(e, r, t) {
  * ```
  *
  * @see {@link https://github.com/solidjs/x-reactivity#createprojection}
- */ function createProjection(e, r, t) {
-    return createProjectionInternal(e, r, t).store;
+ */ function createProjection(e, t, r) {
+    return createProjectionInternal(e, t, r).store;
 }
 
 /**
@@ -113,17 +118,17 @@ function createProjectionInternal(e, r, t) {
  * re-enters `setProjectionWriteActive` so reconciles target `STORE_OVERRIDE`
  * instead of `STORE_OPTIMISTIC_OVERRIDE` even when an async yield fires outside
  * the outer `setProjectionWriteActive` scope.
- */ function runProjectionComputed(e, r, t, o, n) {
+ */ function runProjectionComputed(e, t, r, o, n) {
     const i = getOwner();
     let c = false;
     let s;
     const u = new Proxy(e, createWriteTraps(() => !c || i.Te === s, n));
     storeSetter(u, n => {
-        s = r(n);
+        s = t(n);
         c = true;
-        const commit = r => {
-            if (r === n || r === undefined) return;
-            const write = () => storeSetter(e, reconcile(r, t));
+        const commit = t => {
+            if (t === n || t === undefined) return;
+            const write = () => storeSetter(e, e => reconcileState(t, e, r, true));
             o ? o(write) : write();
         };
         commit(handleAsync(i, s, commit));
@@ -131,53 +136,53 @@ function createProjectionInternal(e, r, t) {
     return i;
 }
 
-function createWriteTraps(e, r) {
-    const t = {
-        get(e, r) {
+function createWriteTraps(e, t) {
+    const r = {
+        get(e, t) {
             let o;
             setWriteOverride(true);
             setProjectionWriteActive(true);
             try {
-                o = e[r];
+                o = e[t];
             } finally {
                 setWriteOverride(false);
                 setProjectionWriteActive(false);
             }
-            if (r === $TARGET) return o;
-            return typeof o === "object" && o !== null ? new Proxy(o, t) : o;
+            if (t === $TARGET) return o;
+            return typeof o === "object" && o !== null ? new Proxy(o, r) : o;
         },
-        has(e, r) {
-            let t;
+        has(e, t) {
+            let r;
             setWriteOverride(true);
             setProjectionWriteActive(true);
             try {
-                t = r in e;
+                r = t in e;
             } finally {
                 setWriteOverride(false);
                 setProjectionWriteActive(false);
             }
-            return t;
+            return r;
         },
-        set(t, o, n) {
+        set(r, o, n) {
             if (e && !e()) return true;
             setWriteOverride(true);
             setProjectionWriteActive(true);
             try {
-                t[o] = n;
-                r?.();
+                r[o] = n;
+                t?.();
             } finally {
                 setWriteOverride(false);
                 setProjectionWriteActive(false);
             }
             return true;
         },
-        deleteProperty(t, o) {
+        deleteProperty(r, o) {
             if (e && !e()) return true;
             setWriteOverride(true);
             setProjectionWriteActive(true);
             try {
-                delete t[o];
-                r?.();
+                delete r[o];
+                t?.();
             } finally {
                 setWriteOverride(false);
                 setProjectionWriteActive(false);
@@ -185,7 +190,7 @@ function createWriteTraps(e, r) {
             return true;
         }
     };
-    return t;
+    return r;
 }
 
 export { createProjection, createProjectionInternal, createWriteTraps, runProjectionComputed };