solid-js 1.2.5 → 1.3.0-beta.10

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;
@@ -215,7 +231,7 @@ function createUniqueId() {
   return `${ctx.id}${ctx.count++}`;
 }
 function createComponent(Comp, props) {
-  if (sharedConfig.context) {
+  if (sharedConfig.context && !sharedConfig.context.noHydrate) {
     const c = sharedConfig.context;
     setHydrateContext(nextHydrateContext());
     const r = Comp(props);
@@ -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 (sharedConfig.context.async && !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 && !ctx.streaming) return;
+    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;
@@ -345,21 +376,18 @@ function createResource(fn, fetcher, options = {}) {
     }
     read.loading = true;
     if ("then" in p) {
-      if (ctx.writeResource) {
-        ctx.writeResource(id, p);
-        p.then(v => {
-          value = v;
-          read.loading = false;
-          p = null;
-        });
-        return;
-      }
+      if (ctx.writeResource) ctx.writeResource(id, p);
       p.then(res => {
         read.loading = false;
         ctx.resources[id].data = res;
         p = null;
         notifySuspense(contexts);
         return res;
+      }).catch(err => {
+        read.loading = false;
+        error = err;
+        p = null;
+        notifySuspense(contexts);
       });
       return;
     }
@@ -388,13 +416,13 @@ function lazy(fn) {
       ctx.resources.set(id, track);
       contexts.add(ctx);
     }
-    p.then(() => {
+    if (sharedConfig.context.async) p.then(() => {
       track.loading = false;
       notifySuspense(contexts);
     });
     return "";
   };
-  wrap.preload = () => {};
+  wrap.preload = () => p;
   return wrap;
 }
 function suspenseComplete(c) {
@@ -421,15 +449,10 @@ function useTransition() {
 function SuspenseList(props) {
   return props.children;
 }
-const SUSPENSE_GLOBAL = Symbol("suspense-global");
 function Suspense(props) {
+  let done;
   const ctx = sharedConfig.context;
-  if (!ctx.async) return createComponent(() => {
-    props.children;
-    return props.fallback;
-  }, {});
   const id = ctx.id + ctx.count;
-  const done = ctx.async ? lookup(Owner, SUSPENSE_GLOBAL)(id) : () => {};
   const o = Owner;
   const value = ctx.suspense[id] || (ctx.suspense[id] = {
     resources: new Map(),
@@ -455,43 +478,30 @@ function Suspense(props) {
   }
   const res = runSuspense();
   if (suspenseComplete(value)) {
-    done();
+    ctx.writeResource(id, true);
     return res;
   }
-  return sharedConfig.context.async ? {
-    t: `<#${id}#>`
-  } : props.fallback;
-}
-const SUSPENSE_REPLACE = /<#([\d.]+)#>/;
-function awaitSuspense(fn) {
-  return new Promise(resolve => {
-    const registry = new Set();
-    const cache = Object.create(null);
-    const res = createMemo(() => {
-      Owner.context = {
-        [SUSPENSE_GLOBAL]: getCallback
-      };
-      return fn();
-    });
-    if (!registry.size) resolve(res());
-    function getCallback(key) {
-      registry.add(key);
-      return value => {
-        if (value) cache[key] = value;
-        registry.delete(key);
-        if (!registry.size) Promise.resolve().then(() => {
-          let source = resolveSSRNode(res());
-          let final = "";
-          let match;
-          while (match = source.match(SUSPENSE_REPLACE)) {
-            final += source.substring(0, match.index);
-            source = cache[match[1]] + source.substring(match.index + match[0].length);
-          }
-          resolve(final + source);
-        });
-      };
-    }
+  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,
+    id: ctx.id + "0.f"
   });
+  return props.fallback;
 }
 
-export { $PROXY, DEV, ErrorBoundary, For, Index, Match, Show, Suspense, SuspenseList, Switch, awaitSuspense, 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;
@@ -184,12 +185,13 @@ function createSignal(value, options) {
     pending: NOTPENDING,
     comparator: options.equals || undefined
   };
-  return [readSignal.bind(s), value => {
+  const setter = value => {
     if (typeof value === "function") {
       if (Transition && Transition.running && Transition.sources.has(s)) value = value(s.pending !== NOTPENDING ? s.pending : s.tValue);else value = value(s.pending !== NOTPENDING ? s.pending : s.value);
     }
     return writeSignal(s, value);
-  }];
+  };
+  return [readSignal.bind(s), setter];
 }
 function createComputed(fn, value, options) {
   const c = createComputation(fn, value, true, STALE);
@@ -231,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, {
@@ -246,12 +251,7 @@ function createResource(source, fetcher, options) {
       dynamic = typeof source === "function";
   if (sharedConfig.context) {
     id = `${sharedConfig.context.id}${sharedConfig.context.count++}`;
-    if (sharedConfig.context.loadResource) {
-      initP = sharedConfig.context.loadResource(id);
-    } else if (sharedConfig.resources && id && id in sharedConfig.resources) {
-      initP = sharedConfig.resources[id];
-      delete sharedConfig.resources[id];
-    }
+    if (sharedConfig.load) initP = sharedConfig.load(id);
   }
   function loadEnd(p, v, e) {
     if (pr === p) {
@@ -297,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;
@@ -306,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);
@@ -331,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;
@@ -355,7 +362,7 @@ function createSelector(source, fn = equalFn, options) {
   const subs = new Map();
   const node = createComputation(p => {
     const v = source();
-    for (const key of subs.keys()) if (fn(key, v) || p !== undefined && fn(key, p)) {
+    for (const key of subs.keys()) if (fn(key, v) !== (p !== undefined && fn(key, p))) {
       const l = subs.get(key);
       for (const c of l.values()) {
         c.state = STALE;
@@ -406,7 +413,8 @@ function untrack(fn) {
   Listener = listener;
   return result;
 }
-function on(deps, fn, options) {
+function on(deps, fn,
+options) {
   const isArray = Array.isArray(deps);
   let prevInput;
   let defer = options && options.defer;
@@ -506,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)) {
@@ -633,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) {
@@ -659,7 +698,7 @@ function runTop(node) {
     } else if (!runningTransition && node.state === PENDING || runningTransition && node.tState === PENDING) {
       const updates = Updates;
       Updates = null;
-      lookDownstream(node);
+      lookDownstream(node, ancestors[0]);
       Updates = updates;
     }
   }
@@ -757,13 +796,15 @@ function runUserEffects(queue) {
   for (i = 0; i < userLength; i++) runTop(queue[i]);
   for (i = resume; i < queue.length; i++) runTop(queue[i]);
 }
-function lookDownstream(node) {
+function lookDownstream(node, ignore) {
   node.state = 0;
   const runningTransition = Transition && Transition.running;
   for (let i = 0; i < node.sources.length; i += 1) {
     const source = node.sources[i];
     if (source.sources) {
-      if (!runningTransition && source.state === STALE || runningTransition && source.tState === STALE) runTop(source);else if (!runningTransition && source.state === PENDING || runningTransition && source.tState === PENDING) lookDownstream(source);
+      if (!runningTransition && source.state === STALE || runningTransition && source.tState === STALE) {
+        if (source !== ignore) runTop(source);
+      } else if (!runningTransition && source.state === PENDING || runningTransition && source.tState === PENDING) lookDownstream(source, ignore);
     }
   }
 }
@@ -1064,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));
 }
@@ -1159,19 +1206,20 @@ function splitProps(props, ...keys) {
 }
 function lazy(fn) {
   let comp;
+  let p;
   const wrap = props => {
     const ctx = sharedConfig.context;
-    if (ctx && sharedConfig.resources) {
+    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();
@@ -1187,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;
@@ -1234,7 +1282,7 @@ function Switch(props) {
     }
     return [-1];
   }, undefined, {
-    equals: (a, b) => a && a[0] === b[0] && (strictEqual ? a[1] === b[1] : !a[1] === !b[1]) && a[2] === b[2]
+    equals: (a, b) => a[0] === b[0] && (strictEqual ? a[1] === b[1] : !a[1] === !b[1]) && a[2] === b[2]
   });
   return createMemo(() => {
     const [index, when, cond] = evalConditions();
@@ -1247,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) {
@@ -1328,7 +1380,11 @@ function SuspenseList(props) {
 function Suspense(props) {
   let counter = 0,
       showContent,
-      showFallback;
+      showFallback,
+      ctx,
+      p,
+      flicker,
+      error;
   const [inFallback, setFallback] = createSignal(false),
         SuspenseContext = getSuspenseContext(),
         store = {
@@ -1343,6 +1399,24 @@ function Suspense(props) {
     resolved: false
   },
         owner = getOwner();
+  if (sharedConfig.context) {
+    const key = sharedConfig.context.id + sharedConfig.context.count;
+    p = sharedConfig.load(key);
+    if (p && typeof p === "object") {
+      const [s, set] = createSignal(undefined, {
+        equals: false
+      });
+      flicker = s;
+      p.then(err => {
+        if (error = err) return set();
+        sharedConfig.gather(key);
+        setHydrateContext(ctx);
+        set();
+        setHydrateContext();
+        p = undefined;
+      });
+    }
+  }
   const listContext = useContext(SuspenseListContext);
   if (listContext) [showContent, showFallback] = listContext.register(store.inFallback);
   let dispose;
@@ -1350,28 +1424,43 @@ function Suspense(props) {
   return createComponent(SuspenseContext.Provider, {
     value: store,
     get children() {
-      const rendered = untrack(() => props.children);
       return createMemo(() => {
-        const inFallback = store.inFallback(),
-              visibleContent = showContent ? showContent() : true,
-              visibleFallback = showFallback ? showFallback() : true;
-        dispose && dispose();
-        if (!inFallback && visibleContent) {
-          store.resolved = true;
-          resumeEffects(store.effects);
-          return rendered;
+        if (error) throw error;
+        ctx = sharedConfig.context;
+        if (flicker) {
+          flicker();
+          return flicker = undefined;
         }
-        if (!visibleFallback) return;
-        return createRoot(disposer => {
-          dispose = disposer;
-          return props.fallback;
-        }, owner);
+        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 || p !== undefined) && visibleContent) {
+            store.resolved = true;
+            resumeEffects(store.effects);
+            return rendered;
+          }
+          if (!visibleFallback) return;
+          return createRoot(disposer => {
+            dispose = disposer;
+            if (ctx) {
+              setHydrateContext({
+                id: ctx.id + "f",
+                count: 0
+              });
+              ctx = undefined;
+            }
+            return props.fallback;
+          }, owner);
+        });
       });
     }
   });
 }
 
-function awaitSuspense() {}
 let DEV;
 
 exports.$PROXY = $PROXY;
@@ -1384,7 +1473,6 @@ exports.Show = Show;
 exports.Suspense = Suspense;
 exports.SuspenseList = SuspenseList;
 exports.Switch = Switch;
-exports.awaitSuspense = awaitSuspense;
 exports.batch = batch;
 exports.cancelCallback = cancelCallback;
 exports.children = children;
@@ -1400,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;
@@ -1414,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;