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

package/dist/dev.cjs

@@ -35,9 +35,11 @@ function children(fn) {
 function devComponent(Comp, props) {
   return signals.createRoot(() => {
     const owner = signals.getOwner();
-    owner._props = props;
-    owner._name = Comp.name;
-    owner._component = Comp;
+    owner._component = {
+      fn: Comp,
+      props,
+      name: Comp.name
+    };
     Object.assign(Comp, {
       [$DEVCOMP]: true
     });
@@ -46,12 +48,6 @@ function devComponent(Comp, props) {
     transparent: true
   });
 }
-function registerGraph(value) {
-  const owner = signals.getOwner();
-  if (!owner) return;
-  if (owner.sourceMap) owner.sourceMap.push(value);else owner.sourceMap = [value];
-  value.graph = owner;
-}
 
 const NoHydrateContext = {
   id: Symbol("NoHydrateContext"),
@@ -675,6 +671,38 @@ function resumeBoundaryHydration(o, id, set) {
   signals.flush();
   checkHydrationComplete();
 }
+function initBoundaryResume(o, id) {
+  _pendingBoundaries++;
+  signals.onCleanup(() => {
+    if (!signals.isDisposed(o)) return;
+    sharedConfig.cleanupFragment?.(id);
+  });
+  const set = createBoundaryTrigger();
+  return [set, () => resumeBoundaryHydration(o, id, set)];
+}
+function waitAndResume(p, resume, assetPromise) {
+  const waitFor = assetPromise ? Promise.all([p, assetPromise]) : p;
+  waitFor.then(() => {
+    if (p && typeof p === "object") p.s = 1;
+    resume();
+  }, err => {
+    if (p && typeof p === "object") {
+      p.s = 2;
+      p.v = err;
+    }
+    resume();
+  });
+}
+function scheduleResumeAfterAssets(id, resume, assetPromise) {
+  sharedConfig.gather?.(id);
+  const doResume = () => queueMicrotask(resume);
+  if (assetPromise) {
+    assetPromise.then(doResume);
+    return true;
+  }
+  doResume();
+  return false;
+}
 function createLoadingBoundary(fn, fallback, options) {
   if (!sharedConfig.hydrating) return signals.createLoadingBoundary(fn, fallback, options);
   let settledSerializationResumeQueued = false;
@@ -694,41 +722,14 @@ function createLoadingBoundary(fn, fallback, options) {
       }
       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();
+        const [, resume] = initBoundaryResume(o, id);
+        if (scheduleResumeAfterAssets(id, resume, assetPromise)) return undefined;
         return fallback();
       }
       if (p) {
-        _pendingBoundaries++;
-        signals.onCleanup(() => {
-          if (!signals.isDisposed(o)) return;
-          sharedConfig.cleanupFragment?.(id);
-        });
-        const set = createBoundaryTrigger();
+        const [set, resume] = initBoundaryResume(o, id);
         if (p !== "$$f") {
-          const waitFor = assetPromise ? Promise.all([p, assetPromise]) : p;
-          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);
-          });
+          waitAndResume(p, resume, assetPromise);
         } else {
           const afterAssets = () => {
             _pendingBoundaries--;
@@ -740,10 +741,20 @@ function createLoadingBoundary(fn, fallback, options) {
         return fallback();
       }
     }
+    if (sharedConfig.hydrating && sharedConfig.has(id + "_fr") && !settledSerializationResumeQueued) {
+      settledSerializationResumeQueued = true;
+      const fr = sharedConfig.load(id + "_fr");
+      const [, resume] = initBoundaryResume(o, id);
+      if (fr && typeof fr === "object" && (fr.s === 1 || fr.s === 2)) {
+        if (scheduleResumeAfterAssets(id, resume, assetPromise)) return undefined;
+        return fallback();
+      }
+      waitAndResume(fr, resume, assetPromise);
+      return fallback();
+    }
     if (assetPromise && !sharedConfig.has(id)) {
-      _pendingBoundaries++;
-      const set = createBoundaryTrigger();
-      assetPromise.then(() => resumeBoundaryHydration(o, id, set));
+      const [, resume] = initBoundaryResume(o, id);
+      assetPromise.then(resume);
       return undefined;
     }
     return signals.createLoadingBoundary(fn, fallback, options);
@@ -892,14 +903,16 @@ function Loading(props) {
   } : undefined;
   return createLoadingBoundary(() => props.children, () => props.fallback, onOpt);
 }
+function Reveal(props) {
+  return signals.createRevealOrder(() => props.children, {
+    together: () => !!props.together,
+    collapsed: () => !!props.collapsed
+  });
+}
 
 function ssrHandleError() {}
 function ssrRunInScope() {}
-const DevHooks = {};
-const DEV = {
-  hooks: DevHooks,
-  registerGraph
-} ;
+const DEV = signals.DEV ;
 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.");
 }
@@ -932,6 +945,10 @@ Object.defineProperty(exports, "createReaction", {
   enumerable: true,
   get: function () { return signals.createReaction; }
 });
+Object.defineProperty(exports, "createRevealOrder", {
+  enumerable: true,
+  get: function () { return signals.createRevealOrder; }
+});
 Object.defineProperty(exports, "createRoot", {
   enumerable: true,
   get: function () { return signals.createRoot; }
@@ -972,6 +989,10 @@ Object.defineProperty(exports, "getOwner", {
   enumerable: true,
   get: function () { return signals.getOwner; }
 });
+Object.defineProperty(exports, "isDisposed", {
+  enumerable: true,
+  get: function () { return signals.isDisposed; }
+});
 Object.defineProperty(exports, "isEqual", {
   enumerable: true,
   get: function () { return signals.isEqual; }
@@ -1054,6 +1075,7 @@ exports.Match = Match;
 exports.NoHydrateContext = NoHydrateContext;
 exports.NoHydration = NoHydration;
 exports.Repeat = Repeat;
+exports.Reveal = Reveal;
 exports.Show = Show;
 exports.Switch = Switch;
 exports.children = children;

package/dist/dev.js

@@ -1,5 +1,5 @@
-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';
+import { getContext, createMemo as createMemo$1, flatten, createRoot, setContext, getOwner, untrack, createOwner, runWithOwner, createEffect as createEffect$1, createErrorBoundary as createErrorBoundary$1, createLoadingBoundary as createLoadingBoundary$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, onCleanup, isDisposed, peekNextChildId, clearSnapshots, flush, markSnapshotScope, mapArray, repeat, createRevealOrder, DEV as DEV$1 } from '@solidjs/signals';
+export { $PROXY, $REFRESH, $TRACK, NotReadyError, action, createOwner, createReaction, createRevealOrder, createRoot, createTrackedEffect, deep, enableExternalSource, enforceLoadingBoundary, flatten, flush, getNextChildId, getObserver, getOwner, isDisposed, 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) {
@@ -34,9 +34,11 @@ function children(fn) {
 function devComponent(Comp, props) {
   return createRoot(() => {
     const owner = getOwner();
-    owner._props = props;
-    owner._name = Comp.name;
-    owner._component = Comp;
+    owner._component = {
+      fn: Comp,
+      props,
+      name: Comp.name
+    };
     Object.assign(Comp, {
       [$DEVCOMP]: true
     });
@@ -45,12 +47,6 @@ function devComponent(Comp, props) {
     transparent: true
   });
 }
-function registerGraph(value) {
-  const owner = getOwner();
-  if (!owner) return;
-  if (owner.sourceMap) owner.sourceMap.push(value);else owner.sourceMap = [value];
-  value.graph = owner;
-}
 
 const NoHydrateContext = {
   id: Symbol("NoHydrateContext"),
@@ -674,6 +670,38 @@ function resumeBoundaryHydration(o, id, set) {
   flush();
   checkHydrationComplete();
 }
+function initBoundaryResume(o, id) {
+  _pendingBoundaries++;
+  onCleanup(() => {
+    if (!isDisposed(o)) return;
+    sharedConfig.cleanupFragment?.(id);
+  });
+  const set = createBoundaryTrigger();
+  return [set, () => resumeBoundaryHydration(o, id, set)];
+}
+function waitAndResume(p, resume, assetPromise) {
+  const waitFor = assetPromise ? Promise.all([p, assetPromise]) : p;
+  waitFor.then(() => {
+    if (p && typeof p === "object") p.s = 1;
+    resume();
+  }, err => {
+    if (p && typeof p === "object") {
+      p.s = 2;
+      p.v = err;
+    }
+    resume();
+  });
+}
+function scheduleResumeAfterAssets(id, resume, assetPromise) {
+  sharedConfig.gather?.(id);
+  const doResume = () => queueMicrotask(resume);
+  if (assetPromise) {
+    assetPromise.then(doResume);
+    return true;
+  }
+  doResume();
+  return false;
+}
 function createLoadingBoundary(fn, fallback, options) {
   if (!sharedConfig.hydrating) return createLoadingBoundary$1(fn, fallback, options);
   let settledSerializationResumeQueued = false;
@@ -693,41 +721,14 @@ function createLoadingBoundary(fn, fallback, options) {
       }
       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();
+        const [, resume] = initBoundaryResume(o, id);
+        if (scheduleResumeAfterAssets(id, resume, assetPromise)) return undefined;
         return fallback();
       }
       if (p) {
-        _pendingBoundaries++;
-        onCleanup(() => {
-          if (!isDisposed(o)) return;
-          sharedConfig.cleanupFragment?.(id);
-        });
-        const set = createBoundaryTrigger();
+        const [set, resume] = initBoundaryResume(o, id);
         if (p !== "$$f") {
-          const waitFor = assetPromise ? Promise.all([p, assetPromise]) : p;
-          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);
-          });
+          waitAndResume(p, resume, assetPromise);
         } else {
           const afterAssets = () => {
             _pendingBoundaries--;
@@ -739,10 +740,20 @@ function createLoadingBoundary(fn, fallback, options) {
         return fallback();
       }
     }
+    if (sharedConfig.hydrating && sharedConfig.has(id + "_fr") && !settledSerializationResumeQueued) {
+      settledSerializationResumeQueued = true;
+      const fr = sharedConfig.load(id + "_fr");
+      const [, resume] = initBoundaryResume(o, id);
+      if (fr && typeof fr === "object" && (fr.s === 1 || fr.s === 2)) {
+        if (scheduleResumeAfterAssets(id, resume, assetPromise)) return undefined;
+        return fallback();
+      }
+      waitAndResume(fr, resume, assetPromise);
+      return fallback();
+    }
     if (assetPromise && !sharedConfig.has(id)) {
-      _pendingBoundaries++;
-      const set = createBoundaryTrigger();
-      assetPromise.then(() => resumeBoundaryHydration(o, id, set));
+      const [, resume] = initBoundaryResume(o, id);
+      assetPromise.then(resume);
       return undefined;
     }
     return createLoadingBoundary$1(fn, fallback, options);
@@ -891,16 +902,18 @@ function Loading(props) {
   } : undefined;
   return createLoadingBoundary(() => props.children, () => props.fallback, onOpt);
 }
+function Reveal(props) {
+  return createRevealOrder(() => props.children, {
+    together: () => !!props.together,
+    collapsed: () => !!props.collapsed
+  });
+}
 
 function ssrHandleError() {}
 function ssrRunInScope() {}
-const DevHooks = {};
-const DEV = {
-  hooks: DevHooks,
-  registerGraph
-} ;
+const DEV = DEV$1 ;
 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, createErrorBoundary, createLoadingBoundary, 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, Reveal, Show, Switch, children, createComponent, createContext, createEffect, createErrorBoundary, createLoadingBoundary, createMemo, createOptimistic, createOptimisticStore, createProjection, createRenderEffect, createSignal, createStore, createUniqueId, enableHydration, lazy, sharedConfig, ssrHandleError, ssrRunInScope, useContext };

package/dist/server.cjs

@@ -417,13 +417,14 @@ function createProjection(fn, initialValue = {}, options) {
       promise.s = 1;
       if (disposed) {
         promise.v = state;
-        return;
+        return state;
       }
       if (v !== undefined && v !== state) {
         Object.assign(state, v);
       }
       promise.v = state;
       markReady();
+      return state;
     }, () => {});
     if (ctx?.async && !signals.getContext(NoHydrateContext) && owner.id) ctx.serialize(owner.id, promise, options?.deferStream);
     const [pending, markReady] = createPendingProxy(state, promise);
@@ -568,6 +569,10 @@ function createLoadingBoundary$1(fn, fallback, options) {
     throw err;
   }
 }
+function createRevealOrder(fn, _options) {
+  const o = signals.createOwner();
+  return signals.runWithOwner(o, fn);
+}
 function untrack(fn) {
   return fn();
 }
@@ -692,6 +697,10 @@ function createUniqueId() {
   return signals.getNextChildId(o);
 }
 
+const RevealGroupContext = {
+  id: Symbol("RevealGroupContext"),
+  defaultValue: null
+};
 function ssrHandleError(err) {
   if (err instanceof signals.NotReadyError) {
     return err.source;
@@ -717,6 +726,7 @@ function createLoadingBoundary(fn, fallback, options) {
   const ctx = currentCtx;
   const parent = signals.getOwner();
   const parentHandler = parent && signals.runWithOwner(parent, () => signals.getContext(ErrorContext));
+  const revealGroup = parent && signals.runWithOwner(parent, () => signals.getContext(RevealGroupContext));
   const o = signals.createOwner();
   const id = o.id;
   o.id = id + "00";
@@ -779,12 +789,25 @@ function createLoadingBoundary(fn, fallback, options) {
     commitBoundaryState();
     return () => ret;
   }
+  const collapseFallback = revealGroup ? revealGroup.register(id) : false;
+  if (collapseFallback && !ctx.async) {
+    commitBoundaryState();
+    ctx.serialize(id, "$$f");
+    return () => undefined;
+  }
   const fallbackOwner = signals.createOwner({
     id
   });
-  const fallbackResult = signals.runWithOwner(fallbackOwner, () => ctx.async ? ctx.ssr([`<template id="pl-${id}"></template>`, `<!--pl-${id}-->`], ctx.escape(fallback())) : fallback());
+  const fallbackResult = signals.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) {
-    done = ctx.registerFragment(id);
+    const regOpts = revealGroup ? {
+      revealGroup: revealGroup.id
+    } : undefined;
+    done = ctx.registerFragment(id, regOpts);
     (async () => {
       try {
         commitBoundaryState();
@@ -794,6 +817,7 @@ function createLoadingBoundary(fn, fallback, options) {
         }
         flushSerializeBuffer();
         done(ret.t[0]);
+        if (revealGroup) revealGroup.onResolved(id);
       } catch (err) {
         finalizeError(err);
       }
@@ -885,6 +909,97 @@ function Errored(props) {
 function Loading(props) {
   return createLoadingBoundary(() => props.children, () => props.fallback);
 }
+function Reveal(props) {
+  const o = signals.createOwner();
+  const id = o.id;
+  const together = !!props.together;
+  const collapsed = !!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.");
+    }
+    let count = 0;
+    return signals.runWithOwner(o, () => {
+      signals.setContext(RevealGroupContext, {
+        id,
+        register(_key) {
+          count++;
+          if (collapsedByParent) return true;
+          return !together && collapsed && count > 1;
+        },
+        onResolved() {}
+      });
+      return props.children;
+    });
+  }
+  const ctx = sharedConfig.context;
+  const keys = [];
+  const resolved = new Set();
+  const composites = new Map();
+  let frontier = 0;
+  const parent = signals.getOwner();
+  const parentGroup = parent ? signals.runWithOwner(parent, () => signals.getContext(RevealGroupContext)) : null;
+  let collapsedByParent = false;
+  if (parentGroup) {
+    collapsedByParent = parentGroup.register(id, {
+      onActivate: () => {
+        collapsedByParent = false;
+        advanceFrontier();
+      }
+    });
+  }
+  function notifyParentIfDone() {
+    if (parentGroup && resolved.size === keys.length) {
+      parentGroup.onResolved(id);
+    }
+  }
+  function advanceFrontier() {
+    while (frontier < keys.length && resolved.has(keys[frontier])) {
+      if (!composites.has(keys[frontier])) ctx.revealFragments?.([keys[frontier]]);
+      frontier++;
+    }
+    if (frontier < keys.length) {
+      const activate = composites.get(keys[frontier]);
+      if (activate) activate();else if (!together && collapsed) ctx.revealFallbacks?.(keys.slice(frontier));
+    }
+    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;
+      },
+      onResolved(key) {
+        resolved.add(key);
+        if (collapsedByParent) {
+          notifyParentIfDone();
+          return;
+        }
+        if (together) {
+          if (resolved.size === keys.length) {
+            ctx.revealFragments?.(id);
+            notifyParentIfDone();
+          }
+        } else {
+          advanceFrontier();
+        }
+      }
+    });
+    const result = props.children;
+    if (parentGroup && keys.length === 0) {
+      parentGroup.onResolved(id);
+    }
+    return result;
+  });
+}
 
 const DEV = undefined;
 
@@ -932,6 +1047,10 @@ Object.defineProperty(exports, "getOwner", {
   enumerable: true,
   get: function () { return signals.getOwner; }
 });
+Object.defineProperty(exports, "isDisposed", {
+  enumerable: true,
+  get: function () { return signals.isDisposed; }
+});
 Object.defineProperty(exports, "isEqual", {
   enumerable: true,
   get: function () { return signals.isEqual; }
@@ -974,6 +1093,7 @@ exports.Match = Match;
 exports.NoHydrateContext = NoHydrateContext;
 exports.NoHydration = NoHydration;
 exports.Repeat = Repeat;
+exports.Reveal = Reveal;
 exports.Show = Show;
 exports.Switch = Switch;
 exports.action = action;
@@ -990,6 +1110,7 @@ exports.createOptimisticStore = createOptimisticStore;
 exports.createProjection = createProjection;
 exports.createReaction = createReaction;
 exports.createRenderEffect = createRenderEffect;
+exports.createRevealOrder = createRevealOrder;
 exports.createSignal = createSignal;
 exports.createStore = createStore;
 exports.createTrackedEffect = createTrackedEffect;