@solidjs/signals 0.0.3 → 0.0.4

package/dist/node.cjs

@@ -27,7 +27,8 @@ function isUndefined(value) {
 var STATE_CLEAN = 0;
 var STATE_CHECK = 1;
 var STATE_DIRTY = 2;
-var STATE_DISPOSED = 3;
+var STATE_UNINITIALIZED = 3;
+var STATE_DISPOSED = 4;
 var EFFECT_PURE = 0;
 var EFFECT_RENDER = 1;
 var EFFECT_USER = 2;
@@ -48,9 +49,9 @@ var Owner = class {
   // We flatten the owner tree into a linked list so that we don't need a pointer to .firstChild
   // However, the children are actually added in reverse creation order
   // See comment at the top of the file for an example of the _nextSibling traversal
-  r = null;
-  m = null;
   o = null;
+  m = null;
+  p = null;
   a = STATE_CLEAN;
   h = null;
   n = defaultContext;
@@ -61,10 +62,10 @@ var Owner = class {
       currentOwner.append(this);
   }
   append(child) {
-    child.r = this;
     child.o = this;
+    child.p = this;
     if (this.m)
-      this.m.o = child;
+      this.m.p = child;
     child.m = this.m;
     this.m = child;
     if (child.n !== this.n) {
@@ -79,8 +80,8 @@ var Owner = class {
   dispose(self = true) {
     if (this.a === STATE_DISPOSED)
       return;
-    let head = self ? this.o || this.r : this, current = this.m, next = null;
-    while (current && current.r === this) {
+    let head = self ? this.p || this.o : this, current = this.m, next = null;
+    while (current && current.o === this) {
       current.dispose(true);
       current.x();
       next = current.m;
@@ -90,15 +91,15 @@ var Owner = class {
     if (self)
       this.x();
     if (current)
-      current.o = !self ? this : this.o;
+      current.p = !self ? this : this.p;
     if (head)
       head.m = current;
   }
   x() {
-    if (this.o)
-      this.o.m = null;
-    this.r = null;
+    if (this.p)
+      this.p.m = null;
     this.o = null;
+    this.p = null;
     this.n = defaultContext;
     this.i = null;
     this.a = STATE_DISPOSED;
@@ -158,17 +159,18 @@ function setContext(context, value, owner = currentOwner) {
 function hasContext(context, owner = currentOwner) {
   return !isUndefined(owner == null ? void 0 : owner.n[context.id]);
 }
-function onCleanup(disposable) {
+function onCleanup(fn) {
   if (!currentOwner)
-    return;
+    return fn;
   const node = currentOwner;
   if (!node.h) {
-    node.h = disposable;
+    node.h = fn;
   } else if (Array.isArray(node.h)) {
-    node.h.push(disposable);
+    node.h.push(fn);
   } else {
-    node.h = [node.h, disposable];
+    node.h = [node.h, fn];
   }
+  return fn;
 }
 
 // src/core/flags.ts
@@ -198,32 +200,32 @@ var Computation = class extends Owner {
   b = null;
   c = null;
   d;
-  D;
+  E;
   // Used in __DEV__ mode, hopefully removed in production
   V;
   // Using false is an optimization as an alternative to _equals: () => false
   // which could enable more efficient DIRTY notification
-  E = isEqual;
+  F = isEqual;
   N;
   /** Whether the computation is an error or has ancestors that are unresolved */
   j = 0;
   /** Which flags raised by sources are handled, vs. being passed through. */
   A = DEFAULT_FLAGS;
-  F = null;
   G = null;
-  H = -1;
+  H = null;
+  I = -1;
   constructor(initialValue, compute2, options) {
     super(compute2 === null);
-    this.D = compute2;
-    this.a = compute2 ? STATE_DIRTY : STATE_CLEAN;
+    this.E = compute2;
+    this.a = compute2 ? STATE_UNINITIALIZED : STATE_CLEAN;
     this.d = initialValue;
     if ((options == null ? void 0 : options.equals) !== void 0)
-      this.E = options.equals;
+      this.F = options.equals;
     if (options == null ? void 0 : options.unobserved)
       this.N = options == null ? void 0 : options.unobserved;
   }
   O() {
-    if (this.D)
+    if (this.E)
       this.s();
     if (!this.b || this.b.length)
       track(this);
@@ -262,30 +264,30 @@ var Computation = class extends Owner {
    * loading state changes
    */
   loading() {
-    if (this.G === null) {
-      this.G = loadingState(this);
+    if (this.H === null) {
+      this.H = loadingState(this);
     }
-    return this.G.read();
+    return this.H.read();
   }
   /**
    * Return true if the computation is the computation threw an error
    * Triggers re-execution of the computation when the error state changes
    */
   error() {
-    if (this.F === null) {
-      this.F = errorState(this);
+    if (this.G === null) {
+      this.G = errorState(this);
     }
-    return this.F.read();
+    return this.G.read();
   }
   /** Update the computation with a new value. */
   write(value, flags = 0, raw = false) {
     const newValue = !raw && typeof value === "function" ? value(this.d) : value;
-    const valueChanged = newValue !== UNCHANGED && (!!(flags & ERROR_BIT) || this.E === false || !this.E(this.d, newValue));
+    const valueChanged = newValue !== UNCHANGED && (!!(flags & ERROR_BIT) || this.a === STATE_UNINITIALIZED || this.F === false || !this.F(this.d, newValue));
     if (valueChanged)
       this.d = newValue;
     const changedFlagsMask = this.j ^ flags, changedFlags = changedFlagsMask & flags;
     this.j = flags;
-    this.H = clock + 1;
+    this.I = clock + 1;
     if (this.c) {
       for (let i = 0; i < this.c.length; i++) {
         if (valueChanged) {
@@ -365,7 +367,7 @@ var Computation = class extends Owner {
         }
       }
     }
-    if (this.a === STATE_DIRTY) {
+    if (this.a === STATE_DIRTY || this.a === STATE_UNINITIALIZED) {
       update(this);
     } else {
       this.write(UNCHANGED, observerFlags);
@@ -384,7 +386,7 @@ var Computation = class extends Owner {
   }
 };
 function loadingState(node) {
-  const prevOwner = setOwner(node.r);
+  const prevOwner = setOwner(node.o);
   const options = void 0;
   const computation = new Computation(
     void 0,
@@ -400,7 +402,7 @@ function loadingState(node) {
   return computation;
 }
 function errorState(node) {
-  const prevOwner = setOwner(node.r);
+  const prevOwner = setOwner(node.o);
   const options = void 0;
   const computation = new Computation(
     void 0,
@@ -425,7 +427,7 @@ function track(computation) {
       newSources.push(computation);
     }
     if (updateCheck) {
-      updateCheck.d = computation.H > currentObserver.H;
+      updateCheck.d = computation.I > currentObserver.I;
     }
   }
 }
@@ -437,7 +439,7 @@ function update(node) {
   try {
     node.dispose(false);
     node.emptyDisposal();
-    const result = compute(node, node.D, node);
+    const result = compute(node, node.E, node);
     node.write(result, newFlags, true);
   } catch (error) {
     if (error instanceof NotReadyError) {
@@ -546,10 +548,11 @@ function schedule() {
   if (scheduled)
     return;
   scheduled = true;
-  queueMicrotask(flushSync);
+  if (!globalQueue.B)
+    queueMicrotask(flushSync);
 }
 var Queue = class {
-  I = false;
+  B = false;
   u = [[], [], []];
   z = [];
   enqueue(type, node) {
@@ -574,16 +577,17 @@ var Queue = class {
     }
   }
   flush() {
-    if (this.I)
+    if (this.B)
       return;
-    this.I = true;
+    this.B = true;
     try {
       this.run(EFFECT_PURE);
       incrementClock();
+      scheduled = false;
       this.run(EFFECT_RENDER);
       this.run(EFFECT_USER);
     } finally {
-      this.I = false;
+      this.B = false;
     }
   }
   addChild(child) {
@@ -597,8 +601,9 @@ var Queue = class {
 };
 var globalQueue = new Queue();
 function flushSync() {
-  globalQueue.flush();
-  scheduled = false;
+  while (scheduled) {
+    globalQueue.flush();
+  }
 }
 function createBoundary(fn, queue) {
   const owner = new Owner();
@@ -609,7 +614,7 @@ function createBoundary(fn, queue) {
 }
 function runTop(node) {
   const ancestors = [];
-  for (let current = node; current !== null; current = current.r) {
+  for (let current = node; current !== null; current = current.o) {
     if (current.a !== STATE_CLEAN) {
       ancestors.push(current);
     }
@@ -634,18 +639,18 @@ function runEffectQueue(queue) {
 var Effect = class extends Computation {
   J;
   K = false;
-  B;
   C;
+  D;
   e;
   constructor(initialValue, compute2, effect, options) {
     var _a;
     super(initialValue, compute2, options);
     this.J = effect;
-    this.B = initialValue;
-    this.C = (options == null ? void 0 : options.render) ? EFFECT_RENDER : EFFECT_USER;
+    this.C = initialValue;
+    this.D = (options == null ? void 0 : options.render) ? EFFECT_RENDER : EFFECT_USER;
     this.e = ((_a = getOwner()) == null ? void 0 : _a.e) || globalQueue;
     this.s();
-    this.C === EFFECT_USER ? this.e.enqueue(this.C, this) : this.R();
+    this.D === EFFECT_USER ? this.e.enqueue(this.D, this) : this.R();
   }
   write(value, flags = 0) {
     var _a, _b;
@@ -664,7 +669,7 @@ var Effect = class extends Computation {
     if (this.a >= state)
       return;
     if (this.a === STATE_CLEAN)
-      this.e.enqueue(this.C, this);
+      this.e.enqueue(this.D, this);
     this.a = state;
   }
   Q(error) {
@@ -672,13 +677,13 @@ var Effect = class extends Computation {
   }
   x() {
     this.J = void 0;
-    this.B = void 0;
+    this.C = void 0;
     super.x();
   }
   R() {
     if (this.K && this.a !== STATE_DISPOSED) {
-      this.J(this.d, this.B);
-      this.B = this.d;
+      this.J(this.d, this.C);
+      this.C = this.d;
       this.K = false;
     }
   }
@@ -703,24 +708,24 @@ var EagerComputation = class extends Computation {
 // src/core/suspense.ts
 var SuspenseQueue = class extends Queue {
   f = /* @__PURE__ */ new Set();
-  p = false;
+  q = false;
   L = new Computation(false, null);
   run(type) {
-    if (type && this.p)
+    if (type && this.q)
       return;
     super.run(type);
   }
   T(node) {
     if (node.j & LOADING_BIT) {
       this.f.add(node);
-      if (!this.p) {
-        this.p = true;
+      if (!this.q) {
+        this.q = true;
         queueMicrotask(() => this.L.write(true));
       }
     } else {
       this.f.delete(node);
       if (this.f.size === 0) {
-        this.p = false;
+        this.q = false;
         queueMicrotask(() => this.L.write(false));
       }
     }
@@ -729,7 +734,7 @@ var SuspenseQueue = class extends Queue {
 function createSuspense(fn, fallbackFn) {
   const queue = new SuspenseQueue();
   const tree = createBoundary(fn, queue);
-  const equality = new Computation(null, () => queue.L.read() || queue.p);
+  const equality = new Computation(null, () => queue.L.read() || queue.q);
   const comp = new Computation(null, () => equality.read() ? untrack(fallbackFn) : tree);
   return comp.read.bind(comp);
 }
@@ -750,14 +755,36 @@ function createSignal(first, second, third) {
   const node = new Computation(first, null, second);
   return [node.read.bind(node), node.write.bind(node)];
 }
-function createAsync(fn, initial, options) {
+function createMemo(compute2, value, options) {
+  let node = new Computation(
+    value,
+    compute2,
+    options
+  );
+  let resolvedValue;
+  return () => {
+    var _a, _b;
+    if (node) {
+      resolvedValue = node.wait();
+      if (!((_a = node.b) == null ? void 0 : _a.length)) {
+        node.dispose();
+        node = void 0;
+      } else if (!node.o && !((_b = node.c) == null ? void 0 : _b.length)) {
+        node.dispose();
+        node.a = STATE_UNINITIALIZED;
+      }
+    }
+    return resolvedValue;
+  };
+}
+function createAsync(compute2, value, options) {
   const lhs = new EagerComputation(
     {
-      d: initial
+      d: value
     },
     (p) => {
-      const value = p == null ? void 0 : p.d;
-      const source = fn(value);
+      const value2 = p == null ? void 0 : p.d;
+      const source = compute2(value2);
       const isPromise = source instanceof Promise;
       const iterator = source[Symbol.asyncIterator];
       if (!isPromise && !iterator) {
@@ -768,12 +795,12 @@ function createAsync(fn, initial, options) {
           d: source
         };
       }
-      const signal = new Computation(value, null, options);
+      const signal = new Computation(value2, null, options);
       signal.write(UNCHANGED, LOADING_BIT);
       if (isPromise) {
         source.then(
-          (value2) => {
-            signal.write(value2, 0);
+          (value3) => {
+            signal.write(value3, 0);
           },
           (error) => {
             signal.write(error, ERROR_BIT);
@@ -784,10 +811,10 @@ function createAsync(fn, initial, options) {
         onCleanup(() => abort = true);
         (async () => {
           try {
-            for await (let value2 of source) {
+            for await (let value3 of source) {
               if (abort)
                 return;
-              signal.write(value2, 0);
+              signal.write(value3, 0);
             }
           } catch (error) {
             signal.write(error, ERROR_BIT);
@@ -799,29 +826,16 @@ function createAsync(fn, initial, options) {
   );
   return () => lhs.wait().wait();
 }
-function createMemo(compute2, initialValue, options) {
-  let node = new Computation(initialValue, compute2, options);
-  let value;
-  return () => {
-    var _a;
-    if (node) {
-      value = node.wait();
-      if (!((_a = node.b) == null ? void 0 : _a.length))
-        node = void 0;
-    }
-    return value;
-  };
-}
-function createEffect(compute2, effect, initialValue, options) {
+function createEffect(compute2, effect, value, options) {
   void new Effect(
-    initialValue,
+    value,
     compute2,
     effect,
     void 0
   );
 }
-function createRenderEffect(compute2, effect, initialValue, options) {
-  void new Effect(initialValue, compute2, effect, {
+function createRenderEffect(compute2, effect, value, options) {
+  void new Effect(value, compute2, effect, {
     render: true,
     ...void 0
   });
@@ -1312,14 +1326,14 @@ function mapArray(list, map, options) {
     S: new Owner(),
     w: 0,
     U: list,
-    q: [],
+    r: [],
     M: map,
     k: [],
     f: [],
     y: keyFn,
     g: keyFn || (options == null ? void 0 : options.keyed) === false ? [] : void 0,
     l: map.length > 1 ? [] : void 0,
-    p: options == null ? void 0 : options.fallback
+    q: options == null ? void 0 : options.fallback
   });
 }
 function updateKeyedMap() {
@@ -1345,31 +1359,35 @@ function updateKeyedMap() {
       if (this.w !== 0) {
         this.S.dispose(false);
         this.f = [];
-        this.q = [];
+        this.r = [];
         this.k = [];
         this.w = 0;
         this.g && (this.g = []);
         this.l && (this.l = []);
       }
-      if (this.p && !this.k[0]) {
-        this.k[0] = compute(this.f[0] = new Owner(), this.p, null);
+      if (this.q && !this.k[0]) {
+        this.k[0] = compute(
+          this.f[0] = new Owner(),
+          this.q,
+          null
+        );
       }
     } else if (this.w === 0) {
       if (this.f[0])
         this.f[0].dispose();
       this.k = new Array(newLen);
       for (j = 0; j < newLen; j++) {
-        this.q[j] = newItems[j];
+        this.r[j] = newItems[j];
         this.k[j] = compute(this.f[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.g ? new Array(newLen) : void 0, tempIndexes = this.l ? new Array(newLen) : void 0;
-      for (start = 0, end = Math.min(this.w, newLen); start < end && (this.q[start] === newItems[start] || this.g && compare(this.y, this.q[start], newItems[start])); start++) {
+      for (start = 0, end = Math.min(this.w, newLen); start < end && (this.r[start] === newItems[start] || this.g && compare(this.y, this.r[start], newItems[start])); start++) {
         if (this.g)
           this.g[start].write(newItems[start]);
       }
-      for (end = this.w - 1, newEnd = newLen - 1; end >= start && newEnd >= start && (this.q[end] === newItems[newEnd] || this.g && compare(this.y, this.q[end], newItems[newEnd])); end--, newEnd--) {
+      for (end = this.w - 1, newEnd = newLen - 1; end >= start && newEnd >= start && (this.r[end] === newItems[newEnd] || this.g && compare(this.y, this.r[end], newItems[newEnd])); end--, newEnd--) {
         temp[newEnd] = this.k[end];
         tempNodes[newEnd] = this.f[end];
         tempRows && (tempRows[newEnd] = this.g[end]);
@@ -1385,7 +1403,7 @@ function updateKeyedMap() {
         newIndices.set(key, j);
       }
       for (i = start; i <= end; i++) {
-        item = this.q[i];
+        item = this.r[i];
         key = this.y ? this.y(item) : item;
         j = newIndices.get(key);
         if (j !== void 0 && j !== -1) {
@@ -1415,7 +1433,7 @@ function updateKeyedMap() {
         }
       }
       this.k = this.k.slice(0, this.w = newLen);
-      this.q = newItems.slice(0);
+      this.r = newItems.slice(0);
     }
   });
   return this.k;