solid-js 2.0.0-beta.0 → 2.0.0-beta.10

package/dist/server.js

@@ -1,10 +1,15 @@
-import { getOwner, getNextChildId, createOwner, runWithOwner, onCleanup, NotReadyError, isWrappable, setContext, getContext, flatten, createRoot } from '@solidjs/signals';
-export { $PROXY, $TRACK, NotReadyError, createOwner, createRoot, flatten, getNextChildId, getOwner, isEqual, isWrappable, merge, omit, onCleanup, runWithOwner, snapshot, storePath } from '@solidjs/signals';
+import { getOwner, getContext, getNextChildId, createOwner, NotReadyError, runWithOwner, onCleanup, isWrappable, setContext, flatten, createRoot } from '@solidjs/signals';
+export { $PROXY, $REFRESH, $TRACK, NotReadyError, createOwner, createRoot, enableExternalSource, enforceLoadingBoundary, flatten, getNextChildId, getOwner, isDisposed, isEqual, isWrappable, merge, omit, onCleanup, runWithOwner, snapshot, storePath } from '@solidjs/signals';
 
+const NoHydrateContext = {
+  id: Symbol("NoHydrateContext"),
+  defaultValue: false
+};
 const sharedConfig = {
   getNextContextId() {
     const o = getOwner();
     if (!o) throw new Error(`getNextContextId cannot be used under non-hydrating context`);
+    if (getContext(NoHydrateContext)) return undefined;
     return getNextChildId(o);
   }
 };
@@ -22,38 +27,82 @@ function runWithObserver(comp, fn) {
 function getObserver() {
   return Observer;
 }
-function createSignal(first, second, third) {
+function createDeferredPromise() {
+  let settled = false;
+  let resolvePromise;
+  let rejectPromise;
+  const promise = new Promise((resolve, reject) => {
+    resolvePromise = resolve;
+    rejectPromise = reject;
+  });
+  return {
+    promise,
+    resolve(value) {
+      if (settled) return;
+      settled = true;
+      promise.s = 1;
+      promise.v = value;
+      resolvePromise(value);
+    },
+    reject(error) {
+      if (settled) return;
+      settled = true;
+      promise.s = 2;
+      promise.v = error;
+      rejectPromise(error);
+    }
+  };
+}
+function subscribePendingRetry(error, retry) {
+  if (!(error instanceof NotReadyError)) return false;
+  error.source?.then(() => retry(), () => retry());
+  return true;
+}
+function settleServerAsync(initial, rerun, deferred, onSuccess, onError, isDisposed) {
+  let first = true;
+  const attempt = () => {
+    if (isDisposed()) return;
+    let current;
+    try {
+      current = first ? initial : rerun();
+      first = false;
+    } catch (error) {
+      if (subscribePendingRetry(error, attempt)) return;
+      onError(error);
+      deferred.reject(error);
+      return;
+    }
+    Promise.resolve(current).then(value => {
+      if (isDisposed()) return;
+      deferred.resolve(onSuccess(value));
+    }, error => {
+      if (isDisposed()) return;
+      if (subscribePendingRetry(error, attempt)) return;
+      onError(error);
+      deferred.reject(error);
+    });
+  };
+  attempt();
+}
+function createSignal(first, second) {
   if (typeof first === "function") {
-    const ssrSource = third?.ssrSource;
-    if (ssrSource === "initial" || ssrSource === "client") {
-      createOwner();
-      let value = second;
-      return [() => value, v => {
-        return value = typeof v === "function" ? v(value) : v;
-      }];
-    }
-    const memoOpts = third?.deferStream || ssrSource ? {
-      deferStream: third?.deferStream,
-      ssrSource
+    const opts = second?.deferStream || second?.ssrSource ? {
+      deferStream: second?.deferStream,
+      ssrSource: second?.ssrSource
     } : undefined;
-    const memo = createMemo(p => {
-      let value = first(p ? p[0]() : second);
-      return [() => value, v => {
-        return value = typeof v === "function" ? v(value) : v;
-      }];
-    }, undefined, memoOpts);
-    return [() => memo()[0](), v => memo()[1](v)];
+    const memo = createMemo(prev => first(prev), opts);
+    return [memo, () => undefined];
   }
   return [() => first, v => {
     return first = typeof v === "function" ? v(first) : v;
   }];
 }
-function createMemo(compute, value, options) {
+function createMemo(compute, options) {
   const ctx = sharedConfig.context;
   const owner = createOwner();
   const comp = {
     owner,
-    value: value,
+    value: undefined,
     compute: compute,
     error: undefined,
     computed: false,
@@ -64,21 +113,22 @@ function createMemo(compute, value, options) {
   }));
   function update() {
     if (comp.disposed) return;
+    const run = () => runWithOwner(owner, () => runWithObserver(comp, () => comp.compute(comp.value)));
     try {
       comp.error = undefined;
-      const result = runWithOwner(owner, () => runWithObserver(comp, () => comp.compute(comp.value)));
+      const result = run();
       comp.computed = true;
-      processResult(comp, result, owner, ctx, options?.deferStream, options?.ssrSource);
+      processResult(comp, result, owner, ctx, options?.deferStream, options?.ssrSource, run);
     } catch (err) {
       if (err instanceof NotReadyError) {
-        err.source?.then(() => update());
+        subscribePendingRetry(err, update);
       }
       comp.error = err;
       comp.computed = true;
     }
   }
   const ssrSource = options?.ssrSource;
-  if (ssrSource === "initial" || ssrSource === "client") {
+  if (ssrSource === "client") {
     comp.computed = true;
   } else if (!options?.lazy) {
     update();
@@ -153,75 +203,128 @@ function createDeepProxy(target, patches, basePath = []) {
   };
   return new Proxy(target, handler);
 }
-function processResult(comp, result, owner, ctx, deferStream, ssrSource) {
+function processResult(comp, result, owner, ctx, deferStream, ssrSource, rerun) {
   if (comp.disposed) return;
   const id = owner.id;
-  const uninitialized = comp.value === undefined;
+  const noHydrate = getContext(NoHydrateContext, owner);
   if (result instanceof Promise) {
-    result.then(v => {
-      result.s = 1;
-      result.v = v;
-      if (comp.disposed) return;
-      comp.value = v;
+    if (result.s === 1) {
+      comp.value = result.v;
       comp.error = undefined;
-    }, () => {});
-    if (ctx?.async && ctx.serialize && id) ctx.serialize(id, result, deferStream);
-    if (uninitialized) {
-      comp.error = new NotReadyError(result);
+      return;
     }
+    if (result.s === 2) {
+      comp.error = result.v;
+      return;
+    }
+    const deferred = createDeferredPromise();
+    if (ctx?.async && ctx.serialize && id && !noHydrate) ctx.serialize(id, deferred.promise, deferStream);
+    settleServerAsync(result, () => rerun ? rerun() : result, deferred, value => {
+      result.s = 1;
+      result.v = value;
+      comp.value = value;
+      comp.error = undefined;
+      return value;
+    }, error => {
+      result.s = 2;
+      result.v = error;
+      comp.error = error;
+    }, () => comp.disposed);
+    comp.error = new NotReadyError(deferred.promise);
     return;
   }
   const iterator = result?.[Symbol.asyncIterator];
   if (typeof iterator === "function") {
-    const iter = iterator.call(result);
     if (ssrSource === "hybrid") {
-      const promise = iter.next().then(v => {
-        promise.s = 1;
-        promise.v = v.value;
-        if (comp.disposed) return;
-        comp.value = v.value;
+      let currentResult = result;
+      let iter;
+      const deferred = createDeferredPromise();
+      const runFirst = () => {
+        const source = currentResult ?? (rerun ? rerun() : result);
+        currentResult = undefined;
+        const nextIterator = source?.[Symbol.asyncIterator];
+        if (typeof nextIterator !== "function") {
+          throw new Error("Expected async iterator while retrying server createMemo");
+        }
+        iter = nextIterator.call(source);
+        return iter.next().then(value => {
+          if (!value.done) closeAsyncIterator(iter);
+          return value.value;
+        });
+      };
+      settleServerAsync(runFirst(), runFirst, deferred, value => {
+        comp.value = value;
         comp.error = undefined;
-      }, () => {});
-      if (ctx?.async && ctx.serialize && id) ctx.serialize(id, promise, deferStream);
-      if (uninitialized) {
-        comp.error = new NotReadyError(promise);
-      }
+        return value;
+      }, error => {
+        comp.error = error;
+      }, () => comp.disposed);
+      if (ctx?.async && ctx.serialize && id && !noHydrate) ctx.serialize(id, deferred.promise, deferStream);
+      comp.error = new NotReadyError(deferred.promise);
     } else {
-      const firstNext = iter.next();
-      const firstReady = firstNext.then(r => {
-        if (comp.disposed) return;
-        if (!r.done) {
-          comp.value = r.value;
-          comp.error = undefined;
+      let currentResult = result;
+      let iter;
+      let firstResult;
+      const deferred = createDeferredPromise();
+      const runFirst = () => {
+        const source = currentResult ?? (rerun ? rerun() : result);
+        currentResult = undefined;
+        const nextIterator = source?.[Symbol.asyncIterator];
+        if (typeof nextIterator !== "function") {
+          throw new Error("Expected async iterator while retrying server createMemo");
         }
-      }, () => {});
-      let servedFirst = false;
-      const tapped = {
-        [Symbol.asyncIterator]: () => ({
-          next() {
-            if (!servedFirst) {
-              servedFirst = true;
-              return firstNext.then(r => {
-                if (!r.done && !comp.disposed) comp.value = r.value;
-                return r;
-              });
-            }
-            return iter.next().then(r => r);
-          }
-        })
+        iter = nextIterator.call(source);
+        return iter.next().then(value => {
+          firstResult = value;
+          return Promise.resolve();
+        });
       };
-      if (ctx?.async && ctx.serialize && id) ctx.serialize(id, tapped, deferStream);
-      if (uninitialized) {
-        comp.error = new NotReadyError(firstReady);
+      settleServerAsync(runFirst(), runFirst, deferred, () => {
+        const resolved = firstResult;
+        if (resolved && !resolved.done) {
+          comp.value = resolved.value;
+        }
+        comp.error = undefined;
+        return undefined;
+      }, error => {
+        comp.error = error;
+      }, () => comp.disposed);
+      if (ctx?.async && ctx.serialize && id && !noHydrate) {
+        let tappedFirst = true;
+        const tapped = {
+          [Symbol.asyncIterator]: () => ({
+            next() {
+              if (tappedFirst) {
+                tappedFirst = false;
+                return deferred.promise.then(() => firstResult?.done ? {
+                  done: true,
+                  value: undefined
+                } : firstResult);
+              }
+              return iter.next().then(r => r);
+            },
+            return(value) {
+              return iter.return?.(value);
+            }
+          })
+        };
+        ctx.serialize(id, tapped, deferStream);
       }
+      comp.error = new NotReadyError(deferred.promise);
     }
     return;
   }
   comp.value = result;
 }
-function serverEffect(compute, effectFn, value, options) {
+function closeAsyncIterator(iter, value) {
+  const returned = iter.return?.(value);
+  if (returned && typeof returned.then === "function") {
+    returned.then(undefined, () => {});
+  }
+}
+function serverEffect(compute, effectFn, options) {
   const ssrSource = options?.ssrSource;
-  if (ssrSource === "client" || ssrSource === "initial") {
+  if (ssrSource === "client") {
     createOwner();
     return;
   }
@@ -229,7 +332,7 @@ function serverEffect(compute, effectFn, value, options) {
   const owner = createOwner();
   const comp = {
     owner,
-    value: value,
+    value: undefined,
     compute: compute,
     error: undefined,
     computed: true,
@@ -241,19 +344,19 @@ function serverEffect(compute, effectFn, value, options) {
     }));
   }
   try {
-    const result = runWithOwner(owner, () => runWithObserver(comp, () => compute(value)));
+    const result = runWithOwner(owner, () => runWithObserver(comp, () => compute(undefined)));
     if (ssrSource) {
       processResult(comp, result, owner, ctx, options?.deferStream, ssrSource);
     }
-    effectFn?.(ssrSource ? comp.value ?? result : result, value);
+    effectFn?.(ssrSource ? comp.value ?? result : result, undefined);
   } catch (err) {
   }
 }
-function createEffect(compute, effect, value, options) {
-  serverEffect(compute, undefined, value, options);
+function createEffect(compute, effect, options) {
+  serverEffect(compute, undefined, options);
 }
-function createRenderEffect(compute, effectFn, value, options) {
-  serverEffect(compute, effectFn, value, options);
+function createRenderEffect(compute, effectFn, options) {
+  serverEffect(compute, effectFn, options);
 }
 function createTrackedEffect(compute, options) {
   const o = getOwner();
@@ -264,8 +367,8 @@ function createReaction(effectFn, options) {
     tracking();
   };
 }
-function createOptimistic(first, second, third) {
-  return createSignal(first, second, third);
+function createOptimistic(first, second) {
+  return createSignal(first, second);
 }
 function setProperty(state, property, value) {
   if (state[property] === value) return;
@@ -275,7 +378,7 @@ function setProperty(state, property, value) {
 }
 function createStore(first, second) {
   if (typeof first === "function") {
-    const store = createProjection(first, second ?? {});
+    const store = createProjection(first, second);
     return [store, fn => fn(store)];
   }
   const state = first;
@@ -298,11 +401,11 @@ function createPendingProxy(state, source) {
     pending = false;
   }];
 }
-function createProjection(fn, initialValue = {}, options) {
+function createProjection(fn, initialValue, options) {
   const ctx = sharedConfig.context;
   const owner = createOwner();
   const [state] = createStore(initialValue);
-  if (options?.ssrSource === "initial" || options?.ssrSource === "client") {
+  if (options?.ssrSource === "client") {
     return state;
   }
   let disposed = false;
@@ -313,100 +416,131 @@ function createProjection(fn, initialValue = {}, options) {
   const useProxy = ssrSource !== "hybrid";
   const patches = [];
   const draft = useProxy ? createDeepProxy(state, patches) : state;
-  const result = runWithOwner(owner, () => fn(draft));
+  const runProjection = () => runWithOwner(owner, () => fn(draft));
+  const result = runProjection();
   const iteratorFn = result?.[Symbol.asyncIterator];
   if (typeof iteratorFn === "function") {
-    const iter = iteratorFn.call(result);
     if (ssrSource === "hybrid") {
-      const promise = iter.next().then(r => {
-        promise.s = 1;
-        if (disposed) {
-          promise.v = state;
-          return;
+      let currentResult = result;
+      let iter;
+      const deferred = createDeferredPromise();
+      const [pending, markReady] = createPendingProxy(state, deferred.promise);
+      const runFirst = () => {
+        const source = currentResult ?? runProjection();
+        currentResult = undefined;
+        const nextIterator = source?.[Symbol.asyncIterator];
+        if (typeof nextIterator !== "function") {
+          throw new Error("Expected async iterator while retrying server createProjection");
         }
-        if (r.value !== undefined && r.value !== state) {
-          Object.assign(state, r.value);
+        iter = nextIterator.call(source);
+        return iter.next().then(r => {
+          if (!r.done) closeAsyncIterator(iter);
+          return r.value;
+        });
+      };
+      settleServerAsync(runFirst(), runFirst, deferred, value => {
+        if (value !== undefined && value !== state) {
+          Object.assign(state, value);
         }
-        promise.v = state;
         markReady();
-      }, () => {});
-      if (ctx?.async && !ctx.noHydrate && owner.id) ctx.serialize(owner.id, promise, options?.deferStream);
-      const [pending, markReady] = createPendingProxy(state, promise);
+        return state;
+      }, error => {
+        markReady();
+      }, () => disposed);
+      if (ctx?.async && !getContext(NoHydrateContext) && owner.id) ctx.serialize(owner.id, deferred.promise, options?.deferStream);
       return pending;
     } else {
-      const firstNext = iter.next();
-      const firstReady = firstNext.then(r => {
-        if (disposed) return;
+      let currentResult = result;
+      let iter;
+      let firstResult;
+      const deferred = createDeferredPromise();
+      const [pending, markReady] = createPendingProxy(state, deferred.promise);
+      const runFirst = () => {
+        const source = currentResult ?? runProjection();
+        currentResult = undefined;
+        const nextIterator = source?.[Symbol.asyncIterator];
+        if (typeof nextIterator !== "function") {
+          throw new Error("Expected async iterator while retrying server createProjection");
+        }
+        iter = nextIterator.call(source);
+        return iter.next().then(value => {
+          firstResult = value;
+          return Promise.resolve();
+        });
+      };
+      settleServerAsync(runFirst(), runFirst, deferred, () => {
         patches.length = 0;
-        if (!r.done) {
-          if (r.value !== undefined && r.value !== draft) {
-            Object.assign(state, r.value);
-          }
+        const resolved = firstResult;
+        if (resolved && !resolved.done && resolved.value !== undefined && resolved.value !== draft) {
+          Object.assign(state, resolved.value);
         }
         markReady(JSON.parse(JSON.stringify(state)));
-      }, () => {
+        return undefined;
+      }, error => {
         markReady();
-      });
-      let servedFirst = false;
-      const tapped = {
-        [Symbol.asyncIterator]: () => ({
-          next() {
-            if (!servedFirst) {
-              servedFirst = true;
-              return firstNext.then(r => {
-                if (!r.done && !disposed) return {
-                  done: false,
-                  value: state
+      }, () => disposed);
+      if (ctx?.async && !getContext(NoHydrateContext) && owner.id) {
+        let tappedFirst = true;
+        const tapped = {
+          [Symbol.asyncIterator]: () => ({
+            next() {
+              if (tappedFirst) {
+                tappedFirst = false;
+                return deferred.promise.then(() => {
+                  if (firstResult?.done) return {
+                    done: true,
+                    value: undefined
+                  };
+                  return {
+                    done: false,
+                    value: JSON.parse(JSON.stringify(state))
+                  };
+                });
+              }
+              return iter.next().then(r => {
+                if (disposed) return {
+                  done: true,
+                  value: undefined
                 };
+                const flushed = patches.splice(0);
+                if (!r.done) {
+                  if (r.value !== undefined && r.value !== draft) {
+                    Object.assign(state, r.value);
+                  }
+                  return {
+                    done: false,
+                    value: flushed
+                  };
+                }
                 return {
-                  done: r.done,
+                  done: true,
                   value: undefined
                 };
               });
+            },
+            return(value) {
+              return iter.return?.(value);
             }
-            return iter.next().then(r => {
-              if (disposed) return {
-                done: true,
-                value: undefined
-              };
-              const flushed = patches.splice(0);
-              if (!r.done) {
-                if (r.value !== undefined && r.value !== draft) {
-                  Object.assign(state, r.value);
-                }
-                return {
-                  done: false,
-                  value: flushed
-                };
-              }
-              return {
-                done: true,
-                value: undefined
-              };
-            });
-          }
-        })
-      };
-      if (ctx?.async && !ctx.noHydrate && owner.id) ctx.serialize(owner.id, tapped, options?.deferStream);
-      const [pending, markReady] = createPendingProxy(state, firstReady);
+          })
+        };
+        ctx.serialize(owner.id, tapped, options?.deferStream);
+      }
       return pending;
     }
   }
   if (result instanceof Promise) {
-    const promise = result.then(v => {
-      promise.s = 1;
-      if (disposed) {
-        promise.v = state;
-        return;
+    const deferred = createDeferredPromise();
+    const [pending, markReady] = createPendingProxy(state, deferred.promise);
+    settleServerAsync(result, () => runProjection(), deferred, value => {
+      if (value !== undefined && value !== state) {
+        Object.assign(state, value);
       }
-      if (v !== undefined && v !== state) {
-        Object.assign(state, v);
-      }
-      promise.v = state;
       markReady();
-    }, () => {});
-    if (ctx?.async && !ctx.noHydrate && owner.id) ctx.serialize(owner.id, promise, options?.deferStream);
-    const [pending, markReady] = createPendingProxy(state, promise);
+      return state;
+    }, error => {
+      markReady();
+    }, () => disposed);
+    if (ctx?.async && !getContext(NoHydrateContext) && owner.id) ctx.serialize(owner.id, deferred.promise, options?.deferStream);
     return pending;
   }
   if (result !== undefined && result !== state && result !== draft) {
@@ -433,68 +567,111 @@ function deep(store) {
   return store;
 }
 function mapArray(list, mapFn, options = {}) {
-  const root = getOwner();
-  const id = getNextChildId(root);
-  return () => {
+  const parent = createOwner();
+  return createMemo(() => {
     const items = list();
     let s = [];
     if (items && items.length) {
-      for (let i = 0, len = items.length; i < len; i++) {
-        const o = createOwner({
-          id: id + i
-        });
-        s.push(runWithOwner(o, () => mapFn(() => items[i], () => i)));
-      }
-    } else if (options.fallback) s = [options.fallback()];
+      runWithOwner(parent, () => {
+        for (let i = 0, len = items.length; i < len; i++) {
+          const o = createOwner();
+          s.push(runWithOwner(o, () => mapFn(() => items[i], () => i)));
+        }
+      });
+    } else if (options.fallback) {
+      s = [runWithOwner(parent, () => {
+        const fo = createOwner();
+        return runWithOwner(fo, () => options.fallback());
+      })];
+    }
     return s;
-  };
+  });
 }
 function repeat(count, mapFn, options = {}) {
   const owner = createOwner();
-  const len = count();
-  const offset = options.from?.() || 0;
-  let s = [];
-  if (len) {
-    runWithOwner(owner, () => {
-      for (let i = 0; i < len; i++) {
-        const itemOwner = createOwner();
-        s.push(runWithOwner(itemOwner, () => mapFn(i + offset)));
-      }
-    });
-  } else if (options.fallback) {
-    s = [runWithOwner(owner, () => {
-      const fo = createOwner();
-      return runWithOwner(fo, () => options.fallback());
-    })];
-  }
-  return () => s;
+  return createMemo(() => {
+    const len = count();
+    const offset = options.from?.() || 0;
+    if (!len) {
+      if (!options.fallback) return [];
+      return [runWithOwner(owner, () => {
+        const fallbackOwner = createOwner();
+        return runWithOwner(fallbackOwner, () => options.fallback());
+      })];
+    }
+    return runWithOwner(owner, () => Array.from({
+      length: len
+    }, (_, i) => {
+      const itemOwner = createOwner();
+      return runWithOwner(itemOwner, () => mapFn(i + offset));
+    }));
+  });
 }
 const ErrorContext = {
   id: Symbol("ErrorContext"),
   defaultValue: null
 };
+function runWithBoundaryErrorContext(owner, render, onError, context, boundaryId) {
+  const prevCtx = sharedConfig.context;
+  const prevBoundary = context?._currentBoundaryId;
+  if (context) {
+    sharedConfig.context = context;
+    if (boundaryId !== undefined) context._currentBoundaryId = boundaryId;
+  }
+  try {
+    return runWithOwner(owner, () => {
+      const parentHandler = getContext(ErrorContext);
+      setContext(ErrorContext, err => onError(err, parentHandler));
+      return render();
+    });
+  } finally {
+    if (context) {
+      if (boundaryId !== undefined) context._currentBoundaryId = prevBoundary;
+      sharedConfig.context = prevCtx;
+    }
+  }
+}
 function createErrorBoundary(fn, fallback) {
   const ctx = sharedConfig.context;
-  const owner = createOwner();
   const parent = getOwner();
-  if (parent?.id != null) getNextChildId(parent);
-  owner.id = owner.id + "0";
-  return runWithOwner(owner, () => {
+  const owner = createOwner();
+  const resolve = () => {
+    const resolved = ctx.resolve(runWithOwner(createOwner(), fn));
+    if (resolved?.p?.length) throw new NotReadyError(Promise.all(resolved.p));
+    return resolved;
+  };
+  const renderFallback = err => ctx ? runWithOwner(parent, () => {
+    const fallbackOwner = createOwner();
+    return runWithOwner(fallbackOwner, () => fallback(err, () => {}));
+  }) : fallback(err, () => {});
+  const serializeError = err => {
+    if (ctx && owner.id && !runWithOwner(owner, () => getContext(NoHydrateContext))) {
+      ctx.serialize(owner.id, err);
+    }
+  };
+  const handleError = err => {
+    serializeError(err);
+    return renderFallback(err);
+  };
+  return () => {
     let result;
-    setContext(ErrorContext, err => {
-      if (ctx && !ctx.noHydrate && owner.id) ctx.serialize(owner.id, err);
-      result = fallback(err, () => {});
-    });
+    let handled = false;
+    if (ctx) owner.dispose(false);
     try {
-      result = fn();
+      result = ctx ? runWithBoundaryErrorContext(owner, resolve, err => {
+        if (err instanceof NotReadyError) throw err;
+        handled = true;
+        result = handleError(err);
+        throw err;
+      }) : runWithOwner(owner, fn);
     } catch (err) {
-      if (ctx && !ctx.noHydrate && owner.id) ctx.serialize(owner.id, err);
-      result = fallback(err, () => {});
+      if (err instanceof NotReadyError) throw err;
+      result = handled ? result : handleError(err);
     }
-    return () => result;
-  });
+    return result;
+  };
 }
-function createLoadBoundary(fn, fallback) {
+function createLoadingBoundary$1(fn, fallback, options) {
   try {
     const result = fn();
     return () => result;
@@ -505,6 +682,10 @@ function createLoadBoundary(fn, fallback) {
     throw err;
   }
 }
+function createRevealOrder(fn, _options) {
+  const o = createOwner();
+  return runWithOwner(o, fn);
+}
 function untrack(fn) {
   return fn();
 }
@@ -557,10 +738,10 @@ function useContext(context) {
   return getContext(context);
 }
 function children(fn) {
-  const c = createMemo(fn, undefined, {
+  const c = createMemo(fn, {
     lazy: true
   });
-  const memo = createMemo(() => flatten(c()), undefined, {
+  const memo = createMemo(() => flatten(c()), {
     lazy: true
   });
   memo.toArray = () => {
@@ -570,7 +751,9 @@ function children(fn) {
   return memo;
 }
 function ssrRunInScope(fn) {
-  return fn;
+  const owner = getOwner();
+  if (!owner) return fn;
+  return Array.isArray(fn) ? fn.map(hole => () => runWithOwner(owner, hole)) : () => runWithOwner(owner, fn);
 }
 
 function enableHydration() {}
@@ -589,20 +772,23 @@ function lazy(fn, moduleUrl) {
     return p;
   };
   const wrap = props => {
-    if (!moduleUrl) {
+    const noHydrate = getContext(NoHydrateContext);
+    if (!noHydrate && !moduleUrl) {
       throw new Error("lazy() used in SSR without a moduleUrl. " + "All lazy() components require a moduleUrl for correct hydration. " + "This is typically injected by the bundler plugin.");
     }
-    if (!sharedConfig.context?.resolveAssets) {
+    if (!noHydrate && !sharedConfig.context?.resolveAssets) {
       throw new Error(`lazy() called with moduleUrl "${moduleUrl}" but no asset manifest is set. ` + "Pass a manifest option to renderToStream/renderToString.");
     }
     load();
     const ctx = sharedConfig.context;
-    if (!ctx?.registerAsset || !ctx.resolveAssets) return;
+    if (!ctx?.registerAsset || !ctx.resolveAssets || !moduleUrl) return;
     const assets = ctx.resolveAssets(moduleUrl);
     if (assets) {
       for (let i = 0; i < assets.css.length; i++) ctx.registerAsset("style", assets.css[i]);
-      for (let i = 0; i < assets.js.length; i++) ctx.registerAsset("module", assets.js[i]);
-      ctx.registerModule?.(moduleUrl, assets.js[0]);
+      if (!noHydrate) {
+        for (let i = 0; i < assets.js.length; i++) ctx.registerAsset("module", assets.js[i]);
+        ctx.registerModule?.(moduleUrl, assets.js[0]);
+      }
     }
     if (ctx?.async) {
       ctx.block(p.then(() => {
@@ -615,10 +801,166 @@ function lazy(fn, moduleUrl) {
     });
   };
   wrap.preload = load;
+  wrap.moduleUrl = moduleUrl;
   return wrap;
 }
 function createUniqueId() {
-  return sharedConfig.getNextContextId();
+  const o = getOwner();
+  if (!o) throw new Error(`createUniqueId cannot be used outside of a reactive context`);
+  return getNextChildId(o);
+}
+
+const RevealGroupContext = {
+  id: Symbol("RevealGroupContext"),
+  defaultValue: null
+};
+function ssrHandleError(err) {
+  if (err instanceof NotReadyError) {
+    return err.source;
+  }
+  const handler = getContext(ErrorContext);
+  if (handler) {
+    handler(err);
+    return;
+  }
+  throw err;
+}
+function createLoadingBoundary(fn, fallback, options) {
+  const currentCtx = sharedConfig.context;
+  if (!currentCtx) {
+    return createLoadingBoundary$1(fn, fallback);
+  }
+  const ctx = currentCtx;
+  const parent = getOwner();
+  const parentHandler = parent && runWithOwner(parent, () => getContext(ErrorContext));
+  const revealGroup = parent && runWithOwner(parent, () => getContext(RevealGroupContext));
+  const o = createOwner();
+  const id = o.id;
+  o.id = id + "00";
+  let done;
+  let handledRenderError;
+  let retryPromise;
+  let serializeBuffer = [];
+  const bufferedCtx = Object.create(ctx);
+  bufferedCtx.serialize = (id, value, deferStream) => {
+    serializeBuffer.push([id, value, deferStream]);
+  };
+  bufferedCtx._currentBoundaryId = id;
+  function flushSerializeBuffer() {
+    for (const args of serializeBuffer) ctx.serialize(args[0], args[1], args[2]);
+    serializeBuffer = [];
+  }
+  function commitBoundaryState() {
+    flushSerializeBuffer();
+    const modules = ctx.getBoundaryModules?.(id);
+    if (modules) ctx.serialize(id + "_assets", modules);
+  }
+  function runLoadingPhase(render) {
+    handledRenderError = undefined;
+    return runWithBoundaryErrorContext(o, render, (err, parentHandler) => {
+      handledRenderError = err;
+      if (done?.(undefined, err)) throw err;
+      if (parentHandler) {
+        parentHandler(err);
+        return;
+      }
+      throw err;
+    }, bufferedCtx, id);
+  }
+  function finalizeError(err) {
+    if (handledRenderError === err) {
+      handledRenderError = undefined;
+      return;
+    }
+    if (done?.(undefined, err)) return;
+    if (!parentHandler) throw err;
+    try {
+      runWithOwner(parent, () => parentHandler(err));
+    } catch (caught) {
+      if (caught !== err) throw caught;
+    }
+  }
+  function runDiscovery() {
+    o.dispose(false);
+    serializeBuffer = [];
+    retryPromise = undefined;
+    return runLoadingPhase(() => {
+      try {
+        return ctx.resolve(fn());
+      } catch (err) {
+        if (err instanceof NotReadyError) {
+          retryPromise = err.source;
+          return undefined;
+        }
+        throw err;
+      }
+    });
+  }
+  let ret = runDiscovery();
+  if (!retryPromise && !ret?.p?.length) {
+    commitBoundaryState();
+    return () => ret;
+  }
+  const regResult = revealGroup ? revealGroup.register(id) : null;
+  const collapseFallback = regResult?.collapseFallback ?? false;
+  if (collapseFallback && !ctx.async) {
+    commitBoundaryState();
+    ctx.serialize(id, "$$f");
+    return () => undefined;
+  }
+  const fallbackOwner = createOwner({
+    id
+  });
+  const fallbackResult = runWithOwner(fallbackOwner, () => {
+    if (!ctx.async) return fallback();
+    const tpl = collapseFallback ? [`<template id="pl-${id}">`, `</template><!--pl-${id}-->`] : [`<template id="pl-${id}"></template>`, `<!--pl-${id}-->`];
+    return ctx.ssr(tpl, ctx.escape(fallback()));
+  });
+  if (ctx.async) {
+    const regOpts = revealGroup ? {
+      revealGroup: revealGroup.id
+    } : undefined;
+    done = ctx.registerFragment(id, regOpts);
+    (async () => {
+      try {
+        while (retryPromise) {
+          await retryPromise.catch(() => {});
+          ret = runDiscovery();
+        }
+        commitBoundaryState();
+        while (ret.p.length) {
+          await Promise.all(ret.p).catch(() => {});
+          ret = runLoadingPhase(() => ctx.ssr(ret.t, ...ret.h));
+        }
+        flushSerializeBuffer();
+        done(ret.t[0]);
+        if (revealGroup) revealGroup.onResolved(id);
+      } catch (err) {
+        finalizeError(err);
+      }
+    })();
+    return () => fallbackResult;
+  }
+  commitBoundaryState();
+  ctx.serialize(id, "$$f");
+  return () => fallbackResult;
+}
+function NoHydration(props) {
+  const o = createOwner();
+  return runWithOwner(o, () => {
+    setContext(NoHydrateContext, true);
+    return props.children;
+  });
+}
+function Hydration(props) {
+  if (!getContext(NoHydrateContext)) return props.children;
+  const o = createOwner({
+    id: props.id ?? ""
+  });
+  return runWithOwner(o, () => {
+    setContext(NoHydrateContext, false);
+    return props.children;
+  });
 }
 
 function For(props) {
@@ -628,7 +970,7 @@ function For(props) {
   } : {
     keyed: props.keyed
   };
-  return createMemo(mapArray(() => props.each, props.children, options));
+  return mapArray(() => props.each, props.children, options);
 }
 function Repeat(props) {
   const options = "fallback" in props ? {
@@ -681,91 +1023,182 @@ function Errored(props) {
     return typeof f === "function" && f.length ? f(err, reset) : f;
   });
 }
-
-function ssrHandleError(err) {
-  if (err instanceof NotReadyError) {
-    return err.source;
-  }
-  const handler = getContext(ErrorContext);
-  if (handler) {
-    handler(err);
-    return;
-  }
-  throw err;
-}
 function Loading(props) {
-  const ctx = sharedConfig.context;
-  if (!ctx) {
-    return createLoadBoundary(() => props.children, () => props.fallback);
-  }
+  return createLoadingBoundary(() => props.children, () => props.fallback);
+}
+function Reveal(props) {
   const o = createOwner();
   const id = o.id;
-  o.id = id + "00";
-  let runPromise;
-  let serializeBuffer = [];
-  const origSerialize = ctx.serialize;
-  function runInitially() {
-    o.dispose(false);
-    serializeBuffer = [];
-    ctx.serialize = (id, p, deferStream) => {
-      serializeBuffer.push([id, p, deferStream]);
-    };
-    const prevBoundary = ctx._currentBoundaryId;
-    ctx._currentBoundaryId = id;
-    const result = runWithOwner(o, () => {
-      try {
-        return ctx.resolve(props.children);
-      } catch (err) {
-        runPromise = ssrHandleError(err);
+  const order = props.order ?? "sequential";
+  const collapsed = order === "sequential" && !!props.collapsed;
+  if (!sharedConfig.context?.async) {
+    const parent = getOwner();
+    const parentGroup = parent ? runWithOwner(parent, () => getContext(RevealGroupContext)) : null;
+    let collapsedByParent = false;
+    if (parentGroup) {
+      const reg = parentGroup.register(id);
+      collapsedByParent = reg.collapseFallback;
+      if (order === "together" || collapsed) console.warn("Nested <Reveal> with collapsed/together won't coordinate correctly with renderToString. Use renderToStream for full support.");
+    }
+    let count = 0;
+    return runWithOwner(o, () => {
+      setContext(RevealGroupContext, {
+        id,
+        register(_key) {
+          count++;
+          const collapseFallback = collapsedByParent || order === "sequential" && collapsed && count > 1;
+          return {
+            collapseFallback,
+            held: false
+          };
+        },
+        onResolved() {}
+      });
+      return props.children;
+    });
+  }
+  const ctx = sharedConfig.context;
+  const keys = [];
+  const resolved = new Set();
+  const minimallyResolved = new Set();
+  const composites = new Map();
+  const activated = new Set();
+  const stash = [];
+  const collapsedLeafKeys = [];
+  let frontier = 0;
+  let heldByParent = false;
+  let collapsedByParent = false;
+  let selfMinimallyResolved = false;
+  let notifiedParentDone = false;
+  const parent = getOwner();
+  const parentGroup = parent ? runWithOwner(parent, () => getContext(RevealGroupContext)) : null;
+  if (parentGroup) {
+    const reg = parentGroup.register(id, {
+      onActivate: () => {
+        if (!heldByParent) return;
+        heldByParent = false;
+        if (collapsedByParent) {
+          collapsedByParent = false;
+          if (collapsedLeafKeys.length) {
+            ctx.revealFallbacks?.([...collapsedLeafKeys]);
+            collapsedLeafKeys.length = 0;
+          }
+        }
+        if (order === "sequential") advanceFrontier();else if (order === "together") checkTogetherRelease();else naturalRelease();
       }
     });
-    ctx._currentBoundaryId = prevBoundary;
-    ctx.serialize = origSerialize;
-    return result;
+    collapsedByParent = reg.collapseFallback;
+    heldByParent = reg.held;
   }
-  let ret = runInitially();
-  if (!(runPromise || ret?.p?.length)) {
-    for (const args of serializeBuffer) origSerialize(args[0], args[1], args[2]);
-    serializeBuffer = [];
-    const modules = ctx.getBoundaryModules?.(id);
-    if (modules) ctx.serialize(id + "_assets", modules);
-    return ret;
+  function notifyParentIfDone() {
+    if (notifiedParentDone) return;
+    if (parentGroup && resolved.size === keys.length) {
+      notifiedParentDone = true;
+      parentGroup.onResolved(id);
+    }
   }
-  const fallbackOwner = createOwner({
-    id
-  });
-  getNextChildId(fallbackOwner);
-  if (ctx.async) {
-    const done = ctx.registerFragment(id);
-    (async () => {
-      try {
-        while (runPromise) {
-          o.dispose(false);
-          await runPromise;
-          runPromise = undefined;
-          ret = runInitially();
+  function activateComposite(key) {
+    if (activated.has(key)) return;
+    activated.add(key);
+    composites.get(key)();
+  }
+  function updateSelfMinimallyResolved() {
+    if (selfMinimallyResolved) return;
+    if (keys.length === 0) selfMinimallyResolved = true;else if (order === "together") selfMinimallyResolved = minimallyResolved.size === keys.length;else if (order === "sequential") selfMinimallyResolved = minimallyResolved.has(keys[0]);
+    else selfMinimallyResolved = resolved.size > 0;
+    if (selfMinimallyResolved) parentGroup?.onMinimallyResolved?.(id);
+  }
+  function advanceFrontier() {
+    if (heldByParent) return;
+    while (frontier < keys.length && resolved.has(keys[frontier])) {
+      const k = keys[frontier];
+      if (composites.has(k)) activateComposite(k);else ctx.revealFragments?.([k]);
+      frontier++;
+    }
+    if (frontier < keys.length) {
+      const k = keys[frontier];
+      if (composites.has(k)) activateComposite(k);else if (order === "sequential" && collapsed) ctx.revealFallbacks?.([k]);
+    }
+    notifyParentIfDone();
+  }
+  function checkTogetherRelease() {
+    if (order !== "together" || heldByParent) return;
+    if (minimallyResolved.size < keys.length) return;
+    if (stash.length) {
+      ctx.revealFragments?.([...stash]);
+      stash.length = 0;
+    }
+    composites.forEach((_, key) => activateComposite(key));
+    notifyParentIfDone();
+  }
+  function naturalRelease() {
+    if (stash.length) {
+      ctx.revealFragments?.([...stash]);
+      stash.length = 0;
+    }
+    composites.forEach((_, key) => activateComposite(key));
+    notifyParentIfDone();
+  }
+  return runWithOwner(o, () => {
+    setContext(RevealGroupContext, {
+      id,
+      register(key, options) {
+        keys.push(key);
+        const isComposite = !!options?.onActivate;
+        if (isComposite) composites.set(key, options.onActivate);
+        const selfCollapse = order === "sequential" && collapsed && keys.length > 1;
+        const collapseFallback = collapsedByParent || selfCollapse;
+        if (collapseFallback && !isComposite) collapsedLeafKeys.push(key);
+        let held = heldByParent;
+        if (!held) {
+          if (order === "together") held = true;else if (order === "sequential" && keys.length > 1) held = true;
         }
-        for (const args of serializeBuffer) origSerialize(args[0], args[1], args[2]);
-        serializeBuffer = [];
-        while (ret.p.length) {
-          await Promise.all(ret.p);
-          ret = runWithOwner(o, () => ctx.ssr(ret.t, ...ret.h));
+        return {
+          collapseFallback,
+          held
+        };
+      },
+      onResolved(key) {
+        resolved.add(key);
+        const isLeaf = !composites.has(key);
+        if (isLeaf) {
+          if (order === "together") {
+            stash.push(key);
+          } else if (order === "natural" && heldByParent) {
+            stash.push(key);
+          } else if (order === "natural") {
+            ctx.revealFragments?.([key]);
+          }
+          markMinimallyResolved(key);
+          if (order === "sequential" && !heldByParent) advanceFrontier();
+          if (order === "natural") updateSelfMinimallyResolved();
+        } else {
+          if (!heldByParent) {
+            if (order === "sequential") advanceFrontier();else if (order === "natural") activateComposite(key);
+          }
+          if (order === "together") checkTogetherRelease();
+          if (order === "natural") updateSelfMinimallyResolved();
         }
-        done(ret.t[0]);
-      } catch (err) {
-        done(undefined, err);
+        notifyParentIfDone();
+      },
+      onMinimallyResolved(key) {
+        markMinimallyResolved(key);
       }
-    })();
-    return runWithOwner(fallbackOwner, () => ctx.ssr([`<template id="pl-${id}"></template>`, `<!--pl-${id}-->`], ctx.escape(props.fallback)));
+    });
+    const result = props.children;
+    if (parentGroup && keys.length === 0) {
+      parentGroup.onResolved(id);
+    }
+    return result;
+  });
+  function markMinimallyResolved(key) {
+    if (minimallyResolved.has(key)) return;
+    minimallyResolved.add(key);
+    updateSelfMinimallyResolved();
+    if (order === "together") checkTogetherRelease();
   }
-  for (const args of serializeBuffer) origSerialize(args[0], args[1], args[2]);
-  serializeBuffer = [];
-  const modules = ctx.getBoundaryModules?.(id);
-  if (modules) ctx.serialize(id + "_assets", modules);
-  ctx.serialize(id, "$$f");
-  return runWithOwner(fallbackOwner, () => props.fallback);
 }
 
 const DEV = undefined;
 
-export { $DEVCOMP, DEV, Errored, For, Loading, Match, 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, Reveal, Show, Switch, action, children, createComponent, createContext, createDeepProxy, createEffect, createErrorBoundary, createLoadingBoundary, createMemo, createOptimistic, createOptimisticStore, createProjection, createReaction, createRenderEffect, createRevealOrder, createSignal, createStore, createTrackedEffect, createUniqueId, deep, enableHydration, flush, getObserver, isPending, isRefreshing, latest, lazy, mapArray, onSettled, reconcile, refresh, repeat, resolve, sharedConfig, ssrHandleError, ssrRunInScope, untrack, useContext };