solid-js 2.0.0-beta.2 → 2.0.0-beta.3

package/dist/dev.cjs

@@ -208,6 +208,67 @@ function applyPatches(target, patches) {
 function isAsyncIterable(v) {
   return v != null && typeof v[Symbol.asyncIterator] === "function";
 }
+function createShadowDraft(realDraft) {
+  const shadow = JSON.parse(JSON.stringify(realDraft));
+  let useShadow = true;
+  return {
+    proxy: new Proxy(shadow, {
+      get(_, prop) {
+        return useShadow ? shadow[prop] : realDraft[prop];
+      },
+      set(_, prop, value) {
+        if (useShadow) {
+          shadow[prop] = value;
+          return true;
+        }
+        return Reflect.set(realDraft, prop, value);
+      },
+      deleteProperty(_, prop) {
+        if (useShadow) {
+          delete shadow[prop];
+          return true;
+        }
+        return Reflect.deleteProperty(realDraft, prop);
+      },
+      has(_, prop) {
+        return prop in (useShadow ? shadow : realDraft);
+      },
+      ownKeys() {
+        return Reflect.ownKeys(useShadow ? shadow : realDraft);
+      },
+      getOwnPropertyDescriptor(_, prop) {
+        return Object.getOwnPropertyDescriptor(useShadow ? shadow : realDraft, prop);
+      }
+    }),
+    activate() {
+      useShadow = false;
+    }
+  };
+}
+function wrapFirstYield(iterable, activate) {
+  const srcIt = iterable[Symbol.asyncIterator]();
+  let first = true;
+  return {
+    [Symbol.asyncIterator]() {
+      return {
+        next() {
+          const p = srcIt.next();
+          if (first) {
+            first = false;
+            return p.then(r => {
+              activate();
+              return r.done ? r : {
+                done: false,
+                value: undefined
+              };
+            });
+          }
+          return p;
+        }
+      };
+    }
+  };
+}
 function hydrateSignalFromAsyncIterable(coreFn, compute, value, options) {
   const parent = signals.getOwner();
   const expectedId = signals.peekNextChildId(parent);
@@ -259,7 +320,11 @@ function hydrateStoreFromAsyncIterable(coreFn, initialValue, options) {
           next() {
             if (isFirst) {
               const r = srcIt.next();
-              return r && typeof r.then === "function" ? r.then(process) : syncThenable(process(r));
+              return r && typeof r.then === "function" ? {
+                then(fn, rej) {
+                  r.then(v => fn(process(v)), rej);
+                }
+              } : syncThenable(process(r));
             }
             if (buffered) {
               const b = buffered;
@@ -288,13 +353,15 @@ function hydrateStoreFromAsyncIterable(coreFn, initialValue, options) {
   }, initialValue, options);
 }
 function hydratedCreateMemo(compute, value, options) {
-  if (!sharedConfig.hydrating) {
+  if (!sharedConfig.hydrating || options?.transparent) {
     return signals.createMemo(compute, value, options);
   }
   markTopLevelSnapshotScope();
   const ssrSource = options?.ssrSource;
   if (ssrSource === "client") {
-    const [hydrated, setHydrated] = signals.createSignal(false);
+    const [hydrated, setHydrated] = signals.createSignal(false, {
+      pureWrite: true
+    });
     const memo = signals.createMemo(prev => {
       if (!hydrated()) return prev ?? value;
       return compute(prev);
@@ -325,7 +392,9 @@ function hydratedCreateSignal(fn, second, third) {
   markTopLevelSnapshotScope();
   const ssrSource = third?.ssrSource;
   if (ssrSource === "client") {
-    const [hydrated, setHydrated] = signals.createSignal(false);
+    const [hydrated, setHydrated] = signals.createSignal(false, {
+      pureWrite: true
+    });
     const sig = signals.createSignal(prev => {
       if (!hydrated()) return prev ?? second;
       return fn(prev);
@@ -376,7 +445,9 @@ function hydratedCreateOptimistic(fn, second, third) {
   markTopLevelSnapshotScope();
   const ssrSource = third?.ssrSource;
   if (ssrSource === "client") {
-    const [hydrated, setHydrated] = signals.createSignal(false);
+    const [hydrated, setHydrated] = signals.createSignal(false, {
+      pureWrite: true
+    });
     const sig = signals.createOptimistic(prev => {
       if (!hydrated()) return prev ?? second;
       return fn(prev);
@@ -402,14 +473,7 @@ function hydratedCreateOptimistic(fn, second, third) {
     return init != null ? (subFetch(fn, prev), init) : fn(prev);
   }, second, third);
 }
-function wrapStoreFn(fn, ssrSource) {
-  if (ssrSource === "initial") {
-    return draft => {
-      if (!sharedConfig.hydrating) return fn(draft);
-      subFetch(fn, draft);
-      return undefined;
-    };
-  }
+function wrapStoreFn(fn) {
   return draft => {
     const o = signals.getOwner();
     if (!sharedConfig.hydrating) return fn(draft);
@@ -419,46 +483,77 @@ function wrapStoreFn(fn, ssrSource) {
     return init != null ? (subFetch(fn, draft), init) : fn(draft);
   };
 }
+function hydrateStoreLikeFn(coreFn, fn, initialValue, options, ssrSource) {
+  if (ssrSource === "client") {
+    const [hydrated, setHydrated] = signals.createSignal(false, {
+      pureWrite: true
+    });
+    const result = coreFn(draft => {
+      if (!hydrated()) return;
+      return fn(draft);
+    }, initialValue, options);
+    setHydrated(true);
+    return result;
+  }
+  if (ssrSource === "hybrid") {
+    const [hydrated, setHydrated] = signals.createSignal(false, {
+      pureWrite: true
+    });
+    const result = coreFn(draft => {
+      const o = signals.getOwner();
+      if (!hydrated()) {
+        if (sharedConfig.has(o.id)) {
+          const initP = sharedConfig.load(o.id);
+          const init = initP?.v ?? initP;
+          if (init != null) {
+            subFetch(fn, draft);
+            return init;
+          }
+        }
+        return fn(draft);
+      }
+      const {
+        proxy,
+        activate
+      } = createShadowDraft(draft);
+      const r = fn(proxy);
+      return isAsyncIterable(r) ? wrapFirstYield(r, activate) : r;
+    }, initialValue, options);
+    setHydrated(true);
+    return result;
+  }
+  const aiResult = hydrateStoreFromAsyncIterable(coreFn, initialValue, options);
+  if (aiResult !== null) return aiResult;
+  return coreFn(wrapStoreFn(fn), initialValue, options);
+}
 function hydratedCreateStore(first, second, third) {
   if (typeof first !== "function" || !sharedConfig.hydrating) return signals.createStore(first, second, third);
   markTopLevelSnapshotScope();
   const ssrSource = third?.ssrSource;
-  if (ssrSource === "client" || ssrSource === "initial") {
-    return signals.createStore(second ?? {}, undefined, third);
-  }
-  const aiResult = hydrateStoreFromAsyncIterable(signals.createStore, second ?? {}, third);
-  if (aiResult !== null) return aiResult;
-  return signals.createStore(wrapStoreFn(first, ssrSource), second, third);
+  if (ssrSource === "initial") return signals.createStore(second ?? {}, undefined, third);
+  return hydrateStoreLikeFn(signals.createStore, first, second ?? {}, third, ssrSource);
 }
 function hydratedCreateOptimisticStore(first, second, third) {
   if (typeof first !== "function" || !sharedConfig.hydrating) return signals.createOptimisticStore(first, second, third);
   markTopLevelSnapshotScope();
   const ssrSource = third?.ssrSource;
-  if (ssrSource === "client" || ssrSource === "initial") {
-    return signals.createOptimisticStore(second ?? {}, undefined, third);
-  }
-  const aiResult = hydrateStoreFromAsyncIterable(signals.createOptimisticStore, second ?? {}, third);
-  if (aiResult !== null) return aiResult;
-  return signals.createOptimisticStore(wrapStoreFn(first, ssrSource), second, third);
+  if (ssrSource === "initial") return signals.createOptimisticStore(second ?? {}, undefined, third);
+  return hydrateStoreLikeFn(signals.createOptimisticStore, first, second ?? {}, third, ssrSource);
 }
 function hydratedCreateProjection(fn, initialValue, options) {
-  if (!sharedConfig.hydrating) {
-    return signals.createProjection(fn, initialValue, options);
-  }
+  if (!sharedConfig.hydrating) return signals.createProjection(fn, initialValue, options);
   markTopLevelSnapshotScope();
   const ssrSource = options?.ssrSource;
-  if (ssrSource === "client" || ssrSource === "initial") {
-    return signals.createProjection(draft => draft, initialValue, options);
-  }
-  const aiResult = hydrateStoreFromAsyncIterable(signals.createProjection, initialValue, options);
-  if (aiResult !== null) return aiResult;
-  return signals.createProjection(wrapStoreFn(fn, ssrSource), initialValue, options);
+  if (ssrSource === "initial") return signals.createProjection(draft => draft, initialValue, options);
+  return hydrateStoreLikeFn(signals.createProjection, fn, initialValue, options, ssrSource);
 }
 function hydratedEffect(coreFn, compute, effectFn, value, options) {
   if (!sharedConfig.hydrating) return coreFn(compute, effectFn, value, options);
   const ssrSource = options?.ssrSource;
   if (ssrSource === "client") {
-    const [hydrated, setHydrated] = signals.createSignal(false);
+    const [hydrated, setHydrated] = signals.createSignal(false, {
+      pureWrite: true
+    });
     let active = false;
     coreFn(prev => {
       if (!hydrated()) return value;
@@ -592,13 +687,16 @@ function resumeBoundaryHydration(o, id, set) {
   set();
   signals.flush();
   _snapshotRootOwner = null;
-  _hydratingValue = false;
   signals.releaseSnapshotScope(o);
   signals.flush();
+  _hydratingValue = false;
   checkHydrationComplete();
 }
 function Loading(props) {
-  if (!sharedConfig.hydrating) return signals.createLoadBoundary(() => props.children, () => props.fallback);
+  const onOpt = props.on ? {
+    on: () => props.on()
+  } : undefined;
+  if (!sharedConfig.hydrating) return signals.createLoadingBoundary(() => props.children, () => props.fallback, onOpt);
   return signals.createMemo(() => {
     const o = signals.getOwner();
     const id = o.id;
@@ -646,7 +744,8 @@ function Loading(props) {
       assetPromise.then(() => resumeBoundaryHydration(o, id, set));
       return undefined;
     }
-    return signals.createLoadBoundary(() => props.children, () => props.fallback);
+    const boundary = signals.createLoadingBoundary(() => props.children, () => props.fallback, onOpt);
+    return boundary;
   });
 }
 function NoHydration(props) {
@@ -818,6 +917,14 @@ Object.defineProperty(exports, "action", {
   enumerable: true,
   get: function () { return signals.action; }
 });
+Object.defineProperty(exports, "createErrorBoundary", {
+  enumerable: true,
+  get: function () { return signals.createErrorBoundary; }
+});
+Object.defineProperty(exports, "createLoadingBoundary", {
+  enumerable: true,
+  get: function () { return signals.createLoadingBoundary; }
+});
 Object.defineProperty(exports, "createOwner", {
   enumerable: true,
   get: function () { return signals.createOwner; }
@@ -838,6 +945,14 @@ Object.defineProperty(exports, "deep", {
   enumerable: true,
   get: function () { return signals.deep; }
 });
+Object.defineProperty(exports, "enableExternalSource", {
+  enumerable: true,
+  get: function () { return signals.enableExternalSource; }
+});
+Object.defineProperty(exports, "enforceLoadingBoundary", {
+  enumerable: true,
+  get: function () { return signals.enforceLoadingBoundary; }
+});
 Object.defineProperty(exports, "flatten", {
   enumerable: true,
   get: function () { return signals.flatten; }
@@ -918,10 +1033,6 @@ Object.defineProperty(exports, "runWithOwner", {
   enumerable: true,
   get: function () { return signals.runWithOwner; }
 });
-Object.defineProperty(exports, "setOnUnhandledAsync", {
-  enumerable: true,
-  get: function () { return signals.setOnUnhandledAsync; }
-});
 Object.defineProperty(exports, "snapshot", {
   enumerable: true,
   get: function () { return signals.snapshot; }

package/dist/dev.js

@@ -1,5 +1,5 @@
-import { getContext, createMemo as createMemo$1, flatten, getOwner, createRoot, setContext, untrack, createLoadBoundary, onCleanup, isDisposed, runWithOwner, createOwner, createEffect as createEffect$1, createOptimistic as createOptimistic$1, createOptimisticStore as createOptimisticStore$1, createProjection as createProjection$1, createRenderEffect as createRenderEffect$1, createSignal as createSignal$1, createStore as createStore$1, setSnapshotCapture, releaseSnapshotScope, getNextChildId, createErrorBoundary as createErrorBoundary$1, markSnapshotScope, flush, clearSnapshots, peekNextChildId, mapArray, repeat } from '@solidjs/signals';
-export { $PROXY, $REFRESH, $TRACK, NotReadyError, action, createOwner, createReaction, createRoot, createTrackedEffect, deep, flatten, flush, getNextChildId, getObserver, getOwner, isEqual, isPending, isRefreshing, isWrappable, latest, mapArray, merge, omit, onCleanup, onSettled, reconcile, refresh, repeat, resolve, runWithOwner, setOnUnhandledAsync, snapshot, storePath, untrack } from '@solidjs/signals';
+import { getContext, createMemo as createMemo$1, flatten, getOwner, createRoot, setContext, untrack, createLoadingBoundary, onCleanup, isDisposed, runWithOwner, createOwner, createEffect as createEffect$1, createOptimistic as createOptimistic$1, createOptimisticStore as createOptimisticStore$1, createProjection as createProjection$1, createRenderEffect as createRenderEffect$1, createSignal as createSignal$1, createStore as createStore$1, setSnapshotCapture, releaseSnapshotScope, getNextChildId, createErrorBoundary as createErrorBoundary$1, markSnapshotScope, flush, clearSnapshots, peekNextChildId, mapArray, repeat } from '@solidjs/signals';
+export { $PROXY, $REFRESH, $TRACK, NotReadyError, action, createErrorBoundary, createLoadingBoundary, createOwner, createReaction, createRoot, createTrackedEffect, deep, enableExternalSource, enforceLoadingBoundary, flatten, flush, getNextChildId, getObserver, getOwner, isEqual, isPending, isRefreshing, isWrappable, latest, mapArray, merge, omit, onCleanup, onSettled, reconcile, refresh, repeat, resolve, runWithOwner, snapshot, storePath, untrack } from '@solidjs/signals';
 
 const $DEVCOMP = Symbol("COMPONENT_DEV" );
 function createContext(defaultValue, options) {
@@ -207,6 +207,67 @@ function applyPatches(target, patches) {
 function isAsyncIterable(v) {
   return v != null && typeof v[Symbol.asyncIterator] === "function";
 }
+function createShadowDraft(realDraft) {
+  const shadow = JSON.parse(JSON.stringify(realDraft));
+  let useShadow = true;
+  return {
+    proxy: new Proxy(shadow, {
+      get(_, prop) {
+        return useShadow ? shadow[prop] : realDraft[prop];
+      },
+      set(_, prop, value) {
+        if (useShadow) {
+          shadow[prop] = value;
+          return true;
+        }
+        return Reflect.set(realDraft, prop, value);
+      },
+      deleteProperty(_, prop) {
+        if (useShadow) {
+          delete shadow[prop];
+          return true;
+        }
+        return Reflect.deleteProperty(realDraft, prop);
+      },
+      has(_, prop) {
+        return prop in (useShadow ? shadow : realDraft);
+      },
+      ownKeys() {
+        return Reflect.ownKeys(useShadow ? shadow : realDraft);
+      },
+      getOwnPropertyDescriptor(_, prop) {
+        return Object.getOwnPropertyDescriptor(useShadow ? shadow : realDraft, prop);
+      }
+    }),
+    activate() {
+      useShadow = false;
+    }
+  };
+}
+function wrapFirstYield(iterable, activate) {
+  const srcIt = iterable[Symbol.asyncIterator]();
+  let first = true;
+  return {
+    [Symbol.asyncIterator]() {
+      return {
+        next() {
+          const p = srcIt.next();
+          if (first) {
+            first = false;
+            return p.then(r => {
+              activate();
+              return r.done ? r : {
+                done: false,
+                value: undefined
+              };
+            });
+          }
+          return p;
+        }
+      };
+    }
+  };
+}
 function hydrateSignalFromAsyncIterable(coreFn, compute, value, options) {
   const parent = getOwner();
   const expectedId = peekNextChildId(parent);
@@ -258,7 +319,11 @@ function hydrateStoreFromAsyncIterable(coreFn, initialValue, options) {
           next() {
             if (isFirst) {
               const r = srcIt.next();
-              return r && typeof r.then === "function" ? r.then(process) : syncThenable(process(r));
+              return r && typeof r.then === "function" ? {
+                then(fn, rej) {
+                  r.then(v => fn(process(v)), rej);
+                }
+              } : syncThenable(process(r));
             }
             if (buffered) {
               const b = buffered;
@@ -287,13 +352,15 @@ function hydrateStoreFromAsyncIterable(coreFn, initialValue, options) {
   }, initialValue, options);
 }
 function hydratedCreateMemo(compute, value, options) {
-  if (!sharedConfig.hydrating) {
+  if (!sharedConfig.hydrating || options?.transparent) {
     return createMemo$1(compute, value, options);
   }
   markTopLevelSnapshotScope();
   const ssrSource = options?.ssrSource;
   if (ssrSource === "client") {
-    const [hydrated, setHydrated] = createSignal$1(false);
+    const [hydrated, setHydrated] = createSignal$1(false, {
+      pureWrite: true
+    });
     const memo = createMemo$1(prev => {
       if (!hydrated()) return prev ?? value;
       return compute(prev);
@@ -324,7 +391,9 @@ function hydratedCreateSignal(fn, second, third) {
   markTopLevelSnapshotScope();
   const ssrSource = third?.ssrSource;
   if (ssrSource === "client") {
-    const [hydrated, setHydrated] = createSignal$1(false);
+    const [hydrated, setHydrated] = createSignal$1(false, {
+      pureWrite: true
+    });
     const sig = createSignal$1(prev => {
       if (!hydrated()) return prev ?? second;
       return fn(prev);
@@ -375,7 +444,9 @@ function hydratedCreateOptimistic(fn, second, third) {
   markTopLevelSnapshotScope();
   const ssrSource = third?.ssrSource;
   if (ssrSource === "client") {
-    const [hydrated, setHydrated] = createSignal$1(false);
+    const [hydrated, setHydrated] = createSignal$1(false, {
+      pureWrite: true
+    });
     const sig = createOptimistic$1(prev => {
       if (!hydrated()) return prev ?? second;
       return fn(prev);
@@ -401,14 +472,7 @@ function hydratedCreateOptimistic(fn, second, third) {
     return init != null ? (subFetch(fn, prev), init) : fn(prev);
   }, second, third);
 }
-function wrapStoreFn(fn, ssrSource) {
-  if (ssrSource === "initial") {
-    return draft => {
-      if (!sharedConfig.hydrating) return fn(draft);
-      subFetch(fn, draft);
-      return undefined;
-    };
-  }
+function wrapStoreFn(fn) {
   return draft => {
     const o = getOwner();
     if (!sharedConfig.hydrating) return fn(draft);
@@ -418,46 +482,77 @@ function wrapStoreFn(fn, ssrSource) {
     return init != null ? (subFetch(fn, draft), init) : fn(draft);
   };
 }
+function hydrateStoreLikeFn(coreFn, fn, initialValue, options, ssrSource) {
+  if (ssrSource === "client") {
+    const [hydrated, setHydrated] = createSignal$1(false, {
+      pureWrite: true
+    });
+    const result = coreFn(draft => {
+      if (!hydrated()) return;
+      return fn(draft);
+    }, initialValue, options);
+    setHydrated(true);
+    return result;
+  }
+  if (ssrSource === "hybrid") {
+    const [hydrated, setHydrated] = createSignal$1(false, {
+      pureWrite: true
+    });
+    const result = coreFn(draft => {
+      const o = getOwner();
+      if (!hydrated()) {
+        if (sharedConfig.has(o.id)) {
+          const initP = sharedConfig.load(o.id);
+          const init = initP?.v ?? initP;
+          if (init != null) {
+            subFetch(fn, draft);
+            return init;
+          }
+        }
+        return fn(draft);
+      }
+      const {
+        proxy,
+        activate
+      } = createShadowDraft(draft);
+      const r = fn(proxy);
+      return isAsyncIterable(r) ? wrapFirstYield(r, activate) : r;
+    }, initialValue, options);
+    setHydrated(true);
+    return result;
+  }
+  const aiResult = hydrateStoreFromAsyncIterable(coreFn, initialValue, options);
+  if (aiResult !== null) return aiResult;
+  return coreFn(wrapStoreFn(fn), initialValue, options);
+}
 function hydratedCreateStore(first, second, third) {
   if (typeof first !== "function" || !sharedConfig.hydrating) return createStore$1(first, second, third);
   markTopLevelSnapshotScope();
   const ssrSource = third?.ssrSource;
-  if (ssrSource === "client" || ssrSource === "initial") {
-    return createStore$1(second ?? {}, undefined, third);
-  }
-  const aiResult = hydrateStoreFromAsyncIterable(createStore$1, second ?? {}, third);
-  if (aiResult !== null) return aiResult;
-  return createStore$1(wrapStoreFn(first, ssrSource), second, third);
+  if (ssrSource === "initial") return createStore$1(second ?? {}, undefined, third);
+  return hydrateStoreLikeFn(createStore$1, first, second ?? {}, third, ssrSource);
 }
 function hydratedCreateOptimisticStore(first, second, third) {
   if (typeof first !== "function" || !sharedConfig.hydrating) return createOptimisticStore$1(first, second, third);
   markTopLevelSnapshotScope();
   const ssrSource = third?.ssrSource;
-  if (ssrSource === "client" || ssrSource === "initial") {
-    return createOptimisticStore$1(second ?? {}, undefined, third);
-  }
-  const aiResult = hydrateStoreFromAsyncIterable(createOptimisticStore$1, second ?? {}, third);
-  if (aiResult !== null) return aiResult;
-  return createOptimisticStore$1(wrapStoreFn(first, ssrSource), second, third);
+  if (ssrSource === "initial") return createOptimisticStore$1(second ?? {}, undefined, third);
+  return hydrateStoreLikeFn(createOptimisticStore$1, first, second ?? {}, third, ssrSource);
 }
 function hydratedCreateProjection(fn, initialValue, options) {
-  if (!sharedConfig.hydrating) {
-    return createProjection$1(fn, initialValue, options);
-  }
+  if (!sharedConfig.hydrating) return createProjection$1(fn, initialValue, options);
   markTopLevelSnapshotScope();
   const ssrSource = options?.ssrSource;
-  if (ssrSource === "client" || ssrSource === "initial") {
-    return createProjection$1(draft => draft, initialValue, options);
-  }
-  const aiResult = hydrateStoreFromAsyncIterable(createProjection$1, initialValue, options);
-  if (aiResult !== null) return aiResult;
-  return createProjection$1(wrapStoreFn(fn, ssrSource), initialValue, options);
+  if (ssrSource === "initial") return createProjection$1(draft => draft, initialValue, options);
+  return hydrateStoreLikeFn(createProjection$1, fn, initialValue, options, ssrSource);
 }
 function hydratedEffect(coreFn, compute, effectFn, value, options) {
   if (!sharedConfig.hydrating) return coreFn(compute, effectFn, value, options);
   const ssrSource = options?.ssrSource;
   if (ssrSource === "client") {
-    const [hydrated, setHydrated] = createSignal$1(false);
+    const [hydrated, setHydrated] = createSignal$1(false, {
+      pureWrite: true
+    });
     let active = false;
     coreFn(prev => {
       if (!hydrated()) return value;
@@ -591,13 +686,16 @@ function resumeBoundaryHydration(o, id, set) {
   set();
   flush();
   _snapshotRootOwner = null;
-  _hydratingValue = false;
   releaseSnapshotScope(o);
   flush();
+  _hydratingValue = false;
   checkHydrationComplete();
 }
 function Loading(props) {
-  if (!sharedConfig.hydrating) return createLoadBoundary(() => props.children, () => props.fallback);
+  const onOpt = props.on ? {
+    on: () => props.on()
+  } : undefined;
+  if (!sharedConfig.hydrating) return createLoadingBoundary(() => props.children, () => props.fallback, onOpt);
   return createMemo$1(() => {
     const o = getOwner();
     const id = o.id;
@@ -645,7 +743,8 @@ function Loading(props) {
       assetPromise.then(() => resumeBoundaryHydration(o, id, set));
       return undefined;
     }
-    return createLoadBoundary(() => props.children, () => props.fallback);
+    const boundary = createLoadingBoundary(() => props.children, () => props.fallback, onOpt);
+    return boundary;
   });
 }
 function NoHydration(props) {

package/dist/server.cjs

@@ -493,7 +493,7 @@ function createErrorBoundary(fn, fallback) {
     return () => result;
   });
 }
-function createLoadBoundary(fn, fallback) {
+function createLoadingBoundary(fn, fallback, options) {
   try {
     const result = fn();
     return () => result;
@@ -701,7 +701,7 @@ function ssrHandleError(err) {
 function Loading(props) {
   const ctx = sharedConfig.context;
   if (!ctx) {
-    return createLoadBoundary(() => props.children, () => props.fallback);
+    return createLoadingBoundary(() => props.children, () => props.fallback);
   }
   const o = signals.createOwner();
   const id = o.id;
@@ -814,6 +814,14 @@ Object.defineProperty(exports, "createRoot", {
   enumerable: true,
   get: function () { return signals.createRoot; }
 });
+Object.defineProperty(exports, "enableExternalSource", {
+  enumerable: true,
+  get: function () { return signals.enableExternalSource; }
+});
+Object.defineProperty(exports, "enforceLoadingBoundary", {
+  enumerable: true,
+  get: function () { return signals.enforceLoadingBoundary; }
+});
 Object.defineProperty(exports, "flatten", {
   enumerable: true,
   get: function () { return signals.flatten; }
@@ -850,10 +858,6 @@ Object.defineProperty(exports, "runWithOwner", {
   enumerable: true,
   get: function () { return signals.runWithOwner; }
 });
-Object.defineProperty(exports, "setOnUnhandledAsync", {
-  enumerable: true,
-  get: function () { return signals.setOnUnhandledAsync; }
-});
 Object.defineProperty(exports, "snapshot", {
   enumerable: true,
   get: function () { return signals.snapshot; }
@@ -880,6 +884,8 @@ exports.createComponent = createComponent;
 exports.createContext = createContext;
 exports.createDeepProxy = createDeepProxy;
 exports.createEffect = createEffect;
+exports.createErrorBoundary = createErrorBoundary;
+exports.createLoadingBoundary = createLoadingBoundary;
 exports.createMemo = createMemo;
 exports.createOptimistic = createOptimistic;
 exports.createOptimisticStore = createOptimisticStore;

package/dist/server.js

@@ -1,5 +1,5 @@
-import { getOwner, getContext, getNextChildId, createOwner, runWithOwner, onCleanup, NotReadyError, isWrappable, setContext, flatten, createRoot } from '@solidjs/signals';
-export { $PROXY, $REFRESH, $TRACK, NotReadyError, createOwner, createRoot, flatten, getNextChildId, getOwner, isEqual, isWrappable, merge, omit, onCleanup, runWithOwner, setOnUnhandledAsync, snapshot, storePath } from '@solidjs/signals';
+import { getOwner, getContext, getNextChildId, createOwner, runWithOwner, setContext, NotReadyError, onCleanup, isWrappable, flatten, createRoot } from '@solidjs/signals';
+export { $PROXY, $REFRESH, $TRACK, NotReadyError, createOwner, createRoot, enableExternalSource, enforceLoadingBoundary, flatten, getNextChildId, getOwner, isEqual, isWrappable, merge, omit, onCleanup, runWithOwner, snapshot, storePath } from '@solidjs/signals';
 
 const NoHydrateContext = {
   id: Symbol("NoHydrateContext"),
@@ -492,7 +492,7 @@ function createErrorBoundary(fn, fallback) {
     return () => result;
   });
 }
-function createLoadBoundary(fn, fallback) {
+function createLoadingBoundary(fn, fallback, options) {
   try {
     const result = fn();
     return () => result;
@@ -700,7 +700,7 @@ function ssrHandleError(err) {
 function Loading(props) {
   const ctx = sharedConfig.context;
   if (!ctx) {
-    return createLoadBoundary(() => props.children, () => props.fallback);
+    return createLoadingBoundary(() => props.children, () => props.fallback);
   }
   const o = createOwner();
   const id = o.id;
@@ -789,4 +789,4 @@ function Hydration(props) {
 
 const DEV = undefined;
 
-export { $DEVCOMP, DEV, Errored, For, Hydration, Loading, Match, NoHydrateContext, NoHydration, Repeat, Show, Switch, action, children, createComponent, createContext, createDeepProxy, createEffect, createMemo, createOptimistic, createOptimisticStore, createProjection, createReaction, createRenderEffect, createSignal, createStore, createTrackedEffect, createUniqueId, deep, enableHydration, flush, getObserver, isPending, isRefreshing, latest, lazy, mapArray, onSettled, reconcile, refresh, repeat, resolve, sharedConfig, ssrHandleError, ssrRunInScope, untrack, useContext };
+export { $DEVCOMP, DEV, Errored, For, Hydration, Loading, Match, NoHydrateContext, NoHydration, Repeat, Show, Switch, action, children, createComponent, createContext, createDeepProxy, createEffect, createErrorBoundary, createLoadingBoundary, createMemo, createOptimistic, createOptimisticStore, createProjection, createReaction, createRenderEffect, createSignal, createStore, createTrackedEffect, createUniqueId, deep, enableHydration, flush, getObserver, isPending, isRefreshing, latest, lazy, mapArray, onSettled, reconcile, refresh, repeat, resolve, sharedConfig, ssrHandleError, ssrRunInScope, untrack, useContext };

package/dist/solid.cjs

@@ -187,6 +187,67 @@ function applyPatches(target, patches) {
 function isAsyncIterable(v) {
   return v != null && typeof v[Symbol.asyncIterator] === "function";
 }
+function createShadowDraft(realDraft) {
+  const shadow = JSON.parse(JSON.stringify(realDraft));
+  let useShadow = true;
+  return {
+    proxy: new Proxy(shadow, {
+      get(_, prop) {
+        return useShadow ? shadow[prop] : realDraft[prop];
+      },
+      set(_, prop, value) {
+        if (useShadow) {
+          shadow[prop] = value;
+          return true;
+        }
+        return Reflect.set(realDraft, prop, value);
+      },
+      deleteProperty(_, prop) {
+        if (useShadow) {
+          delete shadow[prop];
+          return true;
+        }
+        return Reflect.deleteProperty(realDraft, prop);
+      },
+      has(_, prop) {
+        return prop in (useShadow ? shadow : realDraft);
+      },
+      ownKeys() {
+        return Reflect.ownKeys(useShadow ? shadow : realDraft);
+      },
+      getOwnPropertyDescriptor(_, prop) {
+        return Object.getOwnPropertyDescriptor(useShadow ? shadow : realDraft, prop);
+      }
+    }),
+    activate() {
+      useShadow = false;
+    }
+  };
+}
+function wrapFirstYield(iterable, activate) {
+  const srcIt = iterable[Symbol.asyncIterator]();
+  let first = true;
+  return {
+    [Symbol.asyncIterator]() {
+      return {
+        next() {
+          const p = srcIt.next();
+          if (first) {
+            first = false;
+            return p.then(r => {
+              activate();
+              return r.done ? r : {
+                done: false,
+                value: undefined
+              };
+            });
+          }
+          return p;
+        }
+      };
+    }
+  };
+}
 function hydrateSignalFromAsyncIterable(coreFn, compute, value, options) {
   const parent = signals.getOwner();
   const expectedId = signals.peekNextChildId(parent);
@@ -238,7 +299,11 @@ function hydrateStoreFromAsyncIterable(coreFn, initialValue, options) {
           next() {
             if (isFirst) {
               const r = srcIt.next();
-              return r && typeof r.then === "function" ? r.then(process) : syncThenable(process(r));
+              return r && typeof r.then === "function" ? {
+                then(fn, rej) {
+                  r.then(v => fn(process(v)), rej);
+                }
+              } : syncThenable(process(r));
             }
             if (buffered) {
               const b = buffered;
@@ -267,13 +332,15 @@ function hydrateStoreFromAsyncIterable(coreFn, initialValue, options) {
   }, initialValue, options);
 }
 function hydratedCreateMemo(compute, value, options) {
-  if (!sharedConfig.hydrating) {
+  if (!sharedConfig.hydrating || options?.transparent) {
     return signals.createMemo(compute, value, options);
   }
   markTopLevelSnapshotScope();
   const ssrSource = options?.ssrSource;
   if (ssrSource === "client") {
-    const [hydrated, setHydrated] = signals.createSignal(false);
+    const [hydrated, setHydrated] = signals.createSignal(false, {
+      pureWrite: true
+    });
     const memo = signals.createMemo(prev => {
       if (!hydrated()) return prev ?? value;
       return compute(prev);
@@ -304,7 +371,9 @@ function hydratedCreateSignal(fn, second, third) {
   markTopLevelSnapshotScope();
   const ssrSource = third?.ssrSource;
   if (ssrSource === "client") {
-    const [hydrated, setHydrated] = signals.createSignal(false);
+    const [hydrated, setHydrated] = signals.createSignal(false, {
+      pureWrite: true
+    });
     const sig = signals.createSignal(prev => {
       if (!hydrated()) return prev ?? second;
       return fn(prev);
@@ -355,7 +424,9 @@ function hydratedCreateOptimistic(fn, second, third) {
   markTopLevelSnapshotScope();
   const ssrSource = third?.ssrSource;
   if (ssrSource === "client") {
-    const [hydrated, setHydrated] = signals.createSignal(false);
+    const [hydrated, setHydrated] = signals.createSignal(false, {
+      pureWrite: true
+    });
     const sig = signals.createOptimistic(prev => {
       if (!hydrated()) return prev ?? second;
       return fn(prev);
@@ -381,14 +452,7 @@ function hydratedCreateOptimistic(fn, second, third) {
     return init != null ? (subFetch(fn, prev), init) : fn(prev);
   }, second, third);
 }
-function wrapStoreFn(fn, ssrSource) {
-  if (ssrSource === "initial") {
-    return draft => {
-      if (!sharedConfig.hydrating) return fn(draft);
-      subFetch(fn, draft);
-      return undefined;
-    };
-  }
+function wrapStoreFn(fn) {
   return draft => {
     const o = signals.getOwner();
     if (!sharedConfig.hydrating) return fn(draft);
@@ -398,46 +462,77 @@ function wrapStoreFn(fn, ssrSource) {
     return init != null ? (subFetch(fn, draft), init) : fn(draft);
   };
 }
+function hydrateStoreLikeFn(coreFn, fn, initialValue, options, ssrSource) {
+  if (ssrSource === "client") {
+    const [hydrated, setHydrated] = signals.createSignal(false, {
+      pureWrite: true
+    });
+    const result = coreFn(draft => {
+      if (!hydrated()) return;
+      return fn(draft);
+    }, initialValue, options);
+    setHydrated(true);
+    return result;
+  }
+  if (ssrSource === "hybrid") {
+    const [hydrated, setHydrated] = signals.createSignal(false, {
+      pureWrite: true
+    });
+    const result = coreFn(draft => {
+      const o = signals.getOwner();
+      if (!hydrated()) {
+        if (sharedConfig.has(o.id)) {
+          const initP = sharedConfig.load(o.id);
+          const init = initP?.v ?? initP;
+          if (init != null) {
+            subFetch(fn, draft);
+            return init;
+          }
+        }
+        return fn(draft);
+      }
+      const {
+        proxy,
+        activate
+      } = createShadowDraft(draft);
+      const r = fn(proxy);
+      return isAsyncIterable(r) ? wrapFirstYield(r, activate) : r;
+    }, initialValue, options);
+    setHydrated(true);
+    return result;
+  }
+  const aiResult = hydrateStoreFromAsyncIterable(coreFn, initialValue, options);
+  if (aiResult !== null) return aiResult;
+  return coreFn(wrapStoreFn(fn), initialValue, options);
+}
 function hydratedCreateStore(first, second, third) {
   if (typeof first !== "function" || !sharedConfig.hydrating) return signals.createStore(first, second, third);
   markTopLevelSnapshotScope();
   const ssrSource = third?.ssrSource;
-  if (ssrSource === "client" || ssrSource === "initial") {
-    return signals.createStore(second ?? {}, undefined, third);
-  }
-  const aiResult = hydrateStoreFromAsyncIterable(signals.createStore, second ?? {}, third);
-  if (aiResult !== null) return aiResult;
-  return signals.createStore(wrapStoreFn(first, ssrSource), second, third);
+  if (ssrSource === "initial") return signals.createStore(second ?? {}, undefined, third);
+  return hydrateStoreLikeFn(signals.createStore, first, second ?? {}, third, ssrSource);
 }
 function hydratedCreateOptimisticStore(first, second, third) {
   if (typeof first !== "function" || !sharedConfig.hydrating) return signals.createOptimisticStore(first, second, third);
   markTopLevelSnapshotScope();
   const ssrSource = third?.ssrSource;
-  if (ssrSource === "client" || ssrSource === "initial") {
-    return signals.createOptimisticStore(second ?? {}, undefined, third);
-  }
-  const aiResult = hydrateStoreFromAsyncIterable(signals.createOptimisticStore, second ?? {}, third);
-  if (aiResult !== null) return aiResult;
-  return signals.createOptimisticStore(wrapStoreFn(first, ssrSource), second, third);
+  if (ssrSource === "initial") return signals.createOptimisticStore(second ?? {}, undefined, third);
+  return hydrateStoreLikeFn(signals.createOptimisticStore, first, second ?? {}, third, ssrSource);
 }
 function hydratedCreateProjection(fn, initialValue, options) {
-  if (!sharedConfig.hydrating) {
-    return signals.createProjection(fn, initialValue, options);
-  }
+  if (!sharedConfig.hydrating) return signals.createProjection(fn, initialValue, options);
   markTopLevelSnapshotScope();
   const ssrSource = options?.ssrSource;
-  if (ssrSource === "client" || ssrSource === "initial") {
-    return signals.createProjection(draft => draft, initialValue, options);
-  }
-  const aiResult = hydrateStoreFromAsyncIterable(signals.createProjection, initialValue, options);
-  if (aiResult !== null) return aiResult;
-  return signals.createProjection(wrapStoreFn(fn, ssrSource), initialValue, options);
+  if (ssrSource === "initial") return signals.createProjection(draft => draft, initialValue, options);
+  return hydrateStoreLikeFn(signals.createProjection, fn, initialValue, options, ssrSource);
 }
 function hydratedEffect(coreFn, compute, effectFn, value, options) {
   if (!sharedConfig.hydrating) return coreFn(compute, effectFn, value, options);
   const ssrSource = options?.ssrSource;
   if (ssrSource === "client") {
-    const [hydrated, setHydrated] = signals.createSignal(false);
+    const [hydrated, setHydrated] = signals.createSignal(false, {
+      pureWrite: true
+    });
     let active = false;
     coreFn(prev => {
       if (!hydrated()) return value;
@@ -571,13 +666,16 @@ function resumeBoundaryHydration(o, id, set) {
   set();
   signals.flush();
   _snapshotRootOwner = null;
-  _hydratingValue = false;
   signals.releaseSnapshotScope(o);
   signals.flush();
+  _hydratingValue = false;
   checkHydrationComplete();
 }
 function Loading(props) {
-  if (!sharedConfig.hydrating) return signals.createLoadBoundary(() => props.children, () => props.fallback);
+  const onOpt = props.on ? {
+    on: () => props.on()
+  } : undefined;
+  if (!sharedConfig.hydrating) return signals.createLoadingBoundary(() => props.children, () => props.fallback, onOpt);
   return signals.createMemo(() => {
     const o = signals.getOwner();
     const id = o.id;
@@ -625,7 +723,8 @@ function Loading(props) {
       assetPromise.then(() => resumeBoundaryHydration(o, id, set));
       return undefined;
     }
-    return signals.createLoadBoundary(() => props.children, () => props.fallback);
+    const boundary = signals.createLoadingBoundary(() => props.children, () => props.fallback, onOpt);
+    return boundary;
   });
 }
 function NoHydration(props) {
@@ -774,6 +873,14 @@ Object.defineProperty(exports, "action", {
   enumerable: true,
   get: function () { return signals.action; }
 });
+Object.defineProperty(exports, "createErrorBoundary", {
+  enumerable: true,
+  get: function () { return signals.createErrorBoundary; }
+});
+Object.defineProperty(exports, "createLoadingBoundary", {
+  enumerable: true,
+  get: function () { return signals.createLoadingBoundary; }
+});
 Object.defineProperty(exports, "createOwner", {
   enumerable: true,
   get: function () { return signals.createOwner; }
@@ -794,6 +901,14 @@ Object.defineProperty(exports, "deep", {
   enumerable: true,
   get: function () { return signals.deep; }
 });
+Object.defineProperty(exports, "enableExternalSource", {
+  enumerable: true,
+  get: function () { return signals.enableExternalSource; }
+});
+Object.defineProperty(exports, "enforceLoadingBoundary", {
+  enumerable: true,
+  get: function () { return signals.enforceLoadingBoundary; }
+});
 Object.defineProperty(exports, "flatten", {
   enumerable: true,
   get: function () { return signals.flatten; }
@@ -874,10 +989,6 @@ Object.defineProperty(exports, "runWithOwner", {
   enumerable: true,
   get: function () { return signals.runWithOwner; }
 });
-Object.defineProperty(exports, "setOnUnhandledAsync", {
-  enumerable: true,
-  get: function () { return signals.setOnUnhandledAsync; }
-});
 Object.defineProperty(exports, "snapshot", {
   enumerable: true,
   get: function () { return signals.snapshot; }

package/dist/solid.js

@@ -1,5 +1,5 @@
-import { getContext, createMemo as createMemo$1, flatten, createRoot, setContext, createLoadBoundary, getOwner, onCleanup, isDisposed, runWithOwner, createOwner, createEffect as createEffect$1, createOptimistic as createOptimistic$1, createOptimisticStore as createOptimisticStore$1, createProjection as createProjection$1, createRenderEffect as createRenderEffect$1, createSignal as createSignal$1, createStore as createStore$1, setSnapshotCapture, releaseSnapshotScope, getNextChildId, createErrorBoundary as createErrorBoundary$1, markSnapshotScope, flush, clearSnapshots, peekNextChildId, untrack, mapArray, repeat } from '@solidjs/signals';
-export { $PROXY, $REFRESH, $TRACK, NotReadyError, action, createOwner, createReaction, createRoot, createTrackedEffect, deep, flatten, flush, getNextChildId, getObserver, getOwner, isEqual, isPending, isRefreshing, isWrappable, latest, mapArray, merge, omit, onCleanup, onSettled, reconcile, refresh, repeat, resolve, runWithOwner, setOnUnhandledAsync, snapshot, storePath, untrack } from '@solidjs/signals';
+import { getContext, createMemo as createMemo$1, flatten, createRoot, setContext, createLoadingBoundary, getOwner, onCleanup, isDisposed, runWithOwner, createOwner, createEffect as createEffect$1, createOptimistic as createOptimistic$1, createOptimisticStore as createOptimisticStore$1, createProjection as createProjection$1, createRenderEffect as createRenderEffect$1, createSignal as createSignal$1, createStore as createStore$1, setSnapshotCapture, releaseSnapshotScope, getNextChildId, createErrorBoundary as createErrorBoundary$1, markSnapshotScope, flush, clearSnapshots, peekNextChildId, untrack, mapArray, repeat } from '@solidjs/signals';
+export { $PROXY, $REFRESH, $TRACK, NotReadyError, action, createErrorBoundary, createLoadingBoundary, createOwner, createReaction, createRoot, createTrackedEffect, deep, enableExternalSource, enforceLoadingBoundary, flatten, flush, getNextChildId, getObserver, getOwner, isEqual, isPending, isRefreshing, isWrappable, latest, mapArray, merge, omit, onCleanup, onSettled, reconcile, refresh, repeat, resolve, runWithOwner, snapshot, storePath, untrack } from '@solidjs/signals';
 
 const IS_DEV = false;
 const $DEVCOMP = Symbol(0);
@@ -186,6 +186,67 @@ function applyPatches(target, patches) {
 function isAsyncIterable(v) {
   return v != null && typeof v[Symbol.asyncIterator] === "function";
 }
+function createShadowDraft(realDraft) {
+  const shadow = JSON.parse(JSON.stringify(realDraft));
+  let useShadow = true;
+  return {
+    proxy: new Proxy(shadow, {
+      get(_, prop) {
+        return useShadow ? shadow[prop] : realDraft[prop];
+      },
+      set(_, prop, value) {
+        if (useShadow) {
+          shadow[prop] = value;
+          return true;
+        }
+        return Reflect.set(realDraft, prop, value);
+      },
+      deleteProperty(_, prop) {
+        if (useShadow) {
+          delete shadow[prop];
+          return true;
+        }
+        return Reflect.deleteProperty(realDraft, prop);
+      },
+      has(_, prop) {
+        return prop in (useShadow ? shadow : realDraft);
+      },
+      ownKeys() {
+        return Reflect.ownKeys(useShadow ? shadow : realDraft);
+      },
+      getOwnPropertyDescriptor(_, prop) {
+        return Object.getOwnPropertyDescriptor(useShadow ? shadow : realDraft, prop);
+      }
+    }),
+    activate() {
+      useShadow = false;
+    }
+  };
+}
+function wrapFirstYield(iterable, activate) {
+  const srcIt = iterable[Symbol.asyncIterator]();
+  let first = true;
+  return {
+    [Symbol.asyncIterator]() {
+      return {
+        next() {
+          const p = srcIt.next();
+          if (first) {
+            first = false;
+            return p.then(r => {
+              activate();
+              return r.done ? r : {
+                done: false,
+                value: undefined
+              };
+            });
+          }
+          return p;
+        }
+      };
+    }
+  };
+}
 function hydrateSignalFromAsyncIterable(coreFn, compute, value, options) {
   const parent = getOwner();
   const expectedId = peekNextChildId(parent);
@@ -237,7 +298,11 @@ function hydrateStoreFromAsyncIterable(coreFn, initialValue, options) {
           next() {
             if (isFirst) {
               const r = srcIt.next();
-              return r && typeof r.then === "function" ? r.then(process) : syncThenable(process(r));
+              return r && typeof r.then === "function" ? {
+                then(fn, rej) {
+                  r.then(v => fn(process(v)), rej);
+                }
+              } : syncThenable(process(r));
             }
             if (buffered) {
               const b = buffered;
@@ -266,13 +331,15 @@ function hydrateStoreFromAsyncIterable(coreFn, initialValue, options) {
   }, initialValue, options);
 }
 function hydratedCreateMemo(compute, value, options) {
-  if (!sharedConfig.hydrating) {
+  if (!sharedConfig.hydrating || options?.transparent) {
     return createMemo$1(compute, value, options);
   }
   markTopLevelSnapshotScope();
   const ssrSource = options?.ssrSource;
   if (ssrSource === "client") {
-    const [hydrated, setHydrated] = createSignal$1(false);
+    const [hydrated, setHydrated] = createSignal$1(false, {
+      pureWrite: true
+    });
     const memo = createMemo$1(prev => {
       if (!hydrated()) return prev ?? value;
       return compute(prev);
@@ -303,7 +370,9 @@ function hydratedCreateSignal(fn, second, third) {
   markTopLevelSnapshotScope();
   const ssrSource = third?.ssrSource;
   if (ssrSource === "client") {
-    const [hydrated, setHydrated] = createSignal$1(false);
+    const [hydrated, setHydrated] = createSignal$1(false, {
+      pureWrite: true
+    });
     const sig = createSignal$1(prev => {
       if (!hydrated()) return prev ?? second;
       return fn(prev);
@@ -354,7 +423,9 @@ function hydratedCreateOptimistic(fn, second, third) {
   markTopLevelSnapshotScope();
   const ssrSource = third?.ssrSource;
   if (ssrSource === "client") {
-    const [hydrated, setHydrated] = createSignal$1(false);
+    const [hydrated, setHydrated] = createSignal$1(false, {
+      pureWrite: true
+    });
     const sig = createOptimistic$1(prev => {
       if (!hydrated()) return prev ?? second;
       return fn(prev);
@@ -380,14 +451,7 @@ function hydratedCreateOptimistic(fn, second, third) {
     return init != null ? (subFetch(fn, prev), init) : fn(prev);
   }, second, third);
 }
-function wrapStoreFn(fn, ssrSource) {
-  if (ssrSource === "initial") {
-    return draft => {
-      if (!sharedConfig.hydrating) return fn(draft);
-      subFetch(fn, draft);
-      return undefined;
-    };
-  }
+function wrapStoreFn(fn) {
   return draft => {
     const o = getOwner();
     if (!sharedConfig.hydrating) return fn(draft);
@@ -397,46 +461,77 @@ function wrapStoreFn(fn, ssrSource) {
     return init != null ? (subFetch(fn, draft), init) : fn(draft);
   };
 }
+function hydrateStoreLikeFn(coreFn, fn, initialValue, options, ssrSource) {
+  if (ssrSource === "client") {
+    const [hydrated, setHydrated] = createSignal$1(false, {
+      pureWrite: true
+    });
+    const result = coreFn(draft => {
+      if (!hydrated()) return;
+      return fn(draft);
+    }, initialValue, options);
+    setHydrated(true);
+    return result;
+  }
+  if (ssrSource === "hybrid") {
+    const [hydrated, setHydrated] = createSignal$1(false, {
+      pureWrite: true
+    });
+    const result = coreFn(draft => {
+      const o = getOwner();
+      if (!hydrated()) {
+        if (sharedConfig.has(o.id)) {
+          const initP = sharedConfig.load(o.id);
+          const init = initP?.v ?? initP;
+          if (init != null) {
+            subFetch(fn, draft);
+            return init;
+          }
+        }
+        return fn(draft);
+      }
+      const {
+        proxy,
+        activate
+      } = createShadowDraft(draft);
+      const r = fn(proxy);
+      return isAsyncIterable(r) ? wrapFirstYield(r, activate) : r;
+    }, initialValue, options);
+    setHydrated(true);
+    return result;
+  }
+  const aiResult = hydrateStoreFromAsyncIterable(coreFn, initialValue, options);
+  if (aiResult !== null) return aiResult;
+  return coreFn(wrapStoreFn(fn), initialValue, options);
+}
 function hydratedCreateStore(first, second, third) {
   if (typeof first !== "function" || !sharedConfig.hydrating) return createStore$1(first, second, third);
   markTopLevelSnapshotScope();
   const ssrSource = third?.ssrSource;
-  if (ssrSource === "client" || ssrSource === "initial") {
-    return createStore$1(second ?? {}, undefined, third);
-  }
-  const aiResult = hydrateStoreFromAsyncIterable(createStore$1, second ?? {}, third);
-  if (aiResult !== null) return aiResult;
-  return createStore$1(wrapStoreFn(first, ssrSource), second, third);
+  if (ssrSource === "initial") return createStore$1(second ?? {}, undefined, third);
+  return hydrateStoreLikeFn(createStore$1, first, second ?? {}, third, ssrSource);
 }
 function hydratedCreateOptimisticStore(first, second, third) {
   if (typeof first !== "function" || !sharedConfig.hydrating) return createOptimisticStore$1(first, second, third);
   markTopLevelSnapshotScope();
   const ssrSource = third?.ssrSource;
-  if (ssrSource === "client" || ssrSource === "initial") {
-    return createOptimisticStore$1(second ?? {}, undefined, third);
-  }
-  const aiResult = hydrateStoreFromAsyncIterable(createOptimisticStore$1, second ?? {}, third);
-  if (aiResult !== null) return aiResult;
-  return createOptimisticStore$1(wrapStoreFn(first, ssrSource), second, third);
+  if (ssrSource === "initial") return createOptimisticStore$1(second ?? {}, undefined, third);
+  return hydrateStoreLikeFn(createOptimisticStore$1, first, second ?? {}, third, ssrSource);
 }
 function hydratedCreateProjection(fn, initialValue, options) {
-  if (!sharedConfig.hydrating) {
-    return createProjection$1(fn, initialValue, options);
-  }
+  if (!sharedConfig.hydrating) return createProjection$1(fn, initialValue, options);
   markTopLevelSnapshotScope();
   const ssrSource = options?.ssrSource;
-  if (ssrSource === "client" || ssrSource === "initial") {
-    return createProjection$1(draft => draft, initialValue, options);
-  }
-  const aiResult = hydrateStoreFromAsyncIterable(createProjection$1, initialValue, options);
-  if (aiResult !== null) return aiResult;
-  return createProjection$1(wrapStoreFn(fn, ssrSource), initialValue, options);
+  if (ssrSource === "initial") return createProjection$1(draft => draft, initialValue, options);
+  return hydrateStoreLikeFn(createProjection$1, fn, initialValue, options, ssrSource);
 }
 function hydratedEffect(coreFn, compute, effectFn, value, options) {
   if (!sharedConfig.hydrating) return coreFn(compute, effectFn, value, options);
   const ssrSource = options?.ssrSource;
   if (ssrSource === "client") {
-    const [hydrated, setHydrated] = createSignal$1(false);
+    const [hydrated, setHydrated] = createSignal$1(false, {
+      pureWrite: true
+    });
     let active = false;
     coreFn(prev => {
       if (!hydrated()) return value;
@@ -570,13 +665,16 @@ function resumeBoundaryHydration(o, id, set) {
   set();
   flush();
   _snapshotRootOwner = null;
-  _hydratingValue = false;
   releaseSnapshotScope(o);
   flush();
+  _hydratingValue = false;
   checkHydrationComplete();
 }
 function Loading(props) {
-  if (!sharedConfig.hydrating) return createLoadBoundary(() => props.children, () => props.fallback);
+  const onOpt = props.on ? {
+    on: () => props.on()
+  } : undefined;
+  if (!sharedConfig.hydrating) return createLoadingBoundary(() => props.children, () => props.fallback, onOpt);
   return createMemo$1(() => {
     const o = getOwner();
     const id = o.id;
@@ -624,7 +722,8 @@ function Loading(props) {
       assetPromise.then(() => resumeBoundaryHydration(o, id, set));
       return undefined;
     }
-    return createLoadBoundary(() => props.children, () => props.fallback);
+    const boundary = createLoadingBoundary(() => props.children, () => props.fallback, onOpt);
+    return boundary;
   });
 }
 function NoHydration(props) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "solid-js",
   "description": "A declarative JavaScript library for building user interfaces.",
-  "version": "2.0.0-beta.2",
+  "version": "2.0.0-beta.3",
   "author": "Ryan Carniato",
   "license": "MIT",
   "homepage": "https://solidjs.com",
@@ -79,7 +79,7 @@
     "performance"
   ],
   "dependencies": {
-    "@solidjs/signals": "^0.12.0",
+    "@solidjs/signals": "^0.13.3",
     "csstype": "^3.1.0",
     "seroval": "~1.5.0",
     "seroval-plugins": "~1.5.0"

package/types/client/hydration.d.ts

@@ -78,6 +78,7 @@ export declare const createEffect: typeof coreEffect;
  */
 export declare function Loading(props: {
     fallback?: JSX.Element;
+    on?: () => any;
     children: JSX.Element;
 }): JSX.Element;
 /**

package/types/index.d.ts

@@ -1,5 +1,5 @@
-export { $PROXY, $REFRESH, $TRACK, action, createOwner, createReaction, createRoot, createTrackedEffect, deep, flatten, flush, getNextChildId, getObserver, getOwner, isEqual, isRefreshing, isPending, isWrappable, mapArray, merge, omit, onCleanup, onSettled, latest, reconcile, refresh, repeat, resolve, NotReadyError, runWithOwner, setOnUnhandledAsync, snapshot, storePath, untrack } from "@solidjs/signals";
-export type { Accessor, ComputeFunction, EffectFunction, EffectOptions, Merge, NoInfer, NotWrappable, Omit, Owner, Signal, SignalOptions, Setter, Store, SolidStore, StoreNode, StoreSetter, StorePathRange, ArrayFilterFn, CustomPartial, Part, PathSetter } from "@solidjs/signals";
+export { $PROXY, $REFRESH, $TRACK, action, createErrorBoundary, createLoadingBoundary, createOwner, createReaction, createRoot, createTrackedEffect, deep, flatten, flush, getNextChildId, getObserver, getOwner, isEqual, isRefreshing, isPending, isWrappable, mapArray, merge, omit, onCleanup, onSettled, latest, reconcile, refresh, repeat, resolve, NotReadyError, runWithOwner, enableExternalSource, enforceLoadingBoundary, snapshot, storePath, untrack } from "@solidjs/signals";
+export type { Accessor, ComputeFunction, EffectFunction, EffectOptions, ExternalSource, ExternalSourceConfig, ExternalSourceFactory, Merge, NoInfer, NotWrappable, Omit, Owner, Signal, SignalOptions, Setter, Store, SolidStore, StoreNode, StoreSetter, StorePathRange, ArrayFilterFn, CustomPartial, Part, PathSetter } from "@solidjs/signals";
 export { $DEVCOMP, children, createContext, useContext } from "./client/core.js";
 export type { ChildrenReturn, Context, ContextProviderComponent, ResolvedChildren, ResolvedJSXElement } from "./client/core.js";
 export * from "./client/component.js";

package/types/server/hydration.d.ts

@@ -17,6 +17,7 @@ export declare function ssrHandleError(err: any): Promise<any> | undefined;
  */
 export declare function Loading(props: {
     fallback?: JSX.Element;
+    on?: () => any;
     children: JSX.Element;
 }): JSX.Element;
 /**

package/types/server/index.d.ts

@@ -1,5 +1,5 @@
-export { $PROXY, $REFRESH, $TRACK, action, createEffect, createMemo, createOptimistic, createOptimisticStore, createOwner, createProjection, createReaction, createRenderEffect, createRoot, createSignal, createStore, createTrackedEffect, deep, flatten, flush, getNextChildId, getObserver, getOwner, isEqual, isRefreshing, isPending, isWrappable, mapArray, merge, omit, onCleanup, onSettled, latest, reconcile, refresh, repeat, resolve, NotReadyError, runWithOwner, snapshot, storePath, createDeepProxy, setOnUnhandledAsync, untrack } from "./signals.js";
-export type { Accessor, ComputeFunction, EffectFunction, EffectOptions, Merge, NoInfer, NotWrappable, Omit, Owner, Signal, SignalOptions, Setter, Store, SolidStore, StoreNode, StoreSetter, StorePathRange, ArrayFilterFn, CustomPartial, Part, PathSetter, PatchOp } from "./signals.js";
+export { $PROXY, $REFRESH, $TRACK, action, createEffect, createMemo, createOptimistic, createOptimisticStore, createErrorBoundary, createLoadingBoundary, createOwner, createProjection, createReaction, createRenderEffect, createRoot, createSignal, createStore, createTrackedEffect, deep, flatten, flush, getNextChildId, getObserver, getOwner, isEqual, isRefreshing, isPending, isWrappable, mapArray, merge, omit, onCleanup, onSettled, latest, reconcile, refresh, repeat, resolve, NotReadyError, runWithOwner, snapshot, storePath, createDeepProxy, enableExternalSource, enforceLoadingBoundary, untrack } from "./signals.js";
+export type { Accessor, ComputeFunction, EffectFunction, EffectOptions, ExternalSource, ExternalSourceConfig, ExternalSourceFactory, Merge, NoInfer, NotWrappable, Omit, Owner, Signal, SignalOptions, Setter, Store, SolidStore, StoreNode, StoreSetter, StorePathRange, ArrayFilterFn, CustomPartial, Part, PathSetter, PatchOp } from "./signals.js";
 export { $DEVCOMP, children, createContext, useContext, ssrRunInScope } from "./core.js";
 export type { ChildrenReturn, Context, ContextProviderComponent, ResolvedChildren, ResolvedJSXElement } from "./core.js";
 export * from "./component.js";

package/types/server/signals.d.ts

@@ -1,7 +1,7 @@
-export { createRoot, createOwner, runWithOwner, getOwner, onCleanup, getNextChildId, createContext, setContext, getContext, NotReadyError, NoOwnerError, ContextNotFoundError, isEqual, isWrappable, SUPPORTS_PROXY, setOnUnhandledAsync } from "@solidjs/signals";
+export { createRoot, createOwner, runWithOwner, getOwner, onCleanup, getNextChildId, createContext, setContext, getContext, NotReadyError, NoOwnerError, ContextNotFoundError, isEqual, isWrappable, SUPPORTS_PROXY, enableExternalSource, enforceLoadingBoundary } from "@solidjs/signals";
 export { flatten } from "@solidjs/signals";
 export { snapshot, merge, omit, storePath, $PROXY, $REFRESH, $TRACK } from "@solidjs/signals";
-export type { Accessor, ComputeFunction, EffectFunction, EffectBundle, EffectOptions, MemoOptions, NoInfer, SignalOptions, Setter, Signal, Owner, Maybe, Store, StoreSetter, StoreNode, NotWrappable, SolidStore, Merge, Omit, Context, ContextRecord, IQueue, StorePathRange, ArrayFilterFn, CustomPartial, Part, PathSetter } from "@solidjs/signals";
+export type { Accessor, ComputeFunction, EffectFunction, EffectBundle, EffectOptions, ExternalSource, ExternalSourceConfig, ExternalSourceFactory, MemoOptions, NoInfer, SignalOptions, Setter, Signal, Owner, Maybe, Store, StoreSetter, StoreNode, NotWrappable, SolidStore, Merge, Omit, Context, ContextRecord, IQueue, StorePathRange, ArrayFilterFn, CustomPartial, Part, PathSetter } from "@solidjs/signals";
 import type { Accessor, ComputeFunction, EffectFunction, EffectBundle, EffectOptions, MemoOptions, SignalOptions, Signal, Owner, Store, StoreSetter, Context } from "@solidjs/signals";
 import { NoHydrateContext } from "./shared.js";
 interface ServerComputation<T = any> {
@@ -49,7 +49,9 @@ declare const ErrorContext: Context<((err: any) => void) | null>;
 export { ErrorContext };
 export { NoHydrateContext };
 export declare function createErrorBoundary<U>(fn: () => any, fallback: (error: unknown, reset: () => void) => U): () => unknown;
-export declare function createLoadBoundary(fn: () => any, fallback: () => any): () => unknown;
+export declare function createLoadingBoundary(fn: () => any, fallback: () => any, options?: {
+    on?: () => any;
+}): () => unknown;
 export declare function untrack<T>(fn: () => T): T;
 export declare function flush(): void;
 export declare function resolve<T>(fn: () => T): Promise<T>;