@solidjs/signals 0.0.6 → 0.0.7

package/dist/dev.js

@@ -622,16 +622,21 @@ var Queue = class {
         runEffectQueue(effects);
       }
     }
+    let rerun = false;
     for (let i = 0; i < this._children.length; i++) {
-      this._children[i].run(type);
+      rerun = this._children[i].run(type) || rerun;
     }
+    if (type === EFFECT_PURE && this._queues[type].length)
+      return true;
   }
   flush() {
     if (this._running)
       return;
     this._running = true;
     try {
-      this.run(EFFECT_PURE);
+      while (this.run(EFFECT_PURE)) {
+      }
+      ;
       incrementClock();
       scheduled = false;
       this.run(EFFECT_RENDER);
@@ -775,7 +780,7 @@ var SuspenseQueue = class extends Queue {
   run(type) {
     if (type && this._fallback)
       return;
-    super.run(type);
+    return super.run(type);
   }
   _update(node) {
     if (node._stateFlags & LOADING_BIT) {

package/dist/node.cjs

@@ -279,7 +279,7 @@ var Computation = class extends Owner {
   P() {
     var _a;
     if (this.C)
-      this.s();
+      this.t();
     if (!this.C || ((_a = this.c) == null ? void 0 : _a.length))
       track(this);
     newFlags |= this.f & ~currentMask;
@@ -344,7 +344,7 @@ var Computation = class extends Owner {
     if (this.b) {
       for (let i = 0; i < this.b.length; i++) {
         if (valueChanged) {
-          this.b[i].t(STATE_DIRTY);
+          this.b[i].u(STATE_DIRTY);
         } else if (changedFlagsMask) {
           this.b[i].Q(changedFlagsMask, changedFlags);
         }
@@ -355,13 +355,13 @@ var Computation = class extends Owner {
   /**
    * Set the current node's state, and recursively mark all of this node's observers as STATE_CHECK
    */
-  t(state) {
+  u(state) {
     if (this.a >= state)
       return;
     this.a = state;
     if (this.b) {
       for (let i = 0; i < this.b.length; i++) {
-        this.b[i].t(STATE_CHECK);
+        this.b[i].u(STATE_CHECK);
       }
     }
   }
@@ -375,7 +375,7 @@ var Computation = class extends Owner {
     if (this.a >= STATE_DIRTY)
       return;
     if (mask & this.D) {
-      this.t(STATE_DIRTY);
+      this.u(STATE_DIRTY);
       return;
     }
     if (this.a >= STATE_CHECK)
@@ -383,7 +383,7 @@ var Computation = class extends Owner {
     const prevFlags = this.f & mask;
     const deltaFlags = prevFlags ^ newFlags2;
     if (newFlags2 === prevFlags) ; else if (deltaFlags & prevFlags & mask) {
-      this.t(STATE_CHECK);
+      this.u(STATE_CHECK);
     } else {
       this.f ^= deltaFlags;
       if (this.b) {
@@ -403,7 +403,7 @@ var Computation = class extends Owner {
    *
    * This function will ensure that the value and states we read from the computation are up to date
    */
-  s() {
+  t() {
     if (this.a === STATE_DISPOSED) {
       throw new Error("Tried to read a disposed computation");
     }
@@ -413,7 +413,7 @@ var Computation = class extends Owner {
     let observerFlags = 0;
     if (this.a === STATE_CHECK) {
       for (let i = 0; i < this.c.length; i++) {
-        this.c[i].s();
+        this.c[i].t();
         observerFlags |= this.c[i].f;
         if (this.a === STATE_DIRTY) {
           break;
@@ -445,7 +445,7 @@ function loadingState(node) {
     void 0,
     () => {
       track(node);
-      node.s();
+      node.t();
       return !!(node.f & LOADING_BIT);
     },
     options
@@ -461,7 +461,7 @@ function errorState(node) {
     void 0,
     () => {
       track(node);
-      node.s();
+      node.t();
       return !!(node.f & ERROR_BIT);
     },
     options
@@ -606,35 +606,40 @@ function schedule() {
 }
 var Queue = class {
   E = false;
-  u = [[], [], []];
+  q = [[], [], []];
   A = [];
   enqueue(type, node) {
-    this.u[0].push(node);
+    this.q[0].push(node);
     if (type)
-      this.u[type].push(node);
+      this.q[type].push(node);
     schedule();
   }
   run(type) {
-    if (this.u[type].length) {
+    if (this.q[type].length) {
       if (type === EFFECT_PURE) {
-        runPureQueue(this.u[type]);
-        this.u[type] = [];
+        runPureQueue(this.q[type]);
+        this.q[type] = [];
       } else {
-        const effects = this.u[type];
-        this.u[type] = [];
+        const effects = this.q[type];
+        this.q[type] = [];
         runEffectQueue(effects);
       }
     }
+    let rerun = false;
     for (let i = 0; i < this.A.length; i++) {
-      this.A[i].run(type);
+      rerun = this.A[i].run(type) || rerun;
     }
+    if (type === EFFECT_PURE && this.q[type].length)
+      return true;
   }
   flush() {
     if (this.E)
       return;
     this.E = true;
     try {
-      this.run(EFFECT_PURE);
+      while (this.run(EFFECT_PURE)) {
+      }
+      ;
       incrementClock();
       scheduled = false;
       this.run(EFFECT_RENDER);
@@ -682,7 +687,7 @@ function runTop(node) {
   }
   for (let i = ancestors.length - 1; i >= 0; i--) {
     if (ancestors[i].a !== STATE_DISPOSED)
-      ancestors[i].s();
+      ancestors[i].t();
   }
 }
 function runPureQueue(queue) {
@@ -710,7 +715,7 @@ var Effect = class extends Computation {
     this.F = initialValue;
     this.B = (options == null ? void 0 : options.render) ? EFFECT_RENDER : EFFECT_USER;
     this.e = ((_a = getOwner()) == null ? void 0 : _a.e) || globalQueue;
-    this.s();
+    this.t();
     this.B === EFFECT_USER ? this.e.enqueue(this.B, this) : this.R();
   }
   write(value, flags = 0) {
@@ -726,7 +731,7 @@ var Effect = class extends Computation {
     this.L = true;
     return value;
   }
-  t(state) {
+  u(state) {
     if (this.a >= state)
       return;
     if (this.a === STATE_CLEAN)
@@ -755,38 +760,38 @@ var EagerComputation = class extends Computation {
     var _a;
     super(initialValue, compute2, options);
     this.e = ((_a = getOwner()) == null ? void 0 : _a.e) || globalQueue;
-    this.s();
+    this.t();
   }
-  t(state) {
+  u(state) {
     if (this.a >= state)
       return;
     if (this.a === STATE_CLEAN)
       this.e.enqueue(EFFECT_PURE, this);
-    super.t(state);
+    super.u(state);
   }
 };
 
 // src/core/suspense.ts
 var SuspenseQueue = class extends Queue {
   g = /* @__PURE__ */ new Set();
-  q = false;
+  r = false;
   M = new Computation(false, null);
   run(type) {
-    if (type && this.q)
+    if (type && this.r)
       return;
-    super.run(type);
+    return super.run(type);
   }
   S(node) {
     if (node.f & LOADING_BIT) {
       this.g.add(node);
-      if (!this.q) {
-        this.q = true;
+      if (!this.r) {
+        this.r = true;
         queueTask(() => this.M.write(true));
       }
     } else {
       this.g.delete(node);
       if (this.g.size === 0) {
-        this.q = false;
+        this.r = false;
         queueTask(() => this.M.write(false));
       }
     }
@@ -809,7 +814,7 @@ function createSuspense(fn, fallback) {
     const child = new Computation(null, fn);
     return new LiveComputation(null, () => flatten(child.wait()));
   }, queue);
-  const equality = new Computation(null, () => queue.M.read() || queue.q);
+  const equality = new Computation(null, () => queue.M.read() || queue.r);
   const comp = new Computation(null, () => equality.read() ? fallback() : tree.read());
   return comp.read.bind(comp);
 }
@@ -1423,14 +1428,14 @@ function mapArray(list, map, options) {
     T: new Owner(),
     w: 0,
     U: list,
-    r: [],
+    s: [],
     N: map,
     l: [],
     g: [],
     y: keyFn,
     h: keyFn || (options == null ? void 0 : options.keyed) === false ? [] : void 0,
     i: map.length > 1 ? [] : void 0,
-    q: options == null ? void 0 : options.fallback
+    r: options == null ? void 0 : options.fallback
   });
 }
 function updateKeyedMap() {
@@ -1456,16 +1461,16 @@ function updateKeyedMap() {
       if (this.w !== 0) {
         this.T.dispose(false);
         this.g = [];
-        this.r = [];
+        this.s = [];
         this.l = [];
         this.w = 0;
         this.h && (this.h = []);
         this.i && (this.i = []);
       }
-      if (this.q && !this.l[0]) {
+      if (this.r && !this.l[0]) {
         this.l[0] = compute(
           this.g[0] = new Owner(),
-          this.q,
+          this.r,
           null
         );
       }
@@ -1474,17 +1479,17 @@ function updateKeyedMap() {
         this.g[0].dispose();
       this.l = new Array(newLen);
       for (j = 0; j < newLen; j++) {
-        this.r[j] = newItems[j];
+        this.s[j] = newItems[j];
         this.l[j] = compute(this.g[j] = new Owner(), mapper, null);
       }
       this.w = newLen;
     } else {
       let start, end, newEnd, item, key, newIndices, newIndicesNext, temp = new Array(newLen), tempNodes = new Array(newLen), tempRows = this.h ? new Array(newLen) : void 0, tempIndexes = this.i ? new Array(newLen) : void 0;
-      for (start = 0, end = Math.min(this.w, newLen); start < end && (this.r[start] === newItems[start] || this.h && compare(this.y, this.r[start], newItems[start])); start++) {
+      for (start = 0, end = Math.min(this.w, newLen); start < end && (this.s[start] === newItems[start] || this.h && compare(this.y, this.s[start], newItems[start])); start++) {
         if (this.h)
           this.h[start].write(newItems[start]);
       }
-      for (end = this.w - 1, newEnd = newLen - 1; end >= start && newEnd >= start && (this.r[end] === newItems[newEnd] || this.h && compare(this.y, this.r[end], newItems[newEnd])); end--, newEnd--) {
+      for (end = this.w - 1, newEnd = newLen - 1; end >= start && newEnd >= start && (this.s[end] === newItems[newEnd] || this.h && compare(this.y, this.s[end], newItems[newEnd])); end--, newEnd--) {
         temp[newEnd] = this.l[end];
         tempNodes[newEnd] = this.g[end];
         tempRows && (tempRows[newEnd] = this.h[end]);
@@ -1500,7 +1505,7 @@ function updateKeyedMap() {
         newIndices.set(key, j);
       }
       for (i = start; i <= end; i++) {
-        item = this.r[i];
+        item = this.s[i];
         key = this.y ? this.y(item) : item;
         j = newIndices.get(key);
         if (j !== void 0 && j !== -1) {
@@ -1530,7 +1535,7 @@ function updateKeyedMap() {
         }
       }
       this.l = this.l.slice(0, this.w = newLen);
-      this.r = newItems.slice(0);
+      this.s = newItems.slice(0);
     }
   });
   return this.l;

package/dist/prod.js

@@ -276,7 +276,7 @@ var Computation = class extends Owner {
   }
   P() {
     if (this.C)
-      this.s();
+      this.t();
     if (!this.C || this.c?.length)
       track(this);
     newFlags |= this.f & ~currentMask;
@@ -341,7 +341,7 @@ var Computation = class extends Owner {
     if (this.b) {
       for (let i = 0; i < this.b.length; i++) {
         if (valueChanged) {
-          this.b[i].t(STATE_DIRTY);
+          this.b[i].u(STATE_DIRTY);
         } else if (changedFlagsMask) {
           this.b[i].Q(changedFlagsMask, changedFlags);
         }
@@ -352,13 +352,13 @@ var Computation = class extends Owner {
   /**
    * Set the current node's state, and recursively mark all of this node's observers as STATE_CHECK
    */
-  t(state) {
+  u(state) {
     if (this.a >= state)
       return;
     this.a = state;
     if (this.b) {
       for (let i = 0; i < this.b.length; i++) {
-        this.b[i].t(STATE_CHECK);
+        this.b[i].u(STATE_CHECK);
       }
     }
   }
@@ -372,7 +372,7 @@ var Computation = class extends Owner {
     if (this.a >= STATE_DIRTY)
       return;
     if (mask & this.D) {
-      this.t(STATE_DIRTY);
+      this.u(STATE_DIRTY);
       return;
     }
     if (this.a >= STATE_CHECK)
@@ -380,7 +380,7 @@ var Computation = class extends Owner {
     const prevFlags = this.f & mask;
     const deltaFlags = prevFlags ^ newFlags2;
     if (newFlags2 === prevFlags) ; else if (deltaFlags & prevFlags & mask) {
-      this.t(STATE_CHECK);
+      this.u(STATE_CHECK);
     } else {
       this.f ^= deltaFlags;
       if (this.b) {
@@ -400,7 +400,7 @@ var Computation = class extends Owner {
    *
    * This function will ensure that the value and states we read from the computation are up to date
    */
-  s() {
+  t() {
     if (this.a === STATE_DISPOSED) {
       throw new Error("Tried to read a disposed computation");
     }
@@ -410,7 +410,7 @@ var Computation = class extends Owner {
     let observerFlags = 0;
     if (this.a === STATE_CHECK) {
       for (let i = 0; i < this.c.length; i++) {
-        this.c[i].s();
+        this.c[i].t();
         observerFlags |= this.c[i].f;
         if (this.a === STATE_DIRTY) {
           break;
@@ -442,7 +442,7 @@ function loadingState(node) {
     void 0,
     () => {
       track(node);
-      node.s();
+      node.t();
       return !!(node.f & LOADING_BIT);
     },
     options
@@ -458,7 +458,7 @@ function errorState(node) {
     void 0,
     () => {
       track(node);
-      node.s();
+      node.t();
       return !!(node.f & ERROR_BIT);
     },
     options
@@ -602,35 +602,40 @@ function schedule() {
 }
 var Queue = class {
   E = false;
-  u = [[], [], []];
+  q = [[], [], []];
   A = [];
   enqueue(type, node) {
-    this.u[0].push(node);
+    this.q[0].push(node);
     if (type)
-      this.u[type].push(node);
+      this.q[type].push(node);
     schedule();
   }
   run(type) {
-    if (this.u[type].length) {
+    if (this.q[type].length) {
       if (type === EFFECT_PURE) {
-        runPureQueue(this.u[type]);
-        this.u[type] = [];
+        runPureQueue(this.q[type]);
+        this.q[type] = [];
       } else {
-        const effects = this.u[type];
-        this.u[type] = [];
+        const effects = this.q[type];
+        this.q[type] = [];
         runEffectQueue(effects);
       }
     }
+    let rerun = false;
     for (let i = 0; i < this.A.length; i++) {
-      this.A[i].run(type);
+      rerun = this.A[i].run(type) || rerun;
     }
+    if (type === EFFECT_PURE && this.q[type].length)
+      return true;
   }
   flush() {
     if (this.E)
       return;
     this.E = true;
     try {
-      this.run(EFFECT_PURE);
+      while (this.run(EFFECT_PURE)) {
+      }
+      ;
       incrementClock();
       scheduled = false;
       this.run(EFFECT_RENDER);
@@ -678,7 +683,7 @@ function runTop(node) {
   }
   for (let i = ancestors.length - 1; i >= 0; i--) {
     if (ancestors[i].a !== STATE_DISPOSED)
-      ancestors[i].s();
+      ancestors[i].t();
   }
 }
 function runPureQueue(queue) {
@@ -705,7 +710,7 @@ var Effect = class extends Computation {
     this.F = initialValue;
     this.B = options?.render ? EFFECT_RENDER : EFFECT_USER;
     this.e = getOwner()?.e || globalQueue;
-    this.s();
+    this.t();
     this.B === EFFECT_USER ? this.e.enqueue(this.B, this) : this.R();
   }
   write(value, flags = 0) {
@@ -720,7 +725,7 @@ var Effect = class extends Computation {
     this.L = true;
     return value;
   }
-  t(state) {
+  u(state) {
     if (this.a >= state)
       return;
     if (this.a === STATE_CLEAN)
@@ -748,38 +753,38 @@ var EagerComputation = class extends Computation {
   constructor(initialValue, compute2, options) {
     super(initialValue, compute2, options);
     this.e = getOwner()?.e || globalQueue;
-    this.s();
+    this.t();
   }
-  t(state) {
+  u(state) {
     if (this.a >= state)
       return;
     if (this.a === STATE_CLEAN)
       this.e.enqueue(EFFECT_PURE, this);
-    super.t(state);
+    super.u(state);
   }
 };
 
 // src/core/suspense.ts
 var SuspenseQueue = class extends Queue {
   g = /* @__PURE__ */ new Set();
-  q = false;
+  r = false;
   M = new Computation(false, null);
   run(type) {
-    if (type && this.q)
+    if (type && this.r)
       return;
-    super.run(type);
+    return super.run(type);
   }
   S(node) {
     if (node.f & LOADING_BIT) {
       this.g.add(node);
-      if (!this.q) {
-        this.q = true;
+      if (!this.r) {
+        this.r = true;
         queueTask(() => this.M.write(true));
       }
     } else {
       this.g.delete(node);
       if (this.g.size === 0) {
-        this.q = false;
+        this.r = false;
         queueTask(() => this.M.write(false));
       }
     }
@@ -801,7 +806,7 @@ function createSuspense(fn, fallback) {
     const child = new Computation(null, fn);
     return new LiveComputation(null, () => flatten(child.wait()));
   }, queue);
-  const equality = new Computation(null, () => queue.M.read() || queue.q);
+  const equality = new Computation(null, () => queue.M.read() || queue.r);
   const comp = new Computation(null, () => equality.read() ? fallback() : tree.read());
   return comp.read.bind(comp);
 }
@@ -1412,14 +1417,14 @@ function mapArray(list, map, options) {
     T: new Owner(),
     w: 0,
     U: list,
-    r: [],
+    s: [],
     N: map,
     l: [],
     g: [],
     y: keyFn,
     h: keyFn || options?.keyed === false ? [] : void 0,
     i: map.length > 1 ? [] : void 0,
-    q: options?.fallback
+    r: options?.fallback
   });
 }
 function updateKeyedMap() {
@@ -1445,16 +1450,16 @@ function updateKeyedMap() {
       if (this.w !== 0) {
         this.T.dispose(false);
         this.g = [];
-        this.r = [];
+        this.s = [];
         this.l = [];
         this.w = 0;
         this.h && (this.h = []);
         this.i && (this.i = []);
       }
-      if (this.q && !this.l[0]) {
+      if (this.r && !this.l[0]) {
         this.l[0] = compute(
           this.g[0] = new Owner(),
-          this.q,
+          this.r,
           null
         );
       }
@@ -1463,17 +1468,17 @@ function updateKeyedMap() {
         this.g[0].dispose();
       this.l = new Array(newLen);
       for (j = 0; j < newLen; j++) {
-        this.r[j] = newItems[j];
+        this.s[j] = newItems[j];
         this.l[j] = compute(this.g[j] = new Owner(), mapper, null);
       }
       this.w = newLen;
     } else {
       let start, end, newEnd, item, key, newIndices, newIndicesNext, temp = new Array(newLen), tempNodes = new Array(newLen), tempRows = this.h ? new Array(newLen) : void 0, tempIndexes = this.i ? new Array(newLen) : void 0;
-      for (start = 0, end = Math.min(this.w, newLen); start < end && (this.r[start] === newItems[start] || this.h && compare(this.y, this.r[start], newItems[start])); start++) {
+      for (start = 0, end = Math.min(this.w, newLen); start < end && (this.s[start] === newItems[start] || this.h && compare(this.y, this.s[start], newItems[start])); start++) {
         if (this.h)
           this.h[start].write(newItems[start]);
       }
-      for (end = this.w - 1, newEnd = newLen - 1; end >= start && newEnd >= start && (this.r[end] === newItems[newEnd] || this.h && compare(this.y, this.r[end], newItems[newEnd])); end--, newEnd--) {
+      for (end = this.w - 1, newEnd = newLen - 1; end >= start && newEnd >= start && (this.s[end] === newItems[newEnd] || this.h && compare(this.y, this.s[end], newItems[newEnd])); end--, newEnd--) {
         temp[newEnd] = this.l[end];
         tempNodes[newEnd] = this.g[end];
         tempRows && (tempRows[newEnd] = this.h[end]);
@@ -1489,7 +1494,7 @@ function updateKeyedMap() {
         newIndices.set(key, j);
       }
       for (i = start; i <= end; i++) {
-        item = this.r[i];
+        item = this.s[i];
         key = this.y ? this.y(item) : item;
         j = newIndices.get(key);
         if (j !== void 0 && j !== -1) {
@@ -1519,7 +1524,7 @@ function updateKeyedMap() {
         }
       }
       this.l = this.l.slice(0, this.w = newLen);
-      this.r = newItems.slice(0);
+      this.s = newItems.slice(0);
     }
   });
   return this.l;

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

@@ -2,7 +2,7 @@ import { Computation } from "./core.js";
 import type { Effect } from "./effect.js";
 export interface IQueue {
     enqueue<T extends Computation | Effect>(type: number, node: T): void;
-    run(type: number): void;
+    run(type: number): boolean | void;
     flush(): void;
     addChild(child: IQueue): void;
     removeChild(child: IQueue): void;
@@ -12,7 +12,7 @@ export declare class Queue implements IQueue {
     _queues: [Computation[], Effect[], Effect[]];
     _children: IQueue[];
     enqueue<T extends Computation | Effect>(type: number, node: T): void;
-    run(type: number): void;
+    run(type: number): true | undefined;
     flush(): void;
     addChild(child: IQueue): void;
     removeChild(child: IQueue): void;

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

@@ -5,7 +5,7 @@ export declare class SuspenseQueue extends Queue {
     _nodes: Set<Effect>;
     _fallback: boolean;
     _signal: Computation<boolean>;
-    run(type: number): void;
+    run(type: number): true | undefined;
     _update(node: Effect): void;
 }
 export declare function createSuspense(fn: () => any, fallback: () => any): () => any;

package/package.json

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