@solidjs/signals 0.0.1 → 0.0.2

package/dist/dev.js

@@ -624,13 +624,8 @@ function runPureQueue(queue) {
   }
 }
 function runEffectQueue(queue) {
-  for (let i = 0; i < queue.length; i++) {
-    if (queue[i]._modified && queue[i]._state !== STATE_DISPOSED) {
-      queue[i]._effect(queue[i]._value, queue[i]._prevValue);
-      queue[i]._modified = false;
-      queue[i]._prevValue = queue[i]._value;
-    }
-  }
+  for (let i = 0; i < queue.length; i++)
+    queue[i]._runEffect();
 }
 
 // src/core/effect.ts
@@ -646,8 +641,8 @@ var Effect = class extends Computation {
     this._prevValue = initialValue;
     this._type = options?.render ? EFFECT_RENDER : EFFECT_USER;
     this._queue = getOwner()?._queue || globalQueue;
-    this._queue.enqueue(this._type, this);
     this._updateIfNecessary();
+    this._type === EFFECT_USER ? this._queue.enqueue(this._type, this) : this._runEffect();
   }
   write(value, flags = 0) {
     const currentFlags = this._stateFlags;
@@ -676,6 +671,13 @@ var Effect = class extends Computation {
     this._prevValue = void 0;
     super._disposeNode();
   }
+  _runEffect() {
+    if (this._modified && this._state !== STATE_DISPOSED) {
+      this._effect(this._value, this._prevValue);
+      this._prevValue = this._value;
+      this._modified = false;
+    }
+  }
 };
 var EagerComputation = class extends Computation {
   _queue;
@@ -1171,7 +1173,7 @@ function resolveSource(s) {
 }
 var $SOURCES = Symbol("MERGE_SOURCE" );
 function merge(...sources) {
-  if (sources.length === 1)
+  if (sources.length === 1 && typeof sources[0] !== "function")
     return sources[0];
   let proxy = false;
   const flattened = [];

package/dist/node.cjs

@@ -198,32 +198,32 @@ var Computation = class extends Owner {
   b = null;
   c = null;
   d;
-  C;
+  D;
   // Used in __DEV__ mode, hopefully removed in production
-  U;
+  V;
   // Using false is an optimization as an alternative to _equals: () => false
   // which could enable more efficient DIRTY notification
-  D = isEqual;
+  E = isEqual;
   N;
   /** Whether the computation is an error or has ancestors that are unresolved */
   i = 0;
   /** Which flags raised by sources are handled, vs. being passed through. */
   A = DEFAULT_FLAGS;
-  E = null;
   F = null;
-  G = -1;
+  G = null;
+  H = -1;
   constructor(initialValue, compute2, options) {
     super(compute2 === null);
-    this.C = compute2;
+    this.D = compute2;
     this.a = compute2 ? STATE_DIRTY : STATE_CLEAN;
     this.d = initialValue;
     if ((options == null ? void 0 : options.equals) !== void 0)
-      this.D = options.equals;
+      this.E = options.equals;
     if (options == null ? void 0 : options.unobserved)
       this.N = options == null ? void 0 : options.unobserved;
   }
   O() {
-    if (this.C)
+    if (this.D)
       this.r();
     if (!this.b || this.b.length)
       track(this);
@@ -262,30 +262,30 @@ var Computation = class extends Owner {
    * loading state changes
    */
   loading() {
-    if (this.F === null) {
-      this.F = loadingState(this);
+    if (this.G === null) {
+      this.G = loadingState(this);
     }
-    return this.F.read();
+    return this.G.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.E === null) {
-      this.E = errorState(this);
+    if (this.F === null) {
+      this.F = errorState(this);
     }
-    return this.E.read();
+    return this.F.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.D === false || !this.D(this.d, newValue));
+    const valueChanged = newValue !== UNCHANGED && (!!(flags & ERROR_BIT) || this.E === false || !this.E(this.d, newValue));
     if (valueChanged)
       this.d = newValue;
     const changedFlagsMask = this.i ^ flags, changedFlags = changedFlagsMask & flags;
     this.i = flags;
-    this.G = clock + 1;
+    this.H = clock + 1;
     if (this.c) {
       for (let i = 0; i < this.c.length; i++) {
         if (valueChanged) {
@@ -425,7 +425,7 @@ function track(computation) {
       newSources.push(computation);
     }
     if (updateCheck) {
-      updateCheck.d = computation.G > currentObserver.G;
+      updateCheck.d = computation.H > currentObserver.H;
     }
   }
 }
@@ -437,7 +437,7 @@ function update(node) {
   try {
     node.dispose(false);
     node.emptyDisposal();
-    const result = compute(node, node.C, node);
+    const result = compute(node, node.D, node);
     node.write(result, newFlags, true);
   } catch (error) {
     if (error instanceof NotReadyError) {
@@ -549,7 +549,7 @@ function schedule() {
   queueMicrotask(flushSync);
 }
 var Queue = class {
-  H = false;
+  I = false;
   t = [[], [], []];
   y = [];
   enqueue(type, node) {
@@ -574,16 +574,16 @@ var Queue = class {
     }
   }
   flush() {
-    if (this.H)
+    if (this.I)
       return;
-    this.H = true;
+    this.I = true;
     try {
       this.run(EFFECT_PURE);
       incrementClock();
       this.run(EFFECT_RENDER);
       this.run(EFFECT_USER);
     } finally {
-      this.H = false;
+      this.I = false;
     }
   }
   addChild(child) {
@@ -626,50 +626,45 @@ function runPureQueue(queue) {
   }
 }
 function runEffectQueue(queue) {
-  for (let i = 0; i < queue.length; i++) {
-    if (queue[i].I && queue[i].a !== STATE_DISPOSED) {
-      queue[i].J(queue[i].d, queue[i].B);
-      queue[i].I = false;
-      queue[i].B = queue[i].d;
-    }
-  }
+  for (let i = 0; i < queue.length; i++)
+    queue[i].R();
 }
 
 // src/core/effect.ts
 var Effect = class extends Computation {
   J;
-  I = false;
+  K = false;
   B;
-  K;
+  C;
   e;
   constructor(initialValue, compute2, effect, options) {
     var _a;
     super(initialValue, compute2, options);
     this.J = effect;
     this.B = initialValue;
-    this.K = (options == null ? void 0 : options.render) ? EFFECT_RENDER : EFFECT_USER;
+    this.C = (options == null ? void 0 : options.render) ? EFFECT_RENDER : EFFECT_USER;
     this.e = ((_a = getOwner()) == null ? void 0 : _a.e) || globalQueue;
-    this.e.enqueue(this.K, this);
     this.r();
+    this.C === EFFECT_USER ? this.e.enqueue(this.C, this) : this.R();
   }
   write(value, flags = 0) {
     var _a, _b;
     const currentFlags = this.i;
     this.i = flags;
     if ((flags & LOADING_BIT) !== (currentFlags & LOADING_BIT)) {
-      (_b = (_a = this.e).S) == null ? void 0 : _b.call(_a, this);
+      (_b = (_a = this.e).T) == null ? void 0 : _b.call(_a, this);
     }
     if (value === UNCHANGED)
       return this.d;
     this.d = value;
-    this.I = true;
+    this.K = true;
     return value;
   }
   s(state) {
     if (this.a >= state)
       return;
     if (this.a === STATE_CLEAN)
-      this.e.enqueue(this.K, this);
+      this.e.enqueue(this.C, this);
     this.a = state;
   }
   Q(error) {
@@ -680,6 +675,13 @@ var Effect = class extends Computation {
     this.B = void 0;
     super.w();
   }
+  R() {
+    if (this.K && this.a !== STATE_DISPOSED) {
+      this.J(this.d, this.B);
+      this.B = this.d;
+      this.K = false;
+    }
+  }
 };
 var EagerComputation = class extends Computation {
   e;
@@ -708,7 +710,7 @@ var SuspenseQueue = class extends Queue {
       return;
     super.run(type);
   }
-  S(node) {
+  T(node) {
     if (node.i & LOADING_BIT) {
       this.k.add(node);
       if (!this.z) {
@@ -1179,7 +1181,7 @@ function resolveSource(s) {
 }
 var $SOURCES = Symbol(0);
 function merge(...sources) {
-  if (sources.length === 1)
+  if (sources.length === 1 && typeof sources[0] !== "function")
     return sources[0];
   let proxy = false;
   const flattened = [];
@@ -1297,9 +1299,9 @@ function mapArray(list, map, options) {
     new Computation(
       [],
       updateKeyedMap.bind({
-        R: new Owner(),
+        S: new Owner(),
         u: 0,
-        T: list,
+        U: list,
         p: [],
         M: map,
         n: [],
@@ -1313,9 +1315,9 @@ function mapArray(list, map, options) {
   );
 }
 function updateKeyedMap() {
-  const newItems = this.T() || [], newLen = newItems.length;
+  const newItems = this.U() || [], newLen = newItems.length;
   newItems[$TRACK];
-  runWithOwner(this.R, () => {
+  runWithOwner(this.S, () => {
     let i, j, mapper = this.f ? () => {
       this.f[j] = new Computation(newItems[j], null);
       this.j[j] = new Computation(j, null);
@@ -1333,7 +1335,7 @@ function updateKeyedMap() {
     };
     if (newLen === 0) {
       if (this.u !== 0) {
-        this.R.dispose(false);
+        this.S.dispose(false);
         this.k = [];
         this.p = [];
         this.n = [];

package/dist/prod.js

@@ -196,32 +196,32 @@ var Computation = class extends Owner {
   b = null;
   c = null;
   d;
-  C;
+  D;
   // Used in __DEV__ mode, hopefully removed in production
-  U;
+  V;
   // Using false is an optimization as an alternative to _equals: () => false
   // which could enable more efficient DIRTY notification
-  D = isEqual;
+  E = isEqual;
   N;
   /** Whether the computation is an error or has ancestors that are unresolved */
   i = 0;
   /** Which flags raised by sources are handled, vs. being passed through. */
   A = DEFAULT_FLAGS;
-  E = null;
   F = null;
-  G = -1;
+  G = null;
+  H = -1;
   constructor(initialValue, compute2, options) {
     super(compute2 === null);
-    this.C = compute2;
+    this.D = compute2;
     this.a = compute2 ? STATE_DIRTY : STATE_CLEAN;
     this.d = initialValue;
     if (options?.equals !== void 0)
-      this.D = options.equals;
+      this.E = options.equals;
     if (options?.unobserved)
       this.N = options?.unobserved;
   }
   O() {
-    if (this.C)
+    if (this.D)
       this.r();
     if (!this.b || this.b.length)
       track(this);
@@ -260,30 +260,30 @@ var Computation = class extends Owner {
    * loading state changes
    */
   loading() {
-    if (this.F === null) {
-      this.F = loadingState(this);
+    if (this.G === null) {
+      this.G = loadingState(this);
     }
-    return this.F.read();
+    return this.G.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.E === null) {
-      this.E = errorState(this);
+    if (this.F === null) {
+      this.F = errorState(this);
     }
-    return this.E.read();
+    return this.F.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.D === false || !this.D(this.d, newValue));
+    const valueChanged = newValue !== UNCHANGED && (!!(flags & ERROR_BIT) || this.E === false || !this.E(this.d, newValue));
     if (valueChanged)
       this.d = newValue;
     const changedFlagsMask = this.i ^ flags, changedFlags = changedFlagsMask & flags;
     this.i = flags;
-    this.G = clock + 1;
+    this.H = clock + 1;
     if (this.c) {
       for (let i = 0; i < this.c.length; i++) {
         if (valueChanged) {
@@ -423,7 +423,7 @@ function track(computation) {
       newSources.push(computation);
     }
     if (updateCheck) {
-      updateCheck.d = computation.G > currentObserver.G;
+      updateCheck.d = computation.H > currentObserver.H;
     }
   }
 }
@@ -435,7 +435,7 @@ function update(node) {
   try {
     node.dispose(false);
     node.emptyDisposal();
-    const result = compute(node, node.C, node);
+    const result = compute(node, node.D, node);
     node.write(result, newFlags, true);
   } catch (error) {
     if (error instanceof NotReadyError) {
@@ -546,7 +546,7 @@ function schedule() {
   queueMicrotask(flushSync);
 }
 var Queue = class {
-  H = false;
+  I = false;
   t = [[], [], []];
   y = [];
   enqueue(type, node) {
@@ -571,16 +571,16 @@ var Queue = class {
     }
   }
   flush() {
-    if (this.H)
+    if (this.I)
       return;
-    this.H = true;
+    this.I = true;
     try {
       this.run(EFFECT_PURE);
       incrementClock();
       this.run(EFFECT_RENDER);
       this.run(EFFECT_USER);
     } finally {
-      this.H = false;
+      this.I = false;
     }
   }
   addChild(child) {
@@ -623,48 +623,43 @@ function runPureQueue(queue) {
   }
 }
 function runEffectQueue(queue) {
-  for (let i = 0; i < queue.length; i++) {
-    if (queue[i].I && queue[i].a !== STATE_DISPOSED) {
-      queue[i].J(queue[i].d, queue[i].B);
-      queue[i].I = false;
-      queue[i].B = queue[i].d;
-    }
-  }
+  for (let i = 0; i < queue.length; i++)
+    queue[i].R();
 }
 
 // src/core/effect.ts
 var Effect = class extends Computation {
   J;
-  I = false;
+  K = false;
   B;
-  K;
+  C;
   e;
   constructor(initialValue, compute2, effect, options) {
     super(initialValue, compute2, options);
     this.J = effect;
     this.B = initialValue;
-    this.K = options?.render ? EFFECT_RENDER : EFFECT_USER;
+    this.C = options?.render ? EFFECT_RENDER : EFFECT_USER;
     this.e = getOwner()?.e || globalQueue;
-    this.e.enqueue(this.K, this);
     this.r();
+    this.C === EFFECT_USER ? this.e.enqueue(this.C, this) : this.R();
   }
   write(value, flags = 0) {
     const currentFlags = this.i;
     this.i = flags;
     if ((flags & LOADING_BIT) !== (currentFlags & LOADING_BIT)) {
-      this.e.S?.(this);
+      this.e.T?.(this);
     }
     if (value === UNCHANGED)
       return this.d;
     this.d = value;
-    this.I = true;
+    this.K = true;
     return value;
   }
   s(state) {
     if (this.a >= state)
       return;
     if (this.a === STATE_CLEAN)
-      this.e.enqueue(this.K, this);
+      this.e.enqueue(this.C, this);
     this.a = state;
   }
   Q(error) {
@@ -675,6 +670,13 @@ var Effect = class extends Computation {
     this.B = void 0;
     super.w();
   }
+  R() {
+    if (this.K && this.a !== STATE_DISPOSED) {
+      this.J(this.d, this.B);
+      this.B = this.d;
+      this.K = false;
+    }
+  }
 };
 var EagerComputation = class extends Computation {
   e;
@@ -702,7 +704,7 @@ var SuspenseQueue = class extends Queue {
       return;
     super.run(type);
   }
-  S(node) {
+  T(node) {
     if (node.i & LOADING_BIT) {
       this.k.add(node);
       if (!this.z) {
@@ -1170,7 +1172,7 @@ function resolveSource(s) {
 }
 var $SOURCES = Symbol(0);
 function merge(...sources) {
-  if (sources.length === 1)
+  if (sources.length === 1 && typeof sources[0] !== "function")
     return sources[0];
   let proxy = false;
   const flattened = [];
@@ -1288,9 +1290,9 @@ function mapArray(list, map, options) {
     new Computation(
       [],
       updateKeyedMap.bind({
-        R: new Owner(),
+        S: new Owner(),
         u: 0,
-        T: list,
+        U: list,
         p: [],
         M: map,
         n: [],
@@ -1304,9 +1306,9 @@ function mapArray(list, map, options) {
   );
 }
 function updateKeyedMap() {
-  const newItems = this.T() || [], newLen = newItems.length;
+  const newItems = this.U() || [], newLen = newItems.length;
   newItems[$TRACK];
-  runWithOwner(this.R, () => {
+  runWithOwner(this.S, () => {
     let i, j, mapper = this.f ? () => {
       this.f[j] = new Computation(newItems[j], null);
       this.j[j] = new Computation(j, null);
@@ -1324,7 +1326,7 @@ function updateKeyedMap() {
     };
     if (newLen === 0) {
       if (this.u !== 0) {
-        this.R.dispose(false);
+        this.S.dispose(false);
         this.k = [];
         this.p = [];
         this.n = [];

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

@@ -19,6 +19,7 @@ export declare class Effect<T = any> extends Computation<T> {
     _notify(state: number): void;
     _setError(error: unknown): void;
     _disposeNode(): void;
+    _runEffect(): void;
 }
 export declare class EagerComputation<T = any> extends Computation<T> {
     _queue: IQueue;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solidjs/signals",
-  "version": "0.0.1",
+  "version": "0.0.2",
   "description": "",
   "license": "ISC",
   "type": "module",