@solidjs/signals 0.10.2 → 0.10.3

package/dist/prod.js

@@ -833,7 +833,9 @@ function runDisposal(e, t) {
   t ? (e.we = null) : (e.be = null);
 }
 function getNextChildId(e) {
-  if (e.id != null) return formatId(e.id, e.ve++);
+  let t = e;
+  while (t.Ve && t.i) t = t.i;
+  if (t.id != null) return formatId(t.id, t.ve++);
   throw new Error("Cannot get child id from owner without an id");
 }
 function formatId(e, t) {
@@ -857,33 +859,35 @@ function onCleanup(e) {
 }
 function createOwner(e) {
   const t = context;
-  const n = {
-    id: e?.id ?? (t?.id != null ? getNextChildId(t) : undefined),
+  const n = e?.transparent ?? false;
+  const i = {
+    id: e?.id ?? (n ? t?.id : t?.id != null ? getNextChildId(t) : undefined),
+    Ve: n || undefined,
     t: true,
     u: t?.t ? t.u : t,
     Ce: null,
     Ne: null,
     be: null,
     se: t?.se ?? globalQueue,
-    Ve: t?.Ve || defaultContext,
+    me: t?.me || defaultContext,
     ve: 0,
     we: null,
     De: null,
     i: t,
     dispose(e = true) {
-      disposeChildren(n, e);
+      disposeChildren(i, e);
     }
   };
   if (t) {
     const e = t.Ce;
     if (e === null) {
-      t.Ce = n;
+      t.Ce = i;
     } else {
-      n.Ne = e;
-      t.Ce = n;
+      i.Ne = e;
+      t.Ce = i;
     }
   }
-  return n;
+  return i;
 }
 function createRoot(e, t) {
   const n = createOwner(t);
@@ -893,15 +897,15 @@ function unlinkSubs(e) {
   const t = e.V;
   const n = e.D;
   const i = e.p;
-  const r = e.me;
-  if (i !== null) i.me = r;
-  else t.Le = r;
+  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.ke?.();
-      t.L && !t.Ue && unobserved(t);
+      t.Ue?.();
+      t.L && !t.We && unobserved(t);
     }
   }
   return n;
@@ -927,9 +931,9 @@ function link(e, t) {
       return;
     }
   }
-  const o = e.Le;
+  const o = e.ke;
   if (o !== null && o.h === t && (!r || isValidLink(o, t))) return;
-  const s = (t.ye = e.Le = { V: e, h: t, D: i, me: o, p: null });
+  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;
@@ -1074,14 +1078,16 @@ function updateIfNecessary(e) {
   e.S = REACTIVE_NONE;
 }
 function computed(e, t, n) {
-  const i = {
-    id: n?.id ?? (context?.id != null ? getNextChildId(context) : undefined),
+  const i = n?.transparent ?? false;
+  const r = {
+    id: n?.id ?? (i ? context?.id : context?.id != null ? getNextChildId(context) : undefined),
+    Ve: i || undefined,
     _e: n?.equals != null ? n.equals : isEqual,
-    We: !!n?.pureWrite,
-    ke: n?.unobserved,
+    xe: !!n?.pureWrite,
+    Ue: n?.unobserved,
     be: null,
     se: context?.se ?? globalQueue,
-    Ve: context?.Ve ?? defaultContext,
+    me: context?.me ?? defaultContext,
     ve: 0,
     L: e,
     le: t,
@@ -1092,7 +1098,7 @@ function computed(e, t, n) {
     N: null,
     ye: null,
     I: null,
-    Le: null,
+    ke: null,
     i: context,
     Ne: null,
     Ce: null,
@@ -1105,29 +1111,29 @@ function computed(e, t, n) {
     Se: null,
     ne: null
   };
-  i.T = i;
-  const r = context?.t ? context.u : context;
+  r.T = r;
+  const o = context?.t ? context.u : context;
   if (context) {
     const e = context.Ce;
     if (e === null) {
-      context.Ce = i;
+      context.Ce = r;
     } else {
-      i.Ne = e;
-      context.Ce = i;
+      r.Ne = e;
+      context.Ce = r;
     }
   }
-  if (r) i.o = r.o + 1;
-  !n?.lazy && recompute(i, true);
-  return i;
+  if (o) r.o = o.o + 1;
+  !n?.lazy && recompute(r, true);
+  return r;
 }
 function signal(e, t, n = null) {
   const i = {
     _e: t?.equals != null ? t.equals : isEqual,
-    We: !!t?.pureWrite,
-    ke: t?.unobserved,
+    xe: !!t?.pureWrite,
+    Ue: t?.unobserved,
     le: e,
     I: null,
-    Le: null,
+    ke: null,
     J: clock,
     m: n,
     P: n?.A || null,
@@ -1402,7 +1408,7 @@ function getContext(e, t = getOwner()) {
   if (!t) {
     throw new NoOwnerError();
   }
-  const n = hasContext(e, t) ? t.Ve[e.id] : e.defaultValue;
+  const n = hasContext(e, t) ? t.me[e.id] : e.defaultValue;
   if (isUndefined(n)) {
     throw new ContextNotFoundError();
   }
@@ -1412,10 +1418,10 @@ function setContext(e, t, n = getOwner()) {
   if (!n) {
     throw new NoOwnerError();
   }
-  n.Ve = { ...n.Ve, [e.id]: isUndefined(t) ? e.defaultValue : t };
+  n.me = { ...n.me, [e.id]: isUndefined(t) ? e.defaultValue : t };
 }
 function hasContext(e, t) {
-  return !isUndefined(t?.Ve[e.id]);
+  return !isUndefined(t?.me[e.id]);
 }
 function isUndefined(e) {
   return typeof e === "undefined";
@@ -1699,7 +1705,7 @@ function createProjectionInternal(e, t = {}, n) {
       r !== i && r !== undefined && reconcile(r, n?.key || "id", n?.all)(o);
     });
   });
-  i.Ue = true;
+  i.We = true;
   return { store: o, node: i };
 }
 function createProjection(e, t = {}, n) {
@@ -2167,7 +2173,7 @@ function createOptimisticProjectionInternal(e, t = {}, n) {
         setProjectionWriteActive(false);
       }
     });
-    i.Ue = true;
+    i.We = true;
   }
   return { store: o, node: i };
 }
@@ -2351,68 +2357,68 @@ function mapArray(e, t, n) {
   const i = typeof n?.keyed === "function" ? n.keyed : undefined;
   return createMemo(
     updateKeyedMap.bind({
-      xe: createOwner(),
-      Me: 0,
-      Fe: e,
-      Ge: [],
-      $e: t,
-      He: [],
+      Me: createOwner(),
+      Fe: 0,
+      Ge: e,
+      $e: [],
+      He: t,
       je: [],
-      Ke: i,
-      Ye: i || n?.keyed === false ? [] : undefined,
-      Be: t.length > 1 ? [] : undefined,
-      Xe: n?.fallback
+      Ke: [],
+      Ye: i,
+      Be: i || n?.keyed === false ? [] : undefined,
+      Xe: t.length > 1 ? [] : undefined,
+      qe: n?.fallback
     })
   );
 }
 const pureOptions = { pureWrite: true };
 function updateKeyedMap() {
-  const e = this.Fe() || [],
+  const e = this.Ge() || [],
     t = e.length;
   e[$TRACK];
-  runWithOwner(this.xe, () => {
+  runWithOwner(this.Me, () => {
     let n,
       i,
-      r = this.Ye
+      r = this.Be
         ? () => {
-            this.Ye[i] = signal(e[i], pureOptions);
-            this.Be && (this.Be[i] = signal(i, pureOptions));
-            return this.$e(
-              read.bind(null, this.Ye[i]),
-              this.Be ? read.bind(null, this.Be[i]) : undefined
+            this.Be[i] = signal(e[i], pureOptions);
+            this.Xe && (this.Xe[i] = signal(i, pureOptions));
+            return this.He(
+              read.bind(null, this.Be[i]),
+              this.Xe ? read.bind(null, this.Xe[i]) : undefined
             );
           }
-        : this.Be
+        : this.Xe
           ? () => {
               const t = e[i];
-              this.Be[i] = signal(i, pureOptions);
-              return this.$e(() => t, read.bind(null, this.Be[i]));
+              this.Xe[i] = signal(i, pureOptions);
+              return this.He(() => t, read.bind(null, this.Xe[i]));
             }
           : () => {
               const t = e[i];
-              return this.$e(() => t);
+              return this.He(() => t);
             };
     if (t === 0) {
-      if (this.Me !== 0) {
-        this.xe.dispose(false);
+      if (this.Fe !== 0) {
+        this.Me.dispose(false);
+        this.Ke = [];
+        this.$e = [];
         this.je = [];
-        this.Ge = [];
-        this.He = [];
-        this.Me = 0;
-        this.Ye && (this.Ye = []);
+        this.Fe = 0;
         this.Be && (this.Be = []);
+        this.Xe && (this.Xe = []);
       }
-      if (this.Xe && !this.He[0]) {
-        this.He[0] = runWithOwner((this.je[0] = createOwner()), this.Xe);
+      if (this.qe && !this.je[0]) {
+        this.je[0] = runWithOwner((this.Ke[0] = createOwner()), this.qe);
       }
-    } else if (this.Me === 0) {
-      if (this.je[0]) this.je[0].dispose();
-      this.He = new Array(t);
+    } else if (this.Fe === 0) {
+      if (this.Ke[0]) this.Ke[0].dispose();
+      this.je = new Array(t);
       for (i = 0; i < t; i++) {
-        this.Ge[i] = e[i];
-        this.He[i] = runWithOwner((this.je[i] = createOwner()), r);
+        this.$e[i] = e[i];
+        this.je[i] = runWithOwner((this.Ke[i] = createOwner()), r);
       }
-      this.Me = t;
+      this.Fe = t;
     } else {
       let o,
         s,
@@ -2423,130 +2429,130 @@ function updateKeyedMap() {
         f,
         E = new Array(t),
         T = new Array(t),
-        d = this.Ye ? new Array(t) : undefined,
-        R = this.Be ? new Array(t) : undefined;
+        d = this.Be ? new Array(t) : undefined,
+        R = this.Xe ? new Array(t) : undefined;
       for (
-        o = 0, s = Math.min(this.Me, t);
-        o < s && (this.Ge[o] === e[o] || (this.Ye && compare(this.Ke, this.Ge[o], e[o])));
+        o = 0, s = Math.min(this.Fe, t);
+        o < s && (this.$e[o] === e[o] || (this.Be && compare(this.Ye, this.$e[o], e[o])));
         o++
       ) {
-        if (this.Ye) setSignal(this.Ye[o], e[o]);
+        if (this.Be) setSignal(this.Be[o], e[o]);
       }
       for (
-        s = this.Me - 1, u = t - 1;
+        s = this.Fe - 1, u = t - 1;
         s >= o &&
         u >= o &&
-        (this.Ge[s] === e[u] || (this.Ye && compare(this.Ke, this.Ge[s], e[u])));
+        (this.$e[s] === e[u] || (this.Be && compare(this.Ye, this.$e[s], e[u])));
         s--, u--
       ) {
-        E[u] = this.He[s];
-        T[u] = this.je[s];
-        d && (d[u] = this.Ye[s]);
-        R && (R[u] = this.Be[s]);
+        E[u] = this.je[s];
+        T[u] = this.Ke[s];
+        d && (d[u] = this.Be[s]);
+        R && (R[u] = this.Xe[s]);
       }
       a = new Map();
       f = new Array(u + 1);
       for (i = u; i >= o; i--) {
         c = e[i];
-        l = this.Ke ? this.Ke(c) : c;
+        l = this.Ye ? this.Ye(c) : c;
         n = a.get(l);
         f[i] = n === undefined ? -1 : n;
         a.set(l, i);
       }
       for (n = o; n <= s; n++) {
-        c = this.Ge[n];
-        l = this.Ke ? this.Ke(c) : c;
+        c = this.$e[n];
+        l = this.Ye ? this.Ye(c) : c;
         i = a.get(l);
         if (i !== undefined && i !== -1) {
-          E[i] = this.He[n];
-          T[i] = this.je[n];
-          d && (d[i] = this.Ye[n]);
-          R && (R[i] = this.Be[n]);
+          E[i] = this.je[n];
+          T[i] = this.Ke[n];
+          d && (d[i] = this.Be[n]);
+          R && (R[i] = this.Xe[n]);
           i = f[i];
           a.set(l, i);
-        } else this.je[n].dispose();
+        } else this.Ke[n].dispose();
       }
       for (i = o; i < t; i++) {
         if (i in E) {
-          this.He[i] = E[i];
-          this.je[i] = T[i];
+          this.je[i] = E[i];
+          this.Ke[i] = T[i];
           if (d) {
-            this.Ye[i] = d[i];
-            setSignal(this.Ye[i], e[i]);
+            this.Be[i] = d[i];
+            setSignal(this.Be[i], e[i]);
           }
           if (R) {
-            this.Be[i] = R[i];
-            setSignal(this.Be[i], i);
+            this.Xe[i] = R[i];
+            setSignal(this.Xe[i], i);
           }
         } else {
-          this.He[i] = runWithOwner((this.je[i] = createOwner()), r);
+          this.je[i] = runWithOwner((this.Ke[i] = createOwner()), r);
         }
       }
-      this.He = this.He.slice(0, (this.Me = t));
-      this.Ge = e.slice(0);
+      this.je = this.je.slice(0, (this.Fe = t));
+      this.$e = e.slice(0);
     }
   });
-  return this.He;
+  return this.je;
 }
 function repeat(e, t, n) {
   return updateRepeat.bind({
-    xe: createOwner(),
-    Me: 0,
-    qe: 0,
-    ze: e,
-    $e: t,
+    Me: createOwner(),
+    Fe: 0,
+    ze: 0,
+    Ze: e,
+    He: t,
+    Ke: [],
     je: [],
-    He: [],
-    Ze: n?.from,
-    Xe: n?.fallback
+    Je: n?.from,
+    qe: n?.fallback
   });
 }
 function updateRepeat() {
-  const e = this.ze();
-  const t = this.Ze?.() || 0;
-  runWithOwner(this.xe, () => {
+  const e = this.Ze();
+  const t = this.Je?.() || 0;
+  runWithOwner(this.Me, () => {
     if (e === 0) {
-      if (this.Me !== 0) {
-        this.xe.dispose(false);
+      if (this.Fe !== 0) {
+        this.Me.dispose(false);
+        this.Ke = [];
         this.je = [];
-        this.He = [];
-        this.Me = 0;
+        this.Fe = 0;
       }
-      if (this.Xe && !this.He[0]) {
-        this.He[0] = runWithOwner((this.je[0] = createOwner()), this.Xe);
+      if (this.qe && !this.je[0]) {
+        this.je[0] = runWithOwner((this.Ke[0] = createOwner()), this.qe);
       }
       return;
     }
     const n = t + e;
-    const i = this.qe + this.Me;
-    if (this.Me === 0 && this.je[0]) this.je[0].dispose();
-    for (let e = n; e < i; e++) this.je[e - this.qe].dispose();
-    if (this.qe < t) {
-      let e = this.qe;
-      while (e < t && e < this.Me) this.je[e++].dispose();
-      this.je.splice(0, t - this.qe);
-      this.He.splice(0, t - this.qe);
-    } else if (this.qe > t) {
-      let n = i - this.qe - 1;
-      let r = this.qe - t;
-      this.je.length = this.He.length = e;
+    const i = this.ze + this.Fe;
+    if (this.Fe === 0 && this.Ke[0]) this.Ke[0].dispose();
+    for (let e = n; e < i; e++) this.Ke[e - this.ze].dispose();
+    if (this.ze < t) {
+      let e = this.ze;
+      while (e < t && e < this.Fe) this.Ke[e++].dispose();
+      this.Ke.splice(0, t - this.ze);
+      this.je.splice(0, t - this.ze);
+    } else if (this.ze > t) {
+      let n = i - this.ze - 1;
+      let r = this.ze - t;
+      this.Ke.length = this.je.length = e;
       while (n >= r) {
+        this.Ke[n] = this.Ke[n - r];
         this.je[n] = this.je[n - r];
-        this.He[n] = this.He[n - r];
         n--;
       }
       for (let e = 0; e < r; e++) {
-        this.He[e] = runWithOwner((this.je[e] = createOwner()), () => this.$e(e + t));
+        this.je[e] = runWithOwner((this.Ke[e] = createOwner()), () => this.He(e + t));
       }
     }
     for (let e = i; e < n; e++) {
-      this.He[e - t] = runWithOwner((this.je[e - t] = createOwner()), () => this.$e(e));
+      this.je[e - t] = runWithOwner((this.Ke[e - t] = createOwner()), () => this.He(e));
     }
-    this.He = this.He.slice(0, e);
-    this.qe = t;
-    this.Me = e;
+    this.je = this.je.slice(0, e);
+    this.ze = t;
+    this.Fe = e;
   });
-  return this.He;
+  return this.je;
 }
 function compare(e, t, n) {
   return e ? e(t) === e(n) : true;
@@ -2556,11 +2562,11 @@ function boundaryComputed(e, t) {
   n.pe = (e, t) => {
     const i = e !== undefined ? e : n.ae;
     const r = t !== undefined ? t : n.q;
-    n.ae &= ~n.Je;
-    n.se.notify(n, n.Je, i, r);
+    n.ae &= ~n.et;
+    n.se.notify(n, n.et, i, r);
   };
-  n.Je = t;
-  n.Ue = true;
+  n.et = t;
+  n.We = true;
   recompute(n, true);
   return n;
 }
@@ -2574,36 +2580,36 @@ function createBoundChildren(e, t, n, i) {
   });
 }
 class CollectionQueue extends Queue {
-  et;
-  tt = new Set();
-  nt = signal(false, { pureWrite: true });
-  it = false;
+  tt;
+  nt = new Set();
+  it = signal(false, { pureWrite: true });
+  rt = false;
   constructor(e) {
     super();
-    this.et = e;
+    this.tt = e;
   }
   run(e) {
-    if (!e || read(this.nt)) return;
+    if (!e || read(this.it)) return;
     return super.run(e);
   }
   notify(e, t, n, i) {
-    if (!(t & this.et) || (this.et & STATUS_PENDING && this.it)) return super.notify(e, t, n, i);
-    if (n & this.et) {
+    if (!(t & this.tt) || (this.tt & STATUS_PENDING && this.rt)) return super.notify(e, t, n, i);
+    if (n & this.tt) {
       const t = i?.source || e.q?.source;
       if (t) {
-        const e = this.tt.size === 0;
-        this.tt.add(t);
-        if (e) setSignal(this.nt, true);
+        const e = this.nt.size === 0;
+        this.nt.add(t);
+        if (e) setSignal(this.it, true);
       }
     }
-    t &= ~this.et;
+    t &= ~this.tt;
     return t ? super.notify(e, t, n, i) : true;
   }
   checkSources() {
-    for (const e of this.tt) {
-      if (!(e.ae & this.et)) this.tt.delete(e);
+    for (const e of this.nt) {
+      if (!(e.ae & this.tt)) this.nt.delete(e);
     }
-    if (!this.tt.size) setSignal(this.nt, false);
+    if (!this.nt.size) setSignal(this.it, false);
   }
 }
 function createCollectionBoundary(e, t, n) {
@@ -2611,10 +2617,10 @@ function createCollectionBoundary(e, t, n) {
   const r = new CollectionQueue(e);
   const o = createBoundChildren(i, t, r, e);
   const s = computed(() => {
-    if (!read(r.nt)) {
+    if (!read(r.it)) {
       const e = read(o);
-      if (!untrack(() => read(r.nt))) {
-        r.it = true;
+      if (!untrack(() => read(r.it))) {
+        r.rt = true;
         return e;
       }
     }
@@ -2627,10 +2633,10 @@ function createLoadBoundary(e, t) {
 }
 function createErrorBoundary(e, t) {
   return createCollectionBoundary(STATUS_ERROR, e, e => {
-    let n = e.tt.values().next().value;
+    let n = e.nt.values().next().value;
     const i = n.q?.cause ?? n.q;
     return t(i, () => {
-      for (const t of e.tt) recompute(t);
+      for (const t of e.nt) recompute(t);
       schedule();
     });
   });

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

@@ -7,7 +7,8 @@ export declare function getObserver(): Owner | null;
 export declare function getOwner(): Owner | null;
 export declare function onCleanup(fn: Disposable): Disposable;
 export declare function createOwner(options?: {
-    id: string;
+    id?: string;
+    transparent?: boolean;
 }): Root;
 /**
  * Creates a new non-tracked reactive context with manual disposal
@@ -18,5 +19,6 @@ export declare function createOwner(options?: {
  * @description https://docs.solidjs.com/reference/reactive-utilities/create-root
  */
 export declare function createRoot<T>(init: ((dispose: () => void) => T) | (() => T), options?: {
-    id: string;
+    id?: string;
+    transparent?: boolean;
 }): T;

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

@@ -14,6 +14,7 @@ export interface Link {
 export interface NodeOptions<T> {
     id?: string;
     name?: string;
+    transparent?: boolean;
     equals?: ((prev: T, next: T) => boolean) | false;
     pureWrite?: boolean;
     unobserved?: () => void;
@@ -43,6 +44,7 @@ export interface FirewallSignal<T> extends RawSignal<T> {
 export type Signal<T> = RawSignal<T> | FirewallSignal<T>;
 export interface Owner {
     id?: string;
+    _transparent?: boolean;
     _disposal: Disposable | Disposable[] | null;
     _parent: Owner | null;
     _context: Record<symbol | string, unknown>;

package/dist/types/signals.d.ts

@@ -40,6 +40,8 @@ export interface MemoOptions<T> {
     id?: string;
     /** Debug name (dev mode only) */
     name?: string;
+    /** When true, the owner is invisible to the ID scheme -- inherits parent ID and doesn't consume a childCount slot */
+    transparent?: boolean;
     /** Custom equality function, or `false` to always notify subscribers */
     equals?: false | ((prev: T, next: T) => boolean);
     /** Callback invoked when the computed loses all subscribers */

package/package.json

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