solid-js 1.3.0-beta.1 → 1.3.0-beta.10

package/dist/server.cjs

@@ -41,8 +41,15 @@ function createComputed(fn, value) {
     owner: Owner,
     context: null
   };
-  fn(value);
-  Owner = Owner.owner;
+  try {
+    fn(value);
+  } catch (err) {
+    const fns = lookup(Owner, ERROR);
+    if (!fns) throw err;
+    fns.forEach(f => f(err));
+  } finally {
+    Owner = Owner.owner;
+  }
 }
 const createRenderEffect = createComputed;
 function createEffect(fn, value) {}
@@ -51,8 +58,16 @@ function createMemo(fn, value) {
     owner: Owner,
     context: null
   };
-  const v = fn(value);
-  Owner = Owner.owner;
+  let v;
+  try {
+    v = fn(value);
+  } catch (err) {
+    const fns = lookup(Owner, ERROR);
+    if (!fns) throw err;
+    fns.forEach(f => f(err));
+  } finally {
+    Owner = Owner.owner;
+  }
   return () => v;
 }
 function createDeferred(source) {
@@ -193,6 +208,7 @@ function from(producer) {
   }
   return s;
 }
+function enableExternalSource(factory) {}
 
 function resolveSSRNode(node) {
   const t = typeof node;
@@ -290,7 +306,20 @@ function Match(props) {
   return props;
 }
 function ErrorBoundary(props) {
-  return props.children;
+  let error, res;
+  const ctx = sharedConfig.context;
+  const id = ctx.id + ctx.count;
+  onError(err => error = err);
+  createMemo(() => res = props.children);
+  if (error) {
+    ctx.writeResource(id, error, true);
+    setHydrateContext({ ...ctx,
+      count: 0
+    });
+    const f = props.fallback;
+    return typeof f === "function" && f.length ? f(error, () => {}) : f;
+  }
+  return res;
 }
 const SuspenseContext = createContext();
 let resourceContext = null;
@@ -310,6 +339,7 @@ function createResource(fn, fetcher, options = {}) {
   let resource = {};
   let value = options.initialValue;
   let p;
+  let error;
   if (sharedConfig.context.async) {
     resource = sharedConfig.context.resources[id] || (sharedConfig.context.resources[id] = {});
     if (resource.ref) {
@@ -318,9 +348,10 @@ function createResource(fn, fetcher, options = {}) {
     }
   }
   const read = () => {
+    if (error) throw error;
     if (resourceContext && p) resourceContext.push(p);
     const resolved = sharedConfig.context.async && sharedConfig.context.resources[id].data;
-    if (!resolved) {
+    if (!resolved && read.loading) {
       const ctx = useContext(SuspenseContext);
       if (ctx) {
         ctx.resources.set(id, read);
@@ -332,7 +363,7 @@ function createResource(fn, fetcher, options = {}) {
   read.loading = false;
   function load() {
     const ctx = sharedConfig.context;
-    if (!ctx.async) return read.loading = true;
+    if (!ctx.async) return read.loading = !!(typeof fn === "function" ? fn() : fn);
     if (ctx.resources && id in ctx.resources && ctx.resources[id].data) {
       value = ctx.resources[id].data;
       return;
@@ -356,6 +387,11 @@ function createResource(fn, fetcher, options = {}) {
         p = null;
         notifySuspense(contexts);
         return res;
+      }).catch(err => {
+        read.loading = false;
+        error = err;
+        p = null;
+        notifySuspense(contexts);
       });
       return;
     }
@@ -390,7 +426,7 @@ function lazy(fn) {
     });
     return "";
   };
-  wrap.preload = () => {};
+  wrap.preload = () => p;
   return wrap;
 }
 function suspenseComplete(c) {
@@ -418,9 +454,9 @@ function SuspenseList(props) {
   return props.children;
 }
 function Suspense(props) {
+  let done;
   const ctx = sharedConfig.context;
   const id = ctx.id + ctx.count;
-  const done = ctx.async ? ctx.registerFragment(id) : () => {};
   const o = Owner;
   const value = ctx.suspense[id] || (ctx.suspense[id] = {
     resources: new Map(),
@@ -446,26 +482,30 @@ function Suspense(props) {
   }
   const res = runSuspense();
   if (suspenseComplete(value)) {
-    done();
+    ctx.writeResource(id, true);
     return res;
   }
-  if (sharedConfig.context.async) {
-    if (sharedConfig.context.streaming) {
-      setHydrateContext(undefined);
-      const res = {
-        t: `<span id="pl${id}">${resolveSSRNode(props.fallback)}</span>`
-      };
-      setHydrateContext(ctx);
-      return res;
-    }
+  onError(err => {
+    if (!done || !done(undefined, err)) throw err;
+  });
+  done = ctx.async ? ctx.registerFragment(id) : undefined;
+  if (ctx.streaming) {
+    setHydrateContext(undefined);
+    const res = {
+      t: `<span id="pl${id}">${resolveSSRNode(props.fallback)}</span>`
+    };
+    setHydrateContext(ctx);
+    return res;
+  } else if (ctx.async) {
     return {
       t: `<![${id}]>`
     };
   }
   setHydrateContext({ ...ctx,
-    count: 0
+    count: 0,
+    id: ctx.id + "0.f"
   });
-  return createComponent(() => props.fallback, {});
+  return props.fallback;
 }
 
 exports.$PROXY = $PROXY;
@@ -492,6 +532,7 @@ exports.createRoot = createRoot;
 exports.createSelector = createSelector;
 exports.createSignal = createSignal;
 exports.createUniqueId = createUniqueId;
+exports.enableExternalSource = enableExternalSource;
 exports.enableScheduling = enableScheduling;
 exports.equalFn = equalFn;
 exports.from = from;

package/dist/server.js

@@ -37,8 +37,15 @@ function createComputed(fn, value) {
     owner: Owner,
     context: null
   };
-  fn(value);
-  Owner = Owner.owner;
+  try {
+    fn(value);
+  } catch (err) {
+    const fns = lookup(Owner, ERROR);
+    if (!fns) throw err;
+    fns.forEach(f => f(err));
+  } finally {
+    Owner = Owner.owner;
+  }
 }
 const createRenderEffect = createComputed;
 function createEffect(fn, value) {}
@@ -47,8 +54,16 @@ function createMemo(fn, value) {
     owner: Owner,
     context: null
   };
-  const v = fn(value);
-  Owner = Owner.owner;
+  let v;
+  try {
+    v = fn(value);
+  } catch (err) {
+    const fns = lookup(Owner, ERROR);
+    if (!fns) throw err;
+    fns.forEach(f => f(err));
+  } finally {
+    Owner = Owner.owner;
+  }
   return () => v;
 }
 function createDeferred(source) {
@@ -189,6 +204,7 @@ function from(producer) {
   }
   return s;
 }
+function enableExternalSource(factory) {}
 
 function resolveSSRNode(node) {
   const t = typeof node;
@@ -286,7 +302,20 @@ function Match(props) {
   return props;
 }
 function ErrorBoundary(props) {
-  return props.children;
+  let error, res;
+  const ctx = sharedConfig.context;
+  const id = ctx.id + ctx.count;
+  onError(err => error = err);
+  createMemo(() => res = props.children);
+  if (error) {
+    ctx.writeResource(id, error, true);
+    setHydrateContext({ ...ctx,
+      count: 0
+    });
+    const f = props.fallback;
+    return typeof f === "function" && f.length ? f(error, () => {}) : f;
+  }
+  return res;
 }
 const SuspenseContext = createContext();
 let resourceContext = null;
@@ -306,6 +335,7 @@ function createResource(fn, fetcher, options = {}) {
   let resource = {};
   let value = options.initialValue;
   let p;
+  let error;
   if (sharedConfig.context.async) {
     resource = sharedConfig.context.resources[id] || (sharedConfig.context.resources[id] = {});
     if (resource.ref) {
@@ -314,9 +344,10 @@ function createResource(fn, fetcher, options = {}) {
     }
   }
   const read = () => {
+    if (error) throw error;
     if (resourceContext && p) resourceContext.push(p);
     const resolved = sharedConfig.context.async && sharedConfig.context.resources[id].data;
-    if (!resolved) {
+    if (!resolved && read.loading) {
       const ctx = useContext(SuspenseContext);
       if (ctx) {
         ctx.resources.set(id, read);
@@ -328,7 +359,7 @@ function createResource(fn, fetcher, options = {}) {
   read.loading = false;
   function load() {
     const ctx = sharedConfig.context;
-    if (!ctx.async) return read.loading = true;
+    if (!ctx.async) return read.loading = !!(typeof fn === "function" ? fn() : fn);
     if (ctx.resources && id in ctx.resources && ctx.resources[id].data) {
       value = ctx.resources[id].data;
       return;
@@ -352,6 +383,11 @@ function createResource(fn, fetcher, options = {}) {
         p = null;
         notifySuspense(contexts);
         return res;
+      }).catch(err => {
+        read.loading = false;
+        error = err;
+        p = null;
+        notifySuspense(contexts);
       });
       return;
     }
@@ -386,7 +422,7 @@ function lazy(fn) {
     });
     return "";
   };
-  wrap.preload = () => {};
+  wrap.preload = () => p;
   return wrap;
 }
 function suspenseComplete(c) {
@@ -414,9 +450,9 @@ function SuspenseList(props) {
   return props.children;
 }
 function Suspense(props) {
+  let done;
   const ctx = sharedConfig.context;
   const id = ctx.id + ctx.count;
-  const done = ctx.async ? ctx.registerFragment(id) : () => {};
   const o = Owner;
   const value = ctx.suspense[id] || (ctx.suspense[id] = {
     resources: new Map(),
@@ -442,26 +478,30 @@ function Suspense(props) {
   }
   const res = runSuspense();
   if (suspenseComplete(value)) {
-    done();
+    ctx.writeResource(id, true);
     return res;
   }
-  if (sharedConfig.context.async) {
-    if (sharedConfig.context.streaming) {
-      setHydrateContext(undefined);
-      const res = {
-        t: `<span id="pl${id}">${resolveSSRNode(props.fallback)}</span>`
-      };
-      setHydrateContext(ctx);
-      return res;
-    }
+  onError(err => {
+    if (!done || !done(undefined, err)) throw err;
+  });
+  done = ctx.async ? ctx.registerFragment(id) : undefined;
+  if (ctx.streaming) {
+    setHydrateContext(undefined);
+    const res = {
+      t: `<span id="pl${id}">${resolveSSRNode(props.fallback)}</span>`
+    };
+    setHydrateContext(ctx);
+    return res;
+  } else if (ctx.async) {
     return {
       t: `<![${id}]>`
     };
   }
   setHydrateContext({ ...ctx,
-    count: 0
+    count: 0,
+    id: ctx.id + "0.f"
   });
-  return createComponent(() => props.fallback, {});
+  return props.fallback;
 }
 
-export { $PROXY, DEV, ErrorBoundary, For, Index, Match, Show, Suspense, SuspenseList, Switch, batch, children, createComponent, createComputed, createContext, createDeferred, createEffect, createMemo, createRenderEffect, createResource, createRoot, createSelector, createSignal, createUniqueId, enableScheduling, equalFn, from, getListener, getOwner, lazy, mapArray, mergeProps, observable, on, onCleanup, onError, onMount, requestCallback, runWithOwner, sharedConfig, splitProps, startTransition, untrack, useContext, useTransition };
+export { $PROXY, DEV, ErrorBoundary, For, Index, Match, Show, Suspense, SuspenseList, Switch, batch, children, createComponent, createComputed, createContext, createDeferred, createEffect, createMemo, createRenderEffect, createResource, createRoot, createSelector, createSignal, createUniqueId, enableExternalSource, enableScheduling, equalFn, from, getListener, getOwner, lazy, mapArray, mergeProps, observable, on, onCleanup, onError, onMount, requestCallback, runWithOwner, sharedConfig, splitProps, startTransition, untrack, useContext, useTransition };

package/dist/solid.cjs

@@ -149,6 +149,7 @@ const [transPending, setTransPending] = /*@__PURE__*/createSignal(false);
 var Owner = null;
 let Transition = null;
 let Scheduler = null;
+let ExternalSourceFactory = null;
 let Listener = null;
 let Pending = null;
 let Updates = null;
@@ -232,6 +233,9 @@ function createResource(source, fetcher, options) {
     fetcher = source;
     source = true;
   }
+  Resources || (Resources = new Set());
+  Resources.add(load);
+  onCleanup(() => Resources.delete(load));
   const contexts = new Set(),
         [s, set] = createSignal((options || {}).initialValue),
         [track, trigger] = createSignal(undefined, {
@@ -293,7 +297,7 @@ function createResource(source, fetcher, options) {
     }
     return v;
   }
-  function load() {
+  function load(refetching = true) {
     setError(err = undefined);
     const lookup = dynamic ? source() : source;
     loadedUnderTransition = Transition && Transition.running;
@@ -302,7 +306,10 @@ function createResource(source, fetcher, options) {
       return;
     }
     if (Transition && pr) Transition.promises.delete(pr);
-    const p = initP || untrack(() => fetcher(lookup, s));
+    const p = initP || untrack(() => fetcher(lookup, {
+      value: s(),
+      refetching
+    }));
     initP = null;
     if (typeof p !== "object" || !("then" in p)) {
       loadEnd(pr, p);
@@ -327,12 +334,16 @@ function createResource(source, fetcher, options) {
       }
     }
   });
-  if (dynamic) createComputed(load);else load();
+  if (dynamic) createComputed(() => load(false));else load(false);
   return [read, {
     refetch: load,
     mutate: set
   }];
 }
+let Resources;
+function refetchResources(info) {
+  Resources && Resources.forEach(fn => fn(info));
+}
 function createDeferred(source, options) {
   let t,
       timeout = options ? options.timeoutMs : undefined;
@@ -503,6 +514,24 @@ let SuspenseContext;
 function getSuspenseContext() {
   return SuspenseContext || (SuspenseContext = createContext({}));
 }
+function enableExternalSource(factory) {
+  if (ExternalSourceFactory) {
+    const oldFactory = ExternalSourceFactory;
+    ExternalSourceFactory = (fn, trigger) => {
+      const oldSource = oldFactory(fn, trigger);
+      const source = factory(x => oldSource.track(x), trigger);
+      return {
+        track: x => source.track(x),
+        dispose() {
+          source.dispose();
+          oldSource.dispose();
+        }
+      };
+    };
+  } else {
+    ExternalSourceFactory = factory;
+  }
+}
 function readSignal() {
   const runningTransition = Transition && Transition.running;
   if (this.sources && (!runningTransition && this.state || runningTransition && this.tState)) {
@@ -630,6 +659,19 @@ function createComputation(fn, init, pure, state = STALE, options) {
       if (!Owner.owned) Owner.owned = [c];else Owner.owned.push(c);
     }
   }
+  if (ExternalSourceFactory) {
+    const [track, trigger] = createSignal(undefined, {
+      equals: false
+    });
+    const ordinary = ExternalSourceFactory(c.fn, trigger);
+    onCleanup(() => ordinary.dispose());
+    const triggerInTransition = () => startTransition(trigger, () => inTransition.dispose());
+    const inTransition = ExternalSourceFactory(c.fn, triggerInTransition);
+    c.fn = x => {
+      track();
+      return Transition && Transition.running ? inTransition.track(x) : ordinary.track(x);
+    };
+  }
   return c;
 }
 function runTop(node) {
@@ -1063,13 +1105,19 @@ function indexArray(list, mapFn, options = {}) {
   };
 }
 
+let hydrationEnabled = false;
+function enableHydration() {
+  hydrationEnabled = true;
+}
 function createComponent(Comp, props) {
-  if (sharedConfig.context) {
-    const c = sharedConfig.context;
-    setHydrateContext(nextHydrateContext());
-    const r = untrack(() => Comp(props));
-    setHydrateContext(c);
-    return r;
+  if (hydrationEnabled) {
+    if (sharedConfig.context) {
+      const c = sharedConfig.context;
+      setHydrateContext(nextHydrateContext());
+      const r = untrack(() => Comp(props));
+      setHydrateContext(c);
+      return r;
+    }
   }
   return untrack(() => Comp(props));
 }
@@ -1158,19 +1206,20 @@ function splitProps(props, ...keys) {
 }
 function lazy(fn) {
   let comp;
+  let p;
   const wrap = props => {
     const ctx = sharedConfig.context;
     if (ctx) {
       ctx.count++;
       const [s, set] = createSignal();
-      fn().then(mod => {
+      (p || (p = fn())).then(mod => {
         setHydrateContext(ctx);
         set(() => mod.default);
-        setHydrateContext(undefined);
+        setHydrateContext();
       });
       comp = s;
     } else if (!comp) {
-      const [s] = createResource(() => fn().then(mod => mod.default));
+      const [s] = createResource(() => (p || (p = fn())).then(mod => mod.default));
       comp = s;
     } else {
       const c = comp();
@@ -1186,7 +1235,7 @@ function lazy(fn) {
       return r;
     }));
   };
-  wrap.preload = () => comp || fn().then(mod => comp = () => mod.default);
+  wrap.preload = () => p || ((p = fn()).then(mod => comp = () => mod.default), p);
   return wrap;
 }
 let counter = 0;
@@ -1246,7 +1295,11 @@ function Match(props) {
   return props;
 }
 function ErrorBoundary(props) {
-  const [errored, setErrored] = createSignal();
+  let err = undefined;
+  if (sharedConfig.context && sharedConfig.load) {
+    err = sharedConfig.load(sharedConfig.context.id + sharedConfig.context.count);
+  }
+  const [errored, setErrored] = createSignal(err);
   let e;
   return createMemo(() => {
     if ((e = errored()) != null) {
@@ -1329,8 +1382,9 @@ function Suspense(props) {
       showContent,
       showFallback,
       ctx,
-      waitingHydration,
-      flicker;
+      p,
+      flicker,
+      error;
   const [inFallback, setFallback] = createSignal(false),
         SuspenseContext = getSuspenseContext(),
         store = {
@@ -1345,21 +1399,21 @@ function Suspense(props) {
     resolved: false
   },
         owner = getOwner();
-  if (sharedConfig.context && sharedConfig.load) {
+  if (sharedConfig.context) {
     const key = sharedConfig.context.id + sharedConfig.context.count;
-    const p = sharedConfig.load(key);
-    if (p) {
+    p = sharedConfig.load(key);
+    if (p && typeof p === "object") {
       const [s, set] = createSignal(undefined, {
         equals: false
       });
       flicker = s;
-      p.then(() => {
+      p.then(err => {
+        if (error = err) return set();
         sharedConfig.gather(key);
-        waitingHydration = true;
         setHydrateContext(ctx);
         set();
-        setHydrateContext(undefined);
-        waitingHydration = false;
+        setHydrateContext();
+        p = undefined;
       });
     }
   }
@@ -1371,18 +1425,20 @@ function Suspense(props) {
     value: store,
     get children() {
       return createMemo(() => {
+        if (error) throw error;
+        ctx = sharedConfig.context;
         if (flicker) {
-          ctx = sharedConfig.context;
           flicker();
           return flicker = undefined;
         }
+        if (ctx && p === undefined) setHydrateContext();
         const rendered = untrack(() => props.children);
         return createMemo(() => {
           const inFallback = store.inFallback(),
                 visibleContent = showContent ? showContent() : true,
                 visibleFallback = showFallback ? showFallback() : true;
           dispose && dispose();
-          if ((!inFallback || waitingHydration) && visibleContent) {
+          if ((!inFallback || p !== undefined) && visibleContent) {
             store.resolved = true;
             resumeEffects(store.effects);
             return rendered;
@@ -1390,7 +1446,13 @@ function Suspense(props) {
           if (!visibleFallback) return;
           return createRoot(disposer => {
             dispose = disposer;
-            if (sharedConfig.context) sharedConfig.context.count = 0;
+            if (ctx) {
+              setHydrateContext({
+                id: ctx.id + "f",
+                count: 0
+              });
+              ctx = undefined;
+            }
             return props.fallback;
           }, owner);
         });
@@ -1426,6 +1488,8 @@ exports.createRoot = createRoot;
 exports.createSelector = createSelector;
 exports.createSignal = createSignal;
 exports.createUniqueId = createUniqueId;
+exports.enableExternalSource = enableExternalSource;
+exports.enableHydration = enableHydration;
 exports.enableScheduling = enableScheduling;
 exports.equalFn = equalFn;
 exports.from = from;
@@ -1440,6 +1504,7 @@ exports.on = on;
 exports.onCleanup = onCleanup;
 exports.onError = onError;
 exports.onMount = onMount;
+exports.refetchResources = refetchResources;
 exports.requestCallback = requestCallback;
 exports.runWithOwner = runWithOwner;
 exports.sharedConfig = sharedConfig;