@solidjs/signals 0.2.1 → 0.2.3

package/dist/dev.js

@@ -138,60 +138,6 @@ function runEffectQueue(queue) {
 function isUndefined(value) {
   return typeof value === "undefined";
 }
-function flatten(children, options) {
-  if (typeof children === "function" && !children.length) {
-    if (options?.doNotUnwrap)
-      return children;
-    do {
-      children = children();
-    } while (typeof children === "function" && !children.length);
-  }
-  if (options?.skipNonRendered && (children == null || children === true || children === false || children === ""))
-    return;
-  if (Array.isArray(children)) {
-    let results = [];
-    if (flattenArray(children, results, options)) {
-      return () => {
-        let nested = [];
-        flattenArray(results, nested, { ...options, doNotUnwrap: false });
-        return nested;
-      };
-    }
-    return results;
-  }
-  return children;
-}
-function flattenArray(children, results = [], options) {
-  let notReady = null;
-  let needsUnwrap = false;
-  for (let i = 0; i < children.length; i++) {
-    try {
-      let child = children[i];
-      if (typeof child === "function" && !child.length) {
-        if (options?.doNotUnwrap) {
-          results.push(child);
-          needsUnwrap = true;
-          continue;
-        }
-        do {
-          child = child();
-        } while (typeof child === "function" && !child.length);
-      }
-      if (Array.isArray(child)) {
-        needsUnwrap = flattenArray(child, results, options);
-      } else if (options?.skipNonRendered && (child == null || child === true || child === false || child === "")) {
-      } else
-        results.push(child);
-    } catch (e) {
-      if (!(e instanceof NotReadyError))
-        throw e;
-      notReady = e;
-    }
-  }
-  if (notReady)
-    throw notReady;
-  return needsUnwrap;
-}
 
 // src/core/owner.ts
 var currentOwner = null;
@@ -666,8 +612,10 @@ function isPending(fn, loadingValue) {
     latest(fn);
     return staleCheck._value;
   } catch (err) {
-    if (argLength > 1 && err instanceof NotReadyError)
-      return !!loadingValue;
+    if (!(err instanceof NotReadyError))
+      return false;
+    if (argLength > 1)
+      return loadingValue;
     throw err;
   } finally {
     staleCheck = current;
@@ -752,6 +700,68 @@ function compute(owner, fn, observer) {
     notStale = prevNotStale;
   }
 }
+function flatten(children, options) {
+  try {
+    if (typeof children === "function" && !children.length) {
+      if (options?.doNotUnwrap)
+        return children;
+      do {
+        children = children();
+      } while (typeof children === "function" && !children.length);
+    }
+    if (options?.skipNonRendered && (children == null || children === true || children === false || children === ""))
+      return;
+    if (Array.isArray(children)) {
+      let results = [];
+      if (flattenArray(children, results, options)) {
+        return () => {
+          let nested = [];
+          flattenArray(results, nested, { ...options, doNotUnwrap: false });
+          return nested;
+        };
+      }
+      return results;
+    }
+    return children;
+  } catch (e) {
+    if (options?.skipNonRendered && e instanceof NotReadyError) {
+      newFlags |= LOADING_BIT;
+      return void 0;
+    }
+    throw e;
+  }
+}
+function flattenArray(children, results = [], options) {
+  let notReady = null;
+  let needsUnwrap = false;
+  for (let i = 0; i < children.length; i++) {
+    try {
+      let child = children[i];
+      if (typeof child === "function" && !child.length) {
+        if (options?.doNotUnwrap) {
+          results.push(child);
+          needsUnwrap = true;
+          continue;
+        }
+        do {
+          child = child();
+        } while (typeof child === "function" && !child.length);
+      }
+      if (Array.isArray(child)) {
+        needsUnwrap = flattenArray(child, results, options);
+      } else if (options?.skipNonRendered && (child == null || child === true || child === false || child === "")) {
+      } else
+        results.push(child);
+    } catch (e) {
+      if (!(e instanceof NotReadyError))
+        throw e;
+      notReady = e;
+    }
+  }
+  if (notReady)
+    throw notReady;
+  return needsUnwrap;
+}
 function createBoundary(fn, queue) {
   const owner = new Owner();
   const parentQueue = owner._queue;
@@ -775,7 +785,7 @@ var Effect = class extends Computation {
     this._prevValue = initialValue;
     this._type = options?.render ? EFFECT_RENDER : EFFECT_USER;
     if (this._type === EFFECT_RENDER) {
-      this._compute = (p) => getClock() > this._queue.created ? latest(() => compute2(p)) : compute2(p);
+      this._compute = (p) => getClock() > this._queue.created && !(this._stateFlags & ERROR_BIT) ? latest(() => compute2(p)) : compute2(p);
     }
     this._updateIfNecessary();
     !options?.defer && (this._type === EFFECT_USER ? this._queue.enqueue(this._type, this) : this._runEffect());
@@ -806,9 +816,9 @@ var Effect = class extends Computation {
   _setError(error) {
     this._cleanup?.();
     if (this._stateFlags & LOADING_BIT) {
-      this._stateFlags = 0;
       this._queue._update?.(this);
     }
+    this._stateFlags = ERROR_BIT;
     if (this._type === EFFECT_USER) {
       try {
         return this._onerror ? this._cleanup = this._onerror(error) : console.error(new EffectError(this._effect, error));
@@ -1437,7 +1447,7 @@ function reconcile(value, key) {
   };
 }
 
-// src/store/utilities.ts
+// src/store/utils.ts
 function trueFn() {
   return true;
 }

package/dist/node.cjs

@@ -134,60 +134,6 @@ function runEffectQueue(queue) {
 function isUndefined(value) {
   return typeof value === "undefined";
 }
-function flatten(children, options) {
-  if (typeof children === "function" && !children.length) {
-    if (options == null ? void 0 : options.doNotUnwrap)
-      return children;
-    do {
-      children = children();
-    } while (typeof children === "function" && !children.length);
-  }
-  if ((options == null ? void 0 : options.skipNonRendered) && (children == null || children === true || children === false || children === ""))
-    return;
-  if (Array.isArray(children)) {
-    let results = [];
-    if (flattenArray(children, results, options)) {
-      return () => {
-        let nested = [];
-        flattenArray(results, nested, { ...options, doNotUnwrap: false });
-        return nested;
-      };
-    }
-    return results;
-  }
-  return children;
-}
-function flattenArray(children, results = [], options) {
-  let notReady = null;
-  let needsUnwrap = false;
-  for (let i = 0; i < children.length; i++) {
-    try {
-      let child = children[i];
-      if (typeof child === "function" && !child.length) {
-        if (options == null ? void 0 : options.doNotUnwrap) {
-          results.push(child);
-          needsUnwrap = true;
-          continue;
-        }
-        do {
-          child = child();
-        } while (typeof child === "function" && !child.length);
-      }
-      if (Array.isArray(child)) {
-        needsUnwrap = flattenArray(child, results, options);
-      } else if ((options == null ? void 0 : options.skipNonRendered) && (child == null || child === true || child === false || child === "")) {
-      } else
-        results.push(child);
-    } catch (e) {
-      if (!(e instanceof NotReadyError))
-        throw e;
-      notReady = e;
-    }
-  }
-  if (notReady)
-    throw notReady;
-  return needsUnwrap;
-}
 
 // src/core/owner.ts
 var currentOwner = null;
@@ -663,8 +609,10 @@ function isPending(fn, loadingValue) {
     latest(fn);
     return staleCheck.e;
   } catch (err) {
-    if (argLength > 1 && err instanceof NotReadyError)
-      return !!loadingValue;
+    if (!(err instanceof NotReadyError))
+      return false;
+    if (argLength > 1)
+      return loadingValue;
     throw err;
   } finally {
     staleCheck = current;
@@ -749,6 +697,68 @@ function compute(owner, fn, observer) {
     notStale = prevNotStale;
   }
 }
+function flatten(children, options) {
+  try {
+    if (typeof children === "function" && !children.length) {
+      if (options == null ? void 0 : options.doNotUnwrap)
+        return children;
+      do {
+        children = children();
+      } while (typeof children === "function" && !children.length);
+    }
+    if ((options == null ? void 0 : options.skipNonRendered) && (children == null || children === true || children === false || children === ""))
+      return;
+    if (Array.isArray(children)) {
+      let results = [];
+      if (flattenArray(children, results, options)) {
+        return () => {
+          let nested = [];
+          flattenArray(results, nested, { ...options, doNotUnwrap: false });
+          return nested;
+        };
+      }
+      return results;
+    }
+    return children;
+  } catch (e) {
+    if ((options == null ? void 0 : options.skipNonRendered) && e instanceof NotReadyError) {
+      newFlags |= LOADING_BIT;
+      return void 0;
+    }
+    throw e;
+  }
+}
+function flattenArray(children, results = [], options) {
+  let notReady = null;
+  let needsUnwrap = false;
+  for (let i = 0; i < children.length; i++) {
+    try {
+      let child = children[i];
+      if (typeof child === "function" && !child.length) {
+        if (options == null ? void 0 : options.doNotUnwrap) {
+          results.push(child);
+          needsUnwrap = true;
+          continue;
+        }
+        do {
+          child = child();
+        } while (typeof child === "function" && !child.length);
+      }
+      if (Array.isArray(child)) {
+        needsUnwrap = flattenArray(child, results, options);
+      } else if ((options == null ? void 0 : options.skipNonRendered) && (child == null || child === true || child === false || child === "")) {
+      } else
+        results.push(child);
+    } catch (e) {
+      if (!(e instanceof NotReadyError))
+        throw e;
+      notReady = e;
+    }
+  }
+  if (notReady)
+    throw notReady;
+  return needsUnwrap;
+}
 function createBoundary(fn, queue) {
   const owner = new Owner();
   const parentQueue = owner.h;
@@ -772,7 +782,7 @@ var Effect = class extends Computation {
     this.M = initialValue;
     this.u = (options == null ? void 0 : options.render) ? EFFECT_RENDER : EFFECT_USER;
     if (this.u === EFFECT_RENDER) {
-      this.A = (p) => getClock() > this.h.created ? latest(() => compute2(p)) : compute2(p);
+      this.A = (p) => getClock() > this.h.created && !(this.d & ERROR_BIT) ? latest(() => compute2(p)) : compute2(p);
     }
     this.y();
     !(options == null ? void 0 : options.defer) && (this.u === EFFECT_USER ? this.h.enqueue(this.u, this) : this.T());
@@ -803,9 +813,9 @@ var Effect = class extends Computation {
     var _a, _b, _c;
     (_a = this.B) == null ? void 0 : _a.call(this);
     if (this.d & LOADING_BIT) {
-      this.d = 0;
       (_c = (_b = this.h).R) == null ? void 0 : _c.call(_b, this);
     }
+    this.d = ERROR_BIT;
     if (this.u === EFFECT_USER) {
       try {
         return this.L ? this.B = this.L(error) : console.error(new EffectError(this.K, error));
@@ -1437,7 +1447,7 @@ function reconcile(value, key) {
   };
 }
 
-// src/store/utilities.ts
+// src/store/utils.ts
 function trueFn() {
   return true;
 }

package/dist/prod.js

@@ -132,60 +132,6 @@ function runEffectQueue(queue) {
 function isUndefined(value) {
   return typeof value === "undefined";
 }
-function flatten(children, options) {
-  if (typeof children === "function" && !children.length) {
-    if (options?.doNotUnwrap)
-      return children;
-    do {
-      children = children();
-    } while (typeof children === "function" && !children.length);
-  }
-  if (options?.skipNonRendered && (children == null || children === true || children === false || children === ""))
-    return;
-  if (Array.isArray(children)) {
-    let results = [];
-    if (flattenArray(children, results, options)) {
-      return () => {
-        let nested = [];
-        flattenArray(results, nested, { ...options, doNotUnwrap: false });
-        return nested;
-      };
-    }
-    return results;
-  }
-  return children;
-}
-function flattenArray(children, results = [], options) {
-  let notReady = null;
-  let needsUnwrap = false;
-  for (let i = 0; i < children.length; i++) {
-    try {
-      let child = children[i];
-      if (typeof child === "function" && !child.length) {
-        if (options?.doNotUnwrap) {
-          results.push(child);
-          needsUnwrap = true;
-          continue;
-        }
-        do {
-          child = child();
-        } while (typeof child === "function" && !child.length);
-      }
-      if (Array.isArray(child)) {
-        needsUnwrap = flattenArray(child, results, options);
-      } else if (options?.skipNonRendered && (child == null || child === true || child === false || child === "")) {
-      } else
-        results.push(child);
-    } catch (e) {
-      if (!(e instanceof NotReadyError))
-        throw e;
-      notReady = e;
-    }
-  }
-  if (notReady)
-    throw notReady;
-  return needsUnwrap;
-}
 
 // src/core/owner.ts
 var currentOwner = null;
@@ -659,8 +605,10 @@ function isPending(fn, loadingValue) {
     latest(fn);
     return staleCheck.e;
   } catch (err) {
-    if (argLength > 1 && err instanceof NotReadyError)
-      return !!loadingValue;
+    if (!(err instanceof NotReadyError))
+      return false;
+    if (argLength > 1)
+      return loadingValue;
     throw err;
   } finally {
     staleCheck = current;
@@ -745,6 +693,68 @@ function compute(owner, fn, observer) {
     notStale = prevNotStale;
   }
 }
+function flatten(children, options) {
+  try {
+    if (typeof children === "function" && !children.length) {
+      if (options?.doNotUnwrap)
+        return children;
+      do {
+        children = children();
+      } while (typeof children === "function" && !children.length);
+    }
+    if (options?.skipNonRendered && (children == null || children === true || children === false || children === ""))
+      return;
+    if (Array.isArray(children)) {
+      let results = [];
+      if (flattenArray(children, results, options)) {
+        return () => {
+          let nested = [];
+          flattenArray(results, nested, { ...options, doNotUnwrap: false });
+          return nested;
+        };
+      }
+      return results;
+    }
+    return children;
+  } catch (e) {
+    if (options?.skipNonRendered && e instanceof NotReadyError) {
+      newFlags |= LOADING_BIT;
+      return void 0;
+    }
+    throw e;
+  }
+}
+function flattenArray(children, results = [], options) {
+  let notReady = null;
+  let needsUnwrap = false;
+  for (let i = 0; i < children.length; i++) {
+    try {
+      let child = children[i];
+      if (typeof child === "function" && !child.length) {
+        if (options?.doNotUnwrap) {
+          results.push(child);
+          needsUnwrap = true;
+          continue;
+        }
+        do {
+          child = child();
+        } while (typeof child === "function" && !child.length);
+      }
+      if (Array.isArray(child)) {
+        needsUnwrap = flattenArray(child, results, options);
+      } else if (options?.skipNonRendered && (child == null || child === true || child === false || child === "")) {
+      } else
+        results.push(child);
+    } catch (e) {
+      if (!(e instanceof NotReadyError))
+        throw e;
+      notReady = e;
+    }
+  }
+  if (notReady)
+    throw notReady;
+  return needsUnwrap;
+}
 function createBoundary(fn, queue) {
   const owner = new Owner();
   const parentQueue = owner.h;
@@ -768,7 +778,7 @@ var Effect = class extends Computation {
     this.M = initialValue;
     this.u = options?.render ? EFFECT_RENDER : EFFECT_USER;
     if (this.u === EFFECT_RENDER) {
-      this.A = (p) => getClock() > this.h.created ? latest(() => compute2(p)) : compute2(p);
+      this.A = (p) => getClock() > this.h.created && !(this.d & ERROR_BIT) ? latest(() => compute2(p)) : compute2(p);
     }
     this.y();
     !options?.defer && (this.u === EFFECT_USER ? this.h.enqueue(this.u, this) : this.T());
@@ -797,9 +807,9 @@ var Effect = class extends Computation {
   F(error) {
     this.B?.();
     if (this.d & LOADING_BIT) {
-      this.d = 0;
       this.h.R?.(this);
     }
+    this.d = ERROR_BIT;
     if (this.u === EFFECT_USER) {
       try {
         return this.L ? this.B = this.L(error) : console.error(new EffectError(this.K, error));
@@ -1424,7 +1434,7 @@ function reconcile(value, key) {
   };
 }
 
-// src/store/utilities.ts
+// src/store/utils.ts
 function trueFn() {
   return true;
 }

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

@@ -162,5 +162,9 @@ export declare function runWithObserver<T>(observer: Computation, run: () => T):
  */
 export declare function compute<T>(owner: Owner | null, fn: (val: T) => T, observer: Computation<T>): T;
 export declare function compute<T>(owner: Owner | null, fn: (val: undefined) => T, observer: null): T;
+export declare function flatten(children: any, options?: {
+    skipNonRendered?: boolean;
+    doNotUnwrap?: boolean;
+}): any;
 export declare function createBoundary<T>(fn: () => T, queue: IQueue): T;
 export {};

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

@@ -1,9 +1,8 @@
 export { ContextNotFoundError, NoOwnerError, NotReadyError, type ErrorHandler } from "./error.js";
 export { Owner, createContext, getContext, setContext, hasContext, getOwner, onCleanup, type Context, type ContextRecord, type Disposable } from "./owner.js";
-export { Computation, createBoundary, getObserver, isEqual, untrack, hasUpdated, isPending, latest, catchError, UNCHANGED, compute, runWithObserver, type SignalOptions } from "./core.js";
+export { Computation, createBoundary, getObserver, isEqual, untrack, hasUpdated, isPending, latest, flatten, catchError, UNCHANGED, compute, runWithObserver, type SignalOptions } from "./core.js";
 export { Effect, EagerComputation } from "./effect.js";
 export { flushSync, getClock, incrementClock, type IQueue, Queue } from "./scheduler.js";
 export { createSuspense } from "./suspense.js";
 export { SUPPORTS_PROXY } from "./constants.js";
 export * from "./flags.js";
-export { flatten } from "./utils.js";

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

@@ -1,5 +1 @@
 export declare function isUndefined(value: any): value is undefined;
-export declare function flatten(children: any, options?: {
-    skipNonRendered?: boolean;
-    doNotUnwrap?: boolean;
-}): any;

package/dist/types/store/index.d.ts

@@ -1,6 +1,6 @@
 export type { Store, StoreSetter, StoreNode, NotWrappable, SolidStore } from "./store.js";
-export type { Merge, Omit } from "./utilities.js";
+export type { Merge, Omit } from "./utils.js";
 export { unwrap, isWrappable, createStore, $RAW, $TRACK, $PROXY, $TARGET } from "./store.js";
 export { createProjection } from "./projection.js";
 export { reconcile } from "./reconcile.js";
-export { merge, omit } from "./utilities.js";
+export { merge, omit } from "./utils.js";

package/package.json

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