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

package/dist/solid.cjs

@@ -20,10 +20,10 @@ function useContext(context) {
   return signals.getContext(context);
 }
 function children(fn) {
-  const c = signals.createMemo(fn, undefined, {
+  const c = signals.createMemo(fn, {
     lazy: true
   });
-  const memo = signals.createMemo(() => signals.flatten(c()), undefined, {
+  const memo = signals.createMemo(() => signals.flatten(c()), {
     lazy: true
   });
   memo.toArray = () => {
@@ -265,7 +265,7 @@ function wrapFirstYield(iterable, activate) {
     }
   };
 }
-function hydrateSignalFromAsyncIterable(coreFn, compute, value, options) {
+function hydrateSignalFromAsyncIterable(coreFn, compute, options) {
   const parent = signals.getOwner();
   const expectedId = signals.peekNextChildId(parent);
   if (!sharedConfig.has(expectedId)) return null;
@@ -277,7 +277,7 @@ function hydrateSignalFromAsyncIterable(coreFn, compute, value, options) {
       return it;
     }
   };
-  return coreFn(() => iterable, value, options);
+  return coreFn(() => iterable, options);
 }
 function hydrateStoreFromAsyncIterable(coreFn, initialValue, options) {
   const parent = signals.getOwner();
@@ -352,20 +352,20 @@ function hydrateStoreFromAsyncIterable(coreFn, initialValue, options) {
     };
   }, initialValue, options);
 }
-function hydratedCreateMemo(compute, value, options) {
+function hydratedCreateMemo(compute, options) {
   if (!sharedConfig.hydrating || options?.transparent) {
-    return signals.createMemo(compute, value, options);
+    return signals.createMemo(compute, options);
   }
   markTopLevelSnapshotScope();
   const ssrSource = options?.ssrSource;
   if (ssrSource === "client") {
     const [hydrated, setHydrated] = signals.createSignal(false, {
-      pureWrite: true
+      ownedWrite: true
     });
     const memo = signals.createMemo(prev => {
-      if (!hydrated()) return prev ?? value;
+      if (!hydrated()) return prev;
       return compute(prev);
-    }, value, options);
+    }, options);
     setHydrated(true);
     return memo;
   }
@@ -373,25 +373,25 @@ function hydratedCreateMemo(compute, value, options) {
     return signals.createMemo(prev => {
       if (!sharedConfig.hydrating) return compute(prev);
       subFetch(compute, prev);
-      return prev ?? value;
-    }, value, options);
+      return prev;
+    }, options);
   }
-  const aiResult = hydrateSignalFromAsyncIterable(signals.createMemo, compute, value, options);
+  const aiResult = hydrateSignalFromAsyncIterable(signals.createMemo, compute, options);
   if (aiResult !== null) return aiResult;
-  return signals.createMemo(prev => readSerializedOrCompute(compute, prev), value, options);
+  return signals.createMemo(prev => readSerializedOrCompute(compute, prev), options);
 }
-function hydratedCreateSignal(fn, second, third) {
-  if (typeof fn !== "function" || !sharedConfig.hydrating) return signals.createSignal(fn, second, third);
+function hydratedCreateSignal(fn, second) {
+  if (typeof fn !== "function" || !sharedConfig.hydrating) return signals.createSignal(fn, second);
   markTopLevelSnapshotScope();
-  const ssrSource = third?.ssrSource;
+  const ssrSource = second?.ssrSource;
   if (ssrSource === "client") {
     const [hydrated, setHydrated] = signals.createSignal(false, {
-      pureWrite: true
+      ownedWrite: true
     });
     const sig = signals.createSignal(prev => {
-      if (!hydrated()) return prev ?? second;
+      if (!hydrated()) return prev;
       return fn(prev);
-    }, second, third);
+    }, second);
     setHydrated(true);
     return sig;
   }
@@ -399,12 +399,12 @@ function hydratedCreateSignal(fn, second, third) {
     return signals.createSignal(prev => {
       if (!sharedConfig.hydrating) return fn(prev);
       subFetch(fn, prev);
-      return prev ?? second;
-    }, second, third);
+      return prev;
+    }, second);
   }
-  const aiResult = hydrateSignalFromAsyncIterable(signals.createSignal, fn, second, third);
+  const aiResult = hydrateSignalFromAsyncIterable(signals.createSignal, fn, second);
   if (aiResult !== null) return aiResult;
-  return signals.createSignal(prev => readSerializedOrCompute(fn, prev), second, third);
+  return signals.createSignal(prev => readSerializedOrCompute(fn, prev), second);
 }
 function hydratedCreateErrorBoundary(fn, fallback) {
   if (!sharedConfig.hydrating) return signals.createErrorBoundary(fn, fallback);
@@ -426,18 +426,18 @@ function hydratedCreateErrorBoundary(fn, fallback) {
   }
   return signals.createErrorBoundary(fn, fallback);
 }
-function hydratedCreateOptimistic(fn, second, third) {
-  if (typeof fn !== "function" || !sharedConfig.hydrating) return signals.createOptimistic(fn, second, third);
+function hydratedCreateOptimistic(fn, second) {
+  if (typeof fn !== "function" || !sharedConfig.hydrating) return signals.createOptimistic(fn, second);
   markTopLevelSnapshotScope();
-  const ssrSource = third?.ssrSource;
+  const ssrSource = second?.ssrSource;
   if (ssrSource === "client") {
     const [hydrated, setHydrated] = signals.createSignal(false, {
-      pureWrite: true
+      ownedWrite: true
     });
     const sig = signals.createOptimistic(prev => {
-      if (!hydrated()) return prev ?? second;
+      if (!hydrated()) return prev;
       return fn(prev);
-    }, second, third);
+    }, second);
     setHydrated(true);
     return sig;
   }
@@ -445,12 +445,12 @@ function hydratedCreateOptimistic(fn, second, third) {
     return signals.createOptimistic(prev => {
       if (!sharedConfig.hydrating) return fn(prev);
       subFetch(fn, prev);
-      return prev ?? second;
-    }, second, third);
+      return prev;
+    }, second);
   }
-  const aiResult = hydrateSignalFromAsyncIterable(signals.createOptimistic, fn, second, third);
+  const aiResult = hydrateSignalFromAsyncIterable(signals.createOptimistic, fn, second);
   if (aiResult !== null) return aiResult;
-  return signals.createOptimistic(prev => readSerializedOrCompute(fn, prev), second, third);
+  return signals.createOptimistic(prev => readSerializedOrCompute(fn, prev), second);
 }
 function wrapStoreFn(fn) {
   return draft => readSerializedOrCompute(() => fn(draft), draft);
@@ -458,7 +458,7 @@ function wrapStoreFn(fn) {
 function hydrateStoreLikeFn(coreFn, fn, initialValue, options, ssrSource) {
   if (ssrSource === "client") {
     const [hydrated, setHydrated] = signals.createSignal(false, {
-      pureWrite: true
+      ownedWrite: true
     });
     const result = coreFn(draft => {
       if (!hydrated()) return;
@@ -469,7 +469,7 @@ function hydrateStoreLikeFn(coreFn, fn, initialValue, options, ssrSource) {
   }
   if (ssrSource === "hybrid") {
     const [hydrated, setHydrated] = signals.createSignal(false, {
-      pureWrite: true
+      ownedWrite: true
     });
     const result = coreFn(draft => {
       const o = signals.getOwner();
@@ -499,14 +499,14 @@ function hydratedCreateStore(first, second, third) {
   if (typeof first !== "function" || !sharedConfig.hydrating) return signals.createStore(first, second, third);
   markTopLevelSnapshotScope();
   const ssrSource = third?.ssrSource;
-  if (ssrSource === "initial") return signals.createStore(second ?? {}, undefined, third);
+  if (ssrSource === "initial") return signals.createStore(second ?? {});
   return hydrateStoreLikeFn(signals.createStore, first, second ?? {}, third, ssrSource);
 }
 function hydratedCreateOptimisticStore(first, second, third) {
   if (typeof first !== "function" || !sharedConfig.hydrating) return signals.createOptimisticStore(first, second, third);
   markTopLevelSnapshotScope();
   const ssrSource = third?.ssrSource;
-  if (ssrSource === "initial") return signals.createOptimisticStore(second ?? {}, undefined, third);
+  if (ssrSource === "initial") return signals.createOptimisticStore(second ?? {});
   return hydrateStoreLikeFn(signals.createOptimisticStore, first, second ?? {}, third, ssrSource);
 }
 function hydratedCreateProjection(fn, initialValue, options) {
@@ -516,22 +516,22 @@ function hydratedCreateProjection(fn, initialValue, options) {
   if (ssrSource === "initial") return signals.createProjection(draft => draft, initialValue, options);
   return hydrateStoreLikeFn(signals.createProjection, fn, initialValue, options, ssrSource);
 }
-function hydratedEffect(coreFn, compute, effectFn, value, options) {
-  if (!sharedConfig.hydrating) return coreFn(compute, effectFn, value, options);
+function hydratedEffect(coreFn, compute, effectFn, options) {
+  if (!sharedConfig.hydrating || options?.transparent) return coreFn(compute, effectFn, options);
   const ssrSource = options?.ssrSource;
   if (ssrSource === "client") {
     const [hydrated, setHydrated] = signals.createSignal(false, {
-      pureWrite: true
+      ownedWrite: true
     });
     let active = false;
     coreFn(prev => {
-      if (!hydrated()) return value;
+      if (!hydrated()) return prev;
       active = true;
       return compute(prev);
     }, (next, prev) => {
       if (!active) return;
       return effectFn(next, prev);
-    }, value, options);
+    }, options);
     setHydrated(true);
     return;
   }
@@ -539,18 +539,18 @@ function hydratedEffect(coreFn, compute, effectFn, value, options) {
     coreFn(prev => {
       if (!sharedConfig.hydrating) return compute(prev);
       subFetch(compute, prev);
-      return prev ?? value;
-    }, effectFn, value, options);
+      return prev;
+    }, effectFn, options);
     return;
   }
   markTopLevelSnapshotScope();
-  coreFn(prev => readSerializedOrCompute(compute, prev), effectFn, value, options);
+  coreFn(prev => readSerializedOrCompute(compute, prev), effectFn, options);
 }
-function hydratedCreateRenderEffect(compute, effectFn, value, options) {
-  return hydratedEffect(signals.createRenderEffect, compute, effectFn, value, options);
+function hydratedCreateRenderEffect(compute, effectFn, options) {
+  return hydratedEffect(signals.createRenderEffect, compute, effectFn, options);
 }
-function hydratedCreateEffect(compute, effectFn, value, options) {
-  return hydratedEffect(signals.createEffect, compute, effectFn, value, options);
+function hydratedCreateEffect(compute, effectFn, options) {
+  return hydratedEffect(signals.createEffect, compute, effectFn, options);
 }
 function enableHydration() {
   _createMemo = hydratedCreateMemo;
@@ -609,24 +609,6 @@ const createStore = (...args) => (_createStore || signals.createStore)(...args);
 const createOptimisticStore = (...args) => (_createOptimisticStore || signals.createOptimisticStore)(...args);
 const createRenderEffect = (...args) => (_createRenderEffect || signals.createRenderEffect)(...args);
 const createEffect = (...args) => (_createEffect || signals.createEffect)(...args);
-function loadModuleAssets(mapping) {
-  const hy = globalThis._$HY;
-  if (!hy) return;
-  if (!hy.modules) hy.modules = {};
-  if (!hy.loading) hy.loading = {};
-  const pending = [];
-  for (const moduleUrl in mapping) {
-    if (hy.modules[moduleUrl]) continue;
-    const entryUrl = mapping[moduleUrl];
-    if (!hy.loading[moduleUrl]) {
-      hy.loading[moduleUrl] = import(entryUrl).then(mod => {
-        hy.modules[moduleUrl] = mod;
-      });
-    }
-    pending.push(hy.loading[moduleUrl]);
-  }
-  return pending.length ? Promise.all(pending).then(() => {}) : undefined;
-}
 function createBoundaryTrigger() {
   signals.setSnapshotCapture(false);
   const [s, set] = signals.createSignal(undefined, {
@@ -654,6 +636,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;
@@ -663,7 +677,7 @@ function createLoadingBoundary(fn, fallback, options) {
     let assetPromise;
     if (sharedConfig.hydrating && sharedConfig.has(id + "_assets")) {
       const mapping = sharedConfig.load(id + "_assets");
-      if (mapping && typeof mapping === "object") assetPromise = loadModuleAssets(mapping);
+      if (mapping && typeof mapping === "object") assetPromise = sharedConfig.loadModuleAssets?.(mapping);
     }
     if (sharedConfig.hydrating && sharedConfig.has(id)) {
       const ref = sharedConfig.load(id);
@@ -673,41 +687,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--;
@@ -719,10 +706,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);
@@ -794,8 +791,8 @@ function Repeat(props) {
 }
 function Show(props) {
   const keyed = props.keyed;
-  const conditionValue = signals.createMemo(() => props.when, undefined, undefined);
-  const condition = keyed ? conditionValue : signals.createMemo(conditionValue, undefined, {
+  const conditionValue = signals.createMemo(() => props.when, undefined);
+  const condition = keyed ? conditionValue : signals.createMemo(conditionValue, {
     equals: (a, b) => !a === !b
   });
   return signals.createMemo(() => {
@@ -809,7 +806,7 @@ function Show(props) {
       }), IS_DEV) : child;
     }
     return props.fallback;
-  }, undefined, undefined);
+  }, undefined);
 }
 function Switch(props) {
   const chs = children(() => props.children);
@@ -820,8 +817,8 @@ function Switch(props) {
       const index = i;
       const mp = mps[i];
       const prevFunc = func;
-      const conditionValue = signals.createMemo(() => prevFunc() ? undefined : mp.when, undefined, undefined);
-      const condition = mp.keyed ? conditionValue : signals.createMemo(conditionValue, undefined, {
+      const conditionValue = signals.createMemo(() => prevFunc() ? undefined : mp.when, undefined);
+      const condition = mp.keyed ? conditionValue : signals.createMemo(conditionValue, {
         equals: (a, b) => !a === !b
       });
       func = () => prevFunc() || (condition() ? [index, conditionValue, mp] : undefined);
@@ -838,7 +835,7 @@ function Switch(props) {
       if (signals.untrack(switchFunc)()?.[0] !== index) throw narrowedError("Match");
       return conditionValue();
     }), IS_DEV) : child;
-  }, undefined, undefined);
+  }, undefined);
 }
 function Match(props) {
   return props;
@@ -855,6 +852,12 @@ 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() {}
@@ -888,6 +891,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; }
@@ -928,6 +935,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; }
@@ -1010,6 +1021,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;