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

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) {
@@ -18,10 +18,10 @@ function useContext(context) {
   return getContext(context);
 }
 function children(fn) {
-  const c = createMemo$1(fn, undefined, {
+  const c = createMemo$1(fn, {
     lazy: true
   });
-  const memo = createMemo$1(() => flatten(c()), undefined, {
+  const memo = createMemo$1(() => flatten(c()), {
     name: "children",
     lazy: true
   } );
@@ -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"),
@@ -285,7 +281,7 @@ function wrapFirstYield(iterable, activate) {
     }
   };
 }
-function hydrateSignalFromAsyncIterable(coreFn, compute, value, options) {
+function hydrateSignalFromAsyncIterable(coreFn, compute, options) {
   const parent = getOwner();
   const expectedId = peekNextChildId(parent);
   if (!sharedConfig.has(expectedId)) return null;
@@ -297,7 +293,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 = getOwner();
@@ -372,20 +368,20 @@ function hydrateStoreFromAsyncIterable(coreFn, initialValue, options) {
     };
   }, initialValue, options);
 }
-function hydratedCreateMemo(compute, value, options) {
+function hydratedCreateMemo(compute, options) {
   if (!sharedConfig.hydrating || options?.transparent) {
-    return createMemo$1(compute, value, options);
+    return createMemo$1(compute, options);
   }
   markTopLevelSnapshotScope();
   const ssrSource = options?.ssrSource;
   if (ssrSource === "client") {
     const [hydrated, setHydrated] = createSignal$1(false, {
-      pureWrite: true
+      ownedWrite: true
     });
     const memo = createMemo$1(prev => {
-      if (!hydrated()) return prev ?? value;
+      if (!hydrated()) return prev;
       return compute(prev);
-    }, value, options);
+    }, options);
     setHydrated(true);
     return memo;
   }
@@ -393,25 +389,25 @@ function hydratedCreateMemo(compute, value, options) {
     return createMemo$1(prev => {
       if (!sharedConfig.hydrating) return compute(prev);
       subFetch(compute, prev);
-      return prev ?? value;
-    }, value, options);
+      return prev;
+    }, options);
   }
-  const aiResult = hydrateSignalFromAsyncIterable(createMemo$1, compute, value, options);
+  const aiResult = hydrateSignalFromAsyncIterable(createMemo$1, compute, options);
   if (aiResult !== null) return aiResult;
-  return createMemo$1(prev => readSerializedOrCompute(compute, prev), value, options);
+  return createMemo$1(prev => readSerializedOrCompute(compute, prev), options);
 }
-function hydratedCreateSignal(fn, second, third) {
-  if (typeof fn !== "function" || !sharedConfig.hydrating) return createSignal$1(fn, second, third);
+function hydratedCreateSignal(fn, second) {
+  if (typeof fn !== "function" || !sharedConfig.hydrating) return createSignal$1(fn, second);
   markTopLevelSnapshotScope();
-  const ssrSource = third?.ssrSource;
+  const ssrSource = second?.ssrSource;
   if (ssrSource === "client") {
     const [hydrated, setHydrated] = createSignal$1(false, {
-      pureWrite: true
+      ownedWrite: true
     });
     const sig = createSignal$1(prev => {
-      if (!hydrated()) return prev ?? second;
+      if (!hydrated()) return prev;
       return fn(prev);
-    }, second, third);
+    }, second);
     setHydrated(true);
     return sig;
   }
@@ -419,12 +415,12 @@ function hydratedCreateSignal(fn, second, third) {
     return createSignal$1(prev => {
       if (!sharedConfig.hydrating) return fn(prev);
       subFetch(fn, prev);
-      return prev ?? second;
-    }, second, third);
+      return prev;
+    }, second);
   }
-  const aiResult = hydrateSignalFromAsyncIterable(createSignal$1, fn, second, third);
+  const aiResult = hydrateSignalFromAsyncIterable(createSignal$1, fn, second);
   if (aiResult !== null) return aiResult;
-  return createSignal$1(prev => readSerializedOrCompute(fn, prev), second, third);
+  return createSignal$1(prev => readSerializedOrCompute(fn, prev), second);
 }
 function hydratedCreateErrorBoundary(fn, fallback) {
   if (!sharedConfig.hydrating) return createErrorBoundary$1(fn, fallback);
@@ -446,18 +442,18 @@ function hydratedCreateErrorBoundary(fn, fallback) {
   }
   return createErrorBoundary$1(fn, fallback);
 }
-function hydratedCreateOptimistic(fn, second, third) {
-  if (typeof fn !== "function" || !sharedConfig.hydrating) return createOptimistic$1(fn, second, third);
+function hydratedCreateOptimistic(fn, second) {
+  if (typeof fn !== "function" || !sharedConfig.hydrating) return createOptimistic$1(fn, second);
   markTopLevelSnapshotScope();
-  const ssrSource = third?.ssrSource;
+  const ssrSource = second?.ssrSource;
   if (ssrSource === "client") {
     const [hydrated, setHydrated] = createSignal$1(false, {
-      pureWrite: true
+      ownedWrite: true
     });
     const sig = createOptimistic$1(prev => {
-      if (!hydrated()) return prev ?? second;
+      if (!hydrated()) return prev;
       return fn(prev);
-    }, second, third);
+    }, second);
     setHydrated(true);
     return sig;
   }
@@ -465,12 +461,12 @@ function hydratedCreateOptimistic(fn, second, third) {
     return createOptimistic$1(prev => {
       if (!sharedConfig.hydrating) return fn(prev);
       subFetch(fn, prev);
-      return prev ?? second;
-    }, second, third);
+      return prev;
+    }, second);
   }
-  const aiResult = hydrateSignalFromAsyncIterable(createOptimistic$1, fn, second, third);
+  const aiResult = hydrateSignalFromAsyncIterable(createOptimistic$1, fn, second);
   if (aiResult !== null) return aiResult;
-  return createOptimistic$1(prev => readSerializedOrCompute(fn, prev), second, third);
+  return createOptimistic$1(prev => readSerializedOrCompute(fn, prev), second);
 }
 function wrapStoreFn(fn) {
   return draft => readSerializedOrCompute(() => fn(draft), draft);
@@ -478,7 +474,7 @@ function wrapStoreFn(fn) {
 function hydrateStoreLikeFn(coreFn, fn, initialValue, options, ssrSource) {
   if (ssrSource === "client") {
     const [hydrated, setHydrated] = createSignal$1(false, {
-      pureWrite: true
+      ownedWrite: true
     });
     const result = coreFn(draft => {
       if (!hydrated()) return;
@@ -489,7 +485,7 @@ function hydrateStoreLikeFn(coreFn, fn, initialValue, options, ssrSource) {
   }
   if (ssrSource === "hybrid") {
     const [hydrated, setHydrated] = createSignal$1(false, {
-      pureWrite: true
+      ownedWrite: true
     });
     const result = coreFn(draft => {
       const o = getOwner();
@@ -519,14 +515,14 @@ function hydratedCreateStore(first, second, third) {
   if (typeof first !== "function" || !sharedConfig.hydrating) return createStore$1(first, second, third);
   markTopLevelSnapshotScope();
   const ssrSource = third?.ssrSource;
-  if (ssrSource === "initial") return createStore$1(second ?? {}, undefined, third);
+  if (ssrSource === "initial") return createStore$1(second ?? {});
   return hydrateStoreLikeFn(createStore$1, first, second ?? {}, third, ssrSource);
 }
 function hydratedCreateOptimisticStore(first, second, third) {
   if (typeof first !== "function" || !sharedConfig.hydrating) return createOptimisticStore$1(first, second, third);
   markTopLevelSnapshotScope();
   const ssrSource = third?.ssrSource;
-  if (ssrSource === "initial") return createOptimisticStore$1(second ?? {}, undefined, third);
+  if (ssrSource === "initial") return createOptimisticStore$1(second ?? {});
   return hydrateStoreLikeFn(createOptimisticStore$1, first, second ?? {}, third, ssrSource);
 }
 function hydratedCreateProjection(fn, initialValue, options) {
@@ -536,22 +532,22 @@ function hydratedCreateProjection(fn, initialValue, options) {
   if (ssrSource === "initial") return createProjection$1(draft => draft, initialValue, options);
   return hydrateStoreLikeFn(createProjection$1, 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] = createSignal$1(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;
   }
@@ -559,18 +555,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(createRenderEffect$1, compute, effectFn, value, options);
+function hydratedCreateRenderEffect(compute, effectFn, options) {
+  return hydratedEffect(createRenderEffect$1, compute, effectFn, options);
 }
-function hydratedCreateEffect(compute, effectFn, value, options) {
-  return hydratedEffect(createEffect$1, compute, effectFn, value, options);
+function hydratedCreateEffect(compute, effectFn, options) {
+  return hydratedEffect(createEffect$1, compute, effectFn, options);
 }
 function enableHydration() {
   _createMemo = hydratedCreateMemo;
@@ -629,24 +625,6 @@ const createStore = (...args) => (_createStore || createStore$1)(...args);
 const createOptimisticStore = (...args) => (_createOptimisticStore || createOptimisticStore$1)(...args);
 const createRenderEffect = (...args) => (_createRenderEffect || createRenderEffect$1)(...args);
 const createEffect = (...args) => (_createEffect || createEffect$1)(...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() {
   setSnapshotCapture(false);
   const [s, set] = createSignal$1(undefined, {
@@ -674,6 +652,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;
@@ -683,7 +693,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);
@@ -693,41 +703,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 +722,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);
@@ -819,10 +812,10 @@ function Repeat(props) {
 }
 function Show(props) {
   const keyed = props.keyed;
-  const conditionValue = createMemo$1(() => props.when, undefined, {
+  const conditionValue = createMemo$1(() => props.when, {
     name: "condition value"
   } );
-  const condition = keyed ? conditionValue : createMemo$1(conditionValue, undefined, {
+  const condition = keyed ? conditionValue : createMemo$1(conditionValue, {
     equals: (a, b) => !a === !b,
     name: "condition"
   } );
@@ -837,7 +830,7 @@ function Show(props) {
       }), "<Show>") : child;
     }
     return props.fallback;
-  }, undefined, {
+  }, {
     name: "value"
   } );
 }
@@ -850,10 +843,10 @@ function Switch(props) {
       const index = i;
       const mp = mps[i];
       const prevFunc = func;
-      const conditionValue = createMemo$1(() => prevFunc() ? undefined : mp.when, undefined, {
+      const conditionValue = createMemo$1(() => prevFunc() ? undefined : mp.when, {
         name: "condition value"
       } );
-      const condition = mp.keyed ? conditionValue : createMemo$1(conditionValue, undefined, {
+      const condition = mp.keyed ? conditionValue : createMemo$1(conditionValue, {
         equals: (a, b) => !a === !b,
         name: "condition"
       } );
@@ -871,7 +864,7 @@ function Switch(props) {
       if (untrack(switchFunc)()?.[0] !== index) throw narrowedError("Match");
       return conditionValue();
     }), "<Match>") : child;
-  }, undefined, {
+  }, {
     name: "eval conditions"
   } );
 }
@@ -891,16 +884,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 };