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

package/dist/dev.cjs

@@ -19,10 +19,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()), {
     name: "children",
     lazy: true
   } );
@@ -282,7 +282,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;
@@ -294,9 +294,12 @@ function hydrateSignalFromAsyncIterable(coreFn, compute, value, options) {
       return it;
     }
   };
-  return coreFn(() => iterable, value, options);
+  return coreFn(prev => {
+    subFetch(compute, prev);
+    return iterable;
+  }, options);
 }
-function hydrateStoreFromAsyncIterable(coreFn, initialValue, options) {
+function hydrateStoreFromAsyncIterable(coreFn, fn, initialValue, options) {
   const parent = signals.getOwner();
   const expectedId = signals.peekNextChildId(parent);
   if (!sharedConfig.has(expectedId)) return null;
@@ -306,6 +309,10 @@ function hydrateStoreFromAsyncIterable(coreFn, initialValue, options) {
   let isFirst = true;
   let buffered = null;
   return coreFn(draft => {
+    const {
+      proxy
+    } = createShadowDraft(draft);
+    subFetch(fn, proxy);
     const process = res => {
       if (res.done) return {
         done: true,
@@ -313,11 +320,16 @@ function hydrateStoreFromAsyncIterable(coreFn, initialValue, options) {
       };
       if (isFirst) {
         isFirst = false;
-        if (Array.isArray(res.value)) {
-          for (let i = 0; i < res.value.length; i++) draft[i] = res.value[i];
-          draft.length = res.value.length;
-        } else {
-          Object.assign(draft, res.value);
+        signals.setSnapshotCapture(false);
+        try {
+          if (Array.isArray(res.value)) {
+            for (let i = 0; i < res.value.length; i++) draft[i] = res.value[i];
+            draft.length = res.value.length;
+          } else {
+            Object.assign(draft, res.value);
+          }
+        } finally {
+          signals.setSnapshotCapture(true);
         }
       } else {
         applyPatches(draft, res.value);
@@ -369,59 +381,45 @@ 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;
   }
-  if (ssrSource === "initial") {
-    return signals.createMemo(prev => {
-      if (!sharedConfig.hydrating) return compute(prev);
-      subFetch(compute, prev);
-      return prev ?? value;
-    }, value, 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;
   }
-  if (ssrSource === "initial") {
-    return signals.createSignal(prev => {
-      if (!sharedConfig.hydrating) return fn(prev);
-      subFetch(fn, prev);
-      return prev ?? second;
-    }, second, third);
-  }
-  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);
@@ -443,31 +441,24 @@ 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;
   }
-  if (ssrSource === "initial") {
-    return signals.createOptimistic(prev => {
-      if (!sharedConfig.hydrating) return fn(prev);
-      subFetch(fn, prev);
-      return prev ?? second;
-    }, second, third);
-  }
-  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);
@@ -475,7 +466,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;
@@ -486,7 +477,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();
@@ -508,7 +499,7 @@ function hydrateStoreLikeFn(coreFn, fn, initialValue, options, ssrSource) {
     setHydrated(true);
     return result;
   }
-  const aiResult = hydrateStoreFromAsyncIterable(coreFn, initialValue, options);
+  const aiResult = hydrateStoreFromAsyncIterable(coreFn, fn, initialValue, options);
   if (aiResult !== null) return aiResult;
   return coreFn(wrapStoreFn(fn), initialValue, options);
 }
@@ -516,58 +507,47 @@ 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);
   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);
   return hydrateStoreLikeFn(signals.createOptimisticStore, first, second ?? {}, third, ssrSource);
 }
 function hydratedCreateProjection(fn, initialValue, options) {
   if (!sharedConfig.hydrating) return signals.createProjection(fn, initialValue, options);
   markTopLevelSnapshotScope();
   const ssrSource = options?.ssrSource;
-  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;
   }
-  if (ssrSource === "initial") {
-    coreFn(prev => {
-      if (!sharedConfig.hydrating) return compute(prev);
-      subFetch(compute, prev);
-      return prev ?? value;
-    }, effectFn, value, 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;
@@ -626,24 +606,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, {
@@ -712,7 +674,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);
@@ -831,10 +793,10 @@ function Repeat(props) {
 }
 function Show(props) {
   const keyed = props.keyed;
-  const conditionValue = signals.createMemo(() => props.when, undefined, {
+  const conditionValue = signals.createMemo(() => props.when, {
     name: "condition value"
   } );
-  const condition = keyed ? conditionValue : signals.createMemo(conditionValue, undefined, {
+  const condition = keyed ? conditionValue : signals.createMemo(conditionValue, {
     equals: (a, b) => !a === !b,
     name: "condition"
   } );
@@ -849,7 +811,7 @@ function Show(props) {
       }), "<Show>") : child;
     }
     return props.fallback;
-  }, undefined, {
+  }, {
     name: "value"
   } );
 }
@@ -862,10 +824,10 @@ function Switch(props) {
       const index = i;
       const mp = mps[i];
       const prevFunc = func;
-      const conditionValue = signals.createMemo(() => prevFunc() ? undefined : mp.when, undefined, {
+      const conditionValue = signals.createMemo(() => prevFunc() ? undefined : mp.when, {
         name: "condition value"
       } );
-      const condition = mp.keyed ? conditionValue : signals.createMemo(conditionValue, undefined, {
+      const condition = mp.keyed ? conditionValue : signals.createMemo(conditionValue, {
         equals: (a, b) => !a === !b,
         name: "condition"
       } );
@@ -883,7 +845,7 @@ function Switch(props) {
       if (signals.untrack(switchFunc)()?.[0] !== index) throw narrowedError("Match");
       return conditionValue();
     }), "<Match>") : child;
-  }, undefined, {
+  }, {
     name: "eval conditions"
   } );
 }
@@ -905,7 +867,7 @@ function Loading(props) {
 }
 function Reveal(props) {
   return signals.createRevealOrder(() => props.children, {
-    together: () => !!props.together,
+    order: () => props.order ?? "sequential",
     collapsed: () => !!props.collapsed
   });
 }