solid-js 2.0.0-beta.7 → 2.0.0-beta.9

package/dist/server.cjs

@@ -129,7 +129,7 @@ function createMemo(compute, options) {
     }
   }
   const ssrSource = options?.ssrSource;
-  if (ssrSource === "initial" || ssrSource === "client") {
+  if (ssrSource === "client") {
     comp.computed = true;
   } else if (!options?.lazy) {
     update();
@@ -325,7 +325,7 @@ function closeAsyncIterator(iter, value) {
 }
 function serverEffect(compute, effectFn, options) {
   const ssrSource = options?.ssrSource;
-  if (ssrSource === "client" || ssrSource === "initial") {
+  if (ssrSource === "client") {
     signals.createOwner();
     return;
   }
@@ -406,7 +406,7 @@ function createProjection(fn, initialValue, options) {
   const ctx = sharedConfig.context;
   const owner = signals.createOwner();
   const [state] = createStore(initialValue);
-  if (options?.ssrSource === "initial" || options?.ssrSource === "client") {
+  if (options?.ssrSource === "client") {
     return state;
   }
   let disposed = false;
@@ -826,12 +826,6 @@ function ssrHandleError(err) {
   }
   throw err;
 }
-class InvalidTopLevelAsyncReadError extends Error {
-  constructor() {
-    super("Async values must be read within a tracking scope (JSX, a memo, or an effect's compute function).");
-    this.name = "InvalidTopLevelAsyncReadError";
-  }
-}
 function createLoadingBoundary(fn, fallback, options) {
   const currentCtx = sharedConfig.context;
   if (!currentCtx) {
@@ -846,6 +840,7 @@ function createLoadingBoundary(fn, fallback, options) {
   o.id = id + "00";
   let done;
   let handledRenderError;
+  let retryPromise;
   let serializeBuffer = [];
   const bufferedCtx = Object.create(ctx);
   bufferedCtx.serialize = (id, value, deferStream) => {
@@ -889,21 +884,26 @@ function createLoadingBoundary(fn, fallback, options) {
   function runDiscovery() {
     o.dispose(false);
     serializeBuffer = [];
+    retryPromise = undefined;
     return runLoadingPhase(() => {
       try {
         return ctx.resolve(fn());
       } catch (err) {
-        if (err instanceof signals.NotReadyError) throw new InvalidTopLevelAsyncReadError();
+        if (err instanceof signals.NotReadyError) {
+          retryPromise = err.source;
+          return undefined;
+        }
         throw err;
       }
     });
   }
   let ret = runDiscovery();
-  if (!ret?.p?.length) {
+  if (!retryPromise && !ret?.p?.length) {
     commitBoundaryState();
     return () => ret;
   }
-  const collapseFallback = revealGroup ? revealGroup.register(id) : false;
+  const regResult = revealGroup ? revealGroup.register(id) : null;
+  const collapseFallback = regResult?.collapseFallback ?? false;
   if (collapseFallback && !ctx.async) {
     commitBoundaryState();
     ctx.serialize(id, "$$f");
@@ -924,6 +924,10 @@ function createLoadingBoundary(fn, fallback, options) {
     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(() => {});
@@ -1026,15 +1030,16 @@ function Loading(props) {
 function Reveal(props) {
   const o = signals.createOwner();
   const id = o.id;
-  const together = !!props.together;
-  const collapsed = !!props.collapsed;
+  const order = props.order ?? "sequential";
+  const collapsed = order === "sequential" && !!props.collapsed;
   if (!sharedConfig.context?.async) {
     const parent = signals.getOwner();
     const parentGroup = parent ? signals.runWithOwner(parent, () => signals.getContext(RevealGroupContext)) : null;
     let collapsedByParent = false;
     if (parentGroup) {
-      collapsedByParent = parentGroup.register(id);
-      if (collapsed || together) console.warn("Nested <Reveal> with collapsed/together won't coordinate correctly with renderToString. Use renderToStream for full support.");
+      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 signals.runWithOwner(o, () => {
@@ -1042,8 +1047,11 @@ function Reveal(props) {
         id,
         register(_key) {
           count++;
-          if (collapsedByParent) return true;
-          return !together && collapsed && count > 1;
+          const collapseFallback = collapsedByParent || order === "sequential" && collapsed && count > 1;
+          return {
+            collapseFallback,
+            held: false
+          };
         },
         onResolved() {}
       });
@@ -1053,58 +1061,129 @@ function Reveal(props) {
   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 = signals.getOwner();
   const parentGroup = parent ? signals.runWithOwner(parent, () => signals.getContext(RevealGroupContext)) : null;
-  let collapsedByParent = false;
   if (parentGroup) {
-    collapsedByParent = parentGroup.register(id, {
+    const reg = parentGroup.register(id, {
       onActivate: () => {
-        collapsedByParent = false;
-        advanceFrontier();
+        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();
       }
     });
+    collapsedByParent = reg.collapseFallback;
+    heldByParent = reg.held;
   }
   function notifyParentIfDone() {
+    if (notifiedParentDone) return;
     if (parentGroup && resolved.size === keys.length) {
+      notifiedParentDone = true;
       parentGroup.onResolved(id);
     }
   }
+  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])) {
-      if (!composites.has(keys[frontier])) ctx.revealFragments?.([keys[frontier]]);
+      const k = keys[frontier];
+      if (composites.has(k)) activateComposite(k);else ctx.revealFragments?.([k]);
       frontier++;
     }
     if (frontier < keys.length) {
-      const activate = composites.get(keys[frontier]);
-      if (activate) activate();else if (!together && collapsed) ctx.revealFallbacks?.(keys.slice(frontier));
+      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 signals.runWithOwner(o, () => {
     signals.setContext(RevealGroupContext, {
       id,
       register(key, options) {
         keys.push(key);
-        if (options?.onActivate) composites.set(key, options.onActivate);
-        if (collapsedByParent) return true;
-        return !together && collapsed && keys.length > 1;
+        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;
+        }
+        return {
+          collapseFallback,
+          held
+        };
       },
       onResolved(key) {
         resolved.add(key);
-        if (collapsedByParent) {
-          notifyParentIfDone();
-          return;
-        }
-        if (together) {
-          if (resolved.size === keys.length) {
-            ctx.revealFragments?.(id);
-            notifyParentIfDone();
+        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 {
-          advanceFrontier();
+          if (!heldByParent) {
+            if (order === "sequential") advanceFrontier();else if (order === "natural") activateComposite(key);
+          }
+          if (order === "together") checkTogetherRelease();
+          if (order === "natural") updateSelfMinimallyResolved();
         }
+        notifyParentIfDone();
+      },
+      onMinimallyResolved(key) {
+        markMinimallyResolved(key);
       }
     });
     const result = props.children;
@@ -1113,6 +1192,12 @@ function Reveal(props) {
     }
     return result;
   });
+  function markMinimallyResolved(key) {
+    if (minimallyResolved.has(key)) return;
+    minimallyResolved.add(key);
+    updateSelfMinimallyResolved();
+    if (order === "together") checkTogetherRelease();
+  }
 }
 
 const DEV = undefined;

package/dist/server.js

@@ -128,7 +128,7 @@ function createMemo(compute, options) {
     }
   }
   const ssrSource = options?.ssrSource;
-  if (ssrSource === "initial" || ssrSource === "client") {
+  if (ssrSource === "client") {
     comp.computed = true;
   } else if (!options?.lazy) {
     update();
@@ -324,7 +324,7 @@ function closeAsyncIterator(iter, value) {
 }
 function serverEffect(compute, effectFn, options) {
   const ssrSource = options?.ssrSource;
-  if (ssrSource === "client" || ssrSource === "initial") {
+  if (ssrSource === "client") {
     createOwner();
     return;
   }
@@ -405,7 +405,7 @@ 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;
@@ -825,12 +825,6 @@ function ssrHandleError(err) {
   }
   throw err;
 }
-class InvalidTopLevelAsyncReadError extends Error {
-  constructor() {
-    super("Async values must be read within a tracking scope (JSX, a memo, or an effect's compute function).");
-    this.name = "InvalidTopLevelAsyncReadError";
-  }
-}
 function createLoadingBoundary(fn, fallback, options) {
   const currentCtx = sharedConfig.context;
   if (!currentCtx) {
@@ -845,6 +839,7 @@ function createLoadingBoundary(fn, fallback, options) {
   o.id = id + "00";
   let done;
   let handledRenderError;
+  let retryPromise;
   let serializeBuffer = [];
   const bufferedCtx = Object.create(ctx);
   bufferedCtx.serialize = (id, value, deferStream) => {
@@ -888,21 +883,26 @@ function createLoadingBoundary(fn, fallback, options) {
   function runDiscovery() {
     o.dispose(false);
     serializeBuffer = [];
+    retryPromise = undefined;
     return runLoadingPhase(() => {
       try {
         return ctx.resolve(fn());
       } catch (err) {
-        if (err instanceof NotReadyError) throw new InvalidTopLevelAsyncReadError();
+        if (err instanceof NotReadyError) {
+          retryPromise = err.source;
+          return undefined;
+        }
         throw err;
       }
     });
   }
   let ret = runDiscovery();
-  if (!ret?.p?.length) {
+  if (!retryPromise && !ret?.p?.length) {
     commitBoundaryState();
     return () => ret;
   }
-  const collapseFallback = revealGroup ? revealGroup.register(id) : false;
+  const regResult = revealGroup ? revealGroup.register(id) : null;
+  const collapseFallback = regResult?.collapseFallback ?? false;
   if (collapseFallback && !ctx.async) {
     commitBoundaryState();
     ctx.serialize(id, "$$f");
@@ -923,6 +923,10 @@ function createLoadingBoundary(fn, fallback, options) {
     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(() => {});
@@ -1025,15 +1029,16 @@ function Loading(props) {
 function Reveal(props) {
   const o = createOwner();
   const id = o.id;
-  const together = !!props.together;
-  const collapsed = !!props.collapsed;
+  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) {
-      collapsedByParent = parentGroup.register(id);
-      if (collapsed || together) console.warn("Nested <Reveal> with collapsed/together won't coordinate correctly with renderToString. Use renderToStream for full support.");
+      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, () => {
@@ -1041,8 +1046,11 @@ function Reveal(props) {
         id,
         register(_key) {
           count++;
-          if (collapsedByParent) return true;
-          return !together && collapsed && count > 1;
+          const collapseFallback = collapsedByParent || order === "sequential" && collapsed && count > 1;
+          return {
+            collapseFallback,
+            held: false
+          };
         },
         onResolved() {}
       });
@@ -1052,58 +1060,129 @@ function Reveal(props) {
   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;
-  let collapsedByParent = false;
   if (parentGroup) {
-    collapsedByParent = parentGroup.register(id, {
+    const reg = parentGroup.register(id, {
       onActivate: () => {
-        collapsedByParent = false;
-        advanceFrontier();
+        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();
       }
     });
+    collapsedByParent = reg.collapseFallback;
+    heldByParent = reg.held;
   }
   function notifyParentIfDone() {
+    if (notifiedParentDone) return;
     if (parentGroup && resolved.size === keys.length) {
+      notifiedParentDone = true;
       parentGroup.onResolved(id);
     }
   }
+  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])) {
-      if (!composites.has(keys[frontier])) ctx.revealFragments?.([keys[frontier]]);
+      const k = keys[frontier];
+      if (composites.has(k)) activateComposite(k);else ctx.revealFragments?.([k]);
       frontier++;
     }
     if (frontier < keys.length) {
-      const activate = composites.get(keys[frontier]);
-      if (activate) activate();else if (!together && collapsed) ctx.revealFallbacks?.(keys.slice(frontier));
+      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);
-        if (options?.onActivate) composites.set(key, options.onActivate);
-        if (collapsedByParent) return true;
-        return !together && collapsed && keys.length > 1;
+        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;
+        }
+        return {
+          collapseFallback,
+          held
+        };
       },
       onResolved(key) {
         resolved.add(key);
-        if (collapsedByParent) {
-          notifyParentIfDone();
-          return;
-        }
-        if (together) {
-          if (resolved.size === keys.length) {
-            ctx.revealFragments?.(id);
-            notifyParentIfDone();
+        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 {
-          advanceFrontier();
+          if (!heldByParent) {
+            if (order === "sequential") advanceFrontier();else if (order === "natural") activateComposite(key);
+          }
+          if (order === "together") checkTogetherRelease();
+          if (order === "natural") updateSelfMinimallyResolved();
         }
+        notifyParentIfDone();
+      },
+      onMinimallyResolved(key) {
+        markMinimallyResolved(key);
       }
     });
     const result = props.children;
@@ -1112,6 +1191,12 @@ function Reveal(props) {
     }
     return result;
   });
+  function markMinimallyResolved(key) {
+    if (minimallyResolved.has(key)) return;
+    minimallyResolved.add(key);
+    updateSelfMinimallyResolved();
+    if (order === "together") checkTogetherRelease();
+  }
 }
 
 const DEV = undefined;