@solidjs/signals 0.10.3 → 0.10.4

package/dist/prod.js

@@ -103,7 +103,7 @@ function markNode(e, t = REACTIVE_DIRTY) {
     markNode(t.h, REACTIVE_CHECK);
   }
   if (e.A !== null) {
-    for (let t = e.A; t !== null; t = t.P) {
+    for (let t = e.A; t !== null; t = t.C) {
       for (let e = t.I; e !== null; e = e.p) {
         markNode(e.h, REACTIVE_CHECK);
       }
@@ -112,12 +112,12 @@ function markNode(e, t = REACTIVE_DIRTY) {
 }
 function runHeap(e, t) {
   e._ = false;
-  for (e.C = 0; e.C <= e.O; e.C++) {
-    let n = e.l[e.C];
+  for (e.P = 0; e.P <= e.O; e.P++) {
+    let n = e.l[e.P];
     while (n !== undefined) {
       if (n.S & REACTIVE_IN_HEAP) t(n);
       else adjustHeight(n, e);
-      n = e.l[e.C];
+      n = e.l[e.P];
     }
   }
   e.O = 0;
@@ -138,8 +138,8 @@ function adjustHeight(e, t) {
   }
 }
 const transitions = new Set();
-const dirtyQueue = { l: new Array(2e3).fill(undefined), _: false, C: 0, O: 0 };
-const zombieQueue = { l: new Array(2e3).fill(undefined), _: false, C: 0, O: 0 };
+const dirtyQueue = { l: new Array(2e3).fill(undefined), _: false, P: 0, O: 0 };
+const zombieQueue = { l: new Array(2e3).fill(undefined), _: false, P: 0, O: 0 };
 let clock = 0;
 let activeTransition = null;
 let scheduled = false;
@@ -250,7 +250,7 @@ class GlobalQueue extends Queue {
           runLaneEffects(EFFECT_USER);
           this.stashQueues(activeTransition.X);
           clock++;
-          scheduled = dirtyQueue.O >= dirtyQueue.C;
+          scheduled = dirtyQueue.O >= dirtyQueue.P;
           reassignPendingTransition(activeTransition.$);
           activeTransition = null;
           finalizePureQueue(null, true);
@@ -268,7 +268,7 @@ class GlobalQueue extends Queue {
         finalizePureQueue();
       }
       clock++;
-      scheduled = dirtyQueue.O >= dirtyQueue.C;
+      scheduled = dirtyQueue.O >= dirtyQueue.P;
       runLaneEffects(EFFECT_RENDER);
       this.run(EFFECT_RENDER);
       runLaneEffects(EFFECT_USER);
@@ -359,14 +359,14 @@ function insertSubs(e, t = false) {
       continue;
     }
     const r = i.h.S & REACTIVE_ZOMBIE ? zombieQueue : dirtyQueue;
-    if (r.C > i.h.o) r.C = i.h.o;
+    if (r.P > i.h.o) r.P = i.h.o;
     insertIntoHeap(i.h, r);
   }
 }
 function finalizePureQueue(e = null, t = false) {
   let n = !t;
   if (!t) checkBoundaryChildren(globalQueue);
-  if (dirtyQueue.O >= dirtyQueue.C) runHeap(dirtyQueue, GlobalQueue.K);
+  if (dirtyQueue.O >= dirtyQueue.P) runHeap(dirtyQueue, GlobalQueue.K);
   if (n) {
     const t = globalQueue.$;
     for (let e = 0; e < t.length; e++) {
@@ -679,7 +679,7 @@ function notifyStatus(e, t, n, i, r) {
       notifyStatus(i.h, t, n, c, l);
     }
   }
-  for (let i = e.A; i !== null; i = i.P) {
+  for (let i = e.A; i !== null; i = i.C) {
     for (let e = i.I; e !== null; e = e.p) {
       e.h.J = clock;
       if (e.h.q !== n) {
@@ -689,89 +689,67 @@ function notifyStatus(e, t, n, i, r) {
     }
   }
 }
-function effect(e, t, n, i, r) {
-  let o = false;
-  const s = computed(r?.render ? t => staleValues(() => e(t)) : e, i, {
-    ...r,
-    equals: () => {
-      s.oe = !s.q;
-      if (o) s.se.enqueue(s.re, runEffect.bind(s));
-      return false;
-    },
-    lazy: true
-  });
-  s.he = i;
-  s.Ae = t;
-  s.ge = n;
-  s.Pe = undefined;
-  s.re = r?.render ? EFFECT_RENDER : EFFECT_USER;
-  s.pe = (e, t) => {
-    const n = e !== undefined ? e : s.ae;
-    const i = t !== undefined ? t : s.q;
-    if (n & STATUS_ERROR) {
-      let e = i;
-      s.se.notify(s, STATUS_PENDING, 0);
-      if (s.re === EFFECT_USER) {
-        try {
-          return s.ge
-            ? s.ge(e, () => {
-                s.Pe?.();
-                s.Pe = undefined;
-              })
-            : console.error(e);
-        } catch (t) {
-          e = t;
-        }
-      }
-      if (!s.se.notify(s, STATUS_ERROR, STATUS_ERROR)) throw e;
-    } else if (s.re === EFFECT_RENDER) s.se.notify(s, STATUS_PENDING | STATUS_ERROR, n, i);
-  };
-  recompute(s, true);
-  !r?.defer && (s.re === EFFECT_USER ? s.se.enqueue(s.re, runEffect.bind(s)) : runEffect.call(s));
-  o = true;
-  onCleanup(() => s.Pe?.());
+function unlinkSubs(e) {
+  const t = e.V;
+  const n = e.D;
+  const i = e.p;
+  const r = e.he;
+  if (i !== null) i.he = r;
+  else t.Ae = r;
+  if (r !== null) r.p = i;
+  else {
+    t.I = i;
+    if (i === null) {
+      t.ge?.();
+      t.L && !t.Ce && unobserved(t);
+    }
+  }
+  return n;
 }
-function runEffect() {
-  if (!this.oe || this.S & REACTIVE_DISPOSED) return;
-  this.Pe?.();
-  this.Pe = undefined;
-  try {
-    this.Pe = this.Ae(this.le, this.he);
-  } catch (e) {
-    if (!this.se.notify(this, STATUS_ERROR, STATUS_ERROR)) throw e;
-  } finally {
-    this.he = this.le;
-    this.oe = false;
+function unobserved(e) {
+  deleteFromHeap(e, e.S & REACTIVE_ZOMBIE ? zombieQueue : dirtyQueue);
+  let t = e.N;
+  while (t !== null) {
+    t = unlinkSubs(t);
   }
+  e.N = null;
+  disposeChildren(e, true);
 }
-function trackedEffect(e, t) {
-  const run = () => {
-    if (!n.oe || n.S & REACTIVE_DISPOSED) return;
-    n.oe = false;
-    recompute(n);
-  };
-  const n = computed(
-    () => {
-      try {
-        n.Pe?.();
-        n.Pe = undefined;
-        n.Pe = staleValues(e) || undefined;
-      } finally {
-      }
-    },
-    undefined,
-    { ...t, lazy: true, pureWrite: true }
-  );
-  n.Pe = undefined;
-  n.oe = true;
-  n.re = EFFECT_TRACKED;
-  n.ue = run;
-  n.se.enqueue(EFFECT_USER, run);
-  onCleanup(() => n.Pe?.());
+function link(e, t) {
+  const n = t.Pe;
+  if (n !== null && n.V === e) return;
+  let i = null;
+  const r = t.S & REACTIVE_RECOMPUTING_DEPS;
+  if (r) {
+    i = n !== null ? n.D : t.N;
+    if (i !== null && i.V === e) {
+      t.Pe = i;
+      return;
+    }
+  }
+  const o = e.Ae;
+  if (o !== null && o.h === t && (!r || isValidLink(o, t))) return;
+  const s = (t.Pe = e.Ae = { V: e, h: t, D: i, he: o, p: null });
+  if (n !== null) n.D = s;
+  else t.N = s;
+  if (o !== null) o.p = s;
+  else e.I = s;
+}
+function isValidLink(e, t) {
+  const n = t.Pe;
+  if (n !== null) {
+    let i = t.N;
+    do {
+      if (i === e) return true;
+      if (i === n) break;
+      i = i.D;
+    } while (i !== null);
+  }
+  return false;
 }
 const PENDING_OWNER = {};
 function markDisposal(e) {
-  let t = e.Ce;
+  let t = e.Ne;
   while (t) {
     t.S |= REACTIVE_ZOMBIE;
     if (t.S & REACTIVE_IN_HEAP) {
@@ -779,7 +757,7 @@ function markDisposal(e) {
       insertIntoHeap(t, zombieQueue);
     }
     markDisposal(t);
-    t = t.Ne;
+    t = t.ye;
   }
 }
 function dispose(e) {
@@ -788,15 +766,15 @@ function dispose(e) {
     t = unlinkSubs(t);
   } while (t !== null);
   e.N = null;
-  e.ye = null;
+  e.Pe = null;
   disposeChildren(e, true);
 }
 function disposeChildren(e, t = false, n) {
   if (e.S & REACTIVE_DISPOSED) return;
   if (t) e.S = REACTIVE_DISPOSED;
-  let i = n ? e.De : e.Ce;
+  let i = n ? e.De : e.Ne;
   while (i) {
-    const e = i.Ne;
+    const e = i.ye;
     if (i.N) {
       const e = i;
       deleteFromHeap(e, e.S & REACTIVE_ZOMBIE ? zombieQueue : dirtyQueue);
@@ -805,7 +783,7 @@ function disposeChildren(e, t = false, n) {
         t = unlinkSubs(t);
       } while (t !== null);
       e.N = null;
-      e.ye = null;
+      e.Pe = null;
     }
     disposeChildren(i, true);
     i = e;
@@ -813,8 +791,8 @@ function disposeChildren(e, t = false, n) {
   if (n) {
     e.De = null;
   } else {
-    e.Ce = null;
     e.Ne = null;
+    e.ye = null;
     e.ve = 0;
   }
   runDisposal(e, n);
@@ -832,12 +810,18 @@ function runDisposal(e, t) {
   }
   t ? (e.we = null) : (e.be = null);
 }
-function getNextChildId(e) {
-  let t = e;
-  while (t.Ve && t.i) t = t.i;
-  if (t.id != null) return formatId(t.id, t.ve++);
+function childId(e, t) {
+  let n = e;
+  while (n.Ve && n.i) n = n.i;
+  if (n.id != null) return formatId(n.id, t ? n.ve++ : n.ve);
   throw new Error("Cannot get child id from owner without an id");
 }
+function getNextChildId(e) {
+  return childId(e, true);
+}
+function peekNextChildId(e) {
+  return childId(e, false);
+}
 function formatId(e, t) {
   const n = t.toString(36),
     i = n.length - 1;
@@ -865,8 +849,8 @@ function createOwner(e) {
     Ve: n || undefined,
     t: true,
     u: t?.t ? t.u : t,
-    Ce: null,
     Ne: null,
+    ye: null,
     be: null,
     se: t?.se ?? globalQueue,
     me: t?.me || defaultContext,
@@ -879,12 +863,12 @@ function createOwner(e) {
     }
   };
   if (t) {
-    const e = t.Ce;
+    const e = t.Ne;
     if (e === null) {
-      t.Ce = i;
+      t.Ne = i;
     } else {
-      i.Ne = e;
-      t.Ce = i;
+      i.ye = e;
+      t.Ne = i;
     }
   }
   return i;
@@ -893,63 +877,85 @@ function createRoot(e, t) {
   const n = createOwner(t);
   return runWithOwner(n, () => e(n.dispose));
 }
-function unlinkSubs(e) {
-  const t = e.V;
-  const n = e.D;
-  const i = e.p;
-  const r = e.Le;
-  if (i !== null) i.Le = r;
-  else t.ke = r;
-  if (r !== null) r.p = i;
-  else {
-    t.I = i;
-    if (i === null) {
-      t.Ue?.();
-      t.L && !t.We && unobserved(t);
-    }
-  }
-  return n;
-}
-function unobserved(e) {
-  deleteFromHeap(e, e.S & REACTIVE_ZOMBIE ? zombieQueue : dirtyQueue);
-  let t = e.N;
-  while (t !== null) {
-    t = unlinkSubs(t);
-  }
-  e.N = null;
-  disposeChildren(e, true);
+function effect(e, t, n, i, r) {
+  let o = false;
+  const s = computed(r?.render ? t => staleValues(() => e(t)) : e, i, {
+    ...r,
+    equals: () => {
+      s.oe = !s.q;
+      if (o) s.se.enqueue(s.re, runEffect.bind(s));
+      return false;
+    },
+    lazy: true
+  });
+  s.Le = i;
+  s.ke = t;
+  s.Ue = n;
+  s.We = undefined;
+  s.re = r?.render ? EFFECT_RENDER : EFFECT_USER;
+  s.pe = (e, t) => {
+    const n = e !== undefined ? e : s.ae;
+    const i = t !== undefined ? t : s.q;
+    if (n & STATUS_ERROR) {
+      let e = i;
+      s.se.notify(s, STATUS_PENDING, 0);
+      if (s.re === EFFECT_USER) {
+        try {
+          return s.Ue
+            ? s.Ue(e, () => {
+                s.We?.();
+                s.We = undefined;
+              })
+            : console.error(e);
+        } catch (t) {
+          e = t;
+        }
+      }
+      if (!s.se.notify(s, STATUS_ERROR, STATUS_ERROR)) throw e;
+    } else if (s.re === EFFECT_RENDER) s.se.notify(s, STATUS_PENDING | STATUS_ERROR, n, i);
+  };
+  recompute(s, true);
+  !r?.defer && (s.re === EFFECT_USER ? s.se.enqueue(s.re, runEffect.bind(s)) : runEffect.call(s));
+  o = true;
+  onCleanup(() => s.We?.());
 }
-function link(e, t) {
-  const n = t.ye;
-  if (n !== null && n.V === e) return;
-  let i = null;
-  const r = t.S & REACTIVE_RECOMPUTING_DEPS;
-  if (r) {
-    i = n !== null ? n.D : t.N;
-    if (i !== null && i.V === e) {
-      t.ye = i;
-      return;
-    }
+function runEffect() {
+  if (!this.oe || this.S & REACTIVE_DISPOSED) return;
+  this.We?.();
+  this.We = undefined;
+  try {
+    this.We = this.ke(this.le, this.Le);
+  } catch (e) {
+    if (!this.se.notify(this, STATUS_ERROR, STATUS_ERROR)) throw e;
+  } finally {
+    this.Le = this.le;
+    this.oe = false;
   }
-  const o = e.ke;
-  if (o !== null && o.h === t && (!r || isValidLink(o, t))) return;
-  const s = (t.ye = e.ke = { V: e, h: t, D: i, Le: o, p: null });
-  if (n !== null) n.D = s;
-  else t.N = s;
-  if (o !== null) o.p = s;
-  else e.I = s;
 }
-function isValidLink(e, t) {
-  const n = t.ye;
-  if (n !== null) {
-    let i = t.N;
-    do {
-      if (i === e) return true;
-      if (i === n) break;
-      i = i.D;
-    } while (i !== null);
-  }
-  return false;
+function trackedEffect(e, t) {
+  const run = () => {
+    if (!n.oe || n.S & REACTIVE_DISPOSED) return;
+    n.oe = false;
+    recompute(n);
+  };
+  const n = computed(
+    () => {
+      try {
+        n.We?.();
+        n.We = undefined;
+        n.We = staleValues(e) || undefined;
+      } finally {
+      }
+    },
+    undefined,
+    { ...t, lazy: true, pureWrite: true }
+  );
+  n.We = undefined;
+  n.oe = true;
+  n.re = EFFECT_TRACKED;
+  n.ue = run;
+  n.se.enqueue(EFFECT_USER, run);
+  onCleanup(() => n.We?.());
 }
 GlobalQueue.K = recompute;
 GlobalQueue.Y = disposeChildren;
@@ -971,9 +977,9 @@ function recompute(e, t = false) {
     else {
       markDisposal(e);
       e.we = e.be;
-      e.De = e.Ce;
+      e.De = e.Ne;
       e.be = null;
-      e.Ce = null;
+      e.Ne = null;
       e.ve = 0;
     }
   }
@@ -982,7 +988,7 @@ function recompute(e, t = false) {
   const o = !!(e.ae & STATUS_PENDING);
   const s = context;
   context = e;
-  e.ye = null;
+  e.Pe = null;
   e.S = REACTIVE_RECOMPUTING_DEPS;
   e.J = clock;
   let u = e.ce === NOT_PENDING ? e.le : e.ce;
@@ -1024,7 +1030,7 @@ function recompute(e, t = false) {
     context = s;
   }
   if (!e.q) {
-    const s = e.ye;
+    const s = e.Pe;
     let l = s !== null ? s.D : e.N;
     if (l !== null) {
       do {
@@ -1084,7 +1090,7 @@ function computed(e, t, n) {
     Ve: i || undefined,
     _e: n?.equals != null ? n.equals : isEqual,
     xe: !!n?.pureWrite,
-    Ue: n?.unobserved,
+    ge: n?.unobserved,
     be: null,
     se: context?.se ?? globalQueue,
     me: context?.me ?? defaultContext,
@@ -1096,12 +1102,12 @@ function computed(e, t, n) {
     R: undefined,
     T: null,
     N: null,
-    ye: null,
+    Pe: null,
     I: null,
-    ke: null,
+    Ae: null,
     i: context,
+    ye: null,
     Ne: null,
-    Ce: null,
     S: REACTIVE_NONE,
     ae: STATUS_UNINITIALIZED,
     J: clock,
@@ -1114,12 +1120,12 @@ function computed(e, t, n) {
   r.T = r;
   const o = context?.t ? context.u : context;
   if (context) {
-    const e = context.Ce;
+    const e = context.Ne;
     if (e === null) {
-      context.Ce = r;
+      context.Ne = r;
     } else {
-      r.Ne = e;
-      context.Ce = r;
+      r.ye = e;
+      context.Ne = r;
     }
   }
   if (o) r.o = o.o + 1;
@@ -1130,13 +1136,13 @@ function signal(e, t, n = null) {
   const i = {
     _e: t?.equals != null ? t.equals : isEqual,
     xe: !!t?.pureWrite,
-    Ue: t?.unobserved,
+    ge: t?.unobserved,
     le: e,
     I: null,
-    ke: null,
+    Ae: null,
     J: clock,
     m: n,
-    P: n?.A || null,
+    C: n?.A || null,
     ce: NOT_PENDING
   };
   n && (n.A = i);
@@ -1201,7 +1207,7 @@ function read(e) {
     const n = e.m || e;
     if (n.L) {
       const i = e.S & REACTIVE_ZOMBIE;
-      if (n.o >= (i ? zombieQueue.C : dirtyQueue.C)) {
+      if (n.o >= (i ? zombieQueue.P : dirtyQueue.P)) {
         markNode(t);
         markHeap(i ? zombieQueue : dirtyQueue);
         updateIfNecessary(n);
@@ -1705,7 +1711,7 @@ function createProjectionInternal(e, t = {}, n) {
       r !== i && r !== undefined && reconcile(r, n?.key || "id", n?.all)(o);
     });
   });
-  i.We = true;
+  i.Ce = true;
   return { store: o, node: i };
 }
 function createProjection(e, t = {}, n) {
@@ -2173,7 +2179,7 @@ function createOptimisticProjectionInternal(e, t = {}, n) {
         setProjectionWriteActive(false);
       }
     });
-    i.We = true;
+    i.Ce = true;
   }
   return { store: o, node: i };
 }
@@ -2566,7 +2572,7 @@ function boundaryComputed(e, t) {
     n.se.notify(n, n.et, i, r);
   };
   n.et = t;
-  n.We = true;
+  n.Ce = true;
   recompute(n, true);
   return n;
 }
@@ -2730,6 +2736,7 @@ export {
   omit,
   onCleanup,
   onSettled,
+  peekNextChildId,
   pending,
   reconcile,
   refresh,

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

@@ -1,11 +1,6 @@
-import { handleAsync } from "./async.js";
 import { $REFRESH } from "./constants.js";
 import { type OptimisticLane } from "./lanes.js";
-import { createOwner, createRoot, dispose, getNextChildId, getObserver, getOwner, onCleanup } from "./owner.js";
-import type { Computed, Disposable, FirewallSignal, Link, NodeOptions, Owner, Root, Signal } from "./types.js";
-export { handleAsync };
-export type { Computed, Disposable, FirewallSignal, Link, Owner, Root, Signal, NodeOptions };
-export { createOwner, createRoot, dispose, getNextChildId, getObserver, getOwner, onCleanup };
+import type { Computed, FirewallSignal, NodeOptions, Owner, Signal } from "./types.js";
 export declare let tracking: boolean;
 export declare let stale: boolean;
 export declare let refreshing: boolean;

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

@@ -1,6 +1,8 @@
 export { ContextNotFoundError, NoOwnerError, NotReadyError } from "./error.js";
+export { isEqual, untrack, runWithOwner, computed, signal, read, setSignal, optimisticSignal, optimisticComputed, isPending, pending, refresh, isRefreshing, staleValues } from "./core.js";
+export { createOwner, createRoot, dispose, getNextChildId, getObserver, getOwner, onCleanup, peekNextChildId } from "./owner.js";
 export { createContext, getContext, setContext, type Context, type ContextRecord } from "./context.js";
-export { getObserver, isEqual, untrack, getOwner, runWithOwner, createOwner, createRoot, computed, dispose, signal, read, setSignal, onCleanup, optimisticSignal, optimisticComputed, getNextChildId, isPending, pending, refresh, isRefreshing, staleValues, handleAsync } from "./core.js";
+export { handleAsync } from "./async.js";
 export type { Computed, Disposable, FirewallSignal, Link, Owner, Root, Signal, NodeOptions } from "./types.js";
 export { effect, trackedEffect, type Effect, type TrackedEffect } from "./effect.js";
 export { action } from "./action.js";

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

@@ -3,6 +3,7 @@ export declare function markDisposal(el: Owner): void;
 export declare function dispose(node: Computed<unknown>): void;
 export declare function disposeChildren(node: Owner, self?: boolean, zombie?: boolean): void;
 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;

package/dist/types/index.d.ts

@@ -1,4 +1,4 @@
-export { ContextNotFoundError, NoOwnerError, NotReadyError, action, createContext, createOwner, createRoot, runWithOwner, flush, getNextChildId, getContext, setContext, getOwner, onCleanup, getObserver, isEqual, untrack, isPending, pending, isRefreshing, refresh, SUPPORTS_PROXY } from "./core/index.js";
+export { ContextNotFoundError, NoOwnerError, NotReadyError, action, createContext, createOwner, createRoot, runWithOwner, flush, getNextChildId, peekNextChildId, getContext, setContext, getOwner, onCleanup, getObserver, isEqual, untrack, isPending, pending, isRefreshing, refresh, SUPPORTS_PROXY } from "./core/index.js";
 export type { Owner, Context, ContextRecord, IQueue } from "./core/index.js";
 export * from "./signals.js";
 export { mapArray, repeat, type Maybe } from "./map.js";

package/package.json

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