@solidjs/signals 0.9.3 → 0.9.4

package/dist/dev.js

@@ -1082,9 +1082,7 @@ function createSignal(first, second, third) {
     const node = computed(first, second, third);
     return [read.bind(null, node), setSignal.bind(null, node)];
   }
-  const o = getOwner();
-  const needsId = o?.id != null;
-  const node = signal(first, needsId ? { id: getNextChildId(o), ...second } : second);
+  const node = signal(first, second);
   return [read.bind(null, node), setSignal.bind(null, node)];
 }
 function createMemo(compute, value, options) {
@@ -1143,8 +1141,10 @@ function createOptimistic(first, second, third) {
   if (typeof first === "function") {
     const node = computed(
       prev => {
-        let n = node || getOwner();
-        n._pendingValue = first(prev);
+        const n = getOwner();
+        const value = first(prev);
+        if (n._statusFlags & STATUS_UNINITIALIZED) return value;
+        n._pendingValue = value;
         return prev;
       },
       second,
@@ -1153,9 +1153,7 @@ function createOptimistic(first, second, third) {
     node._optimistic = true;
     return [read.bind(null, node), setSignal.bind(null, node)];
   }
-  const o = getOwner();
-  const needsId = o?.id != null;
-  const node = signal(first, needsId ? { id: getNextChildId(o), ...second } : second);
+  const node = signal(first, second);
   node._optimistic = true;
   return [
     read.bind(null, node),
@@ -1338,13 +1336,13 @@ function createProjectionInternal(fn, initialValue = {}, options) {
   };
   const wrappedStore = wrapProjection(initialValue);
   node = computed(() => {
-    const owner = node || getOwner();
+    const owner = getOwner();
     storeSetter(new Proxy(wrappedStore, writeTraps), s => {
       const value = handleAsync(owner, fn(s), value => {
         value !== wrappedStore &&
           value !== undefined &&
           storeSetter(wrappedStore, reconcile(value, options?.key || "id", options?.all));
-        setSignal(node, undefined);
+        setSignal(owner, undefined);
       });
       value !== wrappedStore &&
         value !== undefined &&

package/dist/node.cjs

@@ -80,8 +80,8 @@ function deleteFromHeap(e, t) {
   e.p = undefined;
 }
 function markHeap(e) {
-  if (e.O) return;
-  e.O = true;
+  if (e.m) return;
+  e.m = true;
   for (let t = 0; t <= e._; t++) {
     for (let n = e.l[t]; n !== undefined; n = n.p) {
       if (n.S & i) markNode(n);
@@ -92,19 +92,19 @@ function markNode(e, r = n) {
   const i = e.S;
   if ((i & (t | n)) >= r) return;
   e.S = (i & -4) | r;
-  for (let n = e.m; n !== null; n = n.C) {
+  for (let n = e.O; n !== null; n = n.C) {
     markNode(n.N, t);
   }
   if (e.k !== null) {
     for (let n = e.k; n !== null; n = n.j) {
-      for (let e = n.m; e !== null; e = e.C) {
+      for (let e = n.O; e !== null; e = e.C) {
         markNode(e.N, t);
       }
     }
   }
 }
 function runHeap(e, t) {
-  e.O = false;
+  e.m = false;
   for (e.P = 0; e.P <= e._; e.P++) {
     let n = e.l[e.P];
     while (n !== undefined) {
@@ -125,28 +125,28 @@ function adjustHeight(e, t) {
   }
   if (e.o !== n) {
     e.o = n;
-    for (let n = e.m; n !== null; n = n.C) {
+    for (let n = e.O; n !== null; n = n.C) {
       insertIntoHeapHeight(n.N, t);
     }
   }
 }
 const _ = new Set();
 let S = false;
-const b = { l: new Array(2e3).fill(undefined), O: false, P: 0, _: 0 };
-const O = { l: new Array(2e3).fill(undefined), O: false, P: 0, _: 0 };
-let m = 0;
+const b = { l: new Array(2e3).fill(undefined), m: false, P: 0, _: 0 };
+const m = { l: new Array(2e3).fill(undefined), m: false, P: 0, _: 0 };
+let O = 0;
 let x = null;
-let C = false;
+let v = false;
 function schedule() {
-  if (C) return;
-  C = true;
-  if (!v.R) Promise.resolve().then(() => queueMicrotask(flush));
+  if (v) return;
+  v = true;
+  if (!C.R) Promise.resolve().then(() => queueMicrotask(flush));
 }
 class Queue {
   i = null;
   V = [[], []];
   q = [];
-  created = m;
+  created = O;
   addChild(e) {
     this.q.push(e);
     e.i = this;
@@ -214,11 +214,11 @@ class GlobalQueue extends Queue {
       if (x) {
         if (!transitionComplete(x)) {
           let e = x;
-          runHeap(O, GlobalQueue.D);
+          runHeap(m, GlobalQueue.D);
           this.M = [];
           this.stashQueues(x.queueStash);
-          m++;
-          C = false;
+          O++;
+          v = false;
           runTransitionPending(x.pendingNodes, true);
           x = null;
           runOptimistic(e);
@@ -230,10 +230,10 @@ class GlobalQueue extends Queue {
         _.delete(x);
         x = null;
         runTransitionPending(this.M, false);
-      } else if (_.size) runHeap(O, GlobalQueue.D);
+      } else if (_.size) runHeap(m, GlobalQueue.D);
       runOptimistic();
-      m++;
-      C = false;
+      O++;
+      v = false;
       this.run(d);
       this.run(h);
     } finally {
@@ -253,10 +253,10 @@ class GlobalQueue extends Queue {
     return false;
   }
   initTransition(e) {
-    if (x && x.time === m) return;
+    if (x && x.time === O) return;
     if (!x) {
       x = e?.G ?? {
-        time: m,
+        time: O,
         pendingNodes: [],
         asyncNodes: [],
         optimisticNodes: [],
@@ -266,7 +266,7 @@ class GlobalQueue extends Queue {
       };
     }
     _.add(x);
-    x.time = m;
+    x.time = O;
     for (let e = 0; e < this.M.length; e++) {
       const t = this.M[e];
       t.G = x;
@@ -282,15 +282,15 @@ class GlobalQueue extends Queue {
   }
 }
 function notifySubs(e) {
-  for (let t = e.m; t !== null; t = t.C) {
-    const e = t.N.S & o ? O : b;
+  for (let t = e.O; t !== null; t = t.C) {
+    const e = t.N.S & o ? m : b;
     if (e.P > t.N.o) e.P = t.N.o;
     insertIntoHeap(t.N, e);
   }
 }
 function runOptimistic(e = null) {
   let t = !e;
-  const n = v.T;
+  const n = C.T;
   S = true;
   for (let t = 0; t < n.length; t++) {
     const r = n[t];
@@ -301,13 +301,13 @@ function runOptimistic(e = null) {
     r.G = e;
     notifySubs(r);
   }
-  v.T = [];
+  C.T = [];
   if (b._ >= b.P) {
     t = true;
     runHeap(b, GlobalQueue.D);
   }
   S = false;
-  t && runPending(v.M);
+  t && runPending(C.M);
 }
 function runPending(e) {
   for (let t = 0; t < e.length; t++) {
@@ -329,10 +329,10 @@ function runTransitionPending(e, t) {
     if (r.Y) r.Y.Z(t);
   }
 }
-const v = new GlobalQueue();
+const C = new GlobalQueue();
 function flush() {
-  while (C) {
-    v.flush();
+  while (v) {
+    C.flush();
   }
 }
 function runQueue(e, t) {
@@ -363,7 +363,7 @@ function runInTransition(e, t) {
 function action(e) {
   return (...t) => {
     const n = e(...t);
-    v.initTransition();
+    C.initTransition();
     let r = x;
     r.actions.push(n);
     const step = e => {
@@ -397,8 +397,8 @@ let A = null;
 function recompute(t, n = false) {
   const i = t.J && t.G != x;
   if (!n) {
-    if (t.G && x !== t.G && !i) v.initTransition(t);
-    deleteFromHeap(t, t.S & o ? O : b);
+    if (t.G && x !== t.G && !i) C.initTransition(t);
+    deleteFromHeap(t, t.S & o ? m : b);
     if (t.G) disposeChildren(t);
     else {
       markDisposal(t);
@@ -412,7 +412,7 @@ function recompute(t, n = false) {
   A = t;
   t.ie = null;
   t.S = r;
-  t.se = m;
+  t.se = O;
   let u = t.U === p || (t.oe && t.G) ? t.L : t.U;
   let d = t.o;
   let h = t.$;
@@ -455,12 +455,12 @@ function recompute(t, n = false) {
     }
     (!t.oe || S) && notifySubs(t);
   } else if (t.o != d) {
-    for (let e = t.m; e !== null; e = e.C) {
-      insertIntoHeapHeight(e.N, e.N.S & o ? O : b);
+    for (let e = t.O; e !== null; e = e.C) {
+      insertIntoHeapHeight(e.N, e.N.S & o ? m : b);
     }
   }
-  t.oe && !S && v.T.push(t);
-  (!n || t.$ & f) && !t.G && v.M.push(t);
+  t.oe && !S && C.T.push(t);
+  (!n || t.$ & f) && !t.G && C.M.push(t);
   t.G && i && runInTransition(t.G, () => recompute(t));
 }
 function handleAsync(e, t, n) {
@@ -475,14 +475,14 @@ function handleAsync(e, t, n) {
   if (i) {
     t.then(r => {
       if (e.ce !== t) return;
-      v.initTransition(e);
+      C.initTransition(e);
       n?.(r) ?? setSignal(e, () => r);
       flush();
     }).catch(n => {
       if (e.ce !== t) return;
-      v.initTransition(e);
+      C.initTransition(e);
       setStatusFlags(e, c, n);
-      e.se = m;
+      e.se = O;
       notifySubs(e);
       schedule();
       flush();
@@ -492,22 +492,22 @@ function handleAsync(e, t, n) {
       try {
         for await (let r of t) {
           if (e.ce !== t) return;
-          v.initTransition(e);
+          C.initTransition(e);
           n?.(r) ?? setSignal(e, () => r);
           flush();
         }
       } catch (n) {
         if (e.ce !== t) return;
-        v.initTransition(e);
+        C.initTransition(e);
         setStatusFlags(e, c, n);
-        e.se = m;
+        e.se = O;
         notifySubs(e);
         schedule();
         flush();
       }
     })();
   }
-  v.initTransition(e);
+  C.initTransition(e);
   throw new NotReadyError(A);
 }
 function updateIfNecessary(r) {
@@ -537,7 +537,7 @@ function unlinkSubs(e) {
   else t.de = i;
   if (i !== null) i.C = r;
   else {
-    t.m = r;
+    t.O = r;
     if (r === null) {
       t.he?.();
       t.H && !t.pe && unobserved(t);
@@ -546,7 +546,7 @@ function unlinkSubs(e) {
   return n;
 }
 function unobserved(e) {
-  deleteFromHeap(e, e.S & o ? O : b);
+  deleteFromHeap(e, e.S & o ? m : b);
   let t = e.W;
   while (t !== null) {
     t = unlinkSubs(t);
@@ -572,7 +572,7 @@ function link(e, t) {
   if (n !== null) n.A = u;
   else t.W = u;
   if (o !== null) o.C = u;
-  else e.m = u;
+  else e.O = u;
 }
 function isValidLink(e, t) {
   const n = t.ie;
@@ -596,7 +596,7 @@ function markDisposal(e) {
     t.S |= o;
     if (t.S & i) {
       deleteFromHeap(t, b);
-      insertIntoHeap(t, O);
+      insertIntoHeap(t, m);
     }
     markDisposal(t);
     t = t.ye;
@@ -619,7 +619,7 @@ function disposeChildren(e, t = false, n) {
     const e = r.ye;
     if (r.W) {
       const e = r;
-      deleteFromHeap(e, e.S & o ? O : b);
+      deleteFromHeap(e, e.S & o ? m : b);
       let t = e.W;
       do {
         t = unlinkSubs(t);
@@ -667,7 +667,7 @@ function computed(t, n, r) {
     we: !!r?.pureWrite,
     he: r?.unobserved,
     te: null,
-    _e: A?._e ?? v,
+    _e: A?._e ?? C,
     Se: A?.Se ?? g,
     ge: 0,
     H: t,
@@ -678,14 +678,14 @@ function computed(t, n, r) {
     h: null,
     W: null,
     ie: null,
-    m: null,
+    O: null,
     de: null,
     i: A,
     ye: null,
     re: null,
     S: e,
     $: a,
-    se: m,
+    se: O,
     U: p,
     ee: null,
     ne: null,
@@ -715,10 +715,10 @@ function signal(e, t, n = null) {
     we: !!t?.pureWrite,
     he: t?.unobserved,
     L: e,
-    m: null,
+    O: null,
     de: null,
     $: l,
-    se: m,
+    se: O,
     F: n,
     j: n?.k || null,
     U: p
@@ -748,9 +748,9 @@ function read(e) {
     const n = e.F || e;
     if (n.H) {
       const r = e.S & o;
-      if (n.o >= (r ? O.P : b.P)) {
+      if (n.o >= (r ? m.P : b.P)) {
         markNode(t);
-        markHeap(r ? O : b);
+        markHeap(r ? m : b);
         updateIfNecessary(n);
       }
       const i = n.o;
@@ -790,7 +790,7 @@ function read(e) {
     }
   }
   if (e.$ & c) {
-    if (e.se < m) {
+    if (e.se < O) {
       recompute(e, true);
       return read(e);
     } else {
@@ -808,14 +808,14 @@ function setSignal(e, t) {
   if (n) {
     if (e.oe) e.L = t;
     else {
-      if (e.U === p) v.M.push(e);
+      if (e.U === p) C.M.push(e);
       e.U = t;
     }
     if (e.fe) setSignal(e.fe, t);
   }
   setStatusFlags(e, l);
-  e.se = m;
-  e.oe && !S ? v.T.push(e) : notifySubs(e);
+  e.se = O;
+  e.oe && !S ? C.T.push(e) : notifySubs(e);
   schedule();
   return t;
 }
@@ -846,7 +846,7 @@ function createOwner(e) {
     ye: null,
     te: null,
     id: e?.id ?? (t?.id != null ? getNextChildId(t) : undefined),
-    _e: t?._e ?? v,
+    _e: t?._e ?? C,
     Se: t?.Se || g,
     ge: 0,
     ee: null,
@@ -962,10 +962,10 @@ function effect(e, t, n, r, i) {
     ...i,
     be: {
       X: true,
-      Oe: r,
-      me: t,
+      me: r,
+      Oe: t,
       xe: n,
-      Ce: undefined,
+      ve: undefined,
       J: i?.render ? d : h,
       le(e, t) {
         if (s) {
@@ -980,8 +980,8 @@ function effect(e, t, n, r, i) {
             try {
               return this.xe
                 ? this.xe(e, () => {
-                    this.Ce?.();
-                    this.Ce = undefined;
+                    this.ve?.();
+                    this.ve = undefined;
                   })
                 : console.error(e);
             } catch (t) {
@@ -1000,18 +1000,18 @@ function effect(e, t, n, r, i) {
   !i?.defer &&
     !(o.$ & (c | f)) &&
     (o.J === h ? o._e.enqueue(o.J, runEffect.bind(o)) : runEffect.call(o));
-  onCleanup(() => o.Ce?.());
+  onCleanup(() => o.ve?.());
 }
 function runEffect() {
   if (!this.X || this.S & u) return;
-  this.Ce?.();
-  this.Ce = undefined;
+  this.ve?.();
+  this.ve = undefined;
   try {
-    this.Ce = this.me(this.L, this.Oe);
+    this.ve = this.Oe(this.L, this.me);
   } catch (e) {
     if (!this._e.notify(this, c, c)) throw e;
   } finally {
-    this.Oe = this.L;
+    this.me = this.L;
     this.X = false;
   }
 }
@@ -1020,10 +1020,8 @@ function createSignal(e, t, n) {
     const r = computed(e, t, n);
     return [read.bind(null, r), setSignal.bind(null, r)];
   }
-  const r = getOwner();
-  const i = r?.id != null;
-  const s = signal(e, i ? { id: getNextChildId(r), ...t } : t);
-  return [read.bind(null, s), setSignal.bind(null, s)];
+  const r = signal(e, t);
+  return [read.bind(null, r), setSignal.bind(null, r)];
 }
 function createMemo(e, t, n) {
   let r = computed(e, t, n);
@@ -1075,8 +1073,10 @@ function createOptimistic(e, t, n) {
   if (typeof e === "function") {
     const r = computed(
       t => {
-        let n = r || getOwner();
-        n.U = e(t);
+        const n = getOwner();
+        const r = e(t);
+        if (n.$ & a) return r;
+        n.U = r;
         return t;
       },
       t,
@@ -1085,15 +1085,13 @@ function createOptimistic(e, t, n) {
     r.oe = true;
     return [read.bind(null, r), setSignal.bind(null, r)];
   }
-  const r = getOwner();
-  const i = r?.id != null;
-  const s = signal(e, i ? { id: getNextChildId(r), ...t } : t);
-  s.oe = true;
+  const r = signal(e, t);
+  r.oe = true;
   return [
-    read.bind(null, s),
+    read.bind(null, r),
     t => {
-      s.U = e;
-      return setSignal(s, t);
+      r.U = e;
+      return setSignal(r, t);
     }
   ];
 }
@@ -1101,7 +1099,7 @@ function onSettled(e) {
   let t;
   const n = getOwner();
   if (n) onCleanup(() => t?.());
-  v.enqueue(h, () => {
+  C.enqueue(h, () => {
     t = e();
     !n && t?.();
   });
@@ -1259,13 +1257,13 @@ function createProjectionInternal(e, t = {}, n) {
   };
   const s = wrapProjection(t);
   r = computed(() => {
-    const t = r || getOwner();
-    storeSetter(new Proxy(s, E), i => {
-      const o = handleAsync(t, e(i), e => {
+    const t = getOwner();
+    storeSetter(new Proxy(s, E), r => {
+      const i = handleAsync(t, e(r), e => {
         e !== s && e !== undefined && storeSetter(s, reconcile(e, n?.key || "id", n?.all));
-        setSignal(r, undefined);
+        setSignal(t, undefined);
       });
-      o !== s && o !== undefined && reconcile(o, n?.key || "id", n?.all)(s);
+      i !== s && i !== undefined && reconcile(i, n?.key || "id", n?.all)(s);
     });
   });
   r.pe = true;
@@ -1754,7 +1752,7 @@ function mapArray(e, t, n) {
   const r = typeof n?.keyed === "function" ? n.keyed : undefined;
   return createMemo(
     updateKeyedMap.bind({
-      ve: createOwner(),
+      Ce: createOwner(),
       Ne: 0,
       ke: e,
       je: [],
@@ -1773,7 +1771,7 @@ function updateKeyedMap() {
   const e = this.ke() || [],
     t = e.length;
   e[I];
-  runWithOwner(this.ve, () => {
+  runWithOwner(this.Ce, () => {
     let n,
       r,
       i = this.Ie
@@ -1797,7 +1795,7 @@ function updateKeyedMap() {
             };
     if (t === 0) {
       if (this.Ne !== 0) {
-        this.ve.dispose(false);
+        this.Ce.dispose(false);
         this.Ae = [];
         this.je = [];
         this.We = [];
@@ -1893,7 +1891,7 @@ function updateKeyedMap() {
 }
 function repeat(e, t, n) {
   return updateRepeat.bind({
-    ve: createOwner(),
+    Ce: createOwner(),
     Ne: 0,
     Qe: 0,
     Re: e,
@@ -1907,10 +1905,10 @@ function repeat(e, t, n) {
 function updateRepeat() {
   const e = this.Re();
   const t = this.Ve?.() || 0;
-  runWithOwner(this.ve, () => {
+  runWithOwner(this.Ce, () => {
     if (e === 0) {
       if (this.Ne !== 0) {
-        this.ve.dispose(false);
+        this.Ce.dispose(false);
         this.Ae = [];
         this.We = [];
         this.Ne = 0;

package/dist/prod.js

@@ -201,8 +201,8 @@ class Queue {
 }
 class GlobalQueue extends Queue {
   k = false;
-  $ = [];
   L = [];
+  $ = [];
   static F;
   static W;
   flush() {
@@ -214,7 +214,7 @@ class GlobalQueue extends Queue {
         if (!transitionComplete(activeTransition)) {
           let e = activeTransition;
           runHeap(zombieQueue, GlobalQueue.F);
-          this.$ = [];
+          this.L = [];
           this.stashQueues(activeTransition.queueStash);
           clock++;
           scheduled = false;
@@ -223,13 +223,13 @@ class GlobalQueue extends Queue {
           runOptimistic(e);
           return;
         }
-        this.$.push(...activeTransition.pendingNodes);
-        this.L !== activeTransition.optimisticNodes &&
-          this.L.push(...activeTransition.optimisticNodes);
+        this.L.push(...activeTransition.pendingNodes);
+        this.$ !== activeTransition.optimisticNodes &&
+          this.$.push(...activeTransition.optimisticNodes);
         this.restoreQueues(activeTransition.queueStash);
         transitions.delete(activeTransition);
         activeTransition = null;
-        runTransitionPending(this.$, false);
+        runTransitionPending(this.L, false);
       } else if (transitions.size) runHeap(zombieQueue, GlobalQueue.F);
       runOptimistic();
       clock++;
@@ -267,18 +267,18 @@ class GlobalQueue extends Queue {
     }
     transitions.add(activeTransition);
     activeTransition.time = clock;
-    for (let e = 0; e < this.$.length; e++) {
-      const t = this.$[e];
+    for (let e = 0; e < this.L.length; e++) {
+      const t = this.L[e];
       t.K = activeTransition;
       activeTransition.pendingNodes.push(t);
     }
-    for (let e = 0; e < this.L.length; e++) {
-      const t = this.L[e];
+    for (let e = 0; e < this.$.length; e++) {
+      const t = this.$[e];
       t.K = activeTransition;
       activeTransition.optimisticNodes.push(t);
     }
-    this.$ = activeTransition.pendingNodes;
-    this.L = activeTransition.optimisticNodes;
+    this.L = activeTransition.pendingNodes;
+    this.$ = activeTransition.optimisticNodes;
   }
 }
 function notifySubs(e) {
@@ -290,7 +290,7 @@ function notifySubs(e) {
 }
 function runOptimistic(e = null) {
   let t = !e;
-  const n = globalQueue.L;
+  const n = globalQueue.$;
   optimisticRun = true;
   for (let t = 0; t < n.length; t++) {
     const i = n[t];
@@ -301,13 +301,13 @@ function runOptimistic(e = null) {
     i.K = e;
     notifySubs(i);
   }
-  globalQueue.L = [];
+  globalQueue.$ = [];
   if (dirtyQueue.h >= dirtyQueue.C) {
     t = true;
     runHeap(dirtyQueue, GlobalQueue.F);
   }
   optimisticRun = false;
-  t && runPending(globalQueue.$);
+  t && runPending(globalQueue.L);
 }
 function runPending(e) {
   for (let t = 0; t < e.length; t++) {
@@ -459,8 +459,8 @@ function recompute(e, t = false) {
       insertIntoHeapHeight(t.A, t.A.S & REACTIVE_ZOMBIE ? zombieQueue : dirtyQueue);
     }
   }
-  e.oe && !optimisticRun && globalQueue.L.push(e);
-  (!t || e.J & STATUS_PENDING) && !e.K && globalQueue.$.push(e);
+  e.oe && !optimisticRun && globalQueue.$.push(e);
+  (!t || e.J & STATUS_PENDING) && !e.K && globalQueue.L.push(e);
   e.K && n && runInTransition(e.K, () => recompute(e));
 }
 function handleAsync(e, t, n) {
@@ -813,14 +813,14 @@ function setSignal(e, t) {
   if (n) {
     if (e.oe) e.Y = t;
     else {
-      if (e.M === NOT_PENDING) globalQueue.$.push(e);
+      if (e.M === NOT_PENDING) globalQueue.L.push(e);
       e.M = t;
     }
     if (e.ce) setSignal(e.ce, t);
   }
   setStatusFlags(e, STATUS_NONE);
   e.se = clock;
-  e.oe && !optimisticRun ? globalQueue.L.push(e) : notifySubs(e);
+  e.oe && !optimisticRun ? globalQueue.$.push(e) : notifySubs(e);
   schedule();
   return t;
 }
@@ -968,8 +968,8 @@ function effect(e, t, n, i, r) {
     pe: {
       X: true,
       Ae: i,
-      ge: t,
-      Ne: n,
+      Ne: t,
+      ge: n,
       Ie: undefined,
       B: r?.render ? EFFECT_RENDER : EFFECT_USER,
       le(e, t) {
@@ -983,8 +983,8 @@ function effect(e, t, n, i, r) {
           this._e.notify(this, STATUS_PENDING, 0);
           if (this.B === EFFECT_USER) {
             try {
-              return this.Ne
-                ? this.Ne(e, () => {
+              return this.ge
+                ? this.ge(e, () => {
                     this.Ie?.();
                     this.Ie = undefined;
                   })
@@ -1012,7 +1012,7 @@ function runEffect() {
   this.Ie?.();
   this.Ie = undefined;
   try {
-    this.Ie = this.ge(this.Y, this.Ae);
+    this.Ie = this.Ne(this.Y, this.Ae);
   } catch (e) {
     if (!this._e.notify(this, STATUS_ERROR, STATUS_ERROR)) throw e;
   } finally {
@@ -1025,10 +1025,8 @@ function createSignal(e, t, n) {
     const i = computed(e, t, n);
     return [read.bind(null, i), setSignal.bind(null, i)];
   }
-  const i = getOwner();
-  const r = i?.id != null;
-  const s = signal(e, r ? { id: getNextChildId(i), ...t } : t);
-  return [read.bind(null, s), setSignal.bind(null, s)];
+  const i = signal(e, t);
+  return [read.bind(null, i), setSignal.bind(null, i)];
 }
 function createMemo(e, t, n) {
   let i = computed(e, t, n);
@@ -1080,8 +1078,10 @@ function createOptimistic(e, t, n) {
   if (typeof e === "function") {
     const i = computed(
       t => {
-        let n = i || getOwner();
-        n.M = e(t);
+        const n = getOwner();
+        const i = e(t);
+        if (n.J & STATUS_UNINITIALIZED) return i;
+        n.M = i;
         return t;
       },
       t,
@@ -1090,15 +1090,13 @@ function createOptimistic(e, t, n) {
     i.oe = true;
     return [read.bind(null, i), setSignal.bind(null, i)];
   }
-  const i = getOwner();
-  const r = i?.id != null;
-  const s = signal(e, r ? { id: getNextChildId(i), ...t } : t);
-  s.oe = true;
+  const i = signal(e, t);
+  i.oe = true;
   return [
-    read.bind(null, s),
+    read.bind(null, i),
     t => {
-      s.M = e;
-      return setSignal(s, t);
+      i.M = e;
+      return setSignal(i, t);
     }
   ];
 }
@@ -1266,13 +1264,13 @@ function createProjectionInternal(e, t = {}, n) {
   };
   const s = wrapProjection(t);
   i = computed(() => {
-    const t = i || getOwner();
-    storeSetter(new Proxy(s, writeTraps), r => {
-      const o = handleAsync(t, e(r), e => {
+    const t = getOwner();
+    storeSetter(new Proxy(s, writeTraps), i => {
+      const r = handleAsync(t, e(i), e => {
         e !== s && e !== undefined && storeSetter(s, reconcile(e, n?.key || "id", n?.all));
-        setSignal(i, undefined);
+        setSignal(t, undefined);
       });
-      o !== s && o !== undefined && reconcile(o, n?.key || "id", n?.all)(s);
+      r !== s && r !== undefined && reconcile(r, n?.key || "id", n?.all)(s);
     });
   });
   i.Te = true;
@@ -1998,30 +1996,30 @@ function createBoundChildren(e, t, n, i) {
   });
 }
 class ConditionalQueue extends Queue {
-  $e;
-  Le = new Set();
-  $ = new Set();
+  Le;
+  $e = new Set();
+  L = new Set();
   constructor(e) {
     super();
-    this.$e = e;
+    this.Le = e;
   }
   run(e) {
-    if (!e || read(this.$e)) return;
+    if (!e || read(this.Le)) return;
     return super.run(e);
   }
   notify(e, t, n) {
-    if (read(this.$e)) {
+    if (read(this.Le)) {
       if (t & STATUS_PENDING) {
         if (n & STATUS_PENDING) {
-          this.$.add(e);
+          this.L.add(e);
           t &= ~STATUS_PENDING;
-        } else if (this.$.delete(e)) t &= ~STATUS_PENDING;
+        } else if (this.L.delete(e)) t &= ~STATUS_PENDING;
       }
       if (t & STATUS_ERROR) {
         if (n & STATUS_ERROR) {
-          this.Le.add(e);
+          this.$e.add(e);
           t &= ~STATUS_ERROR;
-        } else if (this.Le.delete(e)) t &= ~STATUS_ERROR;
+        } else if (this.$e.delete(e)) t &= ~STATUS_ERROR;
       }
     }
     return t ? super.notify(e, t, n) : true;
@@ -2030,24 +2028,24 @@ class ConditionalQueue extends Queue {
 class CollectionQueue extends Queue {
   Fe;
   Ve = new Set();
-  $e = signal(false, { pureWrite: true });
+  Le = signal(false, { pureWrite: true });
   We = false;
   constructor(e) {
     super();
     this.Fe = e;
   }
   run(e) {
-    if (!e || read(this.$e)) return;
+    if (!e || read(this.Le)) return;
     return super.run(e);
   }
   notify(e, t, n) {
     if (!(t & this.Fe) || (this.Fe & STATUS_PENDING && this.We)) return super.notify(e, t, n);
     if (n & this.Fe) {
       this.Ve.add(e);
-      if (this.Ve.size === 1) setSignal(this.$e, true);
+      if (this.Ve.size === 1) setSignal(this.Le, true);
     } else if (this.Ve.size > 0) {
       this.Ve.delete(e);
-      if (this.Ve.size === 0) setSignal(this.$e, false);
+      if (this.Ve.size === 0) setSignal(this.Le, false);
     }
     t &= ~this.Fe;
     return t ? super.notify(e, t, n) : true;
@@ -2063,25 +2061,25 @@ function createBoundary(e, t) {
   const i = new ConditionalQueue(computed(() => t() === BoundaryMode.HIDDEN));
   const r = createBoundChildren(n, e, i, 0);
   computed(() => {
-    const e = read(i.$e);
+    const e = read(i.Le);
     r.Qe = e ? STATUS_ERROR | STATUS_PENDING : 0;
     if (!e) {
-      i.$.forEach(e => i.notify(e, STATUS_PENDING, STATUS_PENDING));
-      i.Le.forEach(e => i.notify(e, STATUS_ERROR, STATUS_ERROR));
-      i.$.clear();
-      i.Le.clear();
+      i.L.forEach(e => i.notify(e, STATUS_PENDING, STATUS_PENDING));
+      i.$e.forEach(e => i.notify(e, STATUS_ERROR, STATUS_ERROR));
+      i.L.clear();
+      i.$e.clear();
     }
   });
-  return () => (read(i.$e) ? undefined : read(r));
+  return () => (read(i.Le) ? undefined : read(r));
 }
 function createCollectionBoundary(e, t, n) {
   const i = createOwner();
   const r = new CollectionQueue(e);
   const s = createBoundChildren(i, t, r, e);
   const o = computed(() => {
-    if (!read(r.$e)) {
+    if (!read(r.Le)) {
       const e = read(s);
-      if (!untrack(() => read(r.$e))) r.We = true;
+      if (!untrack(() => read(r.Le))) r.We = true;
       return e;
     }
     return n(r);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solidjs/signals",
-  "version": "0.9.3",
+  "version": "0.9.4",
   "description": "",
   "author": "Ryan Carniato",
   "license": "MIT",