solid-js 2.0.0-beta.4 → 2.0.0-beta.5

package/dist/dev.cjs

@@ -93,6 +93,7 @@ function drainHydrationCallbacks() {
   setTimeout(() => {
     if (sharedConfig.verifyHydration) sharedConfig.verifyHydration();
     if (globalThis._$HY) globalThis._$HY.done = true;
+    sharedConfig.registry?.clear();
   });
 }
 function checkHydrationComplete() {
@@ -110,23 +111,10 @@ let _createOptimisticStore;
 let _createRenderEffect;
 let _createEffect;
 class MockPromise {
-  static all() {
-    return new MockPromise();
-  }
-  static allSettled() {
-    return new MockPromise();
-  }
-  static any() {
-    return new MockPromise();
-  }
-  static race() {
-    return new MockPromise();
-  }
-  static reject() {
-    return new MockPromise();
-  }
-  static resolve() {
-    return new MockPromise();
+  static {
+    for (const k of ["all", "allSettled", "any", "race", "reject", "resolve"]) {
+      MockPromise[k] = () => new MockPromise();
+    }
   }
   catch() {
     return new MockPromise();
@@ -161,6 +149,28 @@ function syncThenable(value) {
     }
   };
 }
+const NO_HYDRATED_VALUE = Symbol("NO_HYDRATED_VALUE");
+function readHydratedValue(initP, refresh) {
+  if (initP == null) return NO_HYDRATED_VALUE;
+  refresh();
+  if (typeof initP === "object" && initP.s === 2) throw initP.v;
+  return initP?.v ?? initP;
+}
+function readSerializedOrCompute(compute, prev) {
+  if (!sharedConfig.hydrating) return compute(prev);
+  const o = signals.getOwner();
+  let initP;
+  if (sharedConfig.has(o.id)) initP = sharedConfig.load(o.id);
+  const init = readHydratedValue(initP, () => subFetch(compute, prev));
+  return init !== NO_HYDRATED_VALUE ? init : compute(prev);
+}
+function forwardIteratorReturn(it, value) {
+  const returned = it.return?.(value);
+  return returned && typeof returned.then === "function" ? returned : syncThenable(returned ?? {
+    done: true,
+    value
+  });
+}
 function normalizeIterator(it) {
   let first = true;
   let buffered = null;
@@ -187,6 +197,10 @@ function normalizeIterator(it) {
         latest = peek;
       }
       return Promise.resolve(latest);
+    },
+    return(value) {
+      buffered = null;
+      return forwardIteratorReturn(it, value);
     }
   };
 }
@@ -264,6 +278,9 @@ function wrapFirstYield(iterable, activate) {
             });
           }
           return p;
+        },
+        return(value) {
+          return forwardIteratorReturn(srcIt, value);
         }
       };
     }
@@ -346,6 +363,10 @@ function hydrateStoreFromAsyncIterable(coreFn, initialValue, options) {
               if (!r.done) result = process(r);
             }
             return Promise.resolve(result);
+          },
+          return(value) {
+            buffered = null;
+            return forwardIteratorReturn(srcIt, value);
           }
         };
       }
@@ -378,14 +399,7 @@ function hydratedCreateMemo(compute, value, options) {
   }
   const aiResult = hydrateSignalFromAsyncIterable(signals.createMemo, compute, value, options);
   if (aiResult !== null) return aiResult;
-  return signals.createMemo(prev => {
-    const o = signals.getOwner();
-    if (!sharedConfig.hydrating) return compute(prev);
-    let initP;
-    if (sharedConfig.has(o.id)) initP = sharedConfig.load(o.id);
-    const init = initP?.v ?? initP;
-    return init != null ? (subFetch(compute, prev), init) : compute(prev);
-  }, value, options);
+  return signals.createMemo(prev => readSerializedOrCompute(compute, prev), value, options);
 }
 function hydratedCreateSignal(fn, second, third) {
   if (typeof fn !== "function" || !sharedConfig.hydrating) return signals.createSignal(fn, second, third);
@@ -411,14 +425,7 @@ function hydratedCreateSignal(fn, second, third) {
   }
   const aiResult = hydrateSignalFromAsyncIterable(signals.createSignal, fn, second, third);
   if (aiResult !== null) return aiResult;
-  return signals.createSignal(prev => {
-    if (!sharedConfig.hydrating) return fn(prev);
-    const o = signals.getOwner();
-    let initP;
-    if (sharedConfig.has(o.id)) initP = sharedConfig.load(o.id);
-    const init = initP?.v ?? initP;
-    return init != null ? (subFetch(fn, prev), init) : fn(prev);
-  }, second, third);
+  return signals.createSignal(prev => readSerializedOrCompute(fn, prev), second, third);
 }
 function hydratedCreateErrorBoundary(fn, fallback) {
   if (!sharedConfig.hydrating) return signals.createErrorBoundary(fn, fallback);
@@ -464,24 +471,10 @@ function hydratedCreateOptimistic(fn, second, third) {
   }
   const aiResult = hydrateSignalFromAsyncIterable(signals.createOptimistic, fn, second, third);
   if (aiResult !== null) return aiResult;
-  return signals.createOptimistic(prev => {
-    const o = signals.getOwner();
-    if (!sharedConfig.hydrating) return fn(prev);
-    let initP;
-    if (sharedConfig.has(o.id)) initP = sharedConfig.load(o.id);
-    const init = initP?.v ?? initP;
-    return init != null ? (subFetch(fn, prev), init) : fn(prev);
-  }, second, third);
+  return signals.createOptimistic(prev => readSerializedOrCompute(fn, prev), second, third);
 }
 function wrapStoreFn(fn) {
-  return draft => {
-    const o = signals.getOwner();
-    if (!sharedConfig.hydrating) return fn(draft);
-    let initP;
-    if (sharedConfig.has(o.id)) initP = sharedConfig.load(o.id);
-    const init = initP?.v ?? initP;
-    return init != null ? (subFetch(fn, draft), init) : fn(draft);
-  };
+  return draft => readSerializedOrCompute(() => fn(draft), draft);
 }
 function hydrateStoreLikeFn(coreFn, fn, initialValue, options, ssrSource) {
   if (ssrSource === "client") {
@@ -504,11 +497,8 @@ function hydrateStoreLikeFn(coreFn, fn, initialValue, options, ssrSource) {
       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;
-          }
+          const init = readHydratedValue(initP, () => subFetch(fn, draft));
+          if (init !== NO_HYDRATED_VALUE) return init;
         }
         return fn(draft);
       }
@@ -575,14 +565,7 @@ function hydratedEffect(coreFn, compute, effectFn, value, options) {
     return;
   }
   markTopLevelSnapshotScope();
-  coreFn(prev => {
-    const o = signals.getOwner();
-    if (!sharedConfig.hydrating) return compute(prev);
-    let initP;
-    if (sharedConfig.has(o.id)) initP = sharedConfig.load(o.id);
-    const init = initP?.v ?? initP;
-    return init != null ? (subFetch(compute, prev), init) : compute(prev);
-  }, effectFn, value, options);
+  coreFn(prev => readSerializedOrCompute(compute, prev), effectFn, value, options);
 }
 function hydratedCreateRenderEffect(compute, effectFn, value, options) {
   return hydratedEffect(signals.createRenderEffect, compute, effectFn, value, options);
@@ -680,7 +663,7 @@ function resumeBoundaryHydration(o, id, set) {
     checkHydrationComplete();
     return;
   }
-  sharedConfig.gather(id);
+  sharedConfig.gather?.(id);
   _hydratingValue = true;
   signals.markSnapshotScope(o);
   _snapshotRootOwner = o;
@@ -692,11 +675,9 @@ function resumeBoundaryHydration(o, id, set) {
   signals.flush();
   checkHydrationComplete();
 }
-function Loading(props) {
-  const onOpt = props.on ? {
-    on: () => props.on()
-  } : undefined;
-  if (!sharedConfig.hydrating) return signals.createLoadingBoundary(() => props.children, () => props.fallback, onOpt);
+function createLoadingBoundary(fn, fallback, options) {
+  if (!sharedConfig.hydrating) return signals.createLoadingBoundary(fn, fallback, options);
+  let settledSerializationResumeQueued = false;
   return signals.createMemo(() => {
     const o = signals.getOwner();
     const id = o.id;
@@ -706,10 +687,26 @@ function Loading(props) {
       if (mapping && typeof mapping === "object") assetPromise = loadModuleAssets(mapping);
     }
     if (sharedConfig.hydrating && sharedConfig.has(id)) {
-      let ref = sharedConfig.load(id);
+      const ref = sharedConfig.load(id);
       let p;
       if (ref) {
-        if (typeof ref !== "object" || ref.s !== 1) p = ref;else sharedConfig.gather(id);
+        if (typeof ref !== "object" || ref.s == null) p = ref;else if (ref.s === 1 || ref.s === 2) sharedConfig.gather?.(id);else p = ref;
+      }
+      if (ref && typeof ref === "object" && ref.s === 1 && p == null && !settledSerializationResumeQueued) {
+        settledSerializationResumeQueued = true;
+        _pendingBoundaries++;
+        signals.onCleanup(() => {
+          if (!signals.isDisposed(o)) return;
+          sharedConfig.cleanupFragment?.(id);
+        });
+        const set = createBoundaryTrigger();
+        const scheduleResume = () => queueMicrotask(() => resumeBoundaryHydration(o, id, set));
+        if (assetPromise) {
+          assetPromise.then(scheduleResume);
+          return undefined;
+        }
+        scheduleResume();
+        return fallback();
       }
       if (p) {
         _pendingBoundaries++;
@@ -720,12 +717,17 @@ function Loading(props) {
         const set = createBoundaryTrigger();
         if (p !== "$$f") {
           const waitFor = assetPromise ? Promise.all([p, assetPromise]) : p;
-          waitFor.then(() => resumeBoundaryHydration(o, id, set), err => {
-            _pendingBoundaries--;
-            checkHydrationComplete();
-            signals.runWithOwner(o, () => {
-              throw err;
-            });
+          waitFor.then(() => {
+            if (p && typeof p === "object") {
+              p.s = 1;
+            }
+            resumeBoundaryHydration(o, id, set);
+          }, err => {
+            if (p && typeof p === "object") {
+              p.s = 2;
+              p.v = err;
+            }
+            resumeBoundaryHydration(o, id, set);
           });
         } else {
           const afterAssets = () => {
@@ -735,17 +737,16 @@ function Loading(props) {
           };
           if (assetPromise) assetPromise.then(() => queueMicrotask(afterAssets));else queueMicrotask(afterAssets);
         }
-        return props.fallback;
+        return fallback();
       }
     }
-    if (assetPromise) {
+    if (assetPromise && !sharedConfig.has(id)) {
       _pendingBoundaries++;
       const set = createBoundaryTrigger();
       assetPromise.then(() => resumeBoundaryHydration(o, id, set));
       return undefined;
     }
-    const boundary = signals.createLoadingBoundary(() => props.children, () => props.fallback, onOpt);
-    return boundary;
+    return signals.createLoadingBoundary(fn, fallback, options);
   });
 }
 function NoHydration(props) {
@@ -885,6 +886,12 @@ function Errored(props) {
     return typeof f === "function" && f.length ? f(err, reset) : f;
   });
 }
+function Loading(props) {
+  const onOpt = "on" in props ? {
+    on: () => props.on
+  } : undefined;
+  return createLoadingBoundary(() => props.children, () => props.fallback, onOpt);
+}
 
 function ssrHandleError() {}
 function ssrRunInScope() {}
@@ -917,14 +924,6 @@ 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; }
@@ -1061,6 +1060,8 @@ exports.children = children;
 exports.createComponent = createComponent;
 exports.createContext = createContext;
 exports.createEffect = createEffect;
+exports.createErrorBoundary = createErrorBoundary;
+exports.createLoadingBoundary = createLoadingBoundary;
 exports.createMemo = createMemo;
 exports.createOptimistic = createOptimistic;
 exports.createOptimisticStore = createOptimisticStore;

package/dist/dev.js

@@ -1,5 +1,5 @@
-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';
+import { getContext, createMemo as createMemo$1, flatten, getOwner, createRoot, setContext, untrack, createOwner, runWithOwner, createEffect as createEffect$1, createErrorBoundary as createErrorBoundary$1, createLoadingBoundary as createLoadingBoundary$1, onCleanup, isDisposed, 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, markSnapshotScope, flush, peekNextChildId, clearSnapshots, mapArray, repeat } from '@solidjs/signals';
+export { $PROXY, $REFRESH, $TRACK, NotReadyError, action, 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) {
@@ -92,6 +92,7 @@ function drainHydrationCallbacks() {
   setTimeout(() => {
     if (sharedConfig.verifyHydration) sharedConfig.verifyHydration();
     if (globalThis._$HY) globalThis._$HY.done = true;
+    sharedConfig.registry?.clear();
   });
 }
 function checkHydrationComplete() {
@@ -109,23 +110,10 @@ let _createOptimisticStore;
 let _createRenderEffect;
 let _createEffect;
 class MockPromise {
-  static all() {
-    return new MockPromise();
-  }
-  static allSettled() {
-    return new MockPromise();
-  }
-  static any() {
-    return new MockPromise();
-  }
-  static race() {
-    return new MockPromise();
-  }
-  static reject() {
-    return new MockPromise();
-  }
-  static resolve() {
-    return new MockPromise();
+  static {
+    for (const k of ["all", "allSettled", "any", "race", "reject", "resolve"]) {
+      MockPromise[k] = () => new MockPromise();
+    }
   }
   catch() {
     return new MockPromise();
@@ -160,6 +148,28 @@ function syncThenable(value) {
     }
   };
 }
+const NO_HYDRATED_VALUE = Symbol("NO_HYDRATED_VALUE");
+function readHydratedValue(initP, refresh) {
+  if (initP == null) return NO_HYDRATED_VALUE;
+  refresh();
+  if (typeof initP === "object" && initP.s === 2) throw initP.v;
+  return initP?.v ?? initP;
+}
+function readSerializedOrCompute(compute, prev) {
+  if (!sharedConfig.hydrating) return compute(prev);
+  const o = getOwner();
+  let initP;
+  if (sharedConfig.has(o.id)) initP = sharedConfig.load(o.id);
+  const init = readHydratedValue(initP, () => subFetch(compute, prev));
+  return init !== NO_HYDRATED_VALUE ? init : compute(prev);
+}
+function forwardIteratorReturn(it, value) {
+  const returned = it.return?.(value);
+  return returned && typeof returned.then === "function" ? returned : syncThenable(returned ?? {
+    done: true,
+    value
+  });
+}
 function normalizeIterator(it) {
   let first = true;
   let buffered = null;
@@ -186,6 +196,10 @@ function normalizeIterator(it) {
         latest = peek;
       }
       return Promise.resolve(latest);
+    },
+    return(value) {
+      buffered = null;
+      return forwardIteratorReturn(it, value);
     }
   };
 }
@@ -263,6 +277,9 @@ function wrapFirstYield(iterable, activate) {
             });
           }
           return p;
+        },
+        return(value) {
+          return forwardIteratorReturn(srcIt, value);
         }
       };
     }
@@ -345,6 +362,10 @@ function hydrateStoreFromAsyncIterable(coreFn, initialValue, options) {
               if (!r.done) result = process(r);
             }
             return Promise.resolve(result);
+          },
+          return(value) {
+            buffered = null;
+            return forwardIteratorReturn(srcIt, value);
           }
         };
       }
@@ -377,14 +398,7 @@ function hydratedCreateMemo(compute, value, options) {
   }
   const aiResult = hydrateSignalFromAsyncIterable(createMemo$1, compute, value, options);
   if (aiResult !== null) return aiResult;
-  return createMemo$1(prev => {
-    const o = getOwner();
-    if (!sharedConfig.hydrating) return compute(prev);
-    let initP;
-    if (sharedConfig.has(o.id)) initP = sharedConfig.load(o.id);
-    const init = initP?.v ?? initP;
-    return init != null ? (subFetch(compute, prev), init) : compute(prev);
-  }, value, options);
+  return createMemo$1(prev => readSerializedOrCompute(compute, prev), value, options);
 }
 function hydratedCreateSignal(fn, second, third) {
   if (typeof fn !== "function" || !sharedConfig.hydrating) return createSignal$1(fn, second, third);
@@ -410,14 +424,7 @@ function hydratedCreateSignal(fn, second, third) {
   }
   const aiResult = hydrateSignalFromAsyncIterable(createSignal$1, fn, second, third);
   if (aiResult !== null) return aiResult;
-  return createSignal$1(prev => {
-    if (!sharedConfig.hydrating) return fn(prev);
-    const o = getOwner();
-    let initP;
-    if (sharedConfig.has(o.id)) initP = sharedConfig.load(o.id);
-    const init = initP?.v ?? initP;
-    return init != null ? (subFetch(fn, prev), init) : fn(prev);
-  }, second, third);
+  return createSignal$1(prev => readSerializedOrCompute(fn, prev), second, third);
 }
 function hydratedCreateErrorBoundary(fn, fallback) {
   if (!sharedConfig.hydrating) return createErrorBoundary$1(fn, fallback);
@@ -463,24 +470,10 @@ function hydratedCreateOptimistic(fn, second, third) {
   }
   const aiResult = hydrateSignalFromAsyncIterable(createOptimistic$1, fn, second, third);
   if (aiResult !== null) return aiResult;
-  return createOptimistic$1(prev => {
-    const o = getOwner();
-    if (!sharedConfig.hydrating) return fn(prev);
-    let initP;
-    if (sharedConfig.has(o.id)) initP = sharedConfig.load(o.id);
-    const init = initP?.v ?? initP;
-    return init != null ? (subFetch(fn, prev), init) : fn(prev);
-  }, second, third);
+  return createOptimistic$1(prev => readSerializedOrCompute(fn, prev), second, third);
 }
 function wrapStoreFn(fn) {
-  return draft => {
-    const o = getOwner();
-    if (!sharedConfig.hydrating) return fn(draft);
-    let initP;
-    if (sharedConfig.has(o.id)) initP = sharedConfig.load(o.id);
-    const init = initP?.v ?? initP;
-    return init != null ? (subFetch(fn, draft), init) : fn(draft);
-  };
+  return draft => readSerializedOrCompute(() => fn(draft), draft);
 }
 function hydrateStoreLikeFn(coreFn, fn, initialValue, options, ssrSource) {
   if (ssrSource === "client") {
@@ -503,11 +496,8 @@ function hydrateStoreLikeFn(coreFn, fn, initialValue, options, ssrSource) {
       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;
-          }
+          const init = readHydratedValue(initP, () => subFetch(fn, draft));
+          if (init !== NO_HYDRATED_VALUE) return init;
         }
         return fn(draft);
       }
@@ -574,14 +564,7 @@ function hydratedEffect(coreFn, compute, effectFn, value, options) {
     return;
   }
   markTopLevelSnapshotScope();
-  coreFn(prev => {
-    const o = getOwner();
-    if (!sharedConfig.hydrating) return compute(prev);
-    let initP;
-    if (sharedConfig.has(o.id)) initP = sharedConfig.load(o.id);
-    const init = initP?.v ?? initP;
-    return init != null ? (subFetch(compute, prev), init) : compute(prev);
-  }, effectFn, value, options);
+  coreFn(prev => readSerializedOrCompute(compute, prev), effectFn, value, options);
 }
 function hydratedCreateRenderEffect(compute, effectFn, value, options) {
   return hydratedEffect(createRenderEffect$1, compute, effectFn, value, options);
@@ -679,7 +662,7 @@ function resumeBoundaryHydration(o, id, set) {
     checkHydrationComplete();
     return;
   }
-  sharedConfig.gather(id);
+  sharedConfig.gather?.(id);
   _hydratingValue = true;
   markSnapshotScope(o);
   _snapshotRootOwner = o;
@@ -691,11 +674,9 @@ function resumeBoundaryHydration(o, id, set) {
   flush();
   checkHydrationComplete();
 }
-function Loading(props) {
-  const onOpt = props.on ? {
-    on: () => props.on()
-  } : undefined;
-  if (!sharedConfig.hydrating) return createLoadingBoundary(() => props.children, () => props.fallback, onOpt);
+function createLoadingBoundary(fn, fallback, options) {
+  if (!sharedConfig.hydrating) return createLoadingBoundary$1(fn, fallback, options);
+  let settledSerializationResumeQueued = false;
   return createMemo$1(() => {
     const o = getOwner();
     const id = o.id;
@@ -705,10 +686,26 @@ function Loading(props) {
       if (mapping && typeof mapping === "object") assetPromise = loadModuleAssets(mapping);
     }
     if (sharedConfig.hydrating && sharedConfig.has(id)) {
-      let ref = sharedConfig.load(id);
+      const ref = sharedConfig.load(id);
       let p;
       if (ref) {
-        if (typeof ref !== "object" || ref.s !== 1) p = ref;else sharedConfig.gather(id);
+        if (typeof ref !== "object" || ref.s == null) p = ref;else if (ref.s === 1 || ref.s === 2) sharedConfig.gather?.(id);else p = ref;
+      }
+      if (ref && typeof ref === "object" && ref.s === 1 && p == null && !settledSerializationResumeQueued) {
+        settledSerializationResumeQueued = true;
+        _pendingBoundaries++;
+        onCleanup(() => {
+          if (!isDisposed(o)) return;
+          sharedConfig.cleanupFragment?.(id);
+        });
+        const set = createBoundaryTrigger();
+        const scheduleResume = () => queueMicrotask(() => resumeBoundaryHydration(o, id, set));
+        if (assetPromise) {
+          assetPromise.then(scheduleResume);
+          return undefined;
+        }
+        scheduleResume();
+        return fallback();
       }
       if (p) {
         _pendingBoundaries++;
@@ -719,12 +716,17 @@ function Loading(props) {
         const set = createBoundaryTrigger();
         if (p !== "$$f") {
           const waitFor = assetPromise ? Promise.all([p, assetPromise]) : p;
-          waitFor.then(() => resumeBoundaryHydration(o, id, set), err => {
-            _pendingBoundaries--;
-            checkHydrationComplete();
-            runWithOwner(o, () => {
-              throw err;
-            });
+          waitFor.then(() => {
+            if (p && typeof p === "object") {
+              p.s = 1;
+            }
+            resumeBoundaryHydration(o, id, set);
+          }, err => {
+            if (p && typeof p === "object") {
+              p.s = 2;
+              p.v = err;
+            }
+            resumeBoundaryHydration(o, id, set);
           });
         } else {
           const afterAssets = () => {
@@ -734,17 +736,16 @@ function Loading(props) {
           };
           if (assetPromise) assetPromise.then(() => queueMicrotask(afterAssets));else queueMicrotask(afterAssets);
         }
-        return props.fallback;
+        return fallback();
       }
     }
-    if (assetPromise) {
+    if (assetPromise && !sharedConfig.has(id)) {
       _pendingBoundaries++;
       const set = createBoundaryTrigger();
       assetPromise.then(() => resumeBoundaryHydration(o, id, set));
       return undefined;
     }
-    const boundary = createLoadingBoundary(() => props.children, () => props.fallback, onOpt);
-    return boundary;
+    return createLoadingBoundary$1(fn, fallback, options);
   });
 }
 function NoHydration(props) {
@@ -884,6 +885,12 @@ function Errored(props) {
     return typeof f === "function" && f.length ? f(err, reset) : f;
   });
 }
+function Loading(props) {
+  const onOpt = "on" in props ? {
+    on: () => props.on
+  } : undefined;
+  return createLoadingBoundary(() => props.children, () => props.fallback, onOpt);
+}
 
 function ssrHandleError() {}
 function ssrRunInScope() {}
@@ -896,4 +903,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 { $DEVCOMP, DEV, Errored, For, Hydration, Loading, Match, NoHydrateContext, NoHydration, Repeat, Show, Switch, children, createComponent, createContext, createEffect, createMemo, createOptimistic, createOptimisticStore, createProjection, createRenderEffect, createSignal, createStore, createUniqueId, enableHydration, lazy, sharedConfig, ssrHandleError, ssrRunInScope, useContext };
+export { $DEVCOMP, DEV, Errored, For, Hydration, Loading, Match, NoHydrateContext, NoHydration, Repeat, Show, Switch, children, createComponent, createContext, createEffect, createErrorBoundary, createLoadingBoundary, createMemo, createOptimistic, createOptimisticStore, createProjection, createRenderEffect, createSignal, createStore, createUniqueId, enableHydration, lazy, sharedConfig, ssrHandleError, ssrRunInScope, useContext };