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

package/dist/dev.js

@@ -1,5 +1,5 @@
-import { getContext, createMemo as createMemo$1, flatten, getOwner, createRoot, setContext, untrack, createLoadingBoundary, onCleanup, isDisposed, runWithOwner, createOwner, createEffect as createEffect$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, createErrorBoundary as createErrorBoundary$1, markSnapshotScope, flush, clearSnapshots, peekNextChildId, mapArray, repeat } from '@solidjs/signals';
-export { $PROXY, $REFRESH, $TRACK, NotReadyError, action, createErrorBoundary, createLoadingBoundary, 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"),
@@ -92,6 +88,7 @@ function drainHydrationCallbacks() {
   setTimeout(() => {
     if (sharedConfig.verifyHydration) sharedConfig.verifyHydration();
     if (globalThis._$HY) globalThis._$HY.done = true;
+    sharedConfig.registry?.clear();
   });
 }
 function checkHydrationComplete() {
@@ -109,23 +106,10 @@ let _createOptimisticStore;
 let _createRenderEffect;
 let _createEffect;
 class MockPromise {
-  static all() {
-    return new MockPromise();
-  }
-  static allSettled() {
-    return new MockPromise();
-  }
-  static any() {
-    return new MockPromise();
-  }
-  static race() {
-    return new MockPromise();
-  }
-  static reject() {
-    return new MockPromise();
-  }
-  static resolve() {
-    return new MockPromise();
+  static {
+    for (const k of ["all", "allSettled", "any", "race", "reject", "resolve"]) {
+      MockPromise[k] = () => new MockPromise();
+    }
   }
   catch() {
     return new MockPromise();
@@ -160,6 +144,28 @@ function syncThenable(value) {
     }
   };
 }
+const NO_HYDRATED_VALUE = Symbol("NO_HYDRATED_VALUE");
+function readHydratedValue(initP, refresh) {
+  if (initP == null) return NO_HYDRATED_VALUE;
+  refresh();
+  if (typeof initP === "object" && initP.s === 2) throw initP.v;
+  return initP?.v ?? initP;
+}
+function readSerializedOrCompute(compute, prev) {
+  if (!sharedConfig.hydrating) return compute(prev);
+  const o = getOwner();
+  let initP;
+  if (sharedConfig.has(o.id)) initP = sharedConfig.load(o.id);
+  const init = readHydratedValue(initP, () => subFetch(compute, prev));
+  return init !== NO_HYDRATED_VALUE ? init : compute(prev);
+}
+function forwardIteratorReturn(it, value) {
+  const returned = it.return?.(value);
+  return returned && typeof returned.then === "function" ? returned : syncThenable(returned ?? {
+    done: true,
+    value
+  });
+}
 function normalizeIterator(it) {
   let first = true;
   let buffered = null;
@@ -186,6 +192,10 @@ function normalizeIterator(it) {
         latest = peek;
       }
       return Promise.resolve(latest);
+    },
+    return(value) {
+      buffered = null;
+      return forwardIteratorReturn(it, value);
     }
   };
 }
@@ -263,6 +273,9 @@ function wrapFirstYield(iterable, activate) {
             });
           }
           return p;
+        },
+        return(value) {
+          return forwardIteratorReturn(srcIt, value);
         }
       };
     }
@@ -345,6 +358,10 @@ function hydrateStoreFromAsyncIterable(coreFn, initialValue, options) {
               if (!r.done) result = process(r);
             }
             return Promise.resolve(result);
+          },
+          return(value) {
+            buffered = null;
+            return forwardIteratorReturn(srcIt, value);
           }
         };
       }
@@ -377,14 +394,7 @@ function hydratedCreateMemo(compute, value, options) {
   }
   const aiResult = hydrateSignalFromAsyncIterable(createMemo$1, compute, value, options);
   if (aiResult !== null) return aiResult;
-  return createMemo$1(prev => {
-    const o = getOwner();
-    if (!sharedConfig.hydrating) return compute(prev);
-    let initP;
-    if (sharedConfig.has(o.id)) initP = sharedConfig.load(o.id);
-    const init = initP?.v ?? initP;
-    return init != null ? (subFetch(compute, prev), init) : compute(prev);
-  }, value, options);
+  return createMemo$1(prev => readSerializedOrCompute(compute, prev), value, options);
 }
 function hydratedCreateSignal(fn, second, third) {
   if (typeof fn !== "function" || !sharedConfig.hydrating) return createSignal$1(fn, second, third);
@@ -410,14 +420,7 @@ function hydratedCreateSignal(fn, second, third) {
   }
   const aiResult = hydrateSignalFromAsyncIterable(createSignal$1, fn, second, third);
   if (aiResult !== null) return aiResult;
-  return createSignal$1(prev => {
-    if (!sharedConfig.hydrating) return fn(prev);
-    const o = getOwner();
-    let initP;
-    if (sharedConfig.has(o.id)) initP = sharedConfig.load(o.id);
-    const init = initP?.v ?? initP;
-    return init != null ? (subFetch(fn, prev), init) : fn(prev);
-  }, second, third);
+  return createSignal$1(prev => readSerializedOrCompute(fn, prev), second, third);
 }
 function hydratedCreateErrorBoundary(fn, fallback) {
   if (!sharedConfig.hydrating) return createErrorBoundary$1(fn, fallback);
@@ -463,24 +466,10 @@ function hydratedCreateOptimistic(fn, second, third) {
   }
   const aiResult = hydrateSignalFromAsyncIterable(createOptimistic$1, fn, second, third);
   if (aiResult !== null) return aiResult;
-  return createOptimistic$1(prev => {
-    const o = getOwner();
-    if (!sharedConfig.hydrating) return fn(prev);
-    let initP;
-    if (sharedConfig.has(o.id)) initP = sharedConfig.load(o.id);
-    const init = initP?.v ?? initP;
-    return init != null ? (subFetch(fn, prev), init) : fn(prev);
-  }, second, third);
+  return createOptimistic$1(prev => readSerializedOrCompute(fn, prev), second, third);
 }
 function wrapStoreFn(fn) {
-  return draft => {
-    const o = getOwner();
-    if (!sharedConfig.hydrating) return fn(draft);
-    let initP;
-    if (sharedConfig.has(o.id)) initP = sharedConfig.load(o.id);
-    const init = initP?.v ?? initP;
-    return init != null ? (subFetch(fn, draft), init) : fn(draft);
-  };
+  return draft => readSerializedOrCompute(() => fn(draft), draft);
 }
 function hydrateStoreLikeFn(coreFn, fn, initialValue, options, ssrSource) {
   if (ssrSource === "client") {
@@ -503,11 +492,8 @@ function hydrateStoreLikeFn(coreFn, fn, initialValue, options, ssrSource) {
       if (!hydrated()) {
         if (sharedConfig.has(o.id)) {
           const initP = sharedConfig.load(o.id);
-          const init = initP?.v ?? initP;
-          if (init != null) {
-            subFetch(fn, draft);
-            return init;
-          }
+          const init = readHydratedValue(initP, () => subFetch(fn, draft));
+          if (init !== NO_HYDRATED_VALUE) return init;
         }
         return fn(draft);
       }
@@ -574,14 +560,7 @@ function hydratedEffect(coreFn, compute, effectFn, value, options) {
     return;
   }
   markTopLevelSnapshotScope();
-  coreFn(prev => {
-    const o = getOwner();
-    if (!sharedConfig.hydrating) return compute(prev);
-    let initP;
-    if (sharedConfig.has(o.id)) initP = sharedConfig.load(o.id);
-    const init = initP?.v ?? initP;
-    return init != null ? (subFetch(compute, prev), init) : compute(prev);
-  }, effectFn, value, options);
+  coreFn(prev => readSerializedOrCompute(compute, prev), effectFn, value, options);
 }
 function hydratedCreateRenderEffect(compute, effectFn, value, options) {
   return hydratedEffect(createRenderEffect$1, compute, effectFn, value, options);
@@ -679,7 +658,7 @@ function resumeBoundaryHydration(o, id, set) {
     checkHydrationComplete();
     return;
   }
-  sharedConfig.gather(id);
+  sharedConfig.gather?.(id);
   _hydratingValue = true;
   markSnapshotScope(o);
   _snapshotRootOwner = o;
@@ -691,11 +670,41 @@ function resumeBoundaryHydration(o, id, set) {
   flush();
   checkHydrationComplete();
 }
-function Loading(props) {
-  const onOpt = props.on ? {
-    on: () => props.on()
-  } : undefined;
-  if (!sharedConfig.hydrating) return createLoadingBoundary(() => props.children, () => props.fallback, onOpt);
+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;
   return createMemo$1(() => {
     const o = getOwner();
     const id = o.id;
@@ -705,27 +714,21 @@ function Loading(props) {
       if (mapping && typeof mapping === "object") assetPromise = loadModuleAssets(mapping);
     }
     if (sharedConfig.hydrating && sharedConfig.has(id)) {
-      let ref = sharedConfig.load(id);
+      const ref = sharedConfig.load(id);
       let p;
       if (ref) {
-        if (typeof ref !== "object" || ref.s !== 1) p = ref;else sharedConfig.gather(id);
+        if (typeof ref !== "object" || ref.s == null) p = ref;else if (ref.s === 1 || ref.s === 2) sharedConfig.gather?.(id);else p = ref;
+      }
+      if (ref && typeof ref === "object" && ref.s === 1 && p == null && !settledSerializationResumeQueued) {
+        settledSerializationResumeQueued = true;
+        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(() => resumeBoundaryHydration(o, id, set), err => {
-            _pendingBoundaries--;
-            checkHydrationComplete();
-            runWithOwner(o, () => {
-              throw err;
-            });
-          });
+          waitAndResume(p, resume, assetPromise);
         } else {
           const afterAssets = () => {
             _pendingBoundaries--;
@@ -734,17 +737,26 @@ function Loading(props) {
           };
           if (assetPromise) assetPromise.then(() => queueMicrotask(afterAssets));else queueMicrotask(afterAssets);
         }
-        return props.fallback;
+        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) {
-      _pendingBoundaries++;
-      const set = createBoundaryTrigger();
-      assetPromise.then(() => resumeBoundaryHydration(o, id, set));
+    if (assetPromise && !sharedConfig.has(id)) {
+      const [, resume] = initBoundaryResume(o, id);
+      assetPromise.then(resume);
       return undefined;
     }
-    const boundary = createLoadingBoundary(() => props.children, () => props.fallback, onOpt);
-    return boundary;
+    return createLoadingBoundary$1(fn, fallback, options);
   });
 }
 function NoHydration(props) {
@@ -884,16 +896,24 @@ function Errored(props) {
     return typeof f === "function" && f.length ? f(err, reset) : f;
   });
 }
+function Loading(props) {
+  const onOpt = "on" in props ? {
+    on: () => props.on
+  } : 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, 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 };