solid-js 2.0.0-beta.10 → 2.0.0-beta.12

package/dist/server.cjs

@@ -8,13 +8,154 @@ const NoHydrateContext = {
 };
 const sharedConfig = {
   getNextContextId() {
-    const o = signals.getOwner();
+    const o = getOwner();
     if (!o) throw new Error(`getNextContextId cannot be used under non-hydrating context`);
-    if (signals.getContext(NoHydrateContext)) return undefined;
-    return signals.getNextChildId(o);
+    if (getContext(NoHydrateContext)) return undefined;
+    return getNextChildId(o);
   }
 };
 
+const defaultSSRContext = {};
+let currentOwner = null;
+const OWNER_POOL_MAX = 4096;
+const ownerPool = [];
+function formatChildId(prefix, id) {
+  const num = id.toString(36);
+  const len = num.length - 1;
+  return prefix + (len ? String.fromCharCode(64 + len) : "") + num;
+}
+function nextChildIdFor(owner, consume) {
+  let counter = owner;
+  while (counter._transparent && counter._parent) counter = counter._parent;
+  if (counter.id != null) {
+    return formatChildId(counter.id, counter._childCount++ );
+  }
+  throw new Error("Cannot get child id from owner without an id");
+}
+function consumeClientComputedSlot(owner) {
+  if (owner?.id != null) nextChildIdFor(owner);
+}
+function getNextChildId(owner) {
+  return nextChildIdFor(owner);
+}
+function createOwner(options) {
+  const parent = currentOwner;
+  const transparent = options?.transparent ?? false;
+  const id = options?.id ?? (transparent ? parent?.id : parent?.id != null ? nextChildIdFor(parent) : undefined);
+  const ctx = parent?._context ?? defaultSSRContext;
+  let owner;
+  if (ownerPool.length) {
+    owner = ownerPool.pop();
+    owner.id = id;
+    owner._transparent = transparent;
+    owner._disposal = null;
+    owner._parent = parent;
+    owner._context = ctx;
+    owner._childCount = 0;
+    owner._firstChild = null;
+    owner._nextSibling = null;
+    owner._disposed = false;
+  } else {
+    owner = {
+      id,
+      _transparent: transparent,
+      _disposal: null,
+      _parent: parent,
+      _context: ctx,
+      _childCount: 0,
+      _firstChild: null,
+      _nextSibling: null,
+      _disposed: false
+    };
+  }
+  if (parent) {
+    const lastChild = parent._firstChild;
+    if (lastChild) owner._nextSibling = lastChild;
+    parent._firstChild = owner;
+  }
+  return owner;
+}
+function runWithOwner(owner, fn) {
+  const prev = currentOwner;
+  currentOwner = owner;
+  try {
+    return fn();
+  } finally {
+    currentOwner = prev;
+  }
+}
+function getOwner() {
+  return currentOwner;
+}
+function isDisposed(owner) {
+  return owner._disposed;
+}
+function onCleanup(fn) {
+  const o = currentOwner;
+  if (!o) return fn;
+  if (!o._disposal) o._disposal = fn;else if (Array.isArray(o._disposal)) o._disposal.push(fn);else o._disposal = [o._disposal, fn];
+  return fn;
+}
+function getContext(context, owner = currentOwner) {
+  if (!owner) throw new signals.NoOwnerError();
+  const map = owner._context;
+  const stored = map[context.id];
+  const value = stored !== undefined ? stored : context.defaultValue;
+  if (value === undefined) throw new signals.ContextNotFoundError();
+  return value;
+}
+function setContext(context, value, owner = currentOwner) {
+  if (!owner) throw new signals.NoOwnerError();
+  const o = owner;
+  o._context = {
+    ...o._context,
+    [context.id]: value === undefined ? context.defaultValue : value
+  };
+}
+function disposeOwner(owner, self = true) {
+  const node = owner;
+  if (node._disposed) return;
+  if (!node._firstChild && !node._disposal) {
+    if (self) {
+      node._disposed = true;
+      if (ownerPool.length < OWNER_POOL_MAX) {
+        node.id = undefined;
+        node._parent = null;
+        node._nextSibling = null;
+        ownerPool.push(node);
+      }
+    }
+    return;
+  }
+  if (self) node._disposed = true;
+  let child = node._firstChild;
+  while (child) {
+    const next = child._nextSibling;
+    disposeOwner(child, true);
+    child = next;
+  }
+  node._firstChild = null;
+  node._childCount = 0;
+  const d = node._disposal;
+  if (d) {
+    if (Array.isArray(d)) {
+      for (let i = 0, len = d.length; i < len; i++) d[i]();
+    } else {
+      d();
+    }
+    node._disposal = null;
+  }
+  if (self && ownerPool.length < OWNER_POOL_MAX) {
+    node.id = undefined;
+    node._parent = null;
+    node._nextSibling = null;
+    ownerPool.push(node);
+  }
+}
+function createRoot(init, options) {
+  const owner = createOwner(options);
+  return runWithOwner(owner, () => init(() => disposeOwner(owner)));
+}
 let Observer = null;
 function runWithObserver(comp, fn) {
   const prev = Observer;
@@ -99,8 +240,11 @@ function createSignal(first, second) {
   }];
 }
 function createMemo(compute, options) {
+  if (options?.sync) {
+    return createSyncMemo(compute, options);
+  }
   const ctx = sharedConfig.context;
-  const owner = signals.createOwner();
+  const owner = createOwner();
   const comp = {
     owner,
     value: undefined,
@@ -109,12 +253,12 @@ function createMemo(compute, options) {
     computed: false,
     disposed: false
   };
-  signals.runWithOwner(owner, () => signals.onCleanup(() => {
+  runWithOwner(owner, () => onCleanup(() => {
     comp.disposed = true;
   }));
   function update() {
     if (comp.disposed) return;
-    const run = () => signals.runWithOwner(owner, () => runWithObserver(comp, () => comp.compute(comp.value)));
+    const run = () => runWithOwner(owner, () => runWithObserver(comp, () => comp.compute(comp.value)));
     try {
       comp.error = undefined;
       const result = run();
@@ -134,7 +278,7 @@ function createMemo(compute, options) {
   } else if (!options?.lazy) {
     update();
   }
-  return () => {
+  const read = () => {
     if (!comp.computed) {
       update();
     }
@@ -143,6 +287,44 @@ function createMemo(compute, options) {
     }
     return comp.value;
   };
+  read[signals.$REFRESH] = comp;
+  return read;
+}
+function createSyncMemo(compute, options) {
+  const owner = createOwner();
+  let value;
+  let error;
+  let cached = false;
+  function pull() {
+    const prev = currentOwner;
+    currentOwner = owner;
+    try {
+      value = compute(value);
+      error = undefined;
+      cached = true;
+      return value;
+    } catch (err) {
+      if (err instanceof signals.NotReadyError) throw err;
+      error = err;
+      cached = true;
+      throw err;
+    } finally {
+      currentOwner = prev;
+    }
+  }
+  if (!options?.lazy) {
+    try {
+      pull();
+    } catch {
+    }
+  }
+  return () => {
+    if (cached) {
+      if (error !== undefined) throw error;
+      return value;
+    }
+    return pull();
+  };
 }
 function createDeepProxy(target, patches, basePath = []) {
   const childProxies = new Map();
@@ -207,7 +389,7 @@ function createDeepProxy(target, patches, basePath = []) {
 function processResult(comp, result, owner, ctx, deferStream, ssrSource, rerun) {
   if (comp.disposed) return;
   const id = owner.id;
-  const noHydrate = signals.getContext(NoHydrateContext, owner);
+  const noHydrate = getContext(NoHydrateContext, owner);
   if (result instanceof Promise) {
     if (result.s === 1) {
       comp.value = result.v;
@@ -326,11 +508,11 @@ function closeAsyncIterator(iter, value) {
 function serverEffect(compute, effectFn, options) {
   const ssrSource = options?.ssrSource;
   if (ssrSource === "client") {
-    signals.createOwner();
+    createOwner();
     return;
   }
   const ctx = sharedConfig.context;
-  const owner = signals.createOwner();
+  const owner = createOwner();
   const comp = {
     owner,
     value: undefined,
@@ -340,12 +522,12 @@ function serverEffect(compute, effectFn, options) {
     disposed: false
   };
   if (ssrSource) {
-    signals.runWithOwner(owner, () => signals.onCleanup(() => {
+    runWithOwner(owner, () => onCleanup(() => {
       comp.disposed = true;
     }));
   }
   try {
-    const result = signals.runWithOwner(owner, () => runWithObserver(comp, () => compute(undefined)));
+    const result = runWithOwner(owner, () => runWithObserver(comp, () => compute(undefined)));
     if (ssrSource) {
       processResult(comp, result, owner, ctx, options?.deferStream, ssrSource);
     }
@@ -360,8 +542,8 @@ function createRenderEffect(compute, effectFn, options) {
   serverEffect(compute, effectFn, options);
 }
 function createTrackedEffect(compute, options) {
-  const o = signals.getOwner();
-  if (o?.id != null) signals.getNextChildId(o);
+  const o = getOwner();
+  if (o?.id != null) getNextChildId(o);
 }
 function createReaction(effectFn, options) {
   return tracking => {
@@ -404,20 +586,20 @@ function createPendingProxy(state, source) {
 }
 function createProjection(fn, initialValue, options) {
   const ctx = sharedConfig.context;
-  const owner = signals.createOwner();
+  const owner = createOwner();
   const [state] = createStore(initialValue);
   if (options?.ssrSource === "client") {
     return state;
   }
   let disposed = false;
-  signals.runWithOwner(owner, () => signals.onCleanup(() => {
+  runWithOwner(owner, () => onCleanup(() => {
     disposed = true;
   }));
   const ssrSource = options?.ssrSource;
   const useProxy = ssrSource !== "hybrid";
   const patches = [];
   const draft = useProxy ? createDeepProxy(state, patches) : state;
-  const runProjection = () => signals.runWithOwner(owner, () => fn(draft));
+  const runProjection = () => runWithOwner(owner, () => fn(draft));
   const result = runProjection();
   const iteratorFn = result?.[Symbol.asyncIterator];
   if (typeof iteratorFn === "function") {
@@ -448,7 +630,7 @@ function createProjection(fn, initialValue, options) {
       }, error => {
         markReady();
       }, () => disposed);
-      if (ctx?.async && !signals.getContext(NoHydrateContext) && owner.id) ctx.serialize(owner.id, deferred.promise, options?.deferStream);
+      if (ctx?.async && !getContext(NoHydrateContext) && owner.id) ctx.serialize(owner.id, deferred.promise, options?.deferStream);
       return pending;
     } else {
       let currentResult = result;
@@ -480,7 +662,7 @@ function createProjection(fn, initialValue, options) {
       }, error => {
         markReady();
       }, () => disposed);
-      if (ctx?.async && !signals.getContext(NoHydrateContext) && owner.id) {
+      if (ctx?.async && !getContext(NoHydrateContext) && owner.id) {
         let tappedFirst = true;
         const tapped = {
           [Symbol.asyncIterator]: () => ({
@@ -541,7 +723,7 @@ function createProjection(fn, initialValue, options) {
     }, error => {
       markReady();
     }, () => disposed);
-    if (ctx?.async && !signals.getContext(NoHydrateContext) && owner.id) ctx.serialize(owner.id, deferred.promise, options?.deferStream);
+    if (ctx?.async && !getContext(NoHydrateContext) && owner.id) ctx.serialize(owner.id, deferred.promise, options?.deferStream);
     return pending;
   }
   if (result !== undefined && result !== state && result !== draft) {
@@ -567,46 +749,104 @@ function reconcile(value) {
 function deep(store) {
   return store;
 }
+function proxySource(read) {
+  return new Proxy({}, {
+    get(_, property, receiver) {
+      if (property === signals.$PROXY) return receiver;
+      const source = read() || {};
+      return source[property];
+    },
+    has(_, property) {
+      if (property === signals.$PROXY) return true;
+      return property in (read() || {});
+    },
+    ownKeys() {
+      return Object.keys(read() || {});
+    },
+    getOwnPropertyDescriptor(_, property) {
+      return {
+        configurable: true,
+        enumerable: true,
+        get() {
+          return (read() || {})[property];
+        }
+      };
+    }
+  });
+}
+function merge(...sources) {
+  for (let i = 0; i < sources.length; i++) {
+    if (typeof sources[i] === "function") {
+      sources[i] = proxySource(createMemo(sources[i]));
+    }
+  }
+  return signals.merge(...sources);
+}
 function mapArray(list, mapFn, options = {}) {
-  const parent = signals.createOwner();
-  return createMemo(() => {
+  const indexes = mapFn.length > 1;
+  const parent = currentOwner;
+  const read = createMemo(() => {
     const items = list();
-    let s = [];
+    const s = [];
     if (items && items.length) {
-      signals.runWithOwner(parent, () => {
+      const parent = currentOwner;
+      const origId = parent.id;
+      const origChildCount = parent._childCount;
+      try {
         for (let i = 0, len = items.length; i < len; i++) {
-          const o = signals.createOwner();
-          s.push(signals.runWithOwner(o, () => mapFn(() => items[i], () => i)));
+          if (origId !== undefined) {
+            parent.id = formatChildId(origId, origChildCount + i);
+          }
+          parent._childCount = 0;
+          s.push(options.keyed === false ? indexes ? mapFn(() => items[i], i) : mapFn(() => items[i]) : typeof options.keyed === "function" ? indexes ? mapFn(() => items[i], () => i) : mapFn(() => items[i]) : indexes ? mapFn(items[i], () => i) : mapFn(items[i]));
         }
-      });
+      } finally {
+        parent.id = origId;
+        parent._childCount = origChildCount + items.length;
+      }
     } else if (options.fallback) {
-      s = [signals.runWithOwner(parent, () => {
-        const fo = signals.createOwner();
-        return signals.runWithOwner(fo, () => options.fallback());
-      })];
+      const fo = createOwner();
+      s.push(runWithOwner(fo, () => options.fallback()));
     }
     return s;
+  }, {
+    sync: true
   });
+  consumeClientComputedSlot(parent);
+  return read;
 }
 function repeat(count, mapFn, options = {}) {
-  const owner = signals.createOwner();
-  return createMemo(() => {
+  const parent = currentOwner;
+  const read = createMemo(() => {
     const len = count();
     const offset = options.from?.() || 0;
     if (!len) {
       if (!options.fallback) return [];
-      return [signals.runWithOwner(owner, () => {
-        const fallbackOwner = signals.createOwner();
-        return signals.runWithOwner(fallbackOwner, () => options.fallback());
-      })];
+      const fo = createOwner();
+      return [runWithOwner(fo, () => options.fallback())];
     }
-    return signals.runWithOwner(owner, () => Array.from({
-      length: len
-    }, (_, i) => {
-      const itemOwner = signals.createOwner();
-      return signals.runWithOwner(itemOwner, () => mapFn(i + offset));
-    }));
+    const out = new Array(len);
+    const parent = currentOwner;
+    const origId = parent.id;
+    const origChildCount = parent._childCount;
+    try {
+      for (let i = 0; i < len; i++) {
+        if (origId !== undefined) {
+          parent.id = formatChildId(origId, origChildCount + i);
+        }
+        parent._childCount = 0;
+        out[i] = mapFn(i + offset);
+      }
+    } finally {
+      parent.id = origId;
+      parent._childCount = origChildCount + len;
+    }
+    return out;
+  }, {
+    sync: true
   });
+  consumeClientComputedSlot(parent);
+  return read;
 }
 const ErrorContext = {
   id: Symbol("ErrorContext"),
@@ -620,9 +860,9 @@ function runWithBoundaryErrorContext(owner, render, onError, context, boundaryId
     if (boundaryId !== undefined) context._currentBoundaryId = boundaryId;
   }
   try {
-    return signals.runWithOwner(owner, () => {
-      const parentHandler = signals.getContext(ErrorContext);
-      signals.setContext(ErrorContext, err => onError(err, parentHandler));
+    return runWithOwner(owner, () => {
+      const parentHandler = getContext(ErrorContext);
+      setContext(ErrorContext, err => onError(err, parentHandler));
       return render();
     });
   } finally {
@@ -634,19 +874,19 @@ function runWithBoundaryErrorContext(owner, render, onError, context, boundaryId
 }
 function createErrorBoundary(fn, fallback) {
   const ctx = sharedConfig.context;
-  const parent = signals.getOwner();
-  const owner = signals.createOwner();
+  const parent = getOwner();
+  const owner = createOwner();
   const resolve = () => {
-    const resolved = ctx.resolve(signals.runWithOwner(signals.createOwner(), fn));
+    const resolved = ctx.resolve(runWithOwner(createOwner(), fn));
     if (resolved?.p?.length) throw new signals.NotReadyError(Promise.all(resolved.p));
     return resolved;
   };
-  const renderFallback = err => ctx ? signals.runWithOwner(parent, () => {
-    const fallbackOwner = signals.createOwner();
-    return signals.runWithOwner(fallbackOwner, () => fallback(err, () => {}));
+  const renderFallback = err => ctx ? runWithOwner(parent, () => {
+    const fallbackOwner = createOwner();
+    return runWithOwner(fallbackOwner, () => fallback(err, () => {}));
   }) : fallback(err, () => {});
   const serializeError = err => {
-    if (ctx && owner.id && !signals.runWithOwner(owner, () => signals.getContext(NoHydrateContext))) {
+    if (ctx && owner.id && !runWithOwner(owner, () => getContext(NoHydrateContext))) {
       ctx.serialize(owner.id, err);
     }
   };
@@ -657,14 +897,14 @@ function createErrorBoundary(fn, fallback) {
   return () => {
     let result;
     let handled = false;
-    if (ctx) owner.dispose(false);
+    if (ctx) disposeOwner(owner, false);
     try {
       result = ctx ? runWithBoundaryErrorContext(owner, resolve, err => {
         if (err instanceof signals.NotReadyError) throw err;
         handled = true;
         result = handleError(err);
         throw err;
-      }) : signals.runWithOwner(owner, fn);
+      }) : runWithOwner(owner, fn);
     } catch (err) {
       if (err instanceof signals.NotReadyError) throw err;
       result = handled ? result : handleError(err);
@@ -684,8 +924,8 @@ function createLoadingBoundary$1(fn, fallback, options) {
   }
 }
 function createRevealOrder(fn, _options) {
-  const o = signals.createOwner();
-  return signals.runWithOwner(o, fn);
+  const o = createOwner();
+  return runWithOwner(o, fn);
 }
 function untrack(fn) {
   return fn();
@@ -711,23 +951,23 @@ function latest(fn) {
 function isRefreshing() {
   return false;
 }
-function refresh(fn) {
-  return fn();
+function refresh(_target) {
+  return undefined;
 }
 function action(fn) {
   return fn;
 }
 function onSettled(callback) {
-  const o = signals.getOwner();
-  if (o?.id != null) signals.getNextChildId(o);
+  const o = getOwner();
+  if (o?.id != null) getNextChildId(o);
 }
 
 const $DEVCOMP = Symbol("solid-dev-component");
 function createContext(defaultValue, options) {
   const id = Symbol(options && options.name || "");
   function provider(props) {
-    return signals.createRoot(() => {
-      signals.setContext(provider, props.value);
+    return createRoot(() => {
+      setContext(provider, props.value);
       return children(() => props.children);
     });
   }
@@ -736,14 +976,15 @@ function createContext(defaultValue, options) {
   return provider;
 }
 function useContext(context) {
-  return signals.getContext(context);
+  return getContext(context);
 }
 function children(fn) {
   const c = createMemo(fn, {
     lazy: true
   });
   const memo = createMemo(() => signals.flatten(c()), {
-    lazy: true
+    lazy: true,
+    sync: true
   });
   memo.toArray = () => {
     const v = memo();
@@ -751,11 +992,6 @@ function children(fn) {
   };
   return memo;
 }
-function ssrRunInScope(fn) {
-  const owner = signals.getOwner();
-  if (!owner) return fn;
-  return Array.isArray(fn) ? fn.map(hole => () => signals.runWithOwner(owner, hole)) : () => signals.runWithOwner(owner, fn);
-}
 
 function enableHydration() {}
 function createComponent(Comp, props) {
@@ -773,7 +1009,7 @@ function lazy(fn, moduleUrl) {
     return p;
   };
   const wrap = props => {
-    const noHydrate = signals.getContext(NoHydrateContext);
+    const noHydrate = getContext(NoHydrateContext);
     if (!noHydrate && !moduleUrl) {
       throw new Error("lazy() used in SSR without a moduleUrl. " + "All lazy() components require a moduleUrl for correct hydration. " + "This is typically injected by the bundler plugin.");
     }
@@ -799,6 +1035,8 @@ function lazy(fn, moduleUrl) {
     return createMemo(() => {
       if (!p.v) throw new signals.NotReadyError(p);
       return p.v(props);
+    }, {
+      sync: true
     });
   };
   wrap.preload = load;
@@ -806,9 +1044,9 @@ function lazy(fn, moduleUrl) {
   return wrap;
 }
 function createUniqueId() {
-  const o = signals.getOwner();
+  const o = getOwner();
   if (!o) throw new Error(`createUniqueId cannot be used outside of a reactive context`);
-  return signals.getNextChildId(o);
+  return getNextChildId(o);
 }
 
 const RevealGroupContext = {
@@ -819,7 +1057,7 @@ function ssrHandleError(err) {
   if (err instanceof signals.NotReadyError) {
     return err.source;
   }
-  const handler = signals.getContext(ErrorContext);
+  const handler = getContext(ErrorContext);
   if (handler) {
     handler(err);
     return;
@@ -832,10 +1070,10 @@ function createLoadingBoundary(fn, fallback, options) {
     return createLoadingBoundary$1(fn, fallback);
   }
   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 parent = getOwner();
+  const parentHandler = parent && runWithOwner(parent, () => getContext(ErrorContext));
+  const revealGroup = parent && runWithOwner(parent, () => getContext(RevealGroupContext));
+  const o = createOwner();
   const id = o.id;
   o.id = id + "00";
   let done;
@@ -876,13 +1114,13 @@ function createLoadingBoundary(fn, fallback, options) {
     if (done?.(undefined, err)) return;
     if (!parentHandler) throw err;
     try {
-      signals.runWithOwner(parent, () => parentHandler(err));
+      runWithOwner(parent, () => parentHandler(err));
     } catch (caught) {
       if (caught !== err) throw caught;
     }
   }
   function runDiscovery() {
-    o.dispose(false);
+    disposeOwner(o, false);
     serializeBuffer = [];
     retryPromise = undefined;
     return runLoadingPhase(() => {
@@ -909,10 +1147,10 @@ function createLoadingBoundary(fn, fallback, options) {
     ctx.serialize(id, "$$f");
     return () => undefined;
   }
-  const fallbackOwner = signals.createOwner({
+  const fallbackOwner = createOwner({
     id
   });
-  const fallbackResult = signals.runWithOwner(fallbackOwner, () => {
+  const fallbackResult = 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()));
@@ -929,12 +1167,13 @@ function createLoadingBoundary(fn, fallback, options) {
           ret = runDiscovery();
         }
         commitBoundaryState();
-        while (ret.p.length) {
-          await Promise.all(ret.p).catch(() => {});
-          ret = runLoadingPhase(() => ctx.ssr(ret.t, ...ret.h));
+        while (ret && ret.p && ret.p.length) {
+          const pending = ret;
+          await Promise.all(pending.p).catch(() => {});
+          ret = runLoadingPhase(() => ctx.ssr(pending.t, ...pending.h));
         }
         flushSerializeBuffer();
-        done(ret.t[0]);
+        done(ret && Array.isArray(ret.t) ? ret.t[0] : ret && ret.t);
         if (revealGroup) revealGroup.onResolved(id);
       } catch (err) {
         finalizeError(err);
@@ -947,19 +1186,19 @@ function createLoadingBoundary(fn, fallback, options) {
   return () => fallbackResult;
 }
 function NoHydration(props) {
-  const o = signals.createOwner();
-  return signals.runWithOwner(o, () => {
-    signals.setContext(NoHydrateContext, true);
+  const o = createOwner();
+  return runWithOwner(o, () => {
+    setContext(NoHydrateContext, true);
     return props.children;
   });
 }
 function Hydration(props) {
-  if (!signals.getContext(NoHydrateContext)) return props.children;
-  const o = signals.createOwner({
+  if (!getContext(NoHydrateContext)) return props.children;
+  const o = createOwner({
     id: props.id ?? ""
   });
-  return signals.runWithOwner(o, () => {
-    signals.setContext(NoHydrateContext, false);
+  return runWithOwner(o, () => {
+    setContext(NoHydrateContext, false);
     return props.children;
   });
 }
@@ -981,27 +1220,29 @@ function Repeat(props) {
   return repeat(() => props.count, index => typeof props.children === "function" ? props.children(index) : props.children, options);
 }
 function Show(props) {
-  const o = signals.getOwner();
+  const o = getOwner();
   if (o?.id != null) {
-    signals.getNextChildId(o);
-    if (!props.keyed) signals.getNextChildId(o);
+    getNextChildId(o);
+    if (!props.keyed) getNextChildId(o);
   }
   return createMemo(() => {
     const when = props.when;
     if (when) {
       const child = props.children;
       if (typeof child === "function" && child.length > 0) {
-        return child(() => when);
+        return props.keyed ? child(when) : child(() => when);
       }
       return child;
     }
     return props.fallback;
+  }, {
+    sync: true
   });
 }
 function Switch(props) {
   const chs = children(() => props.children);
-  const o = signals.getOwner();
-  if (o?.id != null) signals.getNextChildId(o);
+  const o = getOwner();
+  if (o?.id != null) getNextChildId(o);
   return createMemo(() => {
     let conds = chs();
     if (!Array.isArray(conds)) conds = [conds];
@@ -1009,10 +1250,12 @@ function Switch(props) {
       const w = conds[i].when;
       if (w) {
         const c = conds[i].children;
-        return typeof c === "function" && c.length > 0 ? c(() => w) : c;
+        return typeof c === "function" && c.length > 0 ? conds[i].keyed ? c(w) : c(() => w) : c;
       }
     }
     return props.fallback;
+  }, {
+    sync: true
   });
 }
 function Match(props) {
@@ -1028,13 +1271,13 @@ function Loading(props) {
   return createLoadingBoundary(() => props.children, () => props.fallback);
 }
 function Reveal(props) {
-  const o = signals.createOwner();
+  const o = createOwner();
   const id = o.id;
   const order = props.order ?? "sequential";
   const collapsed = order === "sequential" && !!props.collapsed;
   if (!sharedConfig.context?.async) {
-    const parent = signals.getOwner();
-    const parentGroup = parent ? signals.runWithOwner(parent, () => signals.getContext(RevealGroupContext)) : null;
+    const parent = getOwner();
+    const parentGroup = parent ? runWithOwner(parent, () => getContext(RevealGroupContext)) : null;
     let collapsedByParent = false;
     if (parentGroup) {
       const reg = parentGroup.register(id);
@@ -1042,8 +1285,8 @@ function Reveal(props) {
       if (order === "together" || collapsed) 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, {
+    return runWithOwner(o, () => {
+      setContext(RevealGroupContext, {
         id,
         register(_key) {
           count++;
@@ -1071,8 +1314,8 @@ function Reveal(props) {
   let collapsedByParent = false;
   let selfMinimallyResolved = false;
   let notifiedParentDone = false;
-  const parent = signals.getOwner();
-  const parentGroup = parent ? signals.runWithOwner(parent, () => signals.getContext(RevealGroupContext)) : null;
+  const parent = getOwner();
+  const parentGroup = parent ? runWithOwner(parent, () => getContext(RevealGroupContext)) : null;
   if (parentGroup) {
     const reg = parentGroup.register(id, {
       onActivate: () => {
@@ -1140,8 +1383,8 @@ function Reveal(props) {
     composites.forEach((_, key) => activateComposite(key));
     notifyParentIfDone();
   }
-  return signals.runWithOwner(o, () => {
-    signals.setContext(RevealGroupContext, {
+  return runWithOwner(o, () => {
+    setContext(RevealGroupContext, {
       id,
       register(key, options) {
         keys.push(key);
@@ -1218,14 +1461,6 @@ Object.defineProperty(exports, "NotReadyError", {
   enumerable: true,
   get: function () { return signals.NotReadyError; }
 });
-Object.defineProperty(exports, "createOwner", {
-  enumerable: true,
-  get: function () { return signals.createOwner; }
-});
-Object.defineProperty(exports, "createRoot", {
-  enumerable: true,
-  get: function () { return signals.createRoot; }
-});
 Object.defineProperty(exports, "enableExternalSource", {
   enumerable: true,
   get: function () { return signals.enableExternalSource; }
@@ -1238,18 +1473,6 @@ Object.defineProperty(exports, "flatten", {
   enumerable: true,
   get: function () { return signals.flatten; }
 });
-Object.defineProperty(exports, "getNextChildId", {
-  enumerable: true,
-  get: function () { return signals.getNextChildId; }
-});
-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; }
@@ -1258,22 +1481,10 @@ Object.defineProperty(exports, "isWrappable", {
   enumerable: true,
   get: function () { return signals.isWrappable; }
 });
-Object.defineProperty(exports, "merge", {
-  enumerable: true,
-  get: function () { return signals.merge; }
-});
 Object.defineProperty(exports, "omit", {
   enumerable: true,
   get: function () { return signals.omit; }
 });
-Object.defineProperty(exports, "onCleanup", {
-  enumerable: true,
-  get: function () { return signals.onCleanup; }
-});
-Object.defineProperty(exports, "runWithOwner", {
-  enumerable: true,
-  get: function () { return signals.runWithOwner; }
-});
 Object.defineProperty(exports, "snapshot", {
   enumerable: true,
   get: function () { return signals.snapshot; }
@@ -1306,10 +1517,12 @@ exports.createLoadingBoundary = createLoadingBoundary;
 exports.createMemo = createMemo;
 exports.createOptimistic = createOptimistic;
 exports.createOptimisticStore = createOptimisticStore;
+exports.createOwner = createOwner;
 exports.createProjection = createProjection;
 exports.createReaction = createReaction;
 exports.createRenderEffect = createRenderEffect;
 exports.createRevealOrder = createRevealOrder;
+exports.createRoot = createRoot;
 exports.createSignal = createSignal;
 exports.createStore = createStore;
 exports.createTrackedEffect = createTrackedEffect;
@@ -1317,19 +1530,24 @@ exports.createUniqueId = createUniqueId;
 exports.deep = deep;
 exports.enableHydration = enableHydration;
 exports.flush = flush;
+exports.getNextChildId = getNextChildId;
 exports.getObserver = getObserver;
+exports.getOwner = getOwner;
+exports.isDisposed = isDisposed;
 exports.isPending = isPending;
 exports.isRefreshing = isRefreshing;
 exports.latest = latest;
 exports.lazy = lazy;
 exports.mapArray = mapArray;
+exports.merge = merge;
+exports.onCleanup = onCleanup;
 exports.onSettled = onSettled;
 exports.reconcile = reconcile;
 exports.refresh = refresh;
 exports.repeat = repeat;
 exports.resolve = resolve;
+exports.runWithOwner = runWithOwner;
 exports.sharedConfig = sharedConfig;
 exports.ssrHandleError = ssrHandleError;
-exports.ssrRunInScope = ssrRunInScope;
 exports.untrack = untrack;
 exports.useContext = useContext;