octane 0.2.13 → 0.2.14

package/dist/cjs/signals/control-binding.cjs

@@ -25,11 +25,11 @@ module.exports = __toCommonJS(control_binding_exports);
 var import_control_capture = require("../hydration/control-capture.cjs");
 var import_early_values = require("./early-values.cjs");
 var import_handle_protocol = require("./handle-protocol.cjs");
+var import_control_handoff = require("./control-handoff.cjs");
 var import_owner_context = require("./owner-context.cjs");
 var import_read_protocol = require("./read-protocol.cjs");
 var import_types = require("./types.cjs");
 var import_transition_state = require("./transition-state.cjs");
-const CONTROL_BINDINGS = /* @__PURE__ */ new WeakMap();
 const RADIO_WRITERS = /* @__PURE__ */ new WeakMap();
 function controlString(value) {
   return typeof value === "string" ? value : typeof value === "function" || typeof value === "symbol" ? "" : String(value);
@@ -48,8 +48,7 @@ function publishRadioInput(input) {
   for (const [write, checked] of edits) if (!checked) write(false);
   for (const [write, checked] of edits) if (checked) write(true);
 }
-function __createBindingControls() {
-  const owner = (0, import_owner_context.currentSignalOwner)();
+function __createBindingControls(owner = (0, import_owner_context.currentSignalOwner)()) {
   const run = owner === null ? (callback) => callback() : (0, import_owner_context.captureSignalOwner)(owner);
   return {
     claim(element, channel, notify) {
@@ -58,12 +57,12 @@ function __createBindingControls() {
         throw new TypeError(
           "A signal control requires a native value/checked property and a signal."
         );
-      if (CONTROL_BINDINGS.get(control)?.has(channel) || (0, import_early_values.hasHydrationControlSignalWriter)(control, channel))
+      if (import_control_handoff.CONTROL_BINDINGS.get(control)?.has(channel) || (0, import_early_values.hasHydrationControlSignalWriter)(control, channel))
         throw new Error(
           "This control property already has a signal binding. Dispose it before rebinding."
         );
-      let channels = CONTROL_BINDINGS.get(control);
-      if (!channels) CONTROL_BINDINGS.set(control, channels = /* @__PURE__ */ new Set());
+      let channels = import_control_handoff.CONTROL_BINDINGS.get(control);
+      if (!channels) import_control_handoff.CONTROL_BINDINGS.set(control, channels = /* @__PURE__ */ new Set());
       channels.add(channel);
       let disposed = false;
       let initialized = false;
@@ -135,7 +134,7 @@ function __createBindingControls() {
         control.removeEventListener("compositionstart", compositionStart);
         control.removeEventListener("compositionend", compositionEnd);
         channels.delete(channel);
-        if (channels.size === 0) CONTROL_BINDINGS.delete(control);
+        if (channels.size === 0) import_control_handoff.CONTROL_BINDINGS.delete(control);
         if (failed) throw failure;
       };
       const prepare = (next, preview = false) => {
@@ -298,11 +297,16 @@ function __createBindingControls() {
         prepare,
         preview: (value) => prepare(value, true),
         prepareCurrent: () => prepare(raw),
+        active: () => !disposed,
+        composing: () => composing,
         dispose
       };
     }
   };
 }
+function controlSignalOwner(owner, document) {
+  return owner !== null && "documentOwner" in owner ? document ? owner.documentOwner : owner.instanceOwner : owner;
+}
 function bindSignalControl(control, channel, handle$) {
   if (!(0, import_handle_protocol.isSignalHandle)(handle$))
     throw new TypeError("A signal control requires a native value/checked property and a signal.");
@@ -310,6 +314,7 @@ function bindSignalControl(control, channel, handle$) {
   let dirty = false;
   let disposed = false;
   let lease;
+  let handoff;
   const dispose = () => {
     disposed = true;
     lease.dispose();
@@ -357,9 +362,28 @@ function bindSignalControl(control, channel, handle$) {
       };
     }
   };
-  lease = __createBindingControls().claim(control, channel, refresh);
+  const owner = (0, import_owner_context.currentSignalOwner)();
+  lease = __createBindingControls(owner).claim(control, channel, refresh);
   refresh();
-  return dispose;
+  return Object.assign(dispose, {
+    [import_control_handoff.CONTROL_HANDOFF]() {
+      return handoff ??= {
+        control,
+        channel,
+        active: () => !disposed && lease.active(),
+        matches(handle) {
+          if (disposed || !lease.active() || handle !== handle$) return false;
+          if (!(import_types.SIGNAL_OWNER_RESOLVE in handle$)) return true;
+          const document = handle$[import_types.SIGNAL_BINDING_IDENTITY]().scope === "document";
+          return owner !== null && controlSignalOwner(owner, document) === controlSignalOwner((0, import_owner_context.currentSignalOwner)(), document) && !disposed && lease.active();
+        },
+        composing: lease.composing,
+        // dispose revokes authority before invoking fallible subscription
+        // cleanup; a later call cannot release the renderer's replacement.
+        retire: dispose
+      };
+    }
+  });
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/cjs/signals/control-handoff.cjs

@@ -0,0 +1,39 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var control_handoff_exports = {};
+__export(control_handoff_exports, {
+  BINDING_HANDOFF: () => BINDING_HANDOFF,
+  CONTROL_BINDINGS: () => CONTROL_BINDINGS,
+  CONTROL_HANDOFF: () => CONTROL_HANDOFF,
+  hasSignalControlBinding: () => hasSignalControlBinding
+});
+module.exports = __toCommonJS(control_handoff_exports);
+const BINDING_HANDOFF = /* @__PURE__ */ Symbol.for("octane.binding-handoff");
+const CONTROL_HANDOFF = /* @__PURE__ */ Symbol.for("octane.control-handoff");
+const CONTROL_BINDINGS = /* @__PURE__ */ new WeakMap();
+function hasSignalControlBinding(control, channel) {
+  return CONTROL_BINDINGS.get(control)?.has(channel) ?? false;
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  BINDING_HANDOFF,
+  CONTROL_BINDINGS,
+  CONTROL_HANDOFF,
+  hasSignalControlBinding
+});

package/dist/cjs/stream-protocol.cjs

@@ -20,6 +20,8 @@ var stream_protocol_exports = {};
 __export(stream_protocol_exports, {
   HYDRATE_STREAM_TOKEN_ATTR: () => HYDRATE_STREAM_TOKEN_ATTR,
   STREAM_BOUNDARY_ATTR: () => STREAM_BOUNDARY_ATTR,
+  STREAM_SCRIPT_ATTR: () => STREAM_SCRIPT_ATTR,
+  SUSPENSE_SCRIPT_ATTR: () => SUSPENSE_SCRIPT_ATTR,
   isRendererStreamBoundaryTemplate: () => isRendererStreamBoundaryTemplate,
   isRendererStreamToken: () => isRendererStreamToken,
   rendererRangeClose: () => rendererRangeClose,
@@ -28,6 +30,8 @@ __export(stream_protocol_exports, {
 module.exports = __toCommonJS(stream_protocol_exports);
 var import_dom_binding_protocol = require("./dom-binding-protocol.cjs");
 const STREAM_BOUNDARY_ATTR = "data-oct-b";
+const SUSPENSE_SCRIPT_ATTR = "data-octane-suspense";
+const STREAM_SCRIPT_ATTR = "data-octane-stream";
 const HYDRATE_STREAM_TOKEN_ATTR = "data-octane-stream-token";
 function hydrationMarkerMultiplicity(data, open) {
   const marker = open ? "[" : "]";
@@ -93,6 +97,8 @@ function isRendererStreamBoundaryTemplate(node, expectedToken) {
 0 && (module.exports = {
   HYDRATE_STREAM_TOKEN_ATTR,
   STREAM_BOUNDARY_ATTR,
+  STREAM_SCRIPT_ATTR,
+  SUSPENSE_SCRIPT_ATTR,
   isRendererStreamBoundaryTemplate,
   isRendererStreamToken,
   rendererRangeClose,

package/dist/cjs/version.cjs

@@ -21,7 +21,7 @@ __export(version_exports, {
   version: () => version
 });
 module.exports = __toCommonJS(version_exports);
-const version = "0.2.13";
+const version = "0.2.14";
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   version

package/dist/compiler/compile.js

@@ -9163,6 +9163,7 @@ function markKnownAttributeSpreads(ast, contracts) {
 		}
 	}
 	const imports = new Map();
+	const unboundImports = new Set();
 	for (const declaration of ast.body) {
 		if (declaration.type !== 'ImportDeclaration' || declaration.importKind === 'type') continue;
 		for (const specifier of declaration.specifiers) {
@@ -9173,6 +9174,8 @@ function markKnownAttributeSpreads(ast, contracts) {
 					: specifier.type === 'ImportDefaultSpecifier'
 						? 'default'
 						: (specifier.imported.name ?? specifier.imported.value);
+			if (declaration.source.value === 'octane/behavior' && imported === 'unbound')
+				unboundImports.add(specifier.local.name);
 			const matches = contracts.filter(
 				(contract) =>
 					contract.source === declaration.source.value && contract.imported === imported,
@@ -9293,13 +9296,24 @@ function markKnownAttributeSpreads(ast, contracts) {
 			};
 		}
 		if (node.type !== 'JSXSpreadAttribute' && node.type !== 'SpreadAttribute') return null;
-		const call = node.argument;
+		let call = unwrapTsExpr(node.argument);
+		const externalCallee = unwrapTsExpr(call?.callee);
+		const external =
+			call?.type === 'CallExpression' &&
+			!call.optional &&
+			externalCallee?.type === 'Identifier' &&
+			unboundImports.has(externalCallee.name) &&
+			lexical.resolveBinding(lexical.nodeScopes.get(externalCallee), externalCallee.name)?.scope ===
+				lexical.rootScope &&
+			call.arguments.length === 1 &&
+			call.arguments[0].type !== 'SpreadElement';
+		if (external) call = unwrapTsExpr(call.arguments[0]);
 		if (call?.type !== 'CallExpression' || call.optional) return null;
-		let callee = call.callee;
+		let callee = unwrapTsExpr(call.callee);
 		const members = [];
 		while (callee?.type === 'MemberExpression' && !callee.computed && !callee.optional) {
 			members.unshift(callee.property.name);
-			callee = callee.object;
+			callee = unwrapTsExpr(callee.object);
 		}
 		if (callee?.type !== 'Identifier') return null;
 		const matches = imports.get(callee.name);
@@ -9319,7 +9333,11 @@ function markKnownAttributeSpreads(ast, contracts) {
 		return contract
 			? {
 					...node,
-					_octaneKnownAttributeSpread: { fields: [...contract.fields], style: contract.style },
+					_octaneKnownAttributeSpread: {
+						fields: [...contract.fields],
+						style: contract.style,
+						...(external ? { unbound: true } : {}),
+					},
 				}
 			: null;
 	});
@@ -15202,11 +15220,13 @@ function compileComponent(node, ctx, options) {
 }
 
 /** Gate explicitly eligible presentation views; ordinary codegen stays direct. */
-function preparePresentationHydration(body, node, ctx) {
+function preparePresentationHydration(body, node, ctx, hostEnd) {
 	const proof = node._octanePresentationHydration;
 	if (!proof || ctx.mode === 'server' || ctx._universalRuntimeUnit != null) return body;
 	const writers = new Set([
 		'bindSignalAttribute',
+		'bindSignalValue',
+		'queueNativeChangeDiagnostic',
 		'setEventHandler',
 		'setAttribute',
 		'setPlainAttribute',
@@ -15272,6 +15292,7 @@ function preparePresentationHydration(body, node, ctx) {
 	const visit = (value, rewrite) => {
 		if (!value || typeof value !== 'object') return value;
 		if (Array.isArray(value)) return value.map((item) => visit(item, rewrite));
+		if (proof.host && value._octanePresentationUnbound) return value;
 		if (!value.type || /Function/.test(value.type)) return value;
 		if (value.type === 'ReturnStatement' && !value._octanePendingOutputGuard) supported = false;
 		const helper =
@@ -15343,11 +15364,15 @@ function preparePresentationHydration(body, node, ctx) {
 				)
 			: result;
 	};
-	visit(body, false);
+	const captured = proof.host ? body.slice(0, hostEnd) : body;
+	visit(captured, false);
 	const frame = b.id(allocCompilerName(ctx, '__presentationHydration'));
 	const completed = b.id(allocCompilerName(ctx, '__presentationComplete'));
-	const failure = proof.structural ? b.id(allocCompilerName(ctx, '__presentationFailure')) : null;
-	const statements = supported ? visit(body, true) : body;
+	const failure =
+		proof.structural || proof.nativeControl || proof.host
+			? b.id(allocCompilerName(ctx, '__presentationFailure'))
+			: null;
+	const statements = supported ? visit(captured, true) : captured;
 	let directiveEnd = 0;
 	while (
 		statements[directiveEnd]?.type === 'ExpressionStatement' &&
@@ -15359,21 +15384,33 @@ function preparePresentationHydration(body, node, ctx) {
 		b.id('__s'),
 		b.literal(proof.id),
 		b.literal(supported),
-		...(proof.structural ? [b.literal(true)] : []),
-		...(proof.conditionalRest ? [b.literal(true)] : []),
+		...(proof.structural || proof.host ? [b.literal(proof.structural === true)] : []),
+		...(proof.conditionalRest || proof.host ? [b.literal(proof.conditionalRest === true)] : []),
+		...(proof.host ? [b.literal(true)] : []),
 	);
 	// A new, unsupported writer can still render normally, but must reject an
 	// attempted lease before publishing anything. It never opens a frame.
 	if (!supported)
-		return [...statements.slice(0, directiveEnd), b.stmt(begin), ...statements.slice(directiveEnd)];
+		return [...body.slice(0, directiveEnd), b.stmt(begin), ...body.slice(directiveEnd)];
 	return [
 		...statements.slice(0, directiveEnd),
-		b.const(frame, begin),
+		proof.host ? b.let(frame, begin) : b.const(frame, begin),
 		b.let(completed, b.literal(false)),
 		b.try(
 			b.block([
 				...statements.slice(directiveEnd),
 				b.stmt(b.assignment('=', completed, b.literal(true))),
+				...(proof.host
+					? [
+							// Descendants hydrate under their own receipts. The completed
+							// host frame remains pending in this root's commit capture.
+							b.stmt(
+								b.call(requireRuntimeForContext(ctx, 'endPresentationHydration'), frame, completed),
+							),
+							b.stmt(b.assignment('=', frame, b.literal(null))),
+							...body.slice(hostEnd),
+						]
+					: []),
 			]),
 			failure === null
 				? null
@@ -15957,6 +15994,8 @@ function compileFunctionBody(node, ctx, name, parentNs = 'html', cssHash = null,
 		);
 		bodyStatements.push(...plan.everyRender);
 	}
+	// Native host presentation ends before any child slot can execute.
+	let presentationHostEnd = bodyStatements.length;
 	if (plan?.after) bodyStatements.push(...plan.after);
 	// Hoisted `<title>`/`<meta>`/`<link>` → headBlock into document.head
 	// (out-of-band; re-applied each render for reactivity, removed on unmount).
@@ -15985,6 +16024,7 @@ function compileFunctionBody(node, ctx, name, parentNs = 'html', cssHash = null,
 		bodyStatements.unshift(
 			inheritOriginLoc(b.const('__block', b.member(b.id('__s'), 'block')), node),
 		);
+		presentationHostEnd++;
 	}
 	// PROPS-FIRST convention: `(…userProps, __s, __extra)`. The scope is the 2nd arg
 	// (a placeholder leads when there are no user params), so a plain function
@@ -16001,7 +16041,12 @@ function compileFunctionBody(node, ctx, name, parentNs = 'html', cssHash = null,
 	ctx.currentMapTemps = prevMapTemps;
 	// ONE FunctionDeclaration node — the caller prints it (once, with the full
 	// esrap map for top-level components) or embeds it in an enclosing body.
-	const presentationBody = preparePresentationHydration(bodyStatements, node, ctx);
+	const presentationBody = preparePresentationHydration(
+		bodyStatements,
+		node,
+		ctx,
+		presentationHostEnd,
+	);
 	ctx.presentationHydration = previousPresentationHydration;
 	const emittedFunction = b.function_declaration(
 		b.id(name, node.id ?? node),
@@ -24344,6 +24389,17 @@ function planJsx(
 		}
 	}
 	for (const b of elementBindings) {
+		if (ctx.presentationHydration?.host && b.path.length === 0) {
+			const name =
+				b.kind === 'ref'
+					? 'ref'
+					: b.kind === 'event' || b.kind === 'event-bundle'
+						? b.slotKeyOrigin?.name
+						: b.name;
+			b.presentationUnbound =
+				typeof name === 'string' &&
+				ctx.presentationHydration.unboundAttributes.has(name.toLowerCase());
+		}
 		const sharesSpreadHost = spreadPaths.has(b.path.join(','));
 		const sharesEventSlot =
 			(b.kind === 'event' || b.kind === 'event-bundle') &&
@@ -25912,11 +25968,13 @@ function propertyIsEnumerableCall(objNode, name) {
 	);
 }
 
-// `(__s.cleanups ??= []).push(<fn>)` — the scope's cleanup array is lazily allocated (most
-// scopes never register one), so the registration site owns creating it.
+// Ref teardown reads the live bag because updates replace refs. An interrupted
+// mount has no committed bag and never attached its refs, so its cleanup is inert.
 function cleanupsPush(fnNode) {
 	const lazyArray = b.assignment('??=', b.member(b.id('__s'), 'cleanups'), b.array([]));
-	return b.stmt(b.call(b.member(lazyArray, 'push'), fnNode));
+	return b.stmt(
+		b.call(b.member(lazyArray, 'push'), b.arrow([], b.logical('&&', b.id('_b'), fnNode.body))),
+	);
 }
 
 /**
@@ -26107,7 +26165,10 @@ function emitBindingMount(bind, elVar, bag) {
 	if (knownExpression !== bind.expr) bind = { ...bind, expr: knownExpression };
 	if (bind.deferred) return emitDeferredMount(bind, elVar, bag);
 	const org = bindingOrigin(bind);
-	const st = (node) => inheritOriginLoc(node, org);
+	const st = (node) => {
+		const emitted = inheritOriginLoc(node, org);
+		return bind.presentationUnbound ? { ...emitted, _octanePresentationUnbound: true } : emitted;
+	};
 	const el = () => hostVarNode(elVar);
 	const local = (key) => b.id(bag.local(key));
 	const hostKey = `_el$${bind.id}`;
@@ -26315,9 +26376,8 @@ function emitBindingMount(bind, elVar, bag) {
 					]),
 				);
 			}
-			// The cleanup closure reads the bag through the captured `_b` — the bag
-			// exists by the time any cleanup runs (committed at mount end), and the
-			// `_host$` field is re-written by updates, so the read must be live.
+			// The `_host$` field is re-written by updates, so cleanup reads the live
+			// bag. cleanupsPush skips that read when mount never committed it.
 			const cleanup = b.arrow(
 				[],
 				b.call(
@@ -26494,9 +26554,8 @@ function emitBindingMount(bind, elVar, bag) {
 			// (queueRefDetach: unmount cleanups run mid-render, and a state-setter
 			// ref firing null synchronously can render before a replacement
 			// element's deferred attach — commit-phase detach batches the two).
-			// The cleanup closure reads the bag through the captured `_b` — the bag
-			// exists by the time any cleanup runs (committed at mount end), and the
-			// `_sp$` field is re-written by updates, so the read must be live.
+			// The `_sp$` field is re-written by updates, so cleanup reads the live
+			// bag. cleanupsPush skips that read when mount never committed it.
 			const flags = bind.skipFormControls
 				? [b.literal(bind.skipDangerouslySetInnerHTML === true), b.literal(true)]
 				: bind.skipDangerouslySetInnerHTML
@@ -26632,7 +26691,10 @@ function emitBindingUpdate(bind, bag, inlineBindingGuards = false) {
 	if (knownExpression !== bind.expr) bind = { ...bind, expr: knownExpression };
 	if (bind.mountOnly) return null;
 	const org = bindingOrigin(bind);
-	const st = (node) => inheritOriginLoc(node, org);
+	const st = (node) => {
+		const emitted = inheritOriginLoc(node, org);
+		return bind.presentationUnbound ? { ...emitted, _octanePresentationUnbound: true } : emitted;
+	};
 	const V = () => b.id('_v');
 	// 1-char bag field names (see makeBag) — resolved from the same registry the
 	// mount pass registered them in; an unmounted field throws at compile time.

package/dist/compiler/dom-binding-program.js

@@ -55,7 +55,9 @@ export function needsBindingProgram(node, isUnbound) {
 	if (!/^[a-z]/.test(tagOf(node) ?? '')) return true;
 	if (
 		(node.openingElement?.attributes ?? node.attributes ?? []).some(
-			(attr) => rawName(attr) === 'ref' || /^on[A-Z]/.test(rawName(attr) ?? ''),
+			(attr) =>
+				(rawName(attr) === 'ref' || /^on[A-Z]/.test(rawName(attr) ?? '')) &&
+				!isUnbound(attrValue(attr)),
 		)
 	)
 		return true;
@@ -590,6 +592,7 @@ export function planBindingProgram(fn, render, context) {
 				if (context.annotationsOnly) return name === 'class' || name === 'className';
 				if (name !== 'ref' && !/^on[A-Z]/.test(name ?? '')) return true;
 				const expression = attrValue(attr);
+				if (isUnbound(expression)) return true;
 				// Event/ref callbacks are native owner adapters, not eager projections.
 				assertAdapter(expression);
 				if (
@@ -695,6 +698,19 @@ export function planBindingProgram(fn, render, context) {
 				selfNs,
 				tag === 'textarea' || opaqueChildren ? null : 0,
 			];
+			if (
+				tag === 'textarea' &&
+				selfNs === 0 &&
+				normalizedChildren.length === 0 &&
+				(node.attributes ?? []).some(
+					(attr) => rawName(attr) === 'value' && native.unbound.has(unwrap(attrValue(attr))),
+				) &&
+				!(node.attributes ?? []).some((attr) => rawName(attr) === 'dangerouslySetInnerHTML')
+			) {
+				// Its SSR text is native value content, not an arbitrary opaque subtree.
+				// The handoff validates the live text-only topology before accepting it.
+				nativeNode.push('value');
+			}
 			if (opaqueChildren)
 				constructionError ??=
 					'This view contains externally owned children that cannot be constructed by a binding program.';
@@ -710,7 +726,7 @@ export function planBindingProgram(fn, render, context) {
 			}
 			const attributes = createTemplateIr();
 			for (const attr of node.attributes ?? []) {
-				if (attr._octaneKnownAttributeSpread) continue;
+				if (attr._octaneKnownAttributeSpread && !attr._octaneKnownAttributeSpread.unbound) continue;
 				if (rawName(attr) === 'ref' || /^on[A-Z]/.test(rawName(attr) ?? '')) continue;
 				if (attr.type === 'SpreadAttribute' || attr.type === 'JSXSpreadAttribute') {
 					constructionError ??=