solid-js 1.3.0-beta.6 → 1.3.0-rc.0

package/dist/dev.cjs

@@ -236,6 +236,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, {
@@ -297,7 +300,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 +309,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 +337,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;
@@ -1281,11 +1291,13 @@ function lazy(fn) {
       (p || (p = fn())).then(mod => {
         setHydrateContext(ctx);
         set(() => mod.default);
-        setHydrateContext(undefined);
+        setHydrateContext();
       });
       comp = s;
     } else if (!comp) {
-      const [s] = createResource(() => (p || (p = fn())).then(mod => mod.default));
+      const [s] = createResource((_, {
+        value
+      }) => value || (p || (p = fn())).then(mod => mod.default));
       comp = s;
     } else {
       const c = comp();
@@ -1448,7 +1460,7 @@ function Suspense(props) {
       showContent,
       showFallback,
       ctx,
-      waitingHydration,
+      p,
       flicker,
       error;
   const [inFallback, setFallback] = createSignal(false),
@@ -1467,8 +1479,8 @@ function Suspense(props) {
         owner = getOwner();
   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
       });
@@ -1476,11 +1488,10 @@ function Suspense(props) {
       p.then(err => {
         if (error = err) return set();
         sharedConfig.gather(key);
-        waitingHydration = true;
         setHydrateContext(ctx);
         set();
-        setHydrateContext(undefined);
-        waitingHydration = false;
+        setHydrateContext();
+        p = undefined;
       });
     }
   }
@@ -1493,18 +1504,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;
@@ -1512,10 +1524,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);
         });
@@ -1577,6 +1592,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,6 +232,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 +296,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 +305,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 +333,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;
@@ -1277,11 +1287,13 @@ function lazy(fn) {
       (p || (p = fn())).then(mod => {
         setHydrateContext(ctx);
         set(() => mod.default);
-        setHydrateContext(undefined);
+        setHydrateContext();
       });
       comp = s;
     } else if (!comp) {
-      const [s] = createResource(() => (p || (p = fn())).then(mod => mod.default));
+      const [s] = createResource((_, {
+        value
+      }) => value || (p || (p = fn())).then(mod => mod.default));
       comp = s;
     } else {
       const c = comp();
@@ -1444,7 +1456,7 @@ function Suspense(props) {
       showContent,
       showFallback,
       ctx,
-      waitingHydration,
+      p,
       flicker,
       error;
   const [inFallback, setFallback] = createSignal(false),
@@ -1463,8 +1475,8 @@ function Suspense(props) {
         owner = getOwner();
   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
       });
@@ -1472,11 +1484,10 @@ function Suspense(props) {
       p.then(err => {
         if (error = err) return set();
         sharedConfig.gather(key);
-        waitingHydration = true;
         setHydrateContext(ctx);
         set();
-        setHydrateContext(undefined);
-        waitingHydration = false;
+        setHydrateContext();
+        p = undefined;
       });
     }
   }
@@ -1489,18 +1500,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;
@@ -1508,10 +1520,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);
         });
@@ -1533,4 +1548,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

@@ -461,7 +461,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 +481,21 @@ function Suspense(props) {
     });
   }
   const res = runSuspense();
-  if (suspenseComplete(value)) return res;
+  if (suspenseComplete(value)) {
+    ctx.writeResource(id, true);
+    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}]>`

package/dist/server.js

@@ -457,7 +457,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 +477,21 @@ function Suspense(props) {
     });
   }
   const res = runSuspense();
-  if (suspenseComplete(value)) return res;
+  if (suspenseComplete(value)) {
+    ctx.writeResource(id, true);
+    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}]>`

package/dist/solid.cjs

@@ -233,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, {
@@ -294,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;
@@ -303,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);
@@ -328,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;
@@ -1205,11 +1215,13 @@ function lazy(fn) {
       (p || (p = fn())).then(mod => {
         setHydrateContext(ctx);
         set(() => mod.default);
-        setHydrateContext(undefined);
+        setHydrateContext();
       });
       comp = s;
     } else if (!comp) {
-      const [s] = createResource(() => (p || (p = fn())).then(mod => mod.default));
+      const [s] = createResource((_, {
+        value
+      }) => value || (p || (p = fn())).then(mod => mod.default));
       comp = s;
     } else {
       const c = comp();
@@ -1372,7 +1384,7 @@ function Suspense(props) {
       showContent,
       showFallback,
       ctx,
-      waitingHydration,
+      p,
       flicker,
       error;
   const [inFallback, setFallback] = createSignal(false),
@@ -1391,8 +1403,8 @@ function Suspense(props) {
         owner = getOwner();
   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
       });
@@ -1400,11 +1412,10 @@ function Suspense(props) {
       p.then(err => {
         if (error = err) return set();
         sharedConfig.gather(key);
-        waitingHydration = true;
         setHydrateContext(ctx);
         set();
-        setHydrateContext(undefined);
-        waitingHydration = false;
+        setHydrateContext();
+        p = undefined;
       });
     }
   }
@@ -1417,18 +1428,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;
@@ -1436,10 +1448,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);
         });
@@ -1491,6 +1506,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/solid.js

@@ -229,6 +229,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, {
@@ -290,7 +293,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;
@@ -299,7 +302,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);
@@ -324,12 +330,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;
@@ -1201,11 +1211,13 @@ function lazy(fn) {
       (p || (p = fn())).then(mod => {
         setHydrateContext(ctx);
         set(() => mod.default);
-        setHydrateContext(undefined);
+        setHydrateContext();
       });
       comp = s;
     } else if (!comp) {
-      const [s] = createResource(() => (p || (p = fn())).then(mod => mod.default));
+      const [s] = createResource((_, {
+        value
+      }) => value || (p || (p = fn())).then(mod => mod.default));
       comp = s;
     } else {
       const c = comp();
@@ -1368,7 +1380,7 @@ function Suspense(props) {
       showContent,
       showFallback,
       ctx,
-      waitingHydration,
+      p,
       flicker,
       error;
   const [inFallback, setFallback] = createSignal(false),
@@ -1387,8 +1399,8 @@ function Suspense(props) {
         owner = getOwner();
   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
       });
@@ -1396,11 +1408,10 @@ function Suspense(props) {
       p.then(err => {
         if (error = err) return set();
         sharedConfig.gather(key);
-        waitingHydration = true;
         setHydrateContext(ctx);
         set();
-        setHydrateContext(undefined);
-        waitingHydration = false;
+        setHydrateContext();
+        p = undefined;
       });
     }
   }
@@ -1413,18 +1424,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;
@@ -1432,10 +1444,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);
         });
@@ -1446,4 +1461,4 @@ function Suspense(props) {
 
 let DEV;
 
-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/package.json

@@ -1,7 +1,7 @@
 {
   "name": "solid-js",
   "description": "A declarative JavaScript library for building user interfaces.",
-  "version": "1.3.0-beta.6",
+  "version": "1.3.0-rc.0",
   "author": "Ryan Carniato",
   "license": "MIT",
   "homepage": "https://solidjs.com",
@@ -144,5 +144,5 @@
     "compiler",
     "performance"
   ],
-  "gitHead": "76f31202b63d632cdef2ad2a36b158ede07597be"
+  "gitHead": "f6e6a9ff9efae848699f66900aa87f46b0707ea5"
 }

package/types/index.d.ts

@@ -1,5 +1,5 @@
-export { createRoot, createSignal, createEffect, createRenderEffect, createComputed, createDeferred, createSelector, createMemo, createResource, onMount, onCleanup, onError, untrack, batch, on, enableScheduling, enableExternalSource, startTransition, useTransition, createContext, useContext, children, getListener, getOwner, runWithOwner, equalFn, $PROXY } from "./reactive/signal";
-export type { Accessor, Setter, Resource, ResourceReturn, Context, ReturnTypes } from "./reactive/signal";
+export { createRoot, createSignal, createEffect, createRenderEffect, createComputed, createDeferred, createSelector, createMemo, createResource, onMount, onCleanup, onError, untrack, batch, on, enableScheduling, enableExternalSource, startTransition, useTransition, refetchResources, createContext, useContext, children, getListener, getOwner, runWithOwner, equalFn, $PROXY } from "./reactive/signal";
+export type { Accessor, Setter, Resource, ResourceReturn, ResourceFetcher, ResourceFetcherInfo, Context, ReturnTypes } from "./reactive/signal";
 export * from "./reactive/observable";
 export * from "./reactive/scheduler";
 export * from "./reactive/array";

package/types/reactive/signal.d.ts

@@ -185,11 +185,15 @@ export interface Resource<T> extends Accessor<T> {
 }
 export declare type ResourceActions<T> = {
     mutate: Setter<T>;
-    refetch: () => void;
+    refetch: (info?: unknown) => void;
 };
 export declare type ResourceReturn<T> = [Resource<T>, ResourceActions<T>];
 export declare type ResourceSource<S> = S | false | null | (() => S | false | null);
-export declare type ResourceFetcher<S, T> = (k: S, getPrev: Accessor<T>) => T | Promise<T>;
+export declare type ResourceFetcher<S, T> = (k: S, info: ResourceFetcherInfo<T>) => T | Promise<T>;
+export declare type ResourceFetcherInfo<T> = {
+    value: T | undefined;
+    refetching?: unknown;
+};
 export declare type ResourceOptions<T> = T extends undefined ? {
     initialValue?: T;
     name?: string;
@@ -200,14 +204,14 @@ export declare type ResourceOptions<T> = T extends undefined ? {
 /**
  * Creates a resource that wraps a repeated promise in a reactive pattern:
  * ```typescript
- * const [resource, { mutate, refetch }] = crateResource(source, fetcher, options);
+ * const [resource, { mutate, refetch }] = createResource(source, fetcher, options);
  * ```
  * @param source - reactive data function to toggle the request, optional
  * @param fetcher - function that receives the source (or true) and an accessor for the last or initial value and returns a value or a Promise with the value:
  * ```typescript
  * const fetcher: ResourceFetcher<S, T, > = (
  *   sourceOutput: ReturnValue<typeof source>,
- *   getPrev: Accessor<T>
+ *   info: ResourceFetcherInfo<T>
  * ) => T | Promise<T>;
  * ```
  * @param options - an optional object with the initialValue and the name (for debugging purposes)
@@ -226,6 +230,7 @@ export declare function createResource<T, S = true>(fetcher: ResourceFetcher<S,
 export declare function createResource<T, S = true>(fetcher: ResourceFetcher<S, T>, options: ResourceOptions<T>): ResourceReturn<T>;
 export declare function createResource<T, S>(source: ResourceSource<S>, fetcher: ResourceFetcher<S, T>, options?: ResourceOptions<undefined>): ResourceReturn<T | undefined>;
 export declare function createResource<T, S>(source: ResourceSource<S>, fetcher: ResourceFetcher<S, T>, options: ResourceOptions<T>): ResourceReturn<T>;
+export declare function refetchResources(info?: unknown): void;
 export interface DeferredOptions<T> {
     equals?: false | ((prev: T, next: T) => boolean);
     name?: string;
@@ -348,6 +353,12 @@ export declare function getListener(): Computation<any, any> | null;
 export declare function getOwner(): Owner | null;
 export declare function runWithOwner(o: Owner, fn: () => any): any;
 export declare function enableScheduling(scheduler?: typeof requestCallback): void;
+/**
+ * ```typescript
+ * export function startTransition(fn: () => void, cb?: () => void) => void
+ *
+ * @description https://www.solidjs.com/docs/latest/api#usetransition
+ */
 export declare function startTransition(fn: () => void, cb?: () => void): void;
 export declare type Transition = [Accessor<boolean>, (fn: () => void, cb?: () => void) => void];
 /**

package/types/server/rendering.d.ts

@@ -82,6 +82,7 @@ export declare function createResource<T, U = true>(fetcher: (k: U, getPrev: ()
 export declare function createResource<T, U>(fn: U | false | (() => U | false), fetcher: (k: U, getPrev: () => T | undefined) => T | Promise<T>, options?: {
     initialValue?: T;
 }): ResourceReturn<T>;
+export declare function refetchResources(info?: unknown): void;
 export declare function lazy(fn: () => Promise<{
     default: any;
 }>): (props: any) => string;
@@ -97,7 +98,6 @@ declare type HydrationContext = {
     registerFragment: (v: string) => (v?: string, err?: any) => boolean;
     async?: boolean;
     streaming?: boolean;
-    dataOnly?: boolean;
     noHydrate: boolean;
 };
 export declare function SuspenseList(props: {

package/web/dist/dev.cjs

@@ -403,6 +403,7 @@ function insertExpression(parent, value, current, marker, unwrapArray) {
     }
     current = array;
   } else if (value instanceof Node) {
+    if (solidJs.sharedConfig.context) return current = value.parentNode ? value : current;
     if (Array.isArray(current)) {
       if (multi) return current = cleanChildren(parent, current, marker, value);
       cleanChildren(parent, current, null, value);

package/web/dist/dev.js

@@ -400,6 +400,7 @@ function insertExpression(parent, value, current, marker, unwrapArray) {
     }
     current = array;
   } else if (value instanceof Node) {
+    if (sharedConfig.context) return current = value.parentNode ? value : current;
     if (Array.isArray(current)) {
       if (multi) return current = cleanChildren(parent, current, marker, value);
       cleanChildren(parent, current, null, value);

package/web/dist/server.cjs

@@ -243,7 +243,8 @@ function renderToString(code, options = {}) {
     assets: [],
     nonce: options.nonce,
     writeResource(id, p, error) {
-      if (error) scripts += `_$HY.set("${id}", ${serializeError(p)});`;
+      if (error) return scripts += `_$HY.set("${id}", ${serializeError(p)});`;
+      scripts += `_$HY.set("${id}", ${devalue(p)});`;
     }
   };
   let html = injectAssets(solidJs.sharedConfig.context.assets, resolveSSRNode(escape(code())));
@@ -251,6 +252,7 @@ function renderToString(code, options = {}) {
   return html;
 }
 function renderToStringAsync(code, options = {}) {
+  let scripts = "";
   const {
     nonce,
     renderId,
@@ -263,12 +265,12 @@ function renderToStringAsync(code, options = {}) {
     suspense: {},
     assets: [],
     async: true,
-    nonce
-  };
-  let scripts = "";
-  solidJs.sharedConfig.context.writeResource = (id, p, error) => {
-    if (error) return scripts += `_$HY.set("${id}", ${serializeError(p)});`;
-    p.then(d => scripts += `_$HY.set("${id}", ${devalue(d)});`).catch(() => scripts += `_$HY.set("${id}", null);`);
+    nonce,
+    writeResource(id, p, error) {
+      if (error) return scripts += `_$HY.set("${id}", ${serializeError(p)});`;
+      if (typeof p !== "object" || !("then" in p)) return scripts += `_$HY.set("${id}", ${devalue(p)});`;
+      p.then(d => scripts += `_$HY.set("${id}", ${devalue(d)});`).catch(() => scripts += `_$HY.set("${id}", {});`);
+    }
   };
   const timeout = new Promise((_, reject) => setTimeout(() => reject("renderToString timed out"), timeoutMs));
   function asyncWrap(fn) {
@@ -281,9 +283,10 @@ function renderToStringAsync(code, options = {}) {
       function register(key) {
         registry.add(key);
         return (value = "", error) => {
+          if (!registry.has(key)) return;
           cache[key] = value;
           registry.delete(key);
-          if (error) return scripts += `_$HY.set("${key}", Promise.resolve(${serializeError(error)}));`;
+          if (error) scripts += `_$HY.set("${key}", Promise.resolve(${serializeError(error)}));`;else scripts += `_$HY.set("${key}", true);`;
           if (!registry.size) Promise.resolve().then(() => {
             let source = resolveSSRNode(rendered);
             let final = "";
@@ -310,7 +313,6 @@ function renderToStream(code, options = {}) {
     nonce,
     onCompleteShell,
     onCompleteAll,
-    dataOnly,
     renderId
   } = options;
   const tmp = [];
@@ -344,7 +346,6 @@ function renderToStream(code, options = {}) {
     count: 0,
     async: true,
     streaming: true,
-    dataOnly,
     resources: {},
     suspense: {},
     assets: [],
@@ -355,22 +356,21 @@ function renderToStream(code, options = {}) {
         scheduled = true;
       }
       if (error) return tasks.push(`_$HY.set("${id}", ${serializeError(p)})`);
+      if (typeof p !== "object" || !("then" in p)) return tasks.push(`_$HY.set("${id}", ${devalue(p)})`);
       tasks.push(`_$HY.init("${id}")`);
       p.then(d => {
         !completed && buffer.write(`<script${nonce ? ` nonce="${nonce}"` : ""}>_$HY.set("${id}", ${devalue(d)})</script>`);
-      }).catch(() => {
-        !completed && buffer.write(`<script${nonce ? ` nonce="${nonce}"` : ""}>_$HY.set("${id}", null)</script>`);
+      }).catch(err => {
+        !completed && buffer.write(`<script${nonce ? ` nonce="${nonce}"` : ""}>_$HY.set("${id}", {})</script>`);
       });
     },
     registerFragment(key) {
       registry.set(key, []);
-      if (!dataOnly) {
-        if (!scheduled) {
-          Promise.resolve().then(writeInitialScript);
-          scheduled = true;
-        }
-        tasks.push(`_$HY.init("${key}")`);
+      if (!scheduled) {
+        Promise.resolve().then(writeInitialScript);
+        scheduled = true;
       }
+      tasks.push(`_$HY.init("${key}")`);
       return (value, error) => {
         const keys = registry.get(key);
         registry.delete(key);
@@ -404,6 +404,7 @@ function renderToStream(code, options = {}) {
       const writer = w.getWriter();
       writable = {
         end() {
+          writer.releaseLock();
           w.close();
         }
       };
@@ -573,7 +574,7 @@ function generateHydrationScript({
   eventNames = ["click", "input"],
   nonce
 }) {
-  return `<script${nonce ? ` nonce="${nonce}"` : ""}>((e,t,o={})=>{t=e=>e&&e.hasAttribute&&(e.hasAttribute("data-hk")?e:t(e.host&&e.host instanceof Node?e.host:e.parentNode)),["${eventNames.join('","')}"].forEach((o=>document.addEventListener(o,(o=>{let n=o.composedPath&&o.composedPath()[0]||o.target,s=t(n);s&&!e.completed.has(s)&&e.events.push([s,o])})))),e.init=(e,t)=>{o[e]=[new Promise((e=>t=e)),t]},e.set=(e,t,n)=>{if(!(n=o[e]))return o[e]=[t];n[1](t)},e.unset=(e)=>{delete o[e]},e.load=(e,t)=>{if(t=o[e])return t[0]}})(window._$HY||(_$HY={events:[],completed:new WeakSet}))</script><!xs>`;
+  return `<script${nonce ? ` nonce="${nonce}"` : ""}>((e,t,o={})=>{t=e=>e&&e.hasAttribute&&(e.hasAttribute("data-hk")?e:t(e.host&&e.host instanceof Node?e.host:e.parentNode)),["${eventNames.join('","')}"].forEach((o=>document.addEventListener(o,(o=>{let s=o.composedPath&&o.composedPath()[0]||o.target,n=t(s);n&&!e.completed.has(n)&&e.events.push([n,o])})))),e.init=(e,t)=>{o[e]=[new Promise(((e,o)=>t=e)),t]},e.set=(e,t,s)=>{(s=o[e])&&s[1](t),o[e]=[t]},e.unset=e=>{delete o[e]},e.load=(e,t)=>{if(t=o[e])return t[0]}})(window._$HY||(_$HY={events:[],completed:new WeakSet}))</script><!xs>`;
 }
 function injectAssets(assets, html) {
   for (let i = 0; i < assets.length; i++) {

package/web/dist/server.js

@@ -240,7 +240,8 @@ function renderToString(code, options = {}) {
     assets: [],
     nonce: options.nonce,
     writeResource(id, p, error) {
-      if (error) scripts += `_$HY.set("${id}", ${serializeError(p)});`;
+      if (error) return scripts += `_$HY.set("${id}", ${serializeError(p)});`;
+      scripts += `_$HY.set("${id}", ${devalue(p)});`;
     }
   };
   let html = injectAssets(sharedConfig.context.assets, resolveSSRNode(escape(code())));
@@ -248,6 +249,7 @@ function renderToString(code, options = {}) {
   return html;
 }
 function renderToStringAsync(code, options = {}) {
+  let scripts = "";
   const {
     nonce,
     renderId,
@@ -260,12 +262,12 @@ function renderToStringAsync(code, options = {}) {
     suspense: {},
     assets: [],
     async: true,
-    nonce
-  };
-  let scripts = "";
-  sharedConfig.context.writeResource = (id, p, error) => {
-    if (error) return scripts += `_$HY.set("${id}", ${serializeError(p)});`;
-    p.then(d => scripts += `_$HY.set("${id}", ${devalue(d)});`).catch(() => scripts += `_$HY.set("${id}", null);`);
+    nonce,
+    writeResource(id, p, error) {
+      if (error) return scripts += `_$HY.set("${id}", ${serializeError(p)});`;
+      if (typeof p !== "object" || !("then" in p)) return scripts += `_$HY.set("${id}", ${devalue(p)});`;
+      p.then(d => scripts += `_$HY.set("${id}", ${devalue(d)});`).catch(() => scripts += `_$HY.set("${id}", {});`);
+    }
   };
   const timeout = new Promise((_, reject) => setTimeout(() => reject("renderToString timed out"), timeoutMs));
   function asyncWrap(fn) {
@@ -278,9 +280,10 @@ function renderToStringAsync(code, options = {}) {
       function register(key) {
         registry.add(key);
         return (value = "", error) => {
+          if (!registry.has(key)) return;
           cache[key] = value;
           registry.delete(key);
-          if (error) return scripts += `_$HY.set("${key}", Promise.resolve(${serializeError(error)}));`;
+          if (error) scripts += `_$HY.set("${key}", Promise.resolve(${serializeError(error)}));`;else scripts += `_$HY.set("${key}", true);`;
           if (!registry.size) Promise.resolve().then(() => {
             let source = resolveSSRNode(rendered);
             let final = "";
@@ -307,7 +310,6 @@ function renderToStream(code, options = {}) {
     nonce,
     onCompleteShell,
     onCompleteAll,
-    dataOnly,
     renderId
   } = options;
   const tmp = [];
@@ -341,7 +343,6 @@ function renderToStream(code, options = {}) {
     count: 0,
     async: true,
     streaming: true,
-    dataOnly,
     resources: {},
     suspense: {},
     assets: [],
@@ -352,22 +353,21 @@ function renderToStream(code, options = {}) {
         scheduled = true;
       }
       if (error) return tasks.push(`_$HY.set("${id}", ${serializeError(p)})`);
+      if (typeof p !== "object" || !("then" in p)) return tasks.push(`_$HY.set("${id}", ${devalue(p)})`);
       tasks.push(`_$HY.init("${id}")`);
       p.then(d => {
         !completed && buffer.write(`<script${nonce ? ` nonce="${nonce}"` : ""}>_$HY.set("${id}", ${devalue(d)})</script>`);
-      }).catch(() => {
-        !completed && buffer.write(`<script${nonce ? ` nonce="${nonce}"` : ""}>_$HY.set("${id}", null)</script>`);
+      }).catch(err => {
+        !completed && buffer.write(`<script${nonce ? ` nonce="${nonce}"` : ""}>_$HY.set("${id}", {})</script>`);
       });
     },
     registerFragment(key) {
       registry.set(key, []);
-      if (!dataOnly) {
-        if (!scheduled) {
-          Promise.resolve().then(writeInitialScript);
-          scheduled = true;
-        }
-        tasks.push(`_$HY.init("${key}")`);
+      if (!scheduled) {
+        Promise.resolve().then(writeInitialScript);
+        scheduled = true;
       }
+      tasks.push(`_$HY.init("${key}")`);
       return (value, error) => {
         const keys = registry.get(key);
         registry.delete(key);
@@ -401,6 +401,7 @@ function renderToStream(code, options = {}) {
       const writer = w.getWriter();
       writable = {
         end() {
+          writer.releaseLock();
           w.close();
         }
       };
@@ -570,7 +571,7 @@ function generateHydrationScript({
   eventNames = ["click", "input"],
   nonce
 }) {
-  return `<script${nonce ? ` nonce="${nonce}"` : ""}>((e,t,o={})=>{t=e=>e&&e.hasAttribute&&(e.hasAttribute("data-hk")?e:t(e.host&&e.host instanceof Node?e.host:e.parentNode)),["${eventNames.join('","')}"].forEach((o=>document.addEventListener(o,(o=>{let n=o.composedPath&&o.composedPath()[0]||o.target,s=t(n);s&&!e.completed.has(s)&&e.events.push([s,o])})))),e.init=(e,t)=>{o[e]=[new Promise((e=>t=e)),t]},e.set=(e,t,n)=>{if(!(n=o[e]))return o[e]=[t];n[1](t)},e.unset=(e)=>{delete o[e]},e.load=(e,t)=>{if(t=o[e])return t[0]}})(window._$HY||(_$HY={events:[],completed:new WeakSet}))</script><!xs>`;
+  return `<script${nonce ? ` nonce="${nonce}"` : ""}>((e,t,o={})=>{t=e=>e&&e.hasAttribute&&(e.hasAttribute("data-hk")?e:t(e.host&&e.host instanceof Node?e.host:e.parentNode)),["${eventNames.join('","')}"].forEach((o=>document.addEventListener(o,(o=>{let s=o.composedPath&&o.composedPath()[0]||o.target,n=t(s);n&&!e.completed.has(n)&&e.events.push([n,o])})))),e.init=(e,t)=>{o[e]=[new Promise(((e,o)=>t=e)),t]},e.set=(e,t,s)=>{(s=o[e])&&s[1](t),o[e]=[t]},e.unset=e=>{delete o[e]},e.load=(e,t)=>{if(t=o[e])return t[0]}})(window._$HY||(_$HY={events:[],completed:new WeakSet}))</script><!xs>`;
 }
 function injectAssets(assets, html) {
   for (let i = 0; i < assets.length; i++) {

package/web/dist/web.cjs

@@ -402,6 +402,7 @@ function insertExpression(parent, value, current, marker, unwrapArray) {
     }
     current = array;
   } else if (value instanceof Node) {
+    if (solidJs.sharedConfig.context) return current = value.parentNode ? value : current;
     if (Array.isArray(current)) {
       if (multi) return current = cleanChildren(parent, current, marker, value);
       cleanChildren(parent, current, null, value);

package/web/dist/web.js

@@ -399,6 +399,7 @@ function insertExpression(parent, value, current, marker, unwrapArray) {
     }
     current = array;
   } else if (value instanceof Node) {
+    if (sharedConfig.context) return current = value.parentNode ? value : current;
     if (Array.isArray(current)) {
       if (multi) return current = cleanChildren(parent, current, marker, value);
       cleanChildren(parent, current, null, value);

package/web/types/server-mock.d.ts

@@ -9,7 +9,6 @@ export declare function renderToStringAsync<T>(fn: () => T, options?: {
 }): Promise<string>;
 export declare function renderToStream<T>(fn: () => T, options?: {
     nonce?: string;
-    dataOnly?: boolean;
     renderId?: string;
     onCompleteShell?: () => void;
     onCompleteAll?: () => void;
@@ -42,7 +41,6 @@ export declare type LegacyResults = {
  */
 export declare function pipeToWritable<T>(fn: () => T, writable: WritableStream, options?: {
     nonce?: string;
-    dataOnly?: boolean;
     onReady?: (res: LegacyResults) => void;
     onCompleteAll?: () => void;
 }): void;
@@ -53,7 +51,6 @@ export declare function pipeToNodeWritable<T>(fn: () => T, writable: {
     write: (v: string) => void;
 }, options?: {
     nonce?: string;
-    dataOnly?: boolean;
     onReady?: (res: LegacyResults) => void;
     onCompleteAll?: () => void;
 }): void;