octane 0.13.5 → 0.13.7

package/README.md

@@ -31,6 +31,41 @@ Applications that use only the Octane runtime do not need this peer.
 scoped state, derived values, async resources, and native component reads.
 The standard compiler handles signals automatically; no extra option is needed.
 
+## Dynamically selected compiled views
+
+In a template, use `CompiledOutlet` when all dynamically selected components
+render compiled Octane output. It owns the selected view inside the surrounding
+tree: hooks, contexts, hydration, and cleanup follow their usual lifetimes.
+
+```tsx
+import { CompiledContext, CompiledOutlet, createCompiledContext, useContext } from 'octane';
+
+const Route = createCompiledContext<string>('home');
+
+function Page({ name }: { name: string }) @{
+  <h1>{name + ': ' + useContext(Route)}</h1>
+}
+
+export function Shell({ screen, name, route }) @{
+  <CompiledContext context={Route} value={route}>
+    <CompiledOutlet key={route} component={screen ?? Page} props={{ name }} />
+  </CompiledContext>
+}
+```
+
+An unchanged component and key retain state; changing either replaces the view
+and runs its cleanups. Use `@try` / `@pending` around the outlet when the
+selected component may suspend. The outlet accepts only a function whose output
+is compiled; it throws for host strings or bodies that return descriptors or
+plain text (including an explicit `null` return). Use an ordinary
+dynamic JSX tag when arbitrary renderables are intentional.
+
+`createCompiledContext` creates a context read by `use` or `useContext`.
+Provide it through `CompiledContext` with children authored between the
+template tags. Rendering the context itself as a provider is an error. Existing
+`createContext` providers continue to accept both compiled and descriptor
+children; compiled contexts are a separate, opt-in contract.
+
 Custom Node build pipelines can opt into project-aware string-child inference
 through `octane/compiler/typescript`. See the
 [type-aware text compilation guide](https://github.com/octanejs/octane/blob/main/docs/compiler-text-inference.md).

package/dist/cjs/dom-bindings.cjs

@@ -108,14 +108,7 @@ function assertBindingRoot(root, descriptor) {
 }
 function isTextLeaf(node) {
   const first = node.firstChild;
-  return first === null || !first.nextSibling && (first.nodeType === 3 || first.localName === "font");
-}
-const htmlWhitespace = /^[\t\n\f\r ]*$/;
-function skipBindingWhitespace(node) {
-  while (node !== null && node.nodeType === 3 && htmlWhitespace.test(node.nodeValue)) {
-    node = node.nextSibling;
-  }
-  return node;
+  return first === null || !first.nextSibling && first.nodeType === 3;
 }
 function resolveFixedNodes(root, descriptor) {
   assertBindingRoot(root, descriptor);
@@ -129,12 +122,12 @@ function resolveFixedNodes(root, descriptor) {
       throw new Error(__octaneDev ? "DOM bindings cannot adopt a mismatched static element topology." : (0, import_error_message_no_arguments.formatNoArgumentErrorMessage)(318));
     }
     if (i !== 0) {
-      cursors[parent] = skipBindingWhitespace(node.nextSibling);
+      cursors[parent] = node.nextSibling;
       childIndices[parent]++;
     }
     nodes.push(node);
     childIndices.push(0);
-    cursors.push(text || children === null ? null : skipBindingWhitespace(node.firstChild));
+    cursors.push(text || children === null ? null : node.firstChild);
   }
   for (let i = 0; i < nodes.length; i++) {
     if (childIndices[i] !== (descriptor.nodes[i][3] ?? 0)) {
@@ -181,11 +174,9 @@ function resolveAddressedNodes(root, descriptor) {
     }
     if (parent !== -1) {
       childCounts[parent]++;
-      if (cursors[parent] !== void 0) cursors[parent] = skipBindingWhitespace(node.nextSibling);
+      if (cursors[parent] !== void 0) cursors[parent] = node.nextSibling;
     }
-    cursors.push(
-      text || children === null || openChildren ? void 0 : skipBindingWhitespace(node.firstChild)
-    );
+    cursors.push(text || children === null || openChildren ? void 0 : node.firstChild);
   }
   for (let i = 0; i < descriptor.nodes.length; i++) {
     if (childCounts[i] !== (descriptor.nodes[i][3] ?? 0)) {
@@ -217,16 +208,12 @@ function normalizeFixedScalar(binding, value) {
       (binding[2] === "start" || binding[2] === "rowspan") && Number.isNaN(Number(value))) ? null : String(value);
   }
 }
-function writeFixedScalar(node, binding, value, previous) {
+function writeFixedScalar(node, binding, value) {
   const name = binding[2];
   if (binding[1] === "text") {
     const text = node.firstChild;
-    const current = text?.nodeValue;
     if (text === null) node.appendChild(node.ownerDocument.createTextNode(value));
-    else if (current !== value) {
-      if (current !== null) text.nodeValue = value;
-      else if (previous !== void 0) node.textContent = value;
-    }
+    else if (text.nodeValue !== value) text.nodeValue = value;
   } else if (value === null) {
     if (node.hasAttribute(name)) node.removeAttribute(name);
   } else if (node.getAttribute(name) !== value) {
@@ -257,7 +244,7 @@ function normalize(binding, value) {
       return normalizeFixedScalar(binding, value);
   }
 }
-function write(node, binding, value, previous) {
+function write(node, binding, value) {
   const name = binding[2];
   if (binding[1] === "classToken") {
     node.classList.toggle(name, value !== null);
@@ -283,7 +270,7 @@ function write(node, binding, value, previous) {
       if (style.getPropertyValue(name) !== text || style.getPropertyPriority(name) !== priority)
         style.setProperty(name, text, priority);
     }
-  } else return writeFixedScalar(node, binding, value, previous);
+  } else return writeFixedScalar(node, binding, value);
 }
 const __bindingURL = [
   (binding) => binding[1] === "url" || isFixedScalarChannel(binding),
@@ -476,7 +463,7 @@ function __adoptBindings(root, descriptor, source, options) {
         if (!style)
           styles.set(i, style = __createBindingStyleRestoration(nodes[binding[0]], binding));
         style.write(prepared);
-      } else written = write(nodes[binding[0]], binding, prepared, last);
+      } else written = write(nodes[binding[0]], binding, prepared);
       if (!disposed) {
         previous[i] = prepared;
         if (binding[1] === "attr" || binding[1] === "boolean" || binding[1] === "aria" || binding[1] === "class" || binding[1] === "url" || binding[1] === "styleProperty" || binding[1] === "styleObject" || binding[1] === "text") {
@@ -902,7 +889,7 @@ function __adoptScalarBindings(root, descriptor, source, options) {
       const last = previous[i];
       if (value === last) continue;
       const binding = bindings[i];
-      const published = writeChannel(nodes[binding[0]], binding, value, last);
+      const published = writeChannel(nodes[binding[0]], binding, value);
       if (!disposed) {
         previous[i] = value;
         const node = owned[i][0];

package/dist/cjs/error-codes.client.generated.cjs

@@ -1074,6 +1074,18 @@ function formatClientError(code, ...args) {
           "A keyed list rollback record restored a different shape than it recorded. This is a bug in Octane.",
           args
         );
+      case 344:
+        return (0, import_error_message.formatDevErrorMessage)(
+          "Provide a compiled context with <CompiledContext context={context}>.",
+          args
+        );
+      case 345:
+        return (0, import_error_message.formatDevErrorMessage)("CompiledContext requires compiled template children.", args);
+      case 346:
+        return (0, import_error_message.formatDevErrorMessage)(
+          "CompiledOutlet requires a compiled component function with no returned renderable.",
+          args
+        );
       default:
         return (0, import_error_message.formatUnknownDevErrorMessage)(code);
     }

package/dist/cjs/error-codes.server.generated.cjs

@@ -769,6 +769,18 @@ function formatServerError(code, ...args) {
           "`<textarea>` children must be text: strings, numbers, or arrays of them. One child was %s. A textarea's content is its default value, so it cannot contain elements; render them outside the textarea or pass a string.",
           args
         );
+      case 344:
+        return (0, import_error_message.formatDevErrorMessage)(
+          "Provide a compiled context with <CompiledContext context={context}>.",
+          args
+        );
+      case 345:
+        return (0, import_error_message.formatDevErrorMessage)("CompiledContext requires compiled template children.", args);
+      case 346:
+        return (0, import_error_message.formatDevErrorMessage)(
+          "CompiledOutlet requires a compiled component function with no returned renderable.",
+          args
+        );
       default:
         return (0, import_error_message.formatUnknownDevErrorMessage)(code);
     }

package/dist/cjs/index.cjs

@@ -20,6 +20,8 @@ var index_exports = {};
 __export(index_exports, {
   Activity: () => import_runtime.Activity,
   Children: () => import_runtime.Children,
+  CompiledContext: () => import_runtime.CompiledContext,
+  CompiledOutlet: () => import_runtime.CompiledOutlet,
   EXTERNAL_HYDRATION_PROMISE: () => import_runtime.EXTERNAL_HYDRATION_PROMISE,
   ErrorBoundary: () => import_runtime.ErrorBoundary,
   Fragment: () => import_runtime.Fragment,
@@ -83,6 +85,7 @@ __export(index_exports, {
   componentSlot: () => import_runtime.componentSlot,
   componentSlotLite: () => import_runtime.componentSlotLite,
   componentSlotVoid: () => import_runtime.componentSlotVoid,
+  createCompiledContext: () => import_runtime.createCompiledContext,
   createContext: () => import_runtime.createContext,
   createElement: () => import_runtime.createElement,
   createHostContextRequest: () => import_runtime.createHostContextRequest,
@@ -268,6 +271,8 @@ var import_method_dep = require("./method-dep.cjs");
 0 && (module.exports = {
   Activity,
   Children,
+  CompiledContext,
+  CompiledOutlet,
   EXTERNAL_HYDRATION_PROMISE,
   ErrorBoundary,
   Fragment,
@@ -331,6 +336,7 @@ var import_method_dep = require("./method-dep.cjs");
   componentSlot,
   componentSlotLite,
   componentSlotVoid,
+  createCompiledContext,
   createContext,
   createElement,
   createHostContextRequest,

package/dist/cjs/runtime.cjs

@@ -20,6 +20,8 @@ var runtime_exports = {};
 __export(runtime_exports, {
   Activity: () => Activity,
   Children: () => Children,
+  CompiledContext: () => CompiledContext,
+  CompiledOutlet: () => CompiledOutlet,
   EXTERNAL_HYDRATION_PROMISE: () => import_constants.EXTERNAL_HYDRATION_PROMISE,
   ErrorBoundary: () => ErrorBoundary,
   Fragment: () => Fragment,
@@ -98,6 +100,7 @@ __export(runtime_exports, {
   componentSlot: () => componentSlot,
   componentSlotLite: () => componentSlotLite,
   componentSlotVoid: () => componentSlotVoid,
+  createCompiledContext: () => createCompiledContext,
   createContext: () => createContext,
   createElement: () => createElement,
   createElementAt: () => createElementAt,
@@ -9849,10 +9852,39 @@ function __createCompiledContext(defaultValue) {
   };
   return initializeContext(ctx, defaultValue);
 }
+function createCompiledContext(defaultValue) {
+  const ctx = function CompiledProvider(_props, _scope) {
+    throw new TypeError((0, import_error_codes_client_generated.formatClientError)(344));
+  };
+  return initializeContext(ctx, defaultValue);
+}
+function CompiledContext(props, scope) {
+  provideContext(scope, props.context, props.value);
+  const children = props.children;
+  if (children == null) return;
+  if (!isChildrenBlock(children)) {
+    throw new TypeError((0, import_error_codes_client_generated.formatClientError)(345));
+  }
+  const dialect = children[CHILDREN_BODY] ?? children;
+  const previous = scope.hooks?.get(CHILDREN_DIALECT_SLOT);
+  if (previous !== dialect) {
+    if (previous !== void 0) {
+      invalidateSharedBodyOutput(scope);
+      if (TRANSITION_JOURNAL !== null && !ROOT_RENDER_ROLLBACK) {
+        const hooks = scope.hooks;
+        journalUndo(() => hooks.set(CHILDREN_DIALECT_SLOT, previous));
+      }
+    }
+    ensureHooks(scope).set(CHILDREN_DIALECT_SLOT, dialect);
+  }
+  const output = renderSharedBody(children, void 0, scope, void 0);
+  if (output != null) throw new TypeError((0, import_error_codes_client_generated.formatClientError)(345));
+}
 function initializeContext(ctx, defaultValue) {
   ctx.$$kind = import_runtime_tags.CONTEXT_TAG;
   ctx.defaultValue = defaultValue;
   ctx.$$version = 0;
+  ctx.$$providerVersion = 0;
   (0, import_context_identity.registerContext)(ctx);
   if (__octaneDev) {
     (0, import_context_identity.defineRemovedContextMembers)(ctx);
@@ -9927,6 +9959,7 @@ function provideContext(scope, context, value) {
       else values.delete(context);
     });
   if (had) {
+    context.$$providerVersion = context.$$providerVersion === context.$$version ? context.$$version + 1 : -1;
     context.$$version++;
     (0, import_context_epoch.bumpContextEpoch)();
   }
@@ -9935,6 +9968,11 @@ function provideContext(scope, context, value) {
 const CHILDREN_BODY = /* @__PURE__ */ Symbol.for("octane.childrenBody");
 const CHILDREN_CAPTURES = /* @__PURE__ */ Symbol.for("octane.childrenCaptures");
 const CHILDREN_SIGNAL_OWNER = /* @__PURE__ */ Symbol();
+function sameRenderBody(previous, next) {
+  const previousBody = previous[CHILDREN_BODY];
+  const nextBody = next[CHILDREN_BODY];
+  return previousBody === void 0 || nextBody === void 0 || previousBody === nextBody;
+}
 function markSingleRoot(component) {
   component.$$singleRoot = true;
   return component;
@@ -11436,12 +11474,29 @@ function promoteMemoAncestry(scope) {
 function recordContextDependency(block, context) {
   if (block === null || !block.memoInChain) return;
   SKIPPED_ROW_REFRESH = refreshSkippedRows;
-  (block.$$ctxDirect ??= /* @__PURE__ */ new Map()).set(context, context.$$version);
+  const direct = block.$$ctxDirect ??= /* @__PURE__ */ new Map();
+  const previous = direct.get(context);
+  direct.set(context, context.$$version);
   for (let current = block; current !== null; current = current.parentBlock) {
     if (current.body?.__memo === true || current.$$implicitBail === true) {
       (current.$$ctxReads ??= /* @__PURE__ */ new Map()).set(context, context.$$version);
     }
   }
+  return previous;
+}
+function recordLocalContextValue(reader, block, context, value, previous) {
+  if (reader === null || block === null || !block.memoInChain) return;
+  if (typeof previous === "number" || context.$$providerVersion !== context.$$version) return;
+  const cache = reader.$$ctxCache;
+  const owner = cache === context ? reader.$$ctxCacheOwner : cache !== null && reader.$$ctxCacheOwner === null ? cache.get(context) : void 0;
+  if (owner === null || owner === void 0 || owner === DEFAULT_CTX) return;
+  if (previous !== void 0) {
+    if (previous.owner !== owner || !Object.is(previous.value, value)) return;
+    previous.version = context.$$version;
+    block.$$ctxDirect.set(context, previous);
+  } else {
+    block.$$ctxDirect.set(context, { version: context.$$version, owner, value });
+  }
 }
 let SCOPED_READ_TRACKING = false;
 let SCOPED_READS = null;
@@ -11599,8 +11654,10 @@ function readContextFrom(reader, block, context) {
   return context.defaultValue;
 }
 function readContextFromScope(scope, context) {
-  recordContextDependency(scope.block, context);
-  return readContextFrom(scope, scope.block, context);
+  const previous = recordContextDependency(scope.block, context);
+  const value = readContextFrom(scope, scope.block, context);
+  recordLocalContextValue(scope, scope.block, context, value, previous);
+  return value;
 }
 function getRendererOwnerVisibility(scope) {
   if (findHiddenActivity(scope.block) !== null) return "activity";
@@ -11618,8 +11675,10 @@ function reportRendererOwnerError(scope, error) {
   }
 }
 function useContextInternal(context) {
-  recordContextDependency(CURRENT_BLOCK, context);
-  return readContextFrom(CURRENT_SCOPE, CURRENT_BLOCK, context);
+  const previous = recordContextDependency(CURRENT_BLOCK, context);
+  const value = readContextFrom(CURRENT_SCOPE, CURRENT_BLOCK, context);
+  recordLocalContextValue(CURRENT_SCOPE, CURRENT_BLOCK, context, value, previous);
+  return value;
 }
 class SuspenseException {
   constructor(thenable) {
@@ -12649,7 +12708,13 @@ function parseTemplate(html, ns, frag) {
   initDomOperations();
   const t = (STAGED_DOM ? STAGED_DOM.view(document) : document).createElement("template");
   if (ns === 0) {
-    (STAGED_DOM ? STAGED_DOM.view(t) : t).innerHTML = frag ? `<octane-frag>${html}</octane-frag>` : html;
+    (STAGED_DOM ? STAGED_DOM.view(t) : t).innerHTML = html;
+    if (frag) {
+      const owner = t.content.ownerDocument;
+      const wrapper = (STAGED_DOM ? STAGED_DOM.view(owner) : owner).createElement("octane-frag");
+      (STAGED_DOM ? STAGED_DOM.view(wrapper) : wrapper).appendChild(t.content);
+      return fragmentTemplate(wrapper);
+    }
     const root = getFirstChild(t.content);
     if (root.nodeType === 1 && root.localName === "octane-frag") {
       return fragmentTemplate(root);
@@ -15987,17 +16052,7 @@ function updateTextValue(node, value) {
   }
 }
 function setText(node, value, host) {
-  if (host !== void 0) {
-    if (node === null) {
-      node = (STAGED_DOM ? STAGED_DOM.view(host) : host).firstChild;
-      if (node === null || node.nodeType !== 3) {
-        node = (STAGED_DOM ? STAGED_DOM.view(document) : document).createTextNode("");
-        resetOnlyChildHost(host, node);
-      }
-    } else if ((STAGED_DOM ? STAGED_DOM.view(node) : node).parentNode !== host)
-      resetOnlyChildHost(host, node);
-  }
-  const target = node;
+  const target = node ?? (STAGED_DOM ? STAGED_DOM.view(host) : host).firstChild;
   if (VIEW_TRANSITION_DRIVER) VIEW_TRANSITION_DRIVER.markDirty();
   if (TRANSITION_JOURNAL !== null)
     journalText(target, (STAGED_DOM ? STAGED_DOM.view(target) : target).nodeValue);
@@ -16005,12 +16060,6 @@ function setText(node, value, host) {
   if (hiddenTextWriter !== null && hiddenTextWriter(target, text)) return;
   (STAGED_DOM ? STAGED_DOM.view(target) : target).nodeValue = text;
 }
-function resetOnlyChildHost(host, node) {
-  if (ROOT_RENDER_TRANSACTION !== null) journalRootRange(host, null, null);
-  const view = STAGED_DOM ? STAGED_DOM.view(host) : host;
-  view.textContent = "";
-  if (node !== null) view.appendChild(node);
-}
 const DIRECT_SIGNAL_BINDING = /* @__PURE__ */ Symbol("octane.direct-signal-binding");
 const CLAIMED_BINDING_VALUE = /* @__PURE__ */ Symbol("octane.claimed-binding-value");
 function hydrateClaimedBindingCaches(scope, fields) {
@@ -21691,6 +21740,29 @@ function componentSlotVoid(parentScope, slotKey, domParent, comp, props, invocat
     invocationSite
   );
 }
+function rejectCompiledReturn(_block, _out, reset) {
+  if (reset !== true) {
+    throw new TypeError((0, import_error_codes_client_generated.formatClientError)(346));
+  }
+}
+function CompiledOutlet(props, scope) {
+  const comp = props.component;
+  if (typeof comp !== "function") {
+    throw new TypeError((0, import_error_codes_client_generated.formatClientError)(346));
+  }
+  const block = scope.block;
+  componentSlotImpl(
+    rejectCompiledReturn,
+    scope,
+    0,
+    block.parentNode,
+    comp,
+    comp,
+    props.props,
+    props.props,
+    block.endMarker
+  );
+}
 function componentSlotImpl(outputHandler, parentScope, slotKey, domParent, body, identity, props, renderProps, anchor, key, singleRoot, inherit, hasKey, invocationSite) {
   if (CURRENT_BLOCK?.pending && !CURRENT_BLOCK.crossRenderUpdate) return;
   if (slotKey === 0 && parentScope !== RETURNED_OUTPUT_SCOPE) {
@@ -22536,8 +22608,6 @@ function hostComponent(scope, slot, tag, props, childrenBody, anchor) {
       anchor: null,
       ref: void 0,
       props: void 0,
-      body: void 0,
-      latest: void 0,
       childScope: void 0
     };
     scope.slots[slot] = state;
@@ -22553,13 +22623,7 @@ function hostComponent(scope, slot, tag, props, childrenBody, anchor) {
   }
   const el = state.el;
   applyHostProps(el, props, scope, state);
-  if (typeof childrenBody === "function") {
-    state.latest = childrenBody;
-    if (state.body === void 0) {
-      state.body = (props2, scope2, extra) => state.latest(props2, scope2, extra);
-    }
-    childSlot(state.childScope, 0, el, state.body, null, false, el);
-  } else if (childrenBody != null || state.childScope.slots[0] !== void 0) {
+  if (childrenBody != null || state.childScope.slots[0] !== void 0) {
     childSlot(state.childScope, 0, el, childrenBody ?? null, null, false, el);
   }
   return el;
@@ -23505,7 +23569,23 @@ function renderHostTagChildren(d, block, el) {
   if (kids == null) return;
   if (typeof kids === "function") {
     let state = block.slots[0];
-    if (state === void 0) {
+    if (state === void 0 || !sameRenderBody(state.block.body, kids)) {
+      if (state !== void 0) {
+        journalRootSlot(state, el, null, null);
+        if (ROOT_RENDER_TRANSACTION !== null && !ROOT_RENDER_TRANSACTION.aborted && !ROOT_RENDER_ROLLBACK) {
+          deferRootReplacement(
+            state.block,
+            el,
+            getFirstChild(el),
+            (STAGED_DOM ? STAGED_DOM.view(el) : el).lastChild
+          );
+        } else {
+          unmountBlock(state.block, false);
+          let child3;
+          while ((child3 = getFirstChild(el)) !== null)
+            (STAGED_DOM ? STAGED_DOM.view(el) : el).removeChild(child3);
+        }
+      }
       const child2 = createBlock(
         "dynamic",
         block,
@@ -23517,10 +23597,15 @@ function renderHostTagChildren(d, block, el) {
         void 0,
         renderReturnedValue
       );
-      state = { __kind: "hostTagChildrenSlot", block: child2 };
-      block.slots[0] = state;
-      registerSlot(block, state);
+      if (state === void 0) {
+        state = { __kind: "hostTagChildrenSlot", block: child2 };
+        block.slots[0] = state;
+        registerSlot(block, state);
+      } else {
+        state.block = child2;
+      }
     } else {
+      if (state.block.body !== kids) journalRootProperty(state.block, "body", state.block.body);
       state.block.body = kids;
     }
     renderBlock(state.block);
@@ -24076,12 +24161,7 @@ function bindSignalChild(parentScope, previous, slotKey, domParent, value, _site
   if (textToken && previous === value && !dangerouslySetInnerHTMLOwnsChild(domParent, value))
     return value;
   const prior = typeof previous === "object" && previous !== null && previous[DIRECT_SIGNAL_CHILD] === true ? previous : null;
-  let cachedText = prior?.text ?? (previous instanceof Text ? previous : null);
-  if (cachedText === null && textToken) {
-    const first = getFirstChild(domParent);
-    if (first !== null && first.nodeType === 3) cachedText = first;
-    else resetOnlyChildHost(domParent, null);
-  }
+  const cachedText = prior?.text ?? (previous instanceof Text ? previous : textToken ? getFirstChild(domParent) : null);
   if (!isSignalHandle(value)) {
     const type = typeof value;
     const primitiveToken = slotKey !== 0 && !onlyChild && bindingMarker === void 0 && value !== null && type !== "object" && type !== "function" && !(CURRENT_BLOCK?.pending && !CURRENT_BLOCK.crossRenderUpdate);
@@ -24267,7 +24347,7 @@ function childSlot(parentScope, slotKey, domParent, value, anchor, ownEnd, ownsH
   if (state !== void 0 && ROOT_RENDER_TRANSACTION !== null) {
     const component = pureHost || preparedList !== null ? null : typeof elementType === "string" ? hostElementBody : valueComponent;
     const unchangedList = preparedList !== null && state.forSlot !== null;
-    const unchangedComponent = state.block !== null && component !== null && (component === state.currentComp || typeof value === "function" && state.currentIsBodyFn);
+    const unchangedComponent = state.block !== null && component !== null && (component === state.currentComp || typeof value === "function" && state.currentIsBodyFn && sameRenderBody(state.currentComp, component));
     const unchangedHost = pureHost && state.hostNode !== null && state.block === null && state.hostNode.nodeType === 1 && isHostElementOfType(state.hostNode, elementType);
     const primitive = value == null || typeof value !== "object" && typeof value !== "function";
     const text = primitive ? coerceChildText(value) : null;
@@ -24582,7 +24662,7 @@ function childSlot(parentScope, slotKey, domParent, value, anchor, ownEnd, ownsH
     componentDescriptor = value;
   }
   if (comp !== null) {
-    if (isBodyFn && state.block !== null && state.currentIsBodyFn) {
+    if (isBodyFn && state.block !== null && state.currentIsBodyFn && sameRenderBody(state.currentComp, comp)) {
       const taggedChildren = isChildrenBlock(comp);
       const wasImplicitlyArmed = state.block.$$implicitBail;
       if (taggedChildren && !wasImplicitlyArmed) {
@@ -24909,17 +24989,12 @@ function childTextHoleUpdate(parentScope, slotKey, domParent, value, cachedNode,
   if (!complex) {
     if (previous === value) return cachedNode;
     if (cachedNode != null && value !== null) {
-      setText(cachedNode, value === true ? "" : value, domParent);
+      setText(cachedNode, value === true ? "" : value);
       return cachedNode;
     }
   }
   return childTextHole(parentScope, slotKey, domParent, value, cachedNode);
 }
-function removeOnlyChildText(host, node) {
-  const view = STAGED_DOM ? STAGED_DOM.view(node) : node;
-  if (view.parentNode === host) view.remove();
-  else resetOnlyChildHost(host, null);
-}
 function childTextHole(parentScope, slotKey, domParent, value, cachedNode) {
   if (domParent.nodeType === 1 && import_constants.VOID_ELEMENTS.has(domParent.localName) && !isPortalTarget(parentScope.block, domParent) && value != null) {
     throw new Error((0, import_error_codes_client_generated.formatClientError)(26, domParent.localName));
@@ -24949,12 +25024,10 @@ function childTextHole(parentScope, slotKey, domParent, value, cachedNode) {
           return null;
         return hydration3.hempty(domParent, vt === "string", siteLoc(parentScope, slotKey));
       }
-      removeOnlyChildText(domParent, cachedNode);
+      (STAGED_DOM ? STAGED_DOM.view(cachedNode) : cachedNode).remove();
       return null;
     }
     if (cachedNode !== null) {
-      if ((STAGED_DOM ? STAGED_DOM.view(cachedNode) : cachedNode).parentNode !== domParent)
-        resetOnlyChildHost(domParent, cachedNode);
       updateTextValue(cachedNode, str);
       return cachedNode;
     }
@@ -24969,7 +25042,8 @@ function childTextHole(parentScope, slotKey, domParent, value, cachedNode) {
     if (!hydration2.framesSlotContent(domParent))
       return hydration2.htext(domParent, str, siteLoc(parentScope, slotKey));
   }
-  if (state === void 0 && cachedNode !== null) removeOnlyChildText(domParent, cachedNode);
+  if (state === void 0 && cachedNode !== null)
+    (STAGED_DOM ? STAGED_DOM.view(cachedNode) : cachedNode).remove();
   const hydration = import_hydration_flag.hydrating ? activeHydration() : null;
   if (hydration !== null && state === void 0)
     hydration.hydrateOnlyChild(
@@ -24994,8 +25068,12 @@ function ctxDepsChanged(block) {
 function ctxDirectChanged(block) {
   const direct = block.$$ctxDirect;
   if (direct === null) return false;
-  for (const [ctx, version] of direct) {
-    if (ctx.$$version !== version) return true;
+  for (const [ctx, read] of direct) {
+    const version = typeof read === "number" ? read : read.version;
+    if (ctx.$$version === version) continue;
+    if (typeof read === "number" || ctx.$$providerVersion !== ctx.$$version || !Object.is(read.owner.$$ctxValues?.get(ctx), read.value))
+      return true;
+    read.version = ctx.$$version;
   }
   return false;
 }
@@ -25064,7 +25142,8 @@ function restampCtxDeps(block) {
       }
     }
     if (hasDirect) {
-      for (const [ctx, v] of direct) {
+      for (const [ctx, read] of direct) {
+        const v = typeof read === "number" ? read : read.version;
         const cur = m.get(ctx);
         if (cur !== v) {
           const live = ctx.$$version;
@@ -32504,6 +32583,8 @@ function scriptResource(attrs) {
 0 && (module.exports = {
   Activity,
   Children,
+  CompiledContext,
+  CompiledOutlet,
   EXTERNAL_HYDRATION_PROMISE,
   ErrorBoundary,
   Fragment,
@@ -32582,6 +32663,7 @@ function scriptResource(attrs) {
   componentSlot,
   componentSlotLite,
   componentSlotVoid,
+  createCompiledContext,
   createContext,
   createElement,
   createElementAt,