solid-js 1.3.0-beta.8 → 1.3.0-rc.2

package/dist/dev.cjs

@@ -236,8 +236,14 @@ function createResource(source, fetcher, options) {
     fetcher = source;
     source = true;
   }
+  options ||= {};
+  if (options.globalRefetch !== false) {
+    Resources || (Resources = new Set());
+    Resources.add(load);
+    onCleanup(() => Resources.delete(load));
+  }
   const contexts = new Set(),
-        [s, set] = createSignal((options || {}).initialValue),
+        [s, set] = createSignal(options.initialValue),
         [track, trigger] = createSignal(undefined, {
     equals: false
   }),
@@ -251,14 +257,16 @@ function createResource(source, fetcher, options) {
       dynamic = typeof source === "function";
   if (sharedConfig.context) {
     id = `${sharedConfig.context.id}${sharedConfig.context.count++}`;
-    ({ ...sharedConfig.context
-    });
     if (sharedConfig.load) initP = sharedConfig.load(id);
   }
-  function loadEnd(p, v, e) {
+  function loadEnd(p, v, e, key) {
     if (pr === p) {
-      setError(err = e);
       pr = null;
+      if (initP && p === initP && options.onHydrated) options.onHydrated(key, {
+        value: v
+      });
+      initP = null;
+      setError(err = e);
       if (Transition && p && loadedUnderTransition) {
         Transition.promises.delete(p);
         loadedUnderTransition = false;
@@ -299,7 +307,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;
@@ -308,18 +316,20 @@ function createResource(source, fetcher, options) {
       return;
     }
     if (Transition && pr) Transition.promises.delete(pr);
-    const p = initP || untrack(() => fetcher(lookup, s));
-    initP = null;
+    const p = initP || untrack(() => fetcher(lookup, {
+      value: s(),
+      refetching
+    }));
     if (typeof p !== "object" || !("then" in p)) {
       loadEnd(pr, p);
-      return;
+      return p;
     }
     pr = p;
     batch(() => {
       setLoading(true);
       trigger();
     });
-    p.then(v => loadEnd(p, v), e => loadEnd(p, e, e));
+    return p.then(v => loadEnd(p, v, undefined, lookup), e => loadEnd(p, e, e));
   }
   Object.defineProperties(read, {
     loading: {
@@ -333,12 +343,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;
@@ -459,28 +473,27 @@ function runWithOwner(o, fn) {
 function enableScheduling(scheduler = requestCallback) {
   Scheduler = scheduler;
 }
-function startTransition(fn, cb) {
+function startTransition(fn) {
   if (Transition && Transition.running) {
     fn();
-    cb && Transition.cb.push(cb);
-    return;
+    return Transition.done;
   }
-  queueMicrotask(() => {
+  return Promise.resolve().then(() => {
+    let t;
     if (Scheduler || SuspenseContext) {
-      Transition || (Transition = {
+      t = Transition || (Transition = {
         sources: new Set(),
         effects: [],
         promises: new Set(),
         disposed: new Set(),
         queue: new Set(),
-        running: true,
-        cb: []
+        running: true
       });
-      cb && Transition.cb.push(cb);
-      Transition.running = true;
+      t.done ||= new Promise(res => t.resolve = res);
+      t.running = true;
     }
     batch(fn);
-    if (!Scheduler && !SuspenseContext && cb) cb();
+    return t ? t.done : undefined;
   });
 }
 function useTransition() {
@@ -709,7 +722,7 @@ function createComputation(fn, init, pure, state = STALE, options) {
     });
     const ordinary = ExternalSourceFactory(c.fn, trigger);
     onCleanup(() => ordinary.dispose());
-    const triggerInTransition = () => startTransition(trigger, () => inTransition.dispose());
+    const triggerInTransition = () => startTransition(trigger).then(() => inTransition.dispose());
     const inTransition = ExternalSourceFactory(c.fn, triggerInTransition);
     c.fn = x => {
       track();
@@ -767,7 +780,7 @@ function completeUpdates(wait) {
     Updates = null;
   }
   if (wait) return;
-  let cbs;
+  let res;
   if (Transition && Transition.running) {
     if (Transition.promises.size || Transition.queue.size) {
       Transition.running = false;
@@ -777,7 +790,7 @@ function completeUpdates(wait) {
       return;
     }
     const sources = Transition.sources;
-    cbs = Transition.cb;
+    res = Transition.resolve;
     Effects.forEach(e => {
       "tState" in e && (e.state = e.tState);
       delete e.tState;
@@ -804,7 +817,7 @@ function completeUpdates(wait) {
     Effects = null;
     globalThis._$afterUpdate && globalThis._$afterUpdate();
   }
-  if (cbs) cbs.forEach(cb => cb());
+  if (res) res();
 }
 function runQueue(queue) {
   for (let i = 0; i < queue.length; i++) runTop(queue[i]);
@@ -1287,7 +1300,9 @@ function lazy(fn) {
       });
       comp = s;
     } else if (!comp) {
-      const [s] = createResource(() => (p || (p = fn())).then(mod => mod.default));
+      const [s] = createResource(() => (p || (p = fn())).then(mod => mod.default), {
+        globalRefetch: false
+      });
       comp = s;
     } else {
       const c = comp();
@@ -1450,7 +1465,7 @@ function Suspense(props) {
       showContent,
       showFallback,
       ctx,
-      waitingHydration,
+      p,
       flicker,
       error;
   const [inFallback, setFallback] = createSignal(false),
@@ -1469,21 +1484,22 @@ function Suspense(props) {
         owner = getOwner();
   if (sharedConfig.context) {
     const key = sharedConfig.context.id + sharedConfig.context.count;
-    const p = sharedConfig.load(key);
+    p = sharedConfig.load(key);
     if (p) {
-      const [s, set] = createSignal(undefined, {
-        equals: false
-      });
-      flicker = s;
-      p.then(err => {
-        if (error = err) return set();
-        sharedConfig.gather(key);
-        waitingHydration = true;
-        setHydrateContext(ctx);
-        set();
-        setHydrateContext();
-        waitingHydration = false;
-      });
+      if (typeof p !== "object" || !("then" in p)) error = p;else {
+        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);
@@ -1495,18 +1511,19 @@ function Suspense(props) {
     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;
@@ -1514,10 +1531,13 @@ function Suspense(props) {
           if (!visibleFallback) return;
           return createRoot(disposer => {
             dispose = disposer;
-            if (sharedConfig.context) setHydrateContext({
-              id: sharedConfig.context.id + "f",
-              count: 0
-            });
+            if (ctx) {
+              setHydrateContext({
+                id: ctx.id + "f",
+                count: 0
+              });
+              ctx = undefined;
+            }
             return props.fallback;
           }, owner);
         });
@@ -1579,6 +1599,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;

package/dist/dev.js

@@ -232,8 +232,14 @@ function createResource(source, fetcher, options) {
     fetcher = source;
     source = true;
   }
+  options ||= {};
+  if (options.globalRefetch !== false) {
+    Resources || (Resources = new Set());
+    Resources.add(load);
+    onCleanup(() => Resources.delete(load));
+  }
   const contexts = new Set(),
-        [s, set] = createSignal((options || {}).initialValue),
+        [s, set] = createSignal(options.initialValue),
         [track, trigger] = createSignal(undefined, {
     equals: false
   }),
@@ -247,14 +253,16 @@ function createResource(source, fetcher, options) {
       dynamic = typeof source === "function";
   if (sharedConfig.context) {
     id = `${sharedConfig.context.id}${sharedConfig.context.count++}`;
-    ({ ...sharedConfig.context
-    });
     if (sharedConfig.load) initP = sharedConfig.load(id);
   }
-  function loadEnd(p, v, e) {
+  function loadEnd(p, v, e, key) {
     if (pr === p) {
-      setError(err = e);
       pr = null;
+      if (initP && p === initP && options.onHydrated) options.onHydrated(key, {
+        value: v
+      });
+      initP = null;
+      setError(err = e);
       if (Transition && p && loadedUnderTransition) {
         Transition.promises.delete(p);
         loadedUnderTransition = false;
@@ -295,7 +303,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;
@@ -304,18 +312,20 @@ function createResource(source, fetcher, options) {
       return;
     }
     if (Transition && pr) Transition.promises.delete(pr);
-    const p = initP || untrack(() => fetcher(lookup, s));
-    initP = null;
+    const p = initP || untrack(() => fetcher(lookup, {
+      value: s(),
+      refetching
+    }));
     if (typeof p !== "object" || !("then" in p)) {
       loadEnd(pr, p);
-      return;
+      return p;
     }
     pr = p;
     batch(() => {
       setLoading(true);
       trigger();
     });
-    p.then(v => loadEnd(p, v), e => loadEnd(p, e, e));
+    return p.then(v => loadEnd(p, v, undefined, lookup), e => loadEnd(p, e, e));
   }
   Object.defineProperties(read, {
     loading: {
@@ -329,12 +339,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;
@@ -455,28 +469,27 @@ function runWithOwner(o, fn) {
 function enableScheduling(scheduler = requestCallback) {
   Scheduler = scheduler;
 }
-function startTransition(fn, cb) {
+function startTransition(fn) {
   if (Transition && Transition.running) {
     fn();
-    cb && Transition.cb.push(cb);
-    return;
+    return Transition.done;
   }
-  queueMicrotask(() => {
+  return Promise.resolve().then(() => {
+    let t;
     if (Scheduler || SuspenseContext) {
-      Transition || (Transition = {
+      t = Transition || (Transition = {
         sources: new Set(),
         effects: [],
         promises: new Set(),
         disposed: new Set(),
         queue: new Set(),
-        running: true,
-        cb: []
+        running: true
       });
-      cb && Transition.cb.push(cb);
-      Transition.running = true;
+      t.done ||= new Promise(res => t.resolve = res);
+      t.running = true;
     }
     batch(fn);
-    if (!Scheduler && !SuspenseContext && cb) cb();
+    return t ? t.done : undefined;
   });
 }
 function useTransition() {
@@ -705,7 +718,7 @@ function createComputation(fn, init, pure, state = STALE, options) {
     });
     const ordinary = ExternalSourceFactory(c.fn, trigger);
     onCleanup(() => ordinary.dispose());
-    const triggerInTransition = () => startTransition(trigger, () => inTransition.dispose());
+    const triggerInTransition = () => startTransition(trigger).then(() => inTransition.dispose());
     const inTransition = ExternalSourceFactory(c.fn, triggerInTransition);
     c.fn = x => {
       track();
@@ -763,7 +776,7 @@ function completeUpdates(wait) {
     Updates = null;
   }
   if (wait) return;
-  let cbs;
+  let res;
   if (Transition && Transition.running) {
     if (Transition.promises.size || Transition.queue.size) {
       Transition.running = false;
@@ -773,7 +786,7 @@ function completeUpdates(wait) {
       return;
     }
     const sources = Transition.sources;
-    cbs = Transition.cb;
+    res = Transition.resolve;
     Effects.forEach(e => {
       "tState" in e && (e.state = e.tState);
       delete e.tState;
@@ -800,7 +813,7 @@ function completeUpdates(wait) {
     Effects = null;
     globalThis._$afterUpdate && globalThis._$afterUpdate();
   }
-  if (cbs) cbs.forEach(cb => cb());
+  if (res) res();
 }
 function runQueue(queue) {
   for (let i = 0; i < queue.length; i++) runTop(queue[i]);
@@ -1283,7 +1296,9 @@ function lazy(fn) {
       });
       comp = s;
     } else if (!comp) {
-      const [s] = createResource(() => (p || (p = fn())).then(mod => mod.default));
+      const [s] = createResource(() => (p || (p = fn())).then(mod => mod.default), {
+        globalRefetch: false
+      });
       comp = s;
     } else {
       const c = comp();
@@ -1446,7 +1461,7 @@ function Suspense(props) {
       showContent,
       showFallback,
       ctx,
-      waitingHydration,
+      p,
       flicker,
       error;
   const [inFallback, setFallback] = createSignal(false),
@@ -1465,21 +1480,22 @@ function Suspense(props) {
         owner = getOwner();
   if (sharedConfig.context) {
     const key = sharedConfig.context.id + sharedConfig.context.count;
-    const p = sharedConfig.load(key);
+    p = sharedConfig.load(key);
     if (p) {
-      const [s, set] = createSignal(undefined, {
-        equals: false
-      });
-      flicker = s;
-      p.then(err => {
-        if (error = err) return set();
-        sharedConfig.gather(key);
-        waitingHydration = true;
-        setHydrateContext(ctx);
-        set();
-        setHydrateContext();
-        waitingHydration = false;
-      });
+      if (typeof p !== "object" || !("then" in p)) error = p;else {
+        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);
@@ -1491,18 +1507,19 @@ function Suspense(props) {
     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;
@@ -1510,10 +1527,13 @@ function Suspense(props) {
           if (!visibleFallback) return;
           return createRoot(disposer => {
             dispose = disposer;
-            if (sharedConfig.context) setHydrateContext({
-              id: sharedConfig.context.id + "f",
-              count: 0
-            });
+            if (ctx) {
+              setHydrateContext({
+                id: ctx.id + "f",
+                count: 0
+              });
+              ctx = undefined;
+            }
             return props.fallback;
           }, owner);
         });
@@ -1535,4 +1555,4 @@ if (globalThis) {
   if (!globalThis.Solid$$) globalThis.Solid$$ = true;else console.warn("You appear to have multiple instances of Solid. This can lead to unexpected behavior.");
 }
 
-export { $PROXY, DEV, ErrorBoundary, For, Index, Match, Show, Suspense, SuspenseList, Switch, batch, cancelCallback, children, createComponent, createComputed, createContext, createDeferred, createEffect, createMemo, createRenderEffect, createResource, createRoot, createSelector, createSignal, createUniqueId, enableExternalSource, enableHydration, enableScheduling, equalFn, from, getListener, getOwner, indexArray, 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, cancelCallback, children, createComponent, createComputed, createContext, createDeferred, createEffect, createMemo, createRenderEffect, createResource, createRoot, createSelector, createSignal, createUniqueId, enableExternalSource, enableHydration, enableScheduling, equalFn, from, getListener, getOwner, indexArray, lazy, mapArray, mergeProps, observable, on, onCleanup, onError, onMount, refetchResources, requestCallback, runWithOwner, sharedConfig, splitProps, startTransition, untrack, useContext, useTransition };

package/dist/server.cjs

@@ -381,7 +381,7 @@ function createResource(fn, fetcher, options = {}) {
     read.loading = true;
     if ("then" in p) {
       if (ctx.writeResource) ctx.writeResource(id, p);
-      p.then(res => {
+      return p.then(res => {
         read.loading = false;
         ctx.resources[id].data = res;
         p = null;
@@ -393,10 +393,10 @@ function createResource(fn, fetcher, options = {}) {
         p = null;
         notifySuspense(contexts);
       });
-      return;
     }
     ctx.resources[id].data = p;
     p = null;
+    return ctx.resources[id].data;
   }
   load();
   return resource.ref = [read, {
@@ -442,6 +442,7 @@ function notifySuspense(contexts) {
   contexts.clear();
 }
 function enableScheduling() {}
+function enableHydration() {}
 function startTransition(fn) {
   fn();
 }
@@ -461,7 +462,6 @@ function Suspense(props) {
   const value = ctx.suspense[id] || (ctx.suspense[id] = {
     resources: new Map(),
     completed: () => {
-      if (ctx.dataOnly) return done();
       const res = runSuspense();
       if (suspenseComplete(value)) {
         done(resolveSSRNode(res));
@@ -482,20 +482,21 @@ function Suspense(props) {
     });
   }
   const res = runSuspense();
-  if (suspenseComplete(value)) return res;
+  if (suspenseComplete(value)) {
+    ctx.writeResource(id, null);
+    return res;
+  }
   onError(err => {
     if (!done || !done(undefined, err)) throw err;
   });
   done = ctx.async ? ctx.registerFragment(id) : undefined;
   if (ctx.streaming) {
-    if (!ctx.dataOnly) {
-      setHydrateContext(undefined);
-      const res = {
-        t: `<span id="pl${id}">${resolveSSRNode(props.fallback)}</span>`
-      };
-      setHydrateContext(ctx);
-      return res;
-    }
+    setHydrateContext(undefined);
+    const res = {
+      t: `<span id="pl${id}">${resolveSSRNode(props.fallback)}</span>`
+    };
+    setHydrateContext(ctx);
+    return res;
   } else if (ctx.async) {
     return {
       t: `<![${id}]>`
@@ -533,6 +534,7 @@ exports.createSelector = createSelector;
 exports.createSignal = createSignal;
 exports.createUniqueId = createUniqueId;
 exports.enableExternalSource = enableExternalSource;
+exports.enableHydration = enableHydration;
 exports.enableScheduling = enableScheduling;
 exports.equalFn = equalFn;
 exports.from = from;

package/dist/server.js

@@ -377,7 +377,7 @@ function createResource(fn, fetcher, options = {}) {
     read.loading = true;
     if ("then" in p) {
       if (ctx.writeResource) ctx.writeResource(id, p);
-      p.then(res => {
+      return p.then(res => {
         read.loading = false;
         ctx.resources[id].data = res;
         p = null;
@@ -389,10 +389,10 @@ function createResource(fn, fetcher, options = {}) {
         p = null;
         notifySuspense(contexts);
       });
-      return;
     }
     ctx.resources[id].data = p;
     p = null;
+    return ctx.resources[id].data;
   }
   load();
   return resource.ref = [read, {
@@ -438,6 +438,7 @@ function notifySuspense(contexts) {
   contexts.clear();
 }
 function enableScheduling() {}
+function enableHydration() {}
 function startTransition(fn) {
   fn();
 }
@@ -457,7 +458,6 @@ function Suspense(props) {
   const value = ctx.suspense[id] || (ctx.suspense[id] = {
     resources: new Map(),
     completed: () => {
-      if (ctx.dataOnly) return done();
       const res = runSuspense();
       if (suspenseComplete(value)) {
         done(resolveSSRNode(res));
@@ -478,20 +478,21 @@ function Suspense(props) {
     });
   }
   const res = runSuspense();
-  if (suspenseComplete(value)) return res;
+  if (suspenseComplete(value)) {
+    ctx.writeResource(id, null);
+    return res;
+  }
   onError(err => {
     if (!done || !done(undefined, err)) throw err;
   });
   done = ctx.async ? ctx.registerFragment(id) : undefined;
   if (ctx.streaming) {
-    if (!ctx.dataOnly) {
-      setHydrateContext(undefined);
-      const res = {
-        t: `<span id="pl${id}">${resolveSSRNode(props.fallback)}</span>`
-      };
-      setHydrateContext(ctx);
-      return res;
-    }
+    setHydrateContext(undefined);
+    const res = {
+      t: `<span id="pl${id}">${resolveSSRNode(props.fallback)}</span>`
+    };
+    setHydrateContext(ctx);
+    return res;
   } else if (ctx.async) {
     return {
       t: `<![${id}]>`
@@ -504,4 +505,4 @@ function Suspense(props) {
   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, enableExternalSource, 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, enableHydration, enableScheduling, equalFn, from, getListener, getOwner, lazy, mapArray, mergeProps, observable, on, onCleanup, onError, onMount, requestCallback, runWithOwner, sharedConfig, splitProps, startTransition, untrack, useContext, useTransition };