octane 0.1.9 → 0.1.10

package/dist/compiler/compile.js

@@ -5051,7 +5051,7 @@ export function compile(source, filename, options) {
 			const args = [JSON.stringify(t.html)];
 			if (t.ns || t.frag) args.push(String(t.ns | 0));
 			if (t.frag) args.push(String(t.frag | 0));
-			return `const ${t.name} = _$template(${args.join(', ')});`;
+			return `const ${t.name} = /* @__PURE__ */ _$template(${args.join(', ')});`;
 		})
 		.join('\n');
 	const templatesBlock = templates ? templates + '\n\n' : '';
@@ -5131,18 +5131,18 @@ export function compile(source, filename, options) {
 				.join('\n') + '\n';
 	}
 
-	// Cross-module singleRoot stamps (docs/comment-marker-elision-plan.md M1):
-	// a component whose body provably renders ONE plain element carries the
-	// marker on its BINDING, so a `componentSlot(…, 2)` call site in ANOTHER
-	// module can take the markerless singleRoot path at mount. Emitted at the
-	// module tail so it lands on the final binding (incl. the hmr() wrapper —
-	// the stamp goes on what importers see). Also feeds the runtime's existing
+	// Cross-module singleRoot fallback stamps (docs/comment-marker-elision-plan.md
+	// M1). Non-HMR initializers carry this metadata inside a tree-shakeable
+	// binding; the tail remains for HMR wrappers and declaration shapes that cannot
+	// safely move the source binding. Also feeds the runtime's existing
 	// value-position `$$singleRoot` descriptor check.
 	let stampBlock = '';
 	if (ctx.componentInfo) {
 		const stamps = [];
 		for (const [name, info] of ctx.componentInfo) {
-			if (info.singleRoot === true) stamps.push(`${name}.$$singleRoot = true;`);
+			if (info.singleRoot === true && info.singleRootInitialized !== true) {
+				stamps.push(`${name}.$$singleRoot = true;`);
+			}
 		}
 		for (const entry of ctx.devFunctionLocs) {
 			stamps.push(
@@ -7068,6 +7068,15 @@ function applyCssScoping(componentNode, ctx) {
 	return cssHash;
 }
 
+// Attach definition metadata through the component's initializer rather than a
+// free-standing module mutation. The call-site annotation is valid because every
+// caller passes a freshly-created compiler function that cannot yet be observed;
+// bundlers may therefore discard the initializer together with an unused export.
+function singleRootInitializer(ctx, component) {
+	ctx.runtimeNeeded.add('markSingleRoot');
+	return `/* @__PURE__ */ _$markSingleRoot(${component})`;
+}
+
 function compileComponent(node, ctx, options) {
 	const name = node.id.name;
 	rejectAsyncOrGenerator(node, name);
@@ -7131,12 +7140,15 @@ function compileComponent(node, ctx, options) {
 	// module const) so the component's own body — where the function-
 	// expression name shadows the const — resolves `_$warmChild(Self, …)` to
 	// an object that carries the plan. hmr() forwards `__warm` from the
-	// wrapped fn onto its wrapper for cross-module references.
-	const warmedFn = ctx._pendingWarm ? `Object.assign(${fn}, { __warm: ${ctx._pendingWarm} })` : fn;
+	// wrapped fn onto its wrapper for cross-module references. Both assignments
+	// below target this freshly-emitted function, so unused initializers may drop.
+	const warmedFn = ctx._pendingWarm
+		? `/* @__PURE__ */ Object.assign(${fn}, { __warm: ${ctx._pendingWarm} })`
+		: fn;
 	ctx._pendingWarm = null;
 	const abiFn =
 		hmrWrap && returnedOutput
-			? `Object.assign(${warmedFn}, { __octaneReturnedOutput: true })`
+			? `/* @__PURE__ */ Object.assign(${warmedFn}, { __octaneReturnedOutput: true })`
 			: warmedFn;
 
 	// HMR-wrap exported components inline so the binding stays a `const` (no
@@ -7146,7 +7158,12 @@ function compileComponent(node, ctx, options) {
 	// function-name identity by NAMING the inner FunctionExpression — `hmr`
 	// returns a wrapper that delegates to whatever fn is currently committed,
 	// and `module.Foo[HMR].update(...)` swaps it on each accept.
-	const valueExpr = hmrWrap && isExported ? `_$hmr(${abiFn})` : abiFn;
+	let valueExpr = hmrWrap && isExported ? `_$hmr(${abiFn})` : abiFn;
+	const componentInfo = ctx.componentInfo.get(name);
+	if (!hmrWrap && componentInfo?.singleRoot === true) {
+		valueExpr = singleRootInitializer(ctx, valueExpr);
+		componentInfo.singleRootInitialized = true;
+	}
 	const declaration = options && options.hmrMutable ? 'let' : 'const';
 	if (isDefault) {
 		if (options && options.hmrMutable) {
@@ -9794,13 +9811,15 @@ function lowerHostFragment(node, ctx, compInlinedSubs, parentNs = 'html', cssHas
 		// compileFunctionBody → emitElementHtml (via ctx._foldedDirectiveCalls).
 		body: { type: 'JSXCodeBlock', body: [], render: rendererEl, foldedDirectives: directiveCalls },
 	};
-	ctx.hoistedHelpers.push(compileFunctionBody(synthFn, ctx, fragName, parentNs, cssHash));
+	const renderer = compileFunctionBody(synthFn, ctx, fragName, parentNs, cssHash);
 	if ((node.type === 'Element' || node.type === 'JSXElement') && !isComponentTag(node)) {
 		// A host fragment is a SINGLE root element, so it can mount markerless (the
 		// element self-delimits) — matching `@{}`'s inline render exactly (no extra
 		// comment markers), which is required for byte-equal DOM when folding `@{}`.
 		// A returned JSX fragment may have multiple roots and must retain its range.
-		ctx.hoistedHelpers.push(`${fragName}.$$singleRoot = true;`);
+		ctx.hoistedHelpers.push(`const ${fragName} = ${singleRootInitializer(ctx, renderer)};`);
+	} else {
+		ctx.hoistedHelpers.push(renderer);
 	}
 	ctx.runtimeNeeded.add('createElement');
 	return {
@@ -10123,7 +10142,7 @@ function allocHookSymbol(ctx, debugName, profile = null, forceSymbol = false) {
 		// and custom-hook boundaries retain the trailing-Symbol ABI consumed by
 		// published bindings. Both use the short, path-free description.
 		if (ctx._hookHash === undefined) ctx._hookHash = hookSlotHash(ctx.filename);
-		symbolExpr = `Symbol(${JSON.stringify(`${ctx._hookHash}#${id}`)})`;
+		symbolExpr = `/* @__PURE__ */ Symbol(${JSON.stringify(`${ctx._hookHash}#${id}`)})`;
 	} else {
 		// Direct sites in a compiler-created render Scope only need a tiny local
 		// integer. Arbitrary callable helpers and custom-hook boundaries can share a
@@ -10132,7 +10151,7 @@ function allocHookSymbol(ctx, debugName, profile = null, forceSymbol = false) {
 		if (forceSymbol) {
 			const { baseName } = ensureHookSlotBase(ctx);
 			const numericExpr = id === 0 ? baseName : `${baseName} + ${id}`;
-			symbolExpr = `Symbol(${numericExpr})`;
+			symbolExpr = `/* @__PURE__ */ Symbol(${numericExpr})`;
 		} else {
 			symbolExpr = String(id);
 		}

package/dist/compiler/slot-hooks.js

@@ -720,10 +720,10 @@ function allocHookSymbol(st, owner, local, imported, node) {
 		// Symbol() collapses those paths and collides state across call sites.
 		// Short filename hash + index; no module path in the output (see
 		// compile.js hookSlotHash for the full rationale).
-		symbolExpr = `Symbol(${JSON.stringify(`${st.hash}#${id}`)})`;
+		symbolExpr = `/* @__PURE__ */ Symbol(${JSON.stringify(`${st.hash}#${id}`)})`;
 	} else {
 		const numericExpr = id === 0 ? st.slotBaseName : `${st.slotBaseName} + ${id}`;
-		symbolExpr = `Symbol(${numericExpr})`;
+		symbolExpr = `/* @__PURE__ */ Symbol(${numericExpr})`;
 	}
 	if (st.profile) {
 		const componentId = `${st.profileFilename || '<anon>'}#${owner.name}@${owner.line}:${owner.column}`;

package/dist/hydration/event-capture.d.ts

@@ -0,0 +1,30 @@
+export declare const HYDRATE_SUPPORTED_INTERACTION_EVENTS: readonly ["auxclick", "click", "contextmenu", "dblclick", "focusin", "keydown", "keyup", "mousedown", "mouseenter", "mouseover", "mouseup", "pointerdown", "pointerenter", "pointerover", "pointerup"];
+export interface HydrationReplayIntent {
+    event: Event;
+    path: number[];
+}
+export type HydrationIntentBoundaryStatus = 'hydrated' | 'never' | 'dormant' | 'handles';
+export type HydrationIntentBoundary = (eventType: string, intent?: HydrationReplayIntent) => HydrationIntentBoundaryStatus;
+/** @internal Resolve an event target to an element-only path beneath a marker. */
+export declare function hydrationEventPathWithin(root: Element, target: EventTarget | null): number[] | null;
+/**
+ * Install document-level capture for deferred-hydration interaction intent.
+ * Calling this function more than once for the same document is a no-op.
+ *
+ * Applications that can receive input before `hydrateRoot()` should call this
+ * from their lightweight client bootstrap. Mounting the first `<Hydrate>`
+ * boundary also invokes it as a synchronous fallback.
+ */
+export declare function initializeHydrationEventCapture(ownerDocument?: Document): void;
+/** @internal Runtime bridge for a mounted deferred-hydration boundary. */
+export declare function registerHydrationIntentBoundary(marker: Element, boundary: HydrationIntentBoundary): void;
+/** @internal Runtime bridge for a removed deferred-hydration boundary. */
+export declare function unregisterHydrationIntentBoundary(marker: Element, boundary: HydrationIntentBoundary): void;
+/** @internal Consume intent captured before the runtime boundary was registered. */
+export declare function takePendingHydrationIntents(marker: Element): HydrationReplayIntent[] | undefined;
+/** @internal Consume conservative nested-dynamic intent recorded before registration. */
+export declare function takeDelegatedDynamicHydrationIntent(marker: Element): boolean;
+/** @internal Avoid duplicate handling by the boundary-local capture listener. */
+export declare function wasEarlyHydrationIntentHandled(event: Event): boolean;
+/** @internal Preserve nested dynamic intent discovered by a mounted parent. */
+export declare function markDelegatedDynamicHydrationIntent(marker: Element): void;

package/dist/hydration/event-capture.js

@@ -0,0 +1,152 @@
+import {
+  HYDRATE_DEFAULT_INTERACTION_EVENTS,
+  HYDRATE_INTERACTION_EVENTS_ATTR
+} from "./interaction-config.js";
+const HYDRATE_MARKER_SELECTOR = "[data-octane-hydrate-id]";
+const HYDRATE_WHEN_ATTR = "data-octane-hydrate-when";
+function isHydrationNode(target) {
+  return target !== null && typeof target.nodeType === "number";
+}
+function isHydrationElement(target) {
+  return isHydrationNode(target) && target.nodeType === 1;
+}
+const HYDRATE_SUPPORTED_INTERACTION_EVENTS = [
+  "auxclick",
+  "click",
+  "contextmenu",
+  "dblclick",
+  "focusin",
+  "keydown",
+  "keyup",
+  "mousedown",
+  "mouseenter",
+  "mouseover",
+  "mouseup",
+  "pointerdown",
+  "pointerenter",
+  "pointerover",
+  "pointerup"
+];
+const HYDRATE_BOUNDARIES = /* @__PURE__ */ new WeakMap();
+const HYDRATE_PENDING_INTENTS = /* @__PURE__ */ new WeakMap();
+const HYDRATE_DELEGATED_DYNAMIC_MARKERS = /* @__PURE__ */ new WeakSet();
+const HYDRATE_HANDLED_INTENT_EVENTS = /* @__PURE__ */ new WeakSet();
+const HYDRATE_INTENT_DOCUMENTS = /* @__PURE__ */ new WeakSet();
+function hydrationEventPathWithin(root, target) {
+  if (!isHydrationNode(target)) return null;
+  const path = [];
+  let node = isHydrationElement(target) ? target : target.parentElement;
+  while (node !== root) {
+    const parent = node?.parentElement ?? null;
+    if (parent === null) return null;
+    const index = Array.prototype.indexOf.call(parent.children, node);
+    if (index < 0) return null;
+    path.push(index);
+    node = parent;
+  }
+  path.reverse();
+  return path;
+}
+function markerStatus(marker, eventType) {
+  const boundary = HYDRATE_BOUNDARIES.get(marker);
+  if (boundary !== void 0) return boundary(eventType);
+  const when = marker.getAttribute(HYDRATE_WHEN_ATTR);
+  if (when === null) return "hydrated";
+  if (when === "never") return "never";
+  if (when === "dynamic") return eventType === "click" ? "handles" : "dormant";
+  if (when !== "interaction") return "dormant";
+  const custom = marker.getAttribute(HYDRATE_INTERACTION_EVENTS_ATTR);
+  const events = custom === null ? HYDRATE_DEFAULT_INTERACTION_EVENTS : custom.split(/\s+/).filter(Boolean);
+  return events.includes(eventType) ? "handles" : "dormant";
+}
+function handleEarlyHydrationIntent(event) {
+  const target = event.target;
+  if (!isHydrationElement(target)) return;
+  const markers = [];
+  let marker = target.closest(HYDRATE_MARKER_SELECTOR);
+  let matches = false;
+  while (marker !== null) {
+    markers.push(marker);
+    matches ||= markerStatus(marker, event.type) === "handles";
+    marker = marker.parentElement?.closest(HYDRATE_MARKER_SELECTOR) ?? null;
+  }
+  if (!matches || markers.length === 0) return;
+  markers.reverse();
+  let candidate = null;
+  let candidateBoundary;
+  for (let i = 0; i < markers.length; i++) {
+    const current = markers[i];
+    const status = markerStatus(current, event.type);
+    if (status === "hydrated") continue;
+    if (status === "never") return;
+    candidate = current;
+    candidateBoundary = HYDRATE_BOUNDARIES.get(current);
+    break;
+  }
+  if (candidate === null) return;
+  for (let i = 0; i < markers.length; i++) {
+    const current = markers[i];
+    if (current !== candidate && candidate.contains(current) && current.getAttribute(HYDRATE_WHEN_ATTR) === "dynamic" && !HYDRATE_BOUNDARIES.has(current)) {
+      HYDRATE_DELEGATED_DYNAMIC_MARKERS.add(current);
+    }
+  }
+  const path = hydrationEventPathWithin(candidate, event.target);
+  if (path === null) return;
+  const intent = { event, path };
+  HYDRATE_HANDLED_INTENT_EVENTS.add(event);
+  if (event.bubbles) {
+    event.preventDefault();
+    event.stopPropagation();
+    event.stopImmediatePropagation();
+  }
+  if (candidateBoundary !== void 0) {
+    candidateBoundary(event.type, intent);
+  } else {
+    const pending = HYDRATE_PENDING_INTENTS.get(candidate) ?? [];
+    pending.push(intent);
+    HYDRATE_PENDING_INTENTS.set(candidate, pending);
+  }
+}
+function initializeHydrationEventCapture(ownerDocument) {
+  const targetDocument = ownerDocument ?? (typeof document === "undefined" ? void 0 : document);
+  if (targetDocument === void 0 || HYDRATE_INTENT_DOCUMENTS.has(targetDocument)) return;
+  HYDRATE_INTENT_DOCUMENTS.add(targetDocument);
+  for (let i = 0; i < HYDRATE_SUPPORTED_INTERACTION_EVENTS.length; i++) {
+    targetDocument.addEventListener(
+      HYDRATE_SUPPORTED_INTERACTION_EVENTS[i],
+      handleEarlyHydrationIntent,
+      true
+    );
+  }
+}
+function registerHydrationIntentBoundary(marker, boundary) {
+  HYDRATE_BOUNDARIES.set(marker, boundary);
+}
+function unregisterHydrationIntentBoundary(marker, boundary) {
+  if (HYDRATE_BOUNDARIES.get(marker) === boundary) HYDRATE_BOUNDARIES.delete(marker);
+}
+function takePendingHydrationIntents(marker) {
+  const intents = HYDRATE_PENDING_INTENTS.get(marker);
+  HYDRATE_PENDING_INTENTS.delete(marker);
+  return intents;
+}
+function takeDelegatedDynamicHydrationIntent(marker) {
+  return HYDRATE_DELEGATED_DYNAMIC_MARKERS.delete(marker);
+}
+function wasEarlyHydrationIntentHandled(event) {
+  return HYDRATE_HANDLED_INTENT_EVENTS.has(event);
+}
+function markDelegatedDynamicHydrationIntent(marker) {
+  HYDRATE_DELEGATED_DYNAMIC_MARKERS.add(marker);
+}
+export {
+  HYDRATE_SUPPORTED_INTERACTION_EVENTS,
+  hydrationEventPathWithin,
+  initializeHydrationEventCapture,
+  markDelegatedDynamicHydrationIntent,
+  registerHydrationIntentBoundary,
+  takeDelegatedDynamicHydrationIntent,
+  takePendingHydrationIntents,
+  unregisterHydrationIntentBoundary,
+  wasEarlyHydrationIntentHandled
+};

package/dist/hydration/index.d.ts

@@ -1,5 +1,6 @@
 export { condition } from './condition.js';
 export type { HydrationCondition } from './condition.js';
+export { initializeHydrationEventCapture } from './event-capture.js';
 export { idle } from './idle.js';
 export type { IdleHydrationOptions } from './idle.js';
 export { interaction } from './interaction.js';

package/dist/hydration/index.js

@@ -1,4 +1,5 @@
 import { condition } from "./condition.js";
+import { initializeHydrationEventCapture } from "./event-capture.js";
 import { idle } from "./idle.js";
 import { interaction } from "./interaction.js";
 import { load } from "./load.js";
@@ -8,6 +9,7 @@ import { visible } from "./visible.js";
 export {
   condition,
   idle,
+  initializeHydrationEventCapture,
   interaction,
   load,
   media,

package/dist/index.d.ts

@@ -1,4 +1,5 @@
 export { version } from './version.js';
-export { createRoot, hydrateRoot, flushSync, act, type Root, type RootOptions, useState, useReducer, useEffect, useLayoutEffect, useInsertionEffect, useMemo, useCallback, useRef, useId, useImperativeHandle, useEffectEvent, useSyncExternalStore, useDeferredValue, useTransition, useActionState, useFormStatus, useOptimistic, useDebugValue, type FormStatus, startTransition, requestFormReset, memo, lazy, preload, preinit, preconnect, prefetchDNS, createContext, use, useContext, type Context, type ForeignHostContext, Suspense, ErrorBoundary, Hydrate, Activity, ViewTransition, addTransitionType, ViewTransition as unstable_ViewTransition, addTransitionType as unstable_addTransitionType, ViewTransitionPseudoElement, type ViewTransitionProps, type ViewTransitionInstance, Fragment, createPortal, type PortalDescriptor, createElement, cloneElement, isValidElement, isChildrenBlock, Children, type ElementDescriptor, type ComponentBody, __useStateWithGetter, __useReducerWithGetter, __createVoidRoot, bindRendererRegionOwner, EXTERNAL_HYDRATION_PROMISE, HYDRATION_RANGE_BOUNDARY, createHostContextRequest, __vtSeen, template, clone, drainFrag, bag0, bag1, bag2, bag3, bag4, bag5, bag6, bag7, bag8, bag9, bag10, bag11, bag12, bag13, bag14, bag15, bag16, bagOf, evt0, evt0u, evt1, evt1u, evt2, evt2u, evtN, evtNu, htext, htextSwap, child, sibling, setText, setScriptText, setHTML, setDangerouslySetInnerHTML, setDangerouslySetInnerHTMLSources, markDangerouslySetInnerHTMLChildren, setAttribute, setStringData, setBooleanAttribute, setAriaAttribute, setClassName, setClassAttr, normalizeClass, setStyle, setSpread, snapshotSpread, setHostPropSources, queueNativeChangeDiagnostic, markNativeChangeDiagnosticStatic, setFormAction, setValue, setFormControlSources, setChecked, setCheckedCheckable, setSelectValue, setDefaultValue, setDefaultValueUncontrolled, setDefaultChecked, setAutoFocus, attachRef, queueRefAttach, queueRefDetach, injectStyle, headBlock, namespaceHead, namespaceHeadElement, delegateEvents, delegateCaptureEvents, forBlock, ifBlock, tryBlock, switchBlock, activityBlock, componentSlot, componentSlotVoid, componentSlotLite, compilerCacheContext, markChildrenBlock, childSlot, positionalChildren, textSlot, textHole, childTextHole, hostComponent, renderBlock, portal, hookSlots, withSlot, useBatch, warmMemo, warmChild, provideContext, mountFragmentRef, FragmentInstance, hmr, HMR, hasPendingWork, type Scope, type Block, drainPassiveEffects, setIsOctaneActEnvironment, setTransitionFallbackTimeout, getTransitionFallbackTimeout, } from './runtime.js';
+export { initializeHydrationEventCapture } from './hydration/event-capture.js';
+export { createRoot, hydrateRoot, flushSync, act, type Root, type RootOptions, useState, useReducer, useEffect, useLayoutEffect, useInsertionEffect, useMemo, useCallback, useRef, useId, useImperativeHandle, useEffectEvent, useSyncExternalStore, useDeferredValue, useTransition, useActionState, useFormStatus, useOptimistic, useDebugValue, type FormStatus, startTransition, requestFormReset, memo, lazy, preload, preinit, preconnect, prefetchDNS, createContext, use, useContext, type Context, type ForeignHostContext, Suspense, ErrorBoundary, Hydrate, Activity, ViewTransition, addTransitionType, ViewTransition as unstable_ViewTransition, addTransitionType as unstable_addTransitionType, ViewTransitionPseudoElement, type ViewTransitionProps, type ViewTransitionInstance, Fragment, createPortal, type PortalDescriptor, createElement, cloneElement, isValidElement, isChildrenBlock, Children, type ElementDescriptor, type ComponentBody, __useStateWithGetter, __useReducerWithGetter, __createVoidRoot, bindRendererRegionOwner, EXTERNAL_HYDRATION_PROMISE, HYDRATION_RANGE_BOUNDARY, createHostContextRequest, __vtSeen, template, clone, drainFrag, bag0, bag1, bag2, bag3, bag4, bag5, bag6, bag7, bag8, bag9, bag10, bag11, bag12, bag13, bag14, bag15, bag16, bagOf, evt0, evt0u, evt1, evt1u, evt2, evt2u, evtN, evtNu, htext, htextSwap, child, sibling, setText, setScriptText, setHTML, setDangerouslySetInnerHTML, setDangerouslySetInnerHTMLSources, markDangerouslySetInnerHTMLChildren, setAttribute, setStringData, setBooleanAttribute, setAriaAttribute, setClassName, setClassAttr, normalizeClass, setStyle, setSpread, snapshotSpread, setHostPropSources, queueNativeChangeDiagnostic, markNativeChangeDiagnosticStatic, setFormAction, setValue, setFormControlSources, setChecked, setCheckedCheckable, setSelectValue, setDefaultValue, setDefaultValueUncontrolled, setDefaultChecked, setAutoFocus, attachRef, queueRefAttach, queueRefDetach, injectStyle, headBlock, namespaceHead, namespaceHeadElement, delegateEvents, delegateCaptureEvents, forBlock, ifBlock, tryBlock, switchBlock, activityBlock, componentSlot, componentSlotVoid, componentSlotLite, compilerCacheContext, markSingleRoot, markChildrenBlock, childSlot, positionalChildren, textSlot, textHole, childTextHole, hostComponent, renderBlock, portal, hookSlots, withSlot, useBatch, warmMemo, warmChild, provideContext, mountFragmentRef, FragmentInstance, hmr, HMR, hasPendingWork, type Scope, type Block, drainPassiveEffects, setIsOctaneActEnvironment, setTransitionFallbackTimeout, getTransitionFallbackTimeout, } from './runtime.js';
 export type { HydrateOptions, HydrateProps, HydrateWhen, HydrationInteractionEvent, HydrationInteractionEvents, HydrationPrefetchContext, HydrationPrefetchFunction, HydrationPrefetchStrategy, HydrationPrefetchWaitReason, HydrationStrategy, HydrationWhen, } from './hydration/types.js';
 export { __serverRpc } from './server-rpc-client.js';

package/dist/index.js

@@ -1,4 +1,5 @@
 import { version } from "./version.js";
+import { initializeHydrationEventCapture } from "./hydration/event-capture.js";
 import {
   createRoot,
   hydrateRoot,
@@ -137,6 +138,7 @@ import {
   componentSlotVoid,
   componentSlotLite,
   compilerCacheContext,
+  markSingleRoot,
   markChildrenBlock,
   childSlot,
   positionalChildren,
@@ -242,6 +244,7 @@ export {
   htextSwap,
   hydrateRoot,
   ifBlock,
+  initializeHydrationEventCapture,
   injectStyle,
   isChildrenBlock,
   isValidElement,
@@ -249,6 +252,7 @@ export {
   markChildrenBlock,
   markDangerouslySetInnerHTMLChildren,
   markNativeChangeDiagnosticStatic,
+  markSingleRoot,
   memo,
   mountFragmentRef,
   namespaceHead,

package/dist/runtime.d.ts

@@ -540,6 +540,13 @@ export declare function createContext<T>(defaultValue: T): Context<T>;
  * propagation.)
  */
 export declare function provideContext<T>(scope: Scope, context: Context<T>, value: T): void;
+/**
+ * Compiler-emitted: attach markerless single-host-root metadata while a fresh
+ * component function is still being initialized. The compiler only calls this
+ * with an otherwise-unobserved function, so unused initializers are removable.
+ * @internal
+ */
+export declare function markSingleRoot<T extends Function>(component: T): T;
 /**
  * Compiler-emitted: tag a children-block render function so `isChildrenBlock` recognises it.
  * Returns the function for inline use (`{ children: markChildrenBlock(__children$N) }`).

package/dist/runtime.js

@@ -39,6 +39,17 @@ import {
   HYDRATE_DEFAULT_INTERACTION_EVENTS,
   HYDRATE_INTERACTION_EVENTS_ATTR
 } from "./hydration/interaction-config.js";
+import {
+  HYDRATE_SUPPORTED_INTERACTION_EVENTS,
+  hydrationEventPathWithin,
+  initializeHydrationEventCapture,
+  markDelegatedDynamicHydrationIntent,
+  registerHydrationIntentBoundary,
+  takeDelegatedDynamicHydrationIntent,
+  takePendingHydrationIntents,
+  unregisterHydrationIntentBoundary,
+  wasEarlyHydrationIntentHandled
+} from "./hydration/event-capture.js";
 import { sanitizeURL, sanitizeURLAttribute } from "./sanitize-url.js";
 import {
   COMPONENT_FLAG_BOUNDARY,
@@ -1350,15 +1361,23 @@ function drainPostPaint() {
   _postPaintCbs = [];
   for (let i = 0; i < cbs.length; i++) cbs[i]();
 }
-let _channel = null;
-if (typeof MessageChannel !== "undefined") {
-  _channel = new MessageChannel();
-  _channel.port1.onmessage = drainPostPaint;
+let _channel;
+function initPostPaintChannel() {
+  if (_channel === void 0) {
+    if (typeof MessageChannel === "undefined") {
+      _channel = null;
+    } else {
+      _channel = new MessageChannel();
+      _channel.port1.onmessage = drainPostPaint;
+    }
+  }
+  return _channel;
 }
 function schedulePostPaint(cb) {
   _postPaintCbs.push(cb);
-  if (_channel) {
-    requestAnimationFrame(() => _channel.port2.postMessage(0));
+  const channel = initPostPaintChannel();
+  if (channel !== null) {
+    requestAnimationFrame(() => channel.port2.postMessage(0));
   } else {
     requestAnimationFrame(() => setTimeout(drainPostPaint, 0));
   }
@@ -2347,6 +2366,7 @@ function useEffectEvent(fn, slot) {
 }
 const CONTEXT_TAG = /* @__PURE__ */ Symbol.for("octane.context");
 let COMPILER_CACHE_CONTEXT_EPOCH = 0;
+// @__NO_SIDE_EFFECTS__
 function createContext(defaultValue) {
   const ctx = function ProviderBody(props, scope) {
     if (scope.$$ctxValues === null) scope.$$ctxValues = /* @__PURE__ */ new Map();
@@ -2374,6 +2394,10 @@ function provideContext(scope, context, value) {
   scope.$$ctxValues.set(context, value);
 }
 const CHILDREN_BLOCK = /* @__PURE__ */ Symbol.for("octane.childrenBlock");
+function markSingleRoot(component) {
+  component.$$singleRoot = true;
+  return component;
+}
 function markChildrenBlock(fn) {
   if (typeof fn === "function") {
     fn[CHILDREN_BLOCK] = true;
@@ -2392,23 +2416,6 @@ function childrenAsBody(children) {
 const HYDRATE_ID_SLOT = /* @__PURE__ */ Symbol("octane.hydrate.id");
 const HYDRATE_SETUP_SLOT = /* @__PURE__ */ Symbol("octane.hydrate.setup");
 const HYDRATE_NOTIFY_SLOT = /* @__PURE__ */ Symbol("octane.hydrate.notify");
-const HYDRATE_SUPPORTED_INTERACTION_EVENTS = [
-  "auxclick",
-  "click",
-  "contextmenu",
-  "dblclick",
-  "focusin",
-  "keydown",
-  "keyup",
-  "mousedown",
-  "mouseenter",
-  "mouseover",
-  "mouseup",
-  "pointerdown",
-  "pointerenter",
-  "pointerover",
-  "pointerup"
-];
 const HYDRATE_STRATEGY_TYPES = /* @__PURE__ */ new Set([
   "load",
   "idle",
@@ -2420,11 +2427,6 @@ const HYDRATE_STRATEGY_TYPES = /* @__PURE__ */ new Set([
   "dynamic"
 ]);
 const HYDRATE_MARKER_SELECTOR = "[data-octane-hydrate-id]";
-const HYDRATE_DELEGATED_DYNAMIC_MARKERS = /* @__PURE__ */ new WeakSet();
-const HYDRATE_SLOTS_BY_MARKER = /* @__PURE__ */ new WeakMap();
-const HYDRATE_PENDING_INTENTS = /* @__PURE__ */ new WeakMap();
-const HYDRATE_HANDLED_INTENT_EVENTS = /* @__PURE__ */ new WeakSet();
-const HYDRATE_INTENT_DOCUMENTS = /* @__PURE__ */ new WeakSet();
 function hydrateStrategyType(when) {
   return typeof when === "function" ? "dynamic" : when?._t ?? "dynamic";
 }
@@ -2608,22 +2610,7 @@ function teardownHydrateBoundary(state) {
   cleanupHydrateInstallers(state);
   state.prefetchAbort?.abort();
   resolveHydrateWaiters(state, "abort");
-  HYDRATE_SLOTS_BY_MARKER.delete(state.wrapper);
-}
-function eventPathWithin(root, target) {
-  if (!(target instanceof Node)) return null;
-  const path = [];
-  let node = target instanceof Element ? target : target.parentElement;
-  while (node !== root) {
-    const parent = node?.parentElement ?? null;
-    if (parent === null) return null;
-    const index = Array.prototype.indexOf.call(parent.children, node);
-    if (index < 0) return null;
-    path.push(index);
-    node = parent;
-  }
-  path.reverse();
-  return path;
+  unregisterHydrationIntentBoundary(state.wrapper, state.intentBoundary);
 }
 function resolveEventPath(root, path) {
   let node = root;
@@ -2646,85 +2633,18 @@ function hydrateStrategyInteractionEvents(strategy) {
   const custom = strategy._a?.()?.[HYDRATE_INTERACTION_EVENTS_ATTR];
   return custom === void 0 ? HYDRATE_DEFAULT_INTERACTION_EVENTS : custom.split(/\s+/).filter(Boolean);
 }
-function markerHandlesEarlyHydrationIntent(marker, eventType) {
-  const state = HYDRATE_SLOTS_BY_MARKER.get(marker);
-  if (state !== void 0) {
-    return hydrateStrategyInteractionEvents(resolveHydrateStrategy(state))?.includes(eventType) ?? false;
-  }
-  const when = marker.getAttribute(HYDRATE_WHEN_ATTR);
-  if (when === "dynamic") return eventType === "click";
-  if (when !== "interaction") return false;
-  const custom = marker.getAttribute(HYDRATE_INTERACTION_EVENTS_ATTR);
-  const events = custom === null ? HYDRATE_DEFAULT_INTERACTION_EVENTS : custom.split(/\s+/).filter(Boolean);
-  return events.includes(eventType);
-}
 function queueHydrateIntent(state, intent) {
   if (state.hydrated || resolveHydrateStrategy(state)._t === "never") return;
   state.replays.push(intent);
   requestHydrateBoundary(state);
 }
-function handleEarlyHydrationIntent(event) {
-  const target = event.target;
-  if (!(target instanceof Element)) return;
-  const markers = [];
-  let marker = target.closest(HYDRATE_MARKER_SELECTOR);
-  let matches = false;
-  while (marker !== null) {
-    markers.push(marker);
-    matches ||= markerHandlesEarlyHydrationIntent(marker, event.type);
-    marker = marker.parentElement?.closest(HYDRATE_MARKER_SELECTOR) ?? null;
-  }
-  if (!matches || markers.length === 0) return;
-  markers.reverse();
-  let candidate = null;
-  let candidateState;
-  for (let i = 0; i < markers.length; i++) {
-    const current = markers[i];
-    const when = current.getAttribute(HYDRATE_WHEN_ATTR);
-    if (when === null) continue;
-    const state = HYDRATE_SLOTS_BY_MARKER.get(current);
-    if (state?.hydrated) continue;
-    if (when === "never" || state !== void 0 && resolveHydrateStrategy(state)._t === "never") {
-      return;
-    }
-    candidate = current;
-    candidateState = state;
-    break;
-  }
-  if (candidate === null) return;
-  for (let i = 0; i < markers.length; i++) {
-    const current = markers[i];
-    if (current !== candidate && candidate.contains(current) && current.getAttribute(HYDRATE_WHEN_ATTR) === "dynamic" && !HYDRATE_SLOTS_BY_MARKER.has(current)) {
-      HYDRATE_DELEGATED_DYNAMIC_MARKERS.add(current);
-    }
-  }
-  const path = eventPathWithin(candidate, event.target);
-  if (path === null) return;
-  const intent = { event, path };
-  HYDRATE_HANDLED_INTENT_EVENTS.add(event);
-  if (event.bubbles) {
-    event.preventDefault();
-    event.stopPropagation();
-    event.stopImmediatePropagation();
-  }
-  if (candidateState !== void 0) {
-    queueHydrateIntent(candidateState, intent);
-  } else {
-    const pending = HYDRATE_PENDING_INTENTS.get(candidate) ?? [];
-    pending.push(intent);
-    HYDRATE_PENDING_INTENTS.set(candidate, pending);
-  }
-}
-function ensureEarlyHydrationIntentCapture(ownerDocument) {
-  if (HYDRATE_INTENT_DOCUMENTS.has(ownerDocument)) return;
-  HYDRATE_INTENT_DOCUMENTS.add(ownerDocument);
-  for (let i = 0; i < HYDRATE_SUPPORTED_INTERACTION_EVENTS.length; i++) {
-    ownerDocument.addEventListener(
-      HYDRATE_SUPPORTED_INTERACTION_EVENTS[i],
-      handleEarlyHydrationIntent,
-      true
-    );
-  }
+function handleRegisteredHydrationIntent(state, eventType, intent) {
+  if (state.hydrated) return "hydrated";
+  const strategy = resolveHydrateStrategy(state);
+  if (strategy._t === "never") return "never";
+  const status = hydrateStrategyInteractionEvents(strategy)?.includes(eventType) ? "handles" : "dormant";
+  if (intent !== void 0) queueHydrateIntent(state, intent);
+  return status;
 }
 function installHydrateInteraction(state, strategy) {
   const ownEvents = hydrateStrategyInteractionEvents(strategy) ?? // A parent-first replay may carry conservative intent for a dynamic marker
@@ -2740,7 +2660,7 @@ function installHydrateInteraction(state, strategy) {
   }
   if (events.size === 0) return () => void 0;
   const onIntent = (event) => {
-    if (HYDRATE_HANDLED_INTENT_EVENTS.has(event)) return;
+    if (wasEarlyHydrationIntentHandled(event)) return;
     if (state.hydrated) return;
     const rawTarget = event.target;
     let target = rawTarget instanceof Element ? rawTarget : rawTarget instanceof Node ? rawTarget.parentElement : null;
@@ -2762,9 +2682,9 @@ function installHydrateInteraction(state, strategy) {
     }
     if (!matches) return;
     for (let i = 0; i < delegatedDynamicMarkers.length; i++) {
-      HYDRATE_DELEGATED_DYNAMIC_MARKERS.add(delegatedDynamicMarkers[i]);
+      markDelegatedDynamicHydrationIntent(delegatedDynamicMarkers[i]);
     }
-    const path = eventPathWithin(state.wrapper, event.target);
+    const path = hydrationEventPathWithin(state.wrapper, event.target);
     if (path === null) return;
     state.replays.push({ event, path });
     if (event.bubbles) {
@@ -2859,7 +2779,7 @@ function createHydrateSlot(props, scope, boundaryId) {
   const hydration = activeHydration();
   const expected = document.createElement("div");
   const wrapper = hydration === null ? expected : hydration.clone(expected);
-  ensureEarlyHydrationIntentCapture(wrapper.ownerDocument);
+  initializeHydrationEventCapture(wrapper.ownerDocument);
   let serverPreserved = hydration !== null && !hydration.isFresh(wrapper) && wrapper.parentNode === parentNode;
   if (wrapper.parentNode !== parentNode) parentNode.insertBefore(wrapper, parentBlock.endMarker);
   if (!wrapper.hasAttribute(HYDRATE_ID_ATTR)) wrapper.setAttribute(HYDRATE_ID_ATTR, boundaryId);
@@ -2909,7 +2829,9 @@ function createHydrateSlot(props, scope, boundaryId) {
     void 0
   );
   block.idState = idState;
-  const state = {
+  let state;
+  const intentBoundary = (eventType, intent) => handleRegisteredHydrationIntent(state, eventType, intent);
+  state = {
     __kind: "hydrateBlockSlot",
     __flags: SLOT_FLAG_TEARDOWN,
     __teardown: teardownHydrateBoundary,
@@ -2920,7 +2842,8 @@ function createHydrateSlot(props, scope, boundaryId) {
     parentBlock,
     props,
     boundaryId: wrapper.getAttribute(HYDRATE_ID_ATTR) ?? boundaryId,
-    delegatedDynamicIntent: HYDRATE_DELEGATED_DYNAMIC_MARKERS.delete(wrapper),
+    intentBoundary,
+    delegatedDynamicIntent: takeDelegatedDynamicHydrationIntent(wrapper),
     serverPreserved,
     preservedFallbackNodes: null,
     seedRaw,
@@ -2948,11 +2871,10 @@ function createHydrateSlot(props, scope, boundaryId) {
   };
   scope.slots[0] = state;
   registerSlot(scope, state);
-  HYDRATE_SLOTS_BY_MARKER.set(wrapper, state);
+  registerHydrationIntentBoundary(wrapper, intentBoundary);
   block.body = hydrateBoundaryBody(state);
   const initialStrategy = resolveHydrateStrategy(state);
-  const pendingIntents = HYDRATE_PENDING_INTENTS.get(wrapper);
-  HYDRATE_PENDING_INTENTS.delete(wrapper);
+  const pendingIntents = takePendingHydrationIntents(wrapper);
   if (serverPreserved && pendingIntents !== void 0 && initialStrategy._t !== "never") {
     state.replays.push(...pendingIntents);
     requestHydrateBoundary(state);
@@ -3018,7 +2940,6 @@ function notifyHydrateBoundary(state) {
   }
 }
 function initializeHydrateComponent() {
-  if (typeof document !== "undefined") ensureEarlyHydrationIntentCapture(document);
   return markComponentFlags(
     function Hydrate2(rawProps, scope) {
       const props = rawProps;
@@ -3208,6 +3129,7 @@ function bindRendererRegionOwner(props) {
   }
 }
 const HOST_CONTEXT_REQUEST_TAG = /* @__PURE__ */ Symbol.for("octane.host-context-request");
+// @__NO_SIDE_EFFECTS__
 function createHostContextRequest(thenable) {
   return { $$kind: HOST_CONTEXT_REQUEST_TAG, thenable };
 }
@@ -3671,6 +3593,7 @@ function resolveLazyModule(mod) {
   }
   return comp;
 }
+// @__NO_SIDE_EFFECTS__
 function lazy(load) {
   let status = "uninitialized";
   let result = null;
@@ -3755,7 +3678,7 @@ function useId(slot) {
   }
   return s.id;
 }
-const OPAQUE_TEMPLATE = /* @__PURE__ */ Symbol("octane.opaque-template");
+const LAZY_TEMPLATE = /* @__PURE__ */ Symbol("octane.lazy-template");
 function parseTemplate(html, ns, frag) {
   const t = document.createElement("template");
   if (ns === 0) {
@@ -3775,13 +3698,16 @@ function parseTemplate(html, ns, frag) {
   }
   return wrapEl.firstChild;
 }
+// @__NO_SIDE_EFFECTS__
 function template(html, ns = 0, frag = 0) {
-  if (ns === 3) {
-    return {
-      [OPAQUE_TEMPLATE]: { html, frag, parsed: [] }
-    };
-  }
-  return parseTemplate(html, ns === 1 ? 1 : ns === 2 ? 2 : 0, frag);
+  return {
+    [LAZY_TEMPLATE]: {
+      html,
+      ns: ns === 1 ? 1 : ns === 2 ? 2 : ns === 3 ? 3 : 0,
+      frag,
+      parsed: []
+    }
+  };
 }
 let currentHydration = null;
 function activeHydration() {
@@ -4211,14 +4137,19 @@ function parseSeedJson(raw) {
   }
 }
 function clone(node, loc) {
-  const opaque = node.nodeType === void 0 ? node[OPAQUE_TEMPLATE] : void 0;
-  if (opaque !== void 0) {
-    const inherited = CURRENT_SCOPE === null ? void 0 : deoptChildNamespace(CURRENT_SCOPE.block.parentNode);
-    const ns = inherited === SVG_NS ? 1 : inherited === MATHML_NS ? 2 : 0;
-    let parsed = opaque.parsed[ns];
+  const lazy2 = node.nodeType === void 0 ? node[LAZY_TEMPLATE] : void 0;
+  if (lazy2 !== void 0) {
+    let ns;
+    if (lazy2.ns === 3) {
+      const inherited = CURRENT_SCOPE === null ? void 0 : deoptChildNamespace(CURRENT_SCOPE.block.parentNode);
+      ns = inherited === SVG_NS ? 1 : inherited === MATHML_NS ? 2 : 0;
+    } else {
+      ns = lazy2.ns;
+    }
+    let parsed = lazy2.parsed[ns];
     if (parsed === void 0) {
-      parsed = parseTemplate(opaque.html, ns, opaque.frag);
-      opaque.parsed[ns] = parsed;
+      parsed = parseTemplate(lazy2.html, ns, lazy2.frag);
+      lazy2.parsed[ns] = parsed;
     }
     const hydration2 = activeHydration();
     return hydration2 === null ? parsed.cloneNode(true) : hydration2.clone(parsed, loc);
@@ -6773,6 +6704,7 @@ function genericPortalBody(value, scope) {
   childSlot(scope, 0, scope.parentNode, value, scope.endMarker);
 }
 const PORTAL_TAG = /* @__PURE__ */ Symbol.for("octane.portal");
+// @__NO_SIDE_EFFECTS__
 function createPortal(body, target, props = void 0) {
   return { $$kind: PORTAL_TAG, body, target, props };
 }
@@ -8808,6 +8740,7 @@ function shallowEqualPropsExact(a, b) {
   }
   return true;
 }
+// @__NO_SIDE_EFFECTS__
 function memo(component, arePropsEqual) {
   function memoWrapper(props, scope, extra) {
     return component(props, scope, extra);
@@ -12118,6 +12051,7 @@ export {
   markChildrenBlock,
   markDangerouslySetInnerHTMLChildren,
   markNativeChangeDiagnosticStatic,
+  markSingleRoot,
   memo,
   mountFragmentRef,
   namespaceHead,

package/dist/runtime.server.d.ts

@@ -605,10 +605,46 @@ export declare function renderToStaticMarkup(component: ServerComponent, props?:
  * its pending form (content ships via its segment).
  */
 export declare function ssrTry(scope: SSRScope, siteKey: string, tryFn: (arg: unknown, scope: SSRScope) => string, pendFn: ((arg: unknown, scope: SSRScope) => string) | null, catchFn: ((err: unknown, scope: SSRScope, reset: () => void) => string) | null, namespace?: 'html' | 'svg' | 'mathml', propagateSuspense?: boolean): string;
+/**
+ * A live source of externally-produced HTML (typically framework data
+ * `<script>` tags materializing as loaders settle) merged natively into a
+ * streamed render. Octane emits injected HTML verbatim, in push order, each
+ * drain as its own transport chunk strictly BETWEEN renderer chunks — never
+ * before the shell, and (for document renders) before the held
+ * `</body></html>` tail. The stream stays open until `done` settles.
+ *
+ * This is an Octane extension (React's Fizz owns its data injection
+ * internally); it exists so frameworks like TanStack Start can merge their
+ * data stream without re-parsing the HTML byte stream for safe insertion
+ * points — every boundary between renderer chunks is tag-complete by
+ * construction.
+ */
+export interface StreamInjectionSource {
+    /**
+     * Pull all queued HTML (concatenated, verbatim). Called at emission
+     * boundaries and after `subscribe` notifications; return '' when empty.
+     */
+    take(): string;
+    /**
+     * The source notifies when new HTML is queued; the renderer then drains
+     * promptly — even while the render itself is idle awaiting `done`.
+     * Returns an unsubscribe function; the renderer unsubscribes on
+     * completion, abort, and failure.
+     */
+    subscribe(notify: () => void): () => void;
+    /**
+     * The renderer holds the document tail and the stream close until this
+     * settles. A rejection fails the stream through the fatal path (after the
+     * shell, mirroring abort: degraded terminal completion).
+     */
+    done: Promise<void>;
+}
 export interface StreamOptions extends RenderOptions {
     onShellReady?: () => void;
     onShellError?: (err: unknown) => void;
     onAllReady?: () => void;
+    /** Merge externally-produced HTML into the stream (see StreamInjectionSource). */
+    injection?: StreamInjectionSource;
 }
 /**
  * React `react-dom/server` `renderToPipeableStream` (Node streams). Returns

package/dist/runtime.server.js

@@ -3283,6 +3283,12 @@ function withStream(stream, fn) {
     STREAM = prev;
   }
 }
+const DOCUMENT_TAIL_RE = /^<\/body>(?:\s|<!--[^]*?-->)*<\/html>(?:\s|<!--[^]*?-->)*$/;
+function documentTailStart(body) {
+  const index = body.lastIndexOf("</body>");
+  if (index === -1) return -1;
+  return DOCUMENT_TAIL_RE.test(body.slice(index)) ? index : -1;
+}
 function segmentChunk(b, nonceAttr) {
   let seedScript = "";
   if (b.seeds.length > 0) {
@@ -3328,6 +3334,59 @@ async function runStream(component, props, options, sink) {
       stream.activePassBoundaryKeys = previousBoundaryKeys;
     }
   };
+  const injection = options?.injection;
+  if (injection !== void 0) injection.done.then(NOOP, NOOP);
+  let injectionUnsubscribe;
+  let injectionFailure;
+  let injectionFailed = false;
+  let signalInjectionFailure;
+  const failInjection = (err) => {
+    if (injectionFailed) return;
+    injectionFailed = true;
+    injectionFailure = err;
+    signalInjectionFailure?.();
+  };
+  let writeChain = injection === void 0 ? null : Promise.resolve();
+  const write = injection === void 0 ? (chunk, terminal) => sink.write(chunk, terminal) : (chunk, terminal) => {
+    const operation = writeChain.then(() => sink.write(chunk, terminal));
+    writeChain = operation.then(NOOP, NOOP);
+    return operation;
+  };
+  const drainInjection = () => {
+    if (injection === void 0 || injectionFailed) return;
+    let html;
+    try {
+      html = injection.take();
+    } catch (err) {
+      failInjection(err);
+      return;
+    }
+    if (!html) return;
+    return write(html);
+  };
+  const notifyInjection = () => {
+    const drained = drainInjection();
+    if (drained !== void 0) drained.catch(NOOP);
+  };
+  const waitForInjectionDone = () => new Promise((resolve, reject) => {
+    let settled = false;
+    const finish = (fn) => {
+      if (settled) return;
+      settled = true;
+      signal?.removeEventListener("abort", onAbort);
+      signalInjectionFailure = void 0;
+      fn();
+    };
+    const onAbort = () => finish(() => reject(signal.reason));
+    signalInjectionFailure = () => finish(() => reject(injectionFailure));
+    if (injectionFailed) return finish(() => reject(injectionFailure));
+    if (signal?.aborted) return onAbort();
+    signal?.addEventListener("abort", onAbort, { once: true });
+    injection.done.then(
+      () => finish(resolve),
+      (err) => finish(() => reject(err))
+    );
+  });
   const emittedCss = /* @__PURE__ */ new Set();
   const flushedSegments = /* @__PURE__ */ new Set();
   const observedDone = /* @__PURE__ */ new Set();
@@ -3370,15 +3429,15 @@ async function runStream(component, props, options, sink) {
     if (errors.length === 0) return;
     let chunk = "";
     for (const boundary of errors) chunk += boundaryErrorChunk(boundary, nonceAttr);
-    const write = sink.write(chunk);
+    const errorWrite = write(chunk);
     const markFlushed = () => {
       for (const boundary of errors) boundary.errorFlushed = true;
     };
-    if (write === void 0) {
+    if (errorWrite === void 0) {
       markFlushed();
       return;
     }
-    return write.then(markFlushed);
+    return errorWrite.then(markFlushed);
   };
   let pass;
   let shellBoundaryKeys;
@@ -3416,13 +3475,24 @@ async function runStream(component, props, options, sink) {
     emittedCss.add(hash);
     shell += '<style data-octane="' + hash + '"' + nonceAttr + ">" + escapeEntireInlineStyleContent(sheet) + "</style>";
   }
-  shell += pass.head + pass.body;
+  let heldDocumentTail = "";
+  if (injection !== void 0) {
+    const tailStart = documentTailStart(pass.body);
+    if (tailStart !== -1) {
+      heldDocumentTail = pass.body.slice(tailStart);
+      shell += pass.head + pass.body.slice(0, tailStart);
+    } else {
+      shell += pass.head + pass.body;
+    }
+  } else {
+    shell += pass.head + pass.body;
+  }
   if (pass.serial.length > 0) shell += serializeSuspenseSeeds(pass.serial, nonceAttr);
   const anyPending = stream.boundaries.size > 0;
   if (anyPending)
     shell += "<script " + STREAM_SCRIPT_ATTR + nonceAttr + ">" + STREAM_RUNTIME_JS + "</script>";
   try {
-    const shellWrite = sink.write(pass.vtCandidates ? vtSsrStrip(shell) : shell);
+    const shellWrite = write(pass.vtCandidates ? vtSsrStrip(shell) : shell);
     if (shellWrite !== void 0) await shellWrite;
   } catch (err) {
     options?.onError?.(err);
@@ -3430,6 +3500,14 @@ async function runStream(component, props, options, sink) {
     return;
   }
   sink.shellReady();
+  if (injection !== void 0) {
+    try {
+      injectionUnsubscribe = injection.subscribe(notifyInjection);
+    } catch (err) {
+      failInjection(err);
+    }
+    notifyInjection();
+  }
   let suspended = pass.suspended;
   let attempt = 0;
   try {
@@ -3437,7 +3515,7 @@ async function runStream(component, props, options, sink) {
     if (initiallyDone.length > 0) {
       let chunk = "";
       for (const boundary of initiallyDone) chunk += segmentChunk(boundary, nonceAttr);
-      const segmentWrite = sink.write(pass.vtCandidates ? vtSsrStrip(chunk) : chunk);
+      const segmentWrite = write(pass.vtCandidates ? vtSsrStrip(chunk) : chunk);
       if (segmentWrite !== void 0) await segmentWrite;
       for (const boundary of initiallyDone) {
         flushedSegments.add(boundary.id);
@@ -3479,7 +3557,7 @@ async function runStream(component, props, options, sink) {
       const done = reachableDoneSegments();
       for (const b of done) chunk += segmentChunk(b, nonceAttr);
       if (chunk !== "") {
-        const segmentWrite = sink.write(pass.vtCandidates ? vtSsrStrip(chunk) : chunk);
+        const segmentWrite = write(pass.vtCandidates ? vtSsrStrip(chunk) : chunk);
         if (segmentWrite !== void 0) await segmentWrite;
         for (const b of done) flushedSegments.add(b.id);
       }
@@ -3496,16 +3574,45 @@ async function runStream(component, props, options, sink) {
     for (const b of stream.boundaries.values()) {
       if (!flushedSegments.has(b.id) && !b.errorFlushed) tail += boundaryErrorChunk(b, nonceAttr);
     }
+    if (heldDocumentTail !== "") tail += heldDocumentTail;
     if (tail !== "") {
       try {
-        const terminalWrite = sink.write(tail, true);
+        const terminalWrite = write(tail, true);
         if (terminalWrite !== void 0) await terminalWrite;
       } catch {
       }
     }
+    injectionUnsubscribe?.();
     sink.fatal(err);
     return;
   }
+  if (injection !== void 0) {
+    try {
+      await waitForInjectionDone();
+      const finalDrain = drainInjection();
+      if (finalDrain !== void 0) await finalDrain;
+      if (injectionFailed) throw injectionFailure;
+      if (heldDocumentTail !== "") {
+        const tailChunk = heldDocumentTail;
+        heldDocumentTail = "";
+        const tailWrite = write(tailChunk);
+        if (tailWrite !== void 0) await tailWrite;
+      }
+    } catch (err) {
+      options?.onError?.(err);
+      if (heldDocumentTail !== "") {
+        try {
+          const terminalWrite = write(heldDocumentTail, true);
+          if (terminalWrite !== void 0) await terminalWrite;
+        } catch {
+        }
+      }
+      injectionUnsubscribe?.();
+      sink.fatal(err);
+      return;
+    }
+    injectionUnsubscribe?.();
+  }
   sink.allReady();
 }
 function renderToPipeableStream(component, props, options) {

package/dist/server/index.d.ts

@@ -21,4 +21,4 @@
  * should call them.
  */
 export { executeServerFunction } from './rpc.js';
-export { renderToString, renderToStaticMarkup, renderToPipeableStream, renderToReadableStream, type RenderResult, type RenderOptions, type StreamOptions, setSsrSuspenseTimeout, getSsrSuspenseTimeout, EXTERNAL_HYDRATION_PROMISE, HYDRATION_RANGE_BOUNDARY, useState, useReducer, __useStateWithGetter, __useReducerWithGetter, useEffect, useLayoutEffect, useInsertionEffect, useImperativeHandle, useMemo, useCallback, useRef, useId, useEffectEvent, useTransition, useDeferredValue, useSyncExternalStore, useActionState, useFormStatus, useOptimistic, useDebugValue, memo, lazy, hookSlots, withSlot, startTransition, flushSync, isChildrenBlock, isValidElement, cloneElement, Children, createPortal, requestFormReset, preload, preinit, preconnect, prefetchDNS, Suspense, ErrorBoundary, Hydrate, Fragment, Activity, ViewTransition, ViewTransition as unstable_ViewTransition, addTransitionType, addTransitionType as unstable_addTransitionType, createContext, use, useContext, ssrIsSuspense, type Context, type FormStatus, markChildrenBlock, createElement, positionalChildren, escapeHtml, escapeAttr, ssrText, ssrTextPre, ssrChild, ssrChildText, ssrAttr, normalizeClass, ssrStyle, ssrClass, ssrAttrs, ssrSnapshotSpread, ssrSpread, ssrInnerHtml, ssrScriptInnerHtml, ssrChildrenSources, ssrVoidContent, ssrValueAttr, ssrCheckedAttr, ssrInputAttrs, ssrTextareaValue, ssrTextareaValueSources, ssrSelectAttrs, ssrSelectScope, ssrSelectScopeSources, ssrOptionValueSources, ssrOption, ssrElement, ssrComponent, ssrComponentNS, ssrInNamespace, ssrBlock, ssrActivity, ssrForBlock, ssrControl, ssrArm, ssrTry, ssrPortal, injectStyle, ssrHeadEl, namespaceHead, namespaceHeadElement, puMemo, puBatch, warmMemo, warmChild, } from '../runtime.server.js';
+export { renderToString, renderToStaticMarkup, renderToPipeableStream, renderToReadableStream, type RenderResult, type RenderOptions, type StreamOptions, type StreamInjectionSource, setSsrSuspenseTimeout, getSsrSuspenseTimeout, EXTERNAL_HYDRATION_PROMISE, HYDRATION_RANGE_BOUNDARY, useState, useReducer, __useStateWithGetter, __useReducerWithGetter, useEffect, useLayoutEffect, useInsertionEffect, useImperativeHandle, useMemo, useCallback, useRef, useId, useEffectEvent, useTransition, useDeferredValue, useSyncExternalStore, useActionState, useFormStatus, useOptimistic, useDebugValue, memo, lazy, hookSlots, withSlot, startTransition, flushSync, isChildrenBlock, isValidElement, cloneElement, Children, createPortal, requestFormReset, preload, preinit, preconnect, prefetchDNS, Suspense, ErrorBoundary, Hydrate, Fragment, Activity, ViewTransition, ViewTransition as unstable_ViewTransition, addTransitionType, addTransitionType as unstable_addTransitionType, createContext, use, useContext, ssrIsSuspense, type Context, type FormStatus, markChildrenBlock, createElement, positionalChildren, escapeHtml, escapeAttr, ssrText, ssrTextPre, ssrChild, ssrChildText, ssrAttr, normalizeClass, ssrStyle, ssrClass, ssrAttrs, ssrSnapshotSpread, ssrSpread, ssrInnerHtml, ssrScriptInnerHtml, ssrChildrenSources, ssrVoidContent, ssrValueAttr, ssrCheckedAttr, ssrInputAttrs, ssrTextareaValue, ssrTextareaValueSources, ssrSelectAttrs, ssrSelectScope, ssrSelectScopeSources, ssrOptionValueSources, ssrOption, ssrElement, ssrComponent, ssrComponentNS, ssrInNamespace, ssrBlock, ssrActivity, ssrForBlock, ssrControl, ssrArm, ssrTry, ssrPortal, injectStyle, ssrHeadEl, namespaceHead, namespaceHeadElement, puMemo, puBatch, warmMemo, warmChild, } from '../runtime.server.js';

package/package.json

@@ -1,14 +1,9 @@
 {
   "name": "octane",
-  "version": "0.1.9",
+  "version": "0.1.10",
   "license": "MIT",
   "type": "module",
-  "sideEffects": [
-    "./src/index.ts",
-    "./src/runtime.ts",
-    "./dist/index.js",
-    "./dist/runtime.js"
-  ],
+  "sideEffects": false,
   "engines": {
     "node": ">=22"
   },