solid-js 1.5.0-beta.1 → 1.5.0-beta.2

package/dist/dev.cjs

@@ -153,7 +153,6 @@ let Transition = null;
 let Scheduler = null;
 let ExternalSourceFactory = null;
 let Listener = null;
-let Pending = null;
 let Updates = null;
 let Effects = null;
 let ExecCount = 0;
@@ -243,18 +242,19 @@ function createMemo(fn, value, options) {
   } else updateComputation(c);
   return readSignal.bind(c);
 }
-function createResource(source, fetcher, options) {
-  if (arguments.length === 2) {
-    if (typeof fetcher === "object") {
-      options = fetcher;
-      fetcher = source;
-      source = true;
-    }
-  } else if (arguments.length === 1) {
-    fetcher = source;
+function createResource(pSource, pFetcher, pOptions) {
+  let source;
+  let fetcher;
+  let options;
+  if (arguments.length === 2 && typeof pFetcher === "object" || arguments.length === 1) {
     source = true;
+    fetcher = pSource;
+    options = pFetcher || {};
+  } else {
+    source = pSource;
+    fetcher = pFetcher;
+    options = pOptions || {};
   }
-  options || (options = {});
   let err = undefined,
       pr = null,
       initP = NO_INIT,
@@ -300,7 +300,7 @@ function createResource(source, fetcher, options) {
   function completeLoad(v, success) {
     !success && (err = castError(v));
     runUpdates(() => {
-      setValue(() => success ? v : undefined);
+      setValue(() => v);
       setState(success ? "ready" : "error");
       for (const c of contexts.keys()) c.decrement();
       contexts.clear();
@@ -324,7 +324,7 @@ function createResource(source, fetcher, options) {
     return v;
   }
   function load(refetching = true) {
-    if (refetching && scheduled) return;
+    if (refetching !== false && scheduled) return;
     scheduled = false;
     err = undefined;
     const lookup = dynamic ? dynamic() : source;
@@ -424,18 +424,7 @@ function createSelector(source, fn = equalFn, options) {
   };
 }
 function batch(fn) {
-  if (Pending) return fn();
-  let result;
-  const q = Pending = [];
-  try {
-    result = fn();
-  } finally {
-    Pending = null;
-  }
-  runUpdates(() => {
-    for (let i = 0; i < q.length; i += 1) notifySignal(q[i]);
-  }, false);
-  return result;
+  return runUpdates(fn, false);
 }
 function untrack(fn) {
   let result,
@@ -623,10 +612,12 @@ function enableExternalSource(factory) {
 function readSignal() {
   const runningTransition = Transition && Transition.running;
   if (this.sources && (!runningTransition && this.state || runningTransition && this.tState)) {
-    const updates = Updates;
-    Updates = null;
-    !runningTransition && this.state === STALE || runningTransition && this.tState === STALE ? updateComputation(this) : lookUpstream(this);
-    Updates = updates;
+    if (!runningTransition && this.state === STALE || runningTransition && this.tState === STALE) updateComputation(this);else {
+      const updates = Updates;
+      Updates = null;
+      runUpdates(() => lookUpstream(this), false);
+      Updates = updates;
+    }
   }
   if (Listener) {
     const sSlot = this.observers ? this.observers.length : 0;
@@ -659,30 +650,27 @@ function writeSignal(node, value, isComp) {
       }
       if (!TransitionRunning) node.value = value;
     } else node.value = value;
-    if (Pending) Pending.push(node);else notifySignal(node);
-  }
-  return value;
-}
-function notifySignal(node) {
-  if (node.observers && node.observers.length) {
-    runUpdates(() => {
-      for (let i = 0; i < node.observers.length; i += 1) {
-        const o = node.observers[i];
-        const TransitionRunning = Transition && Transition.running;
-        if (TransitionRunning && Transition.disposed.has(o)) continue;
-        if (TransitionRunning && !o.tState || !TransitionRunning && !o.state) {
-          if (o.pure) Updates.push(o);else Effects.push(o);
-          if (o.observers) markDownstream(o);
+    if (node.observers && node.observers.length) {
+      runUpdates(() => {
+        for (let i = 0; i < node.observers.length; i += 1) {
+          const o = node.observers[i];
+          const TransitionRunning = Transition && Transition.running;
+          if (TransitionRunning && Transition.disposed.has(o)) continue;
+          if (TransitionRunning && !o.tState || !TransitionRunning && !o.state) {
+            if (o.pure) Updates.push(o);else Effects.push(o);
+            if (o.observers) markDownstream(o);
+          }
+          if (TransitionRunning) o.tState = STALE;else o.state = STALE;
         }
-        if (TransitionRunning) o.tState = STALE;else o.state = STALE;
-      }
-      if (Updates.length > 10e5) {
-        Updates = [];
-        if ("_SOLID_DEV_") throw new Error("Potential Infinite Loop Detected.");
-        throw new Error();
-      }
-    }, false);
+        if (Updates.length > 10e5) {
+          Updates = [];
+          if ("_SOLID_DEV_") throw new Error("Potential Infinite Loop Detected.");
+          throw new Error();
+        }
+      }, false);
+    }
   }
+  return value;
 }
 function updateComputation(node) {
   if (!node.fn) return;
@@ -708,6 +696,7 @@ function runComputation(node, value, time) {
   try {
     nextValue = node.fn(value);
   } catch (err) {
+    if (node.pure) Transition && Transition.running ? node.tState = STALE : node.state = STALE;
     handleError(err);
   }
   if (!node.updatedAt || node.updatedAt <= time) {
@@ -785,7 +774,7 @@ function runTop(node) {
     } else if (!runningTransition && node.state === PENDING || runningTransition && node.tState === PENDING) {
       const updates = Updates;
       Updates = null;
-      lookUpstream(node, ancestors[0]);
+      runUpdates(() => lookUpstream(node, ancestors[0]), false);
       Updates = updates;
     }
   }
@@ -1026,7 +1015,7 @@ function observable(input) {
         };
       }
       const dispose = createRoot(disposer => {
-        createComputed(() => {
+        createEffect(() => {
           const v = input();
           untrack(() => handler(v));
         });
@@ -1434,7 +1423,9 @@ function ErrorBoundary(props) {
     if (e = errored()) {
       const f = props.fallback;
       if ((typeof f !== "function" || f.length == 0)) console.error(e);
-      return typeof f === "function" && f.length ? untrack(() => f(e, setErrored)) : f;
+      const res = typeof f === "function" && f.length ? untrack(() => f(e, () => setErrored())) : f;
+      onError(setErrored);
+      return res;
     }
     onError(setErrored);
     return props.children;
@@ -1530,25 +1521,22 @@ function Suspense(props) {
   if (sharedConfig.context && sharedConfig.load) {
     const key = sharedConfig.context.id + sharedConfig.context.count;
     let ref = sharedConfig.load(key);
-    if (ref) {
-      p = ref[0];
-      if (p === "$$$") sharedConfig.gather(key);else {
-        if (typeof p !== "object" || !("then" in p)) p = Promise.resolve(p);
-        const [s, set] = createSignal(undefined, {
-          equals: false
-        });
-        flicker = s;
-        p.then(err => {
-          if (err !== "$$$" || sharedConfig.done) {
-            err !== "$$$" && (error = err);
-            return set();
-          }
-          sharedConfig.gather(key);
-          setHydrateContext(ctx);
-          set();
-          setHydrateContext();
-        });
-      }
+    if (ref && (p = ref[0]) && p !== "$$f") {
+      if (typeof p !== "object" || !("then" in p)) p = Promise.resolve(p);
+      const [s, set] = createSignal(undefined, {
+        equals: false
+      });
+      flicker = s;
+      p.then(err => {
+        if (err || sharedConfig.done) {
+          err && (error = err);
+          return set();
+        }
+        sharedConfig.gather(key);
+        setHydrateContext(ctx);
+        set();
+        setHydrateContext();
+      });
     }
   }
   const listContext = useContext(SuspenseListContext);
@@ -1565,14 +1553,14 @@ function Suspense(props) {
           flicker();
           return flicker = undefined;
         }
-        if (ctx && !p) setHydrateContext();
+        if (ctx && p === "$$f") setHydrateContext();
         const rendered = createMemo(() => props.children);
         return createMemo(() => {
           const inFallback = store.inFallback(),
                 visibleContent = showContent ? showContent() : true,
                 visibleFallback = showFallback ? showFallback() : true;
           dispose && dispose();
-          if ((!inFallback || p) && visibleContent) {
+          if ((!inFallback || p && p !== "$$f") && visibleContent) {
             store.resolved = true;
             ctx = p = undefined;
             resumeEffects(store.effects);

package/dist/dev.js

@@ -149,7 +149,6 @@ let Transition = null;
 let Scheduler = null;
 let ExternalSourceFactory = null;
 let Listener = null;
-let Pending = null;
 let Updates = null;
 let Effects = null;
 let ExecCount = 0;
@@ -239,18 +238,19 @@ function createMemo(fn, value, options) {
   } else updateComputation(c);
   return readSignal.bind(c);
 }
-function createResource(source, fetcher, options) {
-  if (arguments.length === 2) {
-    if (typeof fetcher === "object") {
-      options = fetcher;
-      fetcher = source;
-      source = true;
-    }
-  } else if (arguments.length === 1) {
-    fetcher = source;
+function createResource(pSource, pFetcher, pOptions) {
+  let source;
+  let fetcher;
+  let options;
+  if (arguments.length === 2 && typeof pFetcher === "object" || arguments.length === 1) {
     source = true;
+    fetcher = pSource;
+    options = pFetcher || {};
+  } else {
+    source = pSource;
+    fetcher = pFetcher;
+    options = pOptions || {};
   }
-  options || (options = {});
   let err = undefined,
       pr = null,
       initP = NO_INIT,
@@ -296,7 +296,7 @@ function createResource(source, fetcher, options) {
   function completeLoad(v, success) {
     !success && (err = castError(v));
     runUpdates(() => {
-      setValue(() => success ? v : undefined);
+      setValue(() => v);
       setState(success ? "ready" : "error");
       for (const c of contexts.keys()) c.decrement();
       contexts.clear();
@@ -320,7 +320,7 @@ function createResource(source, fetcher, options) {
     return v;
   }
   function load(refetching = true) {
-    if (refetching && scheduled) return;
+    if (refetching !== false && scheduled) return;
     scheduled = false;
     err = undefined;
     const lookup = dynamic ? dynamic() : source;
@@ -420,18 +420,7 @@ function createSelector(source, fn = equalFn, options) {
   };
 }
 function batch(fn) {
-  if (Pending) return fn();
-  let result;
-  const q = Pending = [];
-  try {
-    result = fn();
-  } finally {
-    Pending = null;
-  }
-  runUpdates(() => {
-    for (let i = 0; i < q.length; i += 1) notifySignal(q[i]);
-  }, false);
-  return result;
+  return runUpdates(fn, false);
 }
 function untrack(fn) {
   let result,
@@ -619,10 +608,12 @@ function enableExternalSource(factory) {
 function readSignal() {
   const runningTransition = Transition && Transition.running;
   if (this.sources && (!runningTransition && this.state || runningTransition && this.tState)) {
-    const updates = Updates;
-    Updates = null;
-    !runningTransition && this.state === STALE || runningTransition && this.tState === STALE ? updateComputation(this) : lookUpstream(this);
-    Updates = updates;
+    if (!runningTransition && this.state === STALE || runningTransition && this.tState === STALE) updateComputation(this);else {
+      const updates = Updates;
+      Updates = null;
+      runUpdates(() => lookUpstream(this), false);
+      Updates = updates;
+    }
   }
   if (Listener) {
     const sSlot = this.observers ? this.observers.length : 0;
@@ -655,30 +646,27 @@ function writeSignal(node, value, isComp) {
       }
       if (!TransitionRunning) node.value = value;
     } else node.value = value;
-    if (Pending) Pending.push(node);else notifySignal(node);
-  }
-  return value;
-}
-function notifySignal(node) {
-  if (node.observers && node.observers.length) {
-    runUpdates(() => {
-      for (let i = 0; i < node.observers.length; i += 1) {
-        const o = node.observers[i];
-        const TransitionRunning = Transition && Transition.running;
-        if (TransitionRunning && Transition.disposed.has(o)) continue;
-        if (TransitionRunning && !o.tState || !TransitionRunning && !o.state) {
-          if (o.pure) Updates.push(o);else Effects.push(o);
-          if (o.observers) markDownstream(o);
+    if (node.observers && node.observers.length) {
+      runUpdates(() => {
+        for (let i = 0; i < node.observers.length; i += 1) {
+          const o = node.observers[i];
+          const TransitionRunning = Transition && Transition.running;
+          if (TransitionRunning && Transition.disposed.has(o)) continue;
+          if (TransitionRunning && !o.tState || !TransitionRunning && !o.state) {
+            if (o.pure) Updates.push(o);else Effects.push(o);
+            if (o.observers) markDownstream(o);
+          }
+          if (TransitionRunning) o.tState = STALE;else o.state = STALE;
         }
-        if (TransitionRunning) o.tState = STALE;else o.state = STALE;
-      }
-      if (Updates.length > 10e5) {
-        Updates = [];
-        if ("_SOLID_DEV_") throw new Error("Potential Infinite Loop Detected.");
-        throw new Error();
-      }
-    }, false);
+        if (Updates.length > 10e5) {
+          Updates = [];
+          if ("_SOLID_DEV_") throw new Error("Potential Infinite Loop Detected.");
+          throw new Error();
+        }
+      }, false);
+    }
   }
+  return value;
 }
 function updateComputation(node) {
   if (!node.fn) return;
@@ -704,6 +692,7 @@ function runComputation(node, value, time) {
   try {
     nextValue = node.fn(value);
   } catch (err) {
+    if (node.pure) Transition && Transition.running ? node.tState = STALE : node.state = STALE;
     handleError(err);
   }
   if (!node.updatedAt || node.updatedAt <= time) {
@@ -781,7 +770,7 @@ function runTop(node) {
     } else if (!runningTransition && node.state === PENDING || runningTransition && node.tState === PENDING) {
       const updates = Updates;
       Updates = null;
-      lookUpstream(node, ancestors[0]);
+      runUpdates(() => lookUpstream(node, ancestors[0]), false);
       Updates = updates;
     }
   }
@@ -1022,7 +1011,7 @@ function observable(input) {
         };
       }
       const dispose = createRoot(disposer => {
-        createComputed(() => {
+        createEffect(() => {
           const v = input();
           untrack(() => handler(v));
         });
@@ -1430,7 +1419,9 @@ function ErrorBoundary(props) {
     if (e = errored()) {
       const f = props.fallback;
       if ((typeof f !== "function" || f.length == 0)) console.error(e);
-      return typeof f === "function" && f.length ? untrack(() => f(e, setErrored)) : f;
+      const res = typeof f === "function" && f.length ? untrack(() => f(e, () => setErrored())) : f;
+      onError(setErrored);
+      return res;
     }
     onError(setErrored);
     return props.children;
@@ -1526,25 +1517,22 @@ function Suspense(props) {
   if (sharedConfig.context && sharedConfig.load) {
     const key = sharedConfig.context.id + sharedConfig.context.count;
     let ref = sharedConfig.load(key);
-    if (ref) {
-      p = ref[0];
-      if (p === "$$$") sharedConfig.gather(key);else {
-        if (typeof p !== "object" || !("then" in p)) p = Promise.resolve(p);
-        const [s, set] = createSignal(undefined, {
-          equals: false
-        });
-        flicker = s;
-        p.then(err => {
-          if (err !== "$$$" || sharedConfig.done) {
-            err !== "$$$" && (error = err);
-            return set();
-          }
-          sharedConfig.gather(key);
-          setHydrateContext(ctx);
-          set();
-          setHydrateContext();
-        });
-      }
+    if (ref && (p = ref[0]) && p !== "$$f") {
+      if (typeof p !== "object" || !("then" in p)) p = Promise.resolve(p);
+      const [s, set] = createSignal(undefined, {
+        equals: false
+      });
+      flicker = s;
+      p.then(err => {
+        if (err || sharedConfig.done) {
+          err && (error = err);
+          return set();
+        }
+        sharedConfig.gather(key);
+        setHydrateContext(ctx);
+        set();
+        setHydrateContext();
+      });
     }
   }
   const listContext = useContext(SuspenseListContext);
@@ -1561,14 +1549,14 @@ function Suspense(props) {
           flicker();
           return flicker = undefined;
         }
-        if (ctx && !p) setHydrateContext();
+        if (ctx && p === "$$f") setHydrateContext();
         const rendered = createMemo(() => props.children);
         return createMemo(() => {
           const inFallback = store.inFallback(),
                 visibleContent = showContent ? showContent() : true,
                 visibleFallback = showFallback ? showFallback() : true;
           dispose && dispose();
-          if ((!inFallback || p) && visibleContent) {
+          if ((!inFallback || p && p !== "$$f") && visibleContent) {
             store.resolved = true;
             ctx = p = undefined;
             resumeEffects(store.effects);

package/dist/server.cjs

@@ -151,6 +151,8 @@ function runWithOwner(o, fn) {
   Owner = o;
   try {
     return fn();
+  } catch (err) {
+    handleError(err);
   } finally {
     Owner = prev;
   }
@@ -196,31 +198,33 @@ function mapArray(list, mapFn, options = {}) {
   } else if (options.fallback) s = [options.fallback()];
   return () => s;
 }
-function getSymbol() {
-  const SymbolCopy = Symbol;
-  return SymbolCopy.observable || "@@observable";
-}
 function observable(input) {
-  const $$observable = getSymbol();
   return {
     subscribe(observer) {
       if (!(observer instanceof Object) || observer == null) {
         throw new TypeError("Expected the observer to be an object.");
       }
-      const handler = "next" in observer ? observer.next : observer;
-      let complete = false;
-      createComputed(() => {
-        if (complete) return;
-        const v = input();
-        handler(v);
+      const handler = typeof observer === "function" ? observer : observer.next && observer.next.bind(observer);
+      if (!handler) {
+        return {
+          unsubscribe() {}
+        };
+      }
+      const dispose = createRoot(disposer => {
+        createEffect(() => {
+          const v = input();
+          untrack(() => handler(v));
+        });
+        return disposer;
       });
+      if (getOwner()) onCleanup(dispose);
       return {
         unsubscribe() {
-          complete = true;
+          dispose();
         }
       };
     },
-    [$$observable]() {
+    [Symbol.observable || "@@observable"]() {
       return this;
     }
   };
@@ -338,18 +342,13 @@ function Match(props) {
 }
 function resetErrorBoundaries() {}
 function ErrorBoundary(props) {
-  let error, res, clean;
+  let error,
+      res,
+      clean,
+      sync = true;
   const ctx = sharedConfig.context;
   const id = ctx.id + ctx.count;
-  onError(err => error = err);
-  onCleanup(() => cleanNode(clean));
-  createMemo(() => {
-    Owner.context = {
-      [BRANCH]: clean = {}
-    };
-    return res = props.children;
-  });
-  if (error) {
+  function displayFallback() {
     cleanNode(clean);
     ctx.writeResource(id, error, true);
     setHydrateContext({ ...ctx,
@@ -358,7 +357,23 @@ function ErrorBoundary(props) {
     const f = props.fallback;
     return typeof f === "function" && f.length ? f(error, () => {}) : f;
   }
-  return res;
+  onError(err => {
+    error = err;
+    !sync && ctx.replace("e" + id, displayFallback);
+    sync = true;
+  });
+  onCleanup(() => cleanNode(clean));
+  createMemo(() => {
+    Owner.context = {
+      [BRANCH]: clean = {}
+    };
+    return res = props.children;
+  });
+  if (error) return displayFallback();
+  sync = false;
+  return {
+    t: `<!e${id}>${resolveSSRNode(res)}<!/e${id}>`
+  };
 }
 const SuspenseContext = createContext();
 let resourceContext = null;
@@ -465,6 +480,7 @@ function lazy(fn) {
     return p;
   };
   const contexts = new Set();
+  setTimeout(load);
   const wrap = props => {
     load();
     const id = sharedConfig.context.id.slice(0, -1);
@@ -488,10 +504,11 @@ function lazy(fn) {
   return wrap;
 }
 function suspenseComplete(c) {
+  if (c.complete) return true;
   for (const r of c.resources.values()) {
     if (r.loading) return false;
   }
-  return true;
+  return c.complete = true;
 }
 function notifySuspense(contexts) {
   for (const c of contexts) {
@@ -518,9 +535,11 @@ function Suspense(props) {
   const ctx = sharedConfig.context;
   const id = ctx.id + ctx.count;
   const o = Owner;
-  if (o.context) o.context[BRANCH] = clean = {};else o.context = {
-    [BRANCH]: clean = {}
-  };
+  if (o) {
+    if (o.context) o.context[BRANCH] = clean = {};else o.context = {
+      [BRANCH]: clean = {}
+    };
+  }
   const value = ctx.suspense[id] || (ctx.suspense[id] = {
     resources: new Map(),
     completed: () => {
@@ -528,7 +547,8 @@ function Suspense(props) {
       if (suspenseComplete(value)) {
         done(resolveSSRNode(res));
       }
-    }
+    },
+    complete: false
   });
   function runSuspense() {
     setHydrateContext({ ...ctx,
@@ -538,19 +558,20 @@ function Suspense(props) {
       return createComponent(SuspenseContext.Provider, {
         value,
         get children() {
-          cleanNode(clean);
+          clean && cleanNode(clean);
           return props.children;
         }
       });
     });
   }
   const res = runSuspense();
-  if (suspenseComplete(value)) {
-    ctx.writeResource(id, "$$$");
-    return res;
-  }
+  if (suspenseComplete(value)) return res;
   onError(err => {
-    if (!done || !done(undefined, err)) throw err;
+    if (!done || !done(undefined, err)) {
+      if (o) runWithOwner(o.owner, () => {
+        throw err;
+      });else throw err;
+    }
   });
   done = ctx.async ? ctx.registerFragment(id) : undefined;
   if (ctx.async) {
@@ -565,6 +586,7 @@ function Suspense(props) {
     count: 0,
     id: ctx.id + "0.f"
   });
+  ctx.writeResource(id, "$$f");
   return props.fallback;
 }