@solidjs/signals 0.13.4 → 0.13.5

package/dist/prod.js

@@ -166,10 +166,10 @@ function runLaneEffects(e) {
 function queueStashedOptimisticEffects(e) {
   for (let t = e.I; t !== null; t = t.p) {
     const e = t.h;
-    if (!e.H) continue;
-    if (e.H === EFFECT_TRACKED) {
-      if (!e.W) {
-        e.W = true;
+    if (!e.W) continue;
+    if (e.W === EFFECT_TRACKED) {
+      if (!e.H) {
+        e.H = true;
         e.F.enqueue(EFFECT_USER, e.M);
       }
       continue;
@@ -452,9 +452,9 @@ function insertSubs(e, t = false) {
       r.h.q = undefined;
     }
     const e = r.h;
-    if (e.H === EFFECT_TRACKED) {
-      if (!e.W) {
-        e.W = true;
+    if (e.W === EFFECT_TRACKED) {
+      if (!e.H) {
+        e.H = true;
         e.F.enqueue(EFFECT_USER, e.M);
       }
       continue;
@@ -471,7 +471,7 @@ function commitPendingNodes() {
     if (n.X !== NOT_PENDING) {
       n.J = n.X;
       n.X = NOT_PENDING;
-      if (n.H && n.H !== EFFECT_TRACKED) n.W = true;
+      if (n.W && n.W !== EFFECT_TRACKED) n.H = true;
     }
     if (!(n.Se & STATUS_PENDING)) n.Se &= ~STATUS_UNINITIALIZED;
     if (n.L) GlobalQueue.ue(n, false, true);
@@ -685,10 +685,10 @@ function settlePendingSource(e) {
       setPendingError(i);
       updatePendingSignal(i);
       if (i.he) {
-        if (i.H === EFFECT_TRACKED) {
+        if (i.W === EFFECT_TRACKED) {
           const e = i;
-          if (!e.W) {
-            e.W = true;
+          if (!e.H) {
+            e.H = true;
             e.F.enqueue(EFFECT_USER, e.M);
           }
         } else {
@@ -976,10 +976,8 @@ function getObserver() {
 function getOwner() {
   return context;
 }
-function onCleanup(e) {
-  if (!context) {
-    return e;
-  }
+function cleanup(e) {
+  if (!context) return e;
   if (!context.be) context.be = e;
   else if (Array.isArray(context.be)) context.be.push(e);
   else context.be = [context.be, e];
@@ -1035,8 +1033,8 @@ function unlinkSubs(e) {
   else {
     t.I = i;
     if (i === null) {
-      t.xe?.();
-      t.L && !t.Ge && !(t.O & REACTIVE_ZOMBIE) && unobserved(t);
+      t.Ge?.();
+      t.L && !t.xe && !(t.O & REACTIVE_ZOMBIE) && unobserved(t);
     }
   }
   return n;
@@ -1096,7 +1094,7 @@ let snapshotCaptureActive = false;
 let snapshotSources = null;
 function ownerInSnapshotScope(e) {
   while (e) {
-    if (e.He) return true;
+    if (e.We) return true;
     e = e.i;
   }
   return false;
@@ -1106,17 +1104,17 @@ function setSnapshotCapture(e) {
   if (e && !snapshotSources) snapshotSources = new Set();
 }
 function markSnapshotScope(e) {
-  e.He = true;
+  e.We = true;
 }
 function releaseSnapshotScope(e) {
-  e.He = false;
+  e.We = false;
   releaseSubtree(e);
   schedule();
 }
 function releaseSubtree(e) {
   let t = e.Ce;
   while (t) {
-    if (t.He) {
+    if (t.We) {
       t = t.De;
       continue;
     }
@@ -1145,7 +1143,7 @@ function clearSnapshots() {
   snapshotCaptureActive = false;
 }
 function recompute(e, t = false) {
-  const n = e.H;
+  const n = e.W;
   if (!t) {
     if (e.K && (!n || activeTransition) && activeTransition !== e.K)
       globalQueue.initTransition(e.K);
@@ -1267,7 +1265,7 @@ function computed(e, t, n) {
     Ve: i || undefined,
     Ne: n?.equals != null ? n.equals : isEqual,
     fe: !!n?.pureWrite,
-    xe: n?.unobserved,
+    Ge: n?.unobserved,
     be: null,
     F: context?.F ?? globalQueue,
     Le: context?.Le ?? defaultContext,
@@ -1312,7 +1310,7 @@ function computed(e, t, n) {
     const t = externalSourceConfig.factory(r.L, () => {
       setSignal(e, undefined);
     });
-    onCleanup(() => t.dispose());
+    cleanup(() => t.dispose());
     r.L = n => {
       read(e);
       return t.track(n);
@@ -1331,8 +1329,8 @@ function signal(e, t, n = null) {
   const i = {
     Ne: t?.equals != null ? t.equals : isEqual,
     fe: !!t?.pureWrite,
-    We: !!t?.We,
-    xe: t?.unobserved,
+    He: !!t?.He,
+    Ge: t?.unobserved,
     J: e,
     I: null,
     ke: null,
@@ -1342,7 +1340,7 @@ function signal(e, t, n = null) {
     X: NOT_PENDING
   };
   n && (n.A = i);
-  if (snapshotCaptureActive && !i.We && !((n?.Se ?? 0) & STATUS_PENDING)) {
+  if (snapshotCaptureActive && !i.He && !((n?.Se ?? 0) & STATUS_PENDING)) {
     i.Te = e === undefined ? NO_SNAPSHOT : e;
     snapshotSources.add(i);
   }
@@ -1401,8 +1399,14 @@ function read(e) {
     const t = e.V;
     const n = pendingCheckActive;
     pendingCheckActive = false;
-    if (read(getPendingSignal(e))) foundPending = true;
-    if (t && read(getPendingSignal(t))) foundPending = true;
+    if (t && e.ee !== undefined) {
+      if (e.ee !== NOT_PENDING && (t.Ae || !!(t.Se & STATUS_PENDING))) {
+        foundPending = true;
+      }
+    } else {
+      if (read(getPendingSignal(e))) foundPending = true;
+      if (t && read(getPendingSignal(t))) foundPending = true;
+    }
     pendingCheckActive = n;
     return e.J;
   }
@@ -1548,6 +1552,9 @@ function computePendingState(e) {
     }
     return true;
   }
+  if (e.ee !== undefined && e.ee === NOT_PENDING && !e.Re) {
+    return false;
+  }
   if (e.X !== NOT_PENDING && !(t.Se & STATUS_UNINITIALIZED)) return true;
   return !!(t.Se & STATUS_PENDING && !(t.Se & STATUS_UNINITIALIZED));
 }
@@ -1667,8 +1674,8 @@ function effect(e, t, n, i, r) {
   const s = computed(r?.render ? t => staleValues(() => e(t)) : e, i, {
     ...r,
     equals: () => {
-      s.W = !s.le;
-      if (o) s.F.enqueue(s.H, runEffect.bind(s));
+      s.H = !s.le;
+      if (o) s.F.enqueue(s.W, runEffect.bind(s));
       return false;
     },
     lazy: true
@@ -1677,14 +1684,14 @@ function effect(e, t, n, i, r) {
   s.Me = t;
   s.$e = n;
   s.je = undefined;
-  s.H = r?.render ? EFFECT_RENDER : EFFECT_USER;
+  s.W = r?.render ? EFFECT_RENDER : EFFECT_USER;
   s.ge = (e, t) => {
     const n = e !== undefined ? e : s.Se;
     const i = t !== undefined ? t : s.le;
     if (n & STATUS_ERROR) {
       let e = i;
       s.F.notify(s, STATUS_PENDING, 0);
-      if (s.H === EFFECT_USER) {
+      if (s.W === EFFECT_USER) {
         try {
           return s.$e
             ? s.$e(e, () => {
@@ -1697,17 +1704,17 @@ function effect(e, t, n, i, r) {
         }
       }
       if (!s.F.notify(s, STATUS_ERROR, STATUS_ERROR)) throw e;
-    } else if (s.H === EFFECT_RENDER) {
+    } else if (s.W === EFFECT_RENDER) {
       s.F.notify(s, STATUS_PENDING | STATUS_ERROR, n, i);
     }
   };
   recompute(s, true);
-  !r?.defer && (s.H === EFFECT_USER ? s.F.enqueue(s.H, runEffect.bind(s)) : runEffect.call(s));
+  !r?.defer && (s.W === EFFECT_USER ? s.F.enqueue(s.W, runEffect.bind(s)) : runEffect.call(s));
   o = true;
-  onCleanup(() => s.je?.());
+  cleanup(() => s.je?.());
 }
 function runEffect() {
-  if (!this.W || this.O & REACTIVE_DISPOSED) return;
+  if (!this.H || this.O & REACTIVE_DISPOSED) return;
   this.je?.();
   this.je = undefined;
   try {
@@ -1718,13 +1725,13 @@ function runEffect() {
     if (!this.F.notify(this, STATUS_ERROR, STATUS_ERROR)) throw e;
   } finally {
     this.Fe = this.J;
-    this.W = false;
+    this.H = false;
   }
 }
 function trackedEffect(e, t) {
   const run = () => {
-    if (!n.W || n.O & REACTIVE_DISPOSED) return;
-    n.W = false;
+    if (!n.H || n.O & REACTIVE_DISPOSED) return;
+    n.H = false;
     recompute(n);
   };
   const n = computed(
@@ -1738,8 +1745,8 @@ function trackedEffect(e, t) {
   );
   n.je = undefined;
   n.Ke = true;
-  n.W = true;
-  n.H = EFFECT_TRACKED;
+  n.H = true;
+  n.W = EFFECT_TRACKED;
   n.ge = (e, t) => {
     const i = e !== undefined ? e : n.Se;
     if (i & STATUS_ERROR) {
@@ -1750,7 +1757,7 @@ function trackedEffect(e, t) {
   };
   n.M = run;
   n.F.enqueue(EFFECT_USER, run);
-  onCleanup(() => n.je?.());
+  cleanup(() => n.je?.());
 }
 function restoreTransition(e, t) {
   globalQueue.initTransition(e);
@@ -1796,6 +1803,9 @@ function action(e) {
       step();
     });
 }
+function onCleanup(e) {
+  return cleanup(e);
+}
 function accessor(e) {
   const t = read.bind(null, e);
   t.$r = true;
@@ -1824,7 +1834,7 @@ function createTrackedEffect(e, t) {
 }
 function createReaction(e, t) {
   let n = undefined;
-  onCleanup(() => n?.());
+  cleanup(() => n?.());
   const i = getOwner();
   return r => {
     runWithOwner(i, () => {
@@ -2029,55 +2039,68 @@ function createProjectionInternal(e, t = {}, n) {
   const o = wrapProjection(t);
   i = computed(() => {
     const t = getOwner();
-    storeSetter(new Proxy(o, writeTraps), i => {
-      const r = handleAsync(t, e(i), e => {
-        e !== i && e !== undefined && storeSetter(o, reconcile(e, n?.key || "id"));
+    let i = false;
+    let r;
+    const s = new Proxy(
+      o,
+      createWriteTraps(() => !i || t.Ae === r)
+    );
+    storeSetter(s, s => {
+      r = e(s);
+      i = true;
+      const u = handleAsync(t, r, e => {
+        e !== s && e !== undefined && storeSetter(o, reconcile(e, n?.key || "id"));
       });
-      r !== i && r !== undefined && reconcile(r, n?.key || "id")(o);
+      u !== s && u !== undefined && reconcile(u, n?.key || "id")(o);
     });
   });
-  i.Ge = true;
+  i.xe = true;
   return { store: o, node: i };
 }
 function createProjection(e, t = {}, n) {
   return createProjectionInternal(e, t, n).store;
 }
-const writeTraps = {
-  get(e, t) {
-    let n;
-    setWriteOverride(true);
-    setProjectionWriteActive(true);
-    try {
-      n = e[t];
-    } finally {
-      setWriteOverride(false);
-      setProjectionWriteActive(false);
-    }
-    return typeof n === "object" && n !== null ? new Proxy(n, writeTraps) : n;
-  },
-  set(e, t, n) {
-    setWriteOverride(true);
-    setProjectionWriteActive(true);
-    try {
-      e[t] = n;
-    } finally {
-      setWriteOverride(false);
-      setProjectionWriteActive(false);
-    }
-    return true;
-  },
-  deleteProperty(e, t) {
-    setWriteOverride(true);
-    setProjectionWriteActive(true);
-    try {
-      delete e[t];
-    } finally {
-      setWriteOverride(false);
-      setProjectionWriteActive(false);
+function createWriteTraps(e) {
+  const t = {
+    get(e, n) {
+      let i;
+      setWriteOverride(true);
+      setProjectionWriteActive(true);
+      try {
+        i = e[n];
+      } finally {
+        setWriteOverride(false);
+        setProjectionWriteActive(false);
+      }
+      return typeof i === "object" && i !== null ? new Proxy(i, t) : i;
+    },
+    set(t, n, i) {
+      if (e && !e()) return true;
+      setWriteOverride(true);
+      setProjectionWriteActive(true);
+      try {
+        t[n] = i;
+      } finally {
+        setWriteOverride(false);
+        setProjectionWriteActive(false);
+      }
+      return true;
+    },
+    deleteProperty(t, n) {
+      if (e && !e()) return true;
+      setWriteOverride(true);
+      setProjectionWriteActive(true);
+      try {
+        delete t[n];
+      } finally {
+        setWriteOverride(false);
+        setProjectionWriteActive(false);
+      }
+      return true;
     }
-    return true;
-  }
-};
+  };
+  return t;
+}
 const $TRACK = Symbol(0),
   $TARGET = Symbol(0),
   $PROXY = Symbol(0),
@@ -2451,24 +2474,32 @@ function createOptimisticProjectionInternal(e, t = {}, n) {
   if (e) {
     i = computed(() => {
       const t = getOwner();
+      let i = false;
+      let r;
+      const s = new Proxy(
+        o,
+        createWriteTraps(() => !i || t.Ae === r)
+      );
       setProjectionWriteActive(true);
       try {
-        storeSetter(new Proxy(o, writeTraps), i => {
-          const r = handleAsync(t, e(i), e => {
+        storeSetter(s, s => {
+          r = e(s);
+          i = true;
+          const u = handleAsync(t, r, e => {
             setProjectionWriteActive(true);
             try {
-              e !== i && e !== undefined && storeSetter(o, reconcile(e, n?.key || "id"));
+              e !== s && e !== undefined && storeSetter(o, reconcile(e, n?.key || "id"));
             } finally {
               setProjectionWriteActive(false);
             }
           });
-          r !== i && r !== undefined && reconcile(r, n?.key || "id")(o);
+          u !== s && u !== undefined && reconcile(u, n?.key || "id")(o);
         });
       } finally {
         setProjectionWriteActive(false);
       }
     });
-    i.Ge = true;
+    i.xe = true;
   }
   return { store: o, node: i };
 }
@@ -2932,14 +2963,14 @@ function boundaryComputed(e, t) {
     n.F.notify(n, n.ut, i, r);
   };
   n.ut = t;
-  n.Ge = true;
+  n.xe = true;
   recompute(n, true);
   return n;
 }
 function createBoundChildren(e, t, n, i) {
   const r = e.F;
   r.addChild((e.F = n));
-  onCleanup(() => r.removeChild(e.F));
+  cleanup(() => r.removeChild(e.F));
   return runWithOwner(e, () => {
     const e = computed(t);
     return boundaryComputed(() => staleValues(() => flatten(read(e))), i);
@@ -2949,7 +2980,7 @@ const ON_INIT = Symbol();
 class CollectionQueue extends Queue {
   ct;
   ft = new Set();
-  lt = signal(false, { pureWrite: true, We: true });
+  lt = signal(false, { pureWrite: true, He: true });
   Et = false;
   Tt;
   dt = ON_INIT;

package/dist/types/core/index.d.ts

@@ -1,7 +1,7 @@
 export { ContextNotFoundError, NoOwnerError, NotReadyError } from "./error.js";
 export { isEqual, untrack, runWithOwner, computed, signal, read, setSignal, optimisticSignal, optimisticComputed, isPending, latest, refresh, isRefreshing, staleValues, setSnapshotCapture, markSnapshotScope, releaseSnapshotScope, clearSnapshots } from "./core.js";
 export { enableExternalSource, _resetExternalSourceConfig, type ExternalSourceFactory, type ExternalSource, type ExternalSourceConfig } from "./external.js";
-export { createOwner, createRoot, dispose, getNextChildId, getObserver, getOwner, isDisposed, onCleanup, peekNextChildId } from "./owner.js";
+export { createOwner, createRoot, dispose, getNextChildId, getObserver, getOwner, isDisposed, cleanup, peekNextChildId } from "./owner.js";
 export { createContext, getContext, setContext, type Context, type ContextRecord } from "./context.js";
 export { handleAsync } from "./async.js";
 export type { Computed, Disposable, FirewallSignal, Link, Owner, Root, Signal, NodeOptions } from "./types.js";

package/dist/types/core/owner.d.ts

@@ -6,7 +6,7 @@ export declare function getNextChildId(owner: Owner): string;
 export declare function peekNextChildId(owner: Owner): string;
 export declare function getObserver(): Owner | null;
 export declare function getOwner(): Owner | null;
-export declare function onCleanup(fn: Disposable): Disposable;
+export declare function cleanup(fn: Disposable): Disposable;
 export declare function isDisposed(node: Owner): boolean;
 export declare function createOwner(options?: {
     id?: string;

package/dist/types/index.d.ts

@@ -1,6 +1,6 @@
-export { $REFRESH, ContextNotFoundError, NoOwnerError, NotReadyError, action, createContext, createOwner, createRoot, runWithOwner, flush, getNextChildId, peekNextChildId, getContext, setContext, getOwner, onCleanup, isDisposed, getObserver, isEqual, untrack, isPending, latest, isRefreshing, refresh, SUPPORTS_PROXY, setSnapshotCapture, markSnapshotScope, releaseSnapshotScope, clearSnapshots, enforceLoadingBoundary, enableExternalSource } from "./core/index.js";
+export { $REFRESH, ContextNotFoundError, NoOwnerError, NotReadyError, action, createContext, createOwner, createRoot, runWithOwner, flush, getNextChildId, peekNextChildId, getContext, setContext, getOwner, isDisposed, getObserver, isEqual, untrack, isPending, latest, isRefreshing, refresh, SUPPORTS_PROXY, setSnapshotCapture, markSnapshotScope, releaseSnapshotScope, clearSnapshots, enforceLoadingBoundary, enableExternalSource } from "./core/index.js";
 export type { Owner, Context, ContextRecord, IQueue, ExternalSourceFactory, ExternalSource, ExternalSourceConfig } from "./core/index.js";
-export { createSignal, createMemo, createEffect, createRenderEffect, createTrackedEffect, createReaction, createOptimistic, resolve, onSettled } from "./signals.js";
+export { createSignal, createMemo, createEffect, createRenderEffect, createTrackedEffect, createReaction, createOptimistic, resolve, onSettled, onCleanup } from "./signals.js";
 export type { Accessor, Setter, Signal, ComputeFunction, EffectFunction, EffectBundle, EffectOptions, SignalOptions, MemoOptions, NoInfer } from "./signals.js";
 export { mapArray, repeat, type Maybe } from "./map.js";
 export * from "./store/index.js";

package/dist/types/signals.d.ts

@@ -1,3 +1,5 @@
+import type { Disposable } from "./core/index.js";
+export declare function onCleanup(fn: Disposable): Disposable;
 export type Accessor<T> = () => T;
 export declare function accessor<T>(node: any): Accessor<T>;
 export type Setter<in out T> = {

package/dist/types/store/projection.d.ts

@@ -22,4 +22,5 @@ export declare function createProjectionInternal<T extends object = {}>(fn: (dra
 export declare function createProjection<T extends object = {}>(fn: (draft: T) => void | T | Promise<void | T> | AsyncIterable<void | T>, initialValue?: T, options?: ProjectionOptions): Store<T> & {
     [$REFRESH]: any;
 };
+export declare function createWriteTraps(isActive?: () => boolean): ProxyHandler<any>;
 export declare const writeTraps: ProxyHandler<any>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solidjs/signals",
-  "version": "0.13.4",
+  "version": "0.13.5",
   "description": "SolidJS' standalone reactivity implementation",
   "author": "Ryan Carniato",
   "license": "MIT",