octane 0.3.1 → 0.3.2

package/dist/cjs/runtime.server.cjs

@@ -196,6 +196,8 @@ var import_trusted_html = require("./trusted-html.cjs");
 var import_read_protocol = require("./signals/read-protocol.cjs");
 var import_hook_slot_cache = require("./hook-slot-cache.cjs");
 var import_dom_binding_protocol = require("./dom-binding-protocol.cjs");
+var import_hydration_markers = require("./hydration-markers.cjs");
+var import_runtime_tags = require("./runtime-tags.cjs");
 var import_constants = require("./constants.cjs");
 var import_independent_hydration_protocol = require("./independent-hydration-protocol.cjs");
 var import_has_own = require("./has-own.cjs");
@@ -546,10 +548,8 @@ function ssrNestingText(value) {
 }
 const NOOP = () => {
 };
-const ELEMENT_TAG = /* @__PURE__ */ Symbol.for("octane.element");
-const PORTAL_TAG = /* @__PURE__ */ Symbol.for("octane.portal");
-const Fragment = /* @__PURE__ */ Symbol.for("octane.Fragment");
-const Activity = /* @__PURE__ */ Symbol.for("octane.Activity");
+const Fragment = import_runtime_tags.FRAGMENT_TAG;
+const Activity = import_runtime_tags.ACTIVITY_TAG;
 const SCOPED_ELEMENT_PROPS = /* @__PURE__ */ new WeakSet();
 const SCOPED_CHILDREN_RESOLVER = /* @__PURE__ */ Symbol("octane.scopedChildrenResolver");
 const SCOPED_VALUE_RESOLVER = /* @__PURE__ */ Symbol("octane.scopedValueResolver");
@@ -750,7 +750,7 @@ function nativeCreateScopedValue(readElement) {
   return scopedValueDescriptor(createNativeServerScopedResolver(readElement));
 }
 function scopedValueDescriptor(resolve) {
-  const descriptor = { $$kind: ELEMENT_TAG };
+  const descriptor = { $$kind: import_runtime_tags.ELEMENT_TAG };
   Object.defineProperty(descriptor, SCOPED_VALUE_RESOLVER, { value: resolve });
   Object.defineProperty(descriptor, "type", SCOPED_VALUE_PROPERTIES.type);
   Object.defineProperty(descriptor, "props", SCOPED_VALUE_PROPERTIES.props);
@@ -800,7 +800,7 @@ function scopedElementDescriptor(type, copiedProps, key, children, invocationSit
   setScopedChildrenResolver(copiedProps, children);
   SCOPED_ELEMENT_PROPS.add(copiedProps);
   const descriptor = {
-    $$kind: ELEMENT_TAG,
+    $$kind: import_runtime_tags.ELEMENT_TAG,
     type,
     props: copiedProps,
     key,
@@ -834,7 +834,7 @@ function createElementFromConfig(invocationSite, type, props, children) {
   (0, import_shared_value_helpers.applyElementDefaultProps)(type, p);
   kids = p.children;
   const descriptor = {
-    $$kind: ELEMENT_TAG,
+    $$kind: import_runtime_tags.ELEMENT_TAG,
     type,
     props: p,
     key,
@@ -850,7 +850,7 @@ function positionalChildren(children) {
   return children;
 }
 function isElementDescriptor(v) {
-  return v != null && v.$$kind === ELEMENT_TAG;
+  return v != null && v.$$kind === import_runtime_tags.ELEMENT_TAG;
 }
 function isFragmentDescriptor(value) {
   return isElementDescriptor(value) && value.type === Fragment;
@@ -862,7 +862,7 @@ function fragmentDescriptorChildren(value) {
 }
 function fragmentRefDescriptor(value) {
   return {
-    $$kind: ELEMENT_TAG,
+    $$kind: import_runtime_tags.ELEMENT_TAG,
     type: renderFragmentRefDescriptor,
     props: value,
     key: value.key,
@@ -1052,7 +1052,7 @@ function cloneElement(element, config, ...children) {
   let descriptor;
   if (preserveScopedChildren) {
     descriptor = {
-      $$kind: ELEMENT_TAG,
+      $$kind: import_runtime_tags.ELEMENT_TAG,
       type: element.type,
       props,
       key,
@@ -1066,7 +1066,7 @@ function cloneElement(element, config, ...children) {
     if (scopedResolver !== void 0) setScopedChildrenResolver(descriptor, scopedResolver);
   } else {
     descriptor = {
-      $$kind: ELEMENT_TAG,
+      $$kind: import_runtime_tags.ELEMENT_TAG,
       type: element.type,
       props,
       key,
@@ -1085,7 +1085,7 @@ function cloneAndReplaceElementKey(element, key) {
     const get = Object.getOwnPropertyDescriptor(element, "children").get;
     const copiedGetter = get === SCOPED_VALUE_PROPERTIES.children.get ? () => get.call(element) : get;
     descriptor = {
-      $$kind: ELEMENT_TAG,
+      $$kind: import_runtime_tags.ELEMENT_TAG,
       type: element.type,
       props: element.props,
       key,
@@ -1104,7 +1104,7 @@ function cloneAndReplaceElementKey(element, key) {
     }
   } else {
     descriptor = {
-      $$kind: ELEMENT_TAG,
+      $$kind: import_runtime_tags.ELEMENT_TAG,
       type: element.type,
       props: element.props,
       key,
@@ -1167,7 +1167,7 @@ function mapIntoChildren(children, out, escapedPrefix, nameSoFar, callback) {
     children = null;
     type = "object";
   }
-  const isLeaf = children === null || type === "string" || type === "number" || type === "bigint" || isElementDescriptor(children) || children != null && children.$$kind === PORTAL_TAG;
+  const isLeaf = children === null || type === "string" || type === "number" || type === "bigint" || isElementDescriptor(children) || children != null && children.$$kind === import_runtime_tags.PORTAL_TAG;
   if (isLeaf) {
     const child = children;
     let mapped = callback(child);
@@ -1266,7 +1266,7 @@ const Children = {
 };
 function createPortal(body, target, props = void 0) {
   const key = typeof props === "string" || typeof props === "number" ? String(props) : null;
-  return { $$kind: PORTAL_TAG, body, target, key, props: key === null ? props : void 0 };
+  return { $$kind: import_runtime_tags.PORTAL_TAG, body, target, key, props: key === null ? props : void 0 };
 }
 const HTML_ESCAPE_RE = /[&<>]/;
 const SERVER_HTML = /* @__PURE__ */ Symbol.for("octane.serverHtml");
@@ -1301,7 +1301,7 @@ function ssrHtml(html) {
 const BINDING_HTML_ROOT = /* @__PURE__ */ Symbol.for("octane.binding.html");
 function ssrBindingHtml(html, id) {
   const output = new ServerHtml(html);
-  output[BINDING_HTML_ROOT] = "[b;" + id + ";root";
+  output[BINDING_HTML_ROOT] = (0, import_dom_binding_protocol.bindingRootMarker)(id);
   return output;
 }
 function bindPresentationView(view, _id) {
@@ -1396,7 +1396,7 @@ function ssrChildValue(v, scope, includeKeyedSingle, selfMarkItem = false) {
     return v[SERVER_HTML];
   }
   if (v == null || v === false || v === true) return ssrBlock("");
-  if ((typeof v === "object" || typeof v === "function") && (v.$$kind === CONTEXT_TAG || typeof v.then === "function")) {
+  if ((typeof v === "object" || typeof v === "function") && (v.$$kind === import_runtime_tags.CONTEXT_TAG || typeof v.then === "function")) {
     return ssrChildValue(
       use(v),
       scope,
@@ -1420,7 +1420,7 @@ function ssrChildValue(v, scope, includeKeyedSingle, selfMarkItem = false) {
   if (typeof v === "function")
     return ssrComponent(scope, v, {}, void 0, void 0, true);
   if (typeof v === "object") {
-    if (v.$$kind === ELEMENT_TAG) {
+    if (v.$$kind === import_runtime_tags.ELEMENT_TAG) {
       const d = v;
       const render = () => {
         if (typeof d.type === "string") {
@@ -1435,7 +1435,7 @@ function ssrChildValue(v, scope, includeKeyedSingle, selfMarkItem = false) {
       const renderType = () => withAsyncIdentity("child-type", d.type, render);
       return d.key != null ? withAsyncIdentity("child-key", d.key, renderType, true) : renderType();
     }
-    if (v.$$kind === PORTAL_TAG) return ssrBlock(ssrPortal());
+    if (v.$$kind === import_runtime_tags.PORTAL_TAG) return ssrBlock(ssrPortal());
     throw invalidChildError(v);
   }
   return ssrBlock(escapeHtml(v));
@@ -1576,14 +1576,14 @@ function ssrDeoptBlockChildren(children, scope) {
 }
 function serverDescNeedsBlocks(v) {
   if (v == null || typeof v !== "object") return false;
-  if (v.$$kind === CONTEXT_TAG || typeof v.then === "function") return true;
+  if (v.$$kind === import_runtime_tags.CONTEXT_TAG || typeof v.then === "function") return true;
   if (Array.isArray(v)) {
     for (let i = 0; i < v.length; i++) if (serverDescNeedsBlocks(v[i])) return true;
     return false;
   }
   if (!isElementDescriptor(v) && (0, import_shared_value_helpers.childrenIterator)(v) !== null) return true;
   const d = v;
-  if (d.$$kind === ELEMENT_TAG) {
+  if (d.$$kind === import_runtime_tags.ELEMENT_TAG) {
     if (d.type === Fragment || d.type === Activity) return true;
     return typeof d.type === "function" || serverDescNeedsBlocks(d.children);
   }
@@ -1607,7 +1607,7 @@ function serverHostHasPrimitiveChildren(children) {
   return children === null || typeof children !== "object" && typeof children !== "function";
 }
 function ssrDeoptItemContent(value, scope) {
-  if (value !== null && typeof value === "object" && value.$$kind === ELEMENT_TAG) {
+  if (value !== null && typeof value === "object" && value.$$kind === import_runtime_tags.ELEMENT_TAG) {
     const descriptor = value;
     if (typeof descriptor.type === "string") {
       const type = descriptor.type;
@@ -1627,7 +1627,7 @@ function ssrDescriptorContent(v, scope) {
     for (let i = 0; i < v.length; i++) out += ssrDescriptorContent(v[i], scope);
     return out;
   }
-  if (typeof v === "object" && v.$$kind === ELEMENT_TAG) {
+  if (typeof v === "object" && v.$$kind === import_runtime_tags.ELEMENT_TAG) {
     const d = v;
     if (typeof d.type === "string") return ssrHostElement(d.type, d.props, d.children, scope);
     return ssrComponentDescriptor(d, scope);
@@ -3328,7 +3328,7 @@ const Suspense = /* @__PURE__ */ (0, import_component_flags.markComponentFlags)(
   },
   import_component_flags.COMPONENT_FLAG_BOUNDARY,
   "Suspense",
-  /* @__PURE__ */ Symbol.for("octane.suspense")
+  import_runtime_tags.SUSPENSE_TAG
 );
 let VT_SSR_TRY_SEQ = 0;
 let VT_SSR_HAS_CANDIDATES = false;
@@ -3511,11 +3511,7 @@ function vtSsrAnnotateScope(html) {
     true
   );
   const valid = roots === 1 && !sentinel && !text;
-  if (valid)
-    injectStyle(
-      "octane-view-transition-scope",
-      '[vt-scope="element"]{view-transition-scope:all!important}'
-    );
+  if (valid) injectStyle(import_css.VIEW_TRANSITION_SCOPE_STYLE_ID, import_css.VIEW_TRANSITION_SCOPE_CSS);
   return vtSsrMapTags(
     html,
     (open) => vtSsrInject(open, [["vt-scope", valid ? "element" : "none"]]),
@@ -3707,12 +3703,11 @@ const ErrorBoundary = /* @__PURE__ */ (0, import_component_flags.markComponentFl
   import_component_flags.COMPONENT_FLAG_BOUNDARY,
   "ErrorBoundary"
 );
-const CONTEXT_TAG = /* @__PURE__ */ Symbol.for("octane.context");
 function createContext(defaultValue) {
   const ctx = function ProviderBody(props, scope) {
     return ssrHtml(renderServerContextProvider(ctx, props, scope));
   };
-  ctx.$$kind = CONTEXT_TAG;
+  ctx.$$kind = import_runtime_tags.CONTEXT_TAG;
   ctx.defaultValue = defaultValue;
   (0, import_context_identity.registerContext)(ctx);
   if (process.env.NODE_ENV !== "production") {
@@ -3747,7 +3742,7 @@ function readContext(ctx) {
   return ctx.defaultValue;
 }
 function useContext(ctx) {
-  if (ctx && ctx.$$kind === CONTEXT_TAG) return readContext(ctx);
+  if (ctx && ctx.$$kind === import_runtime_tags.CONTEXT_TAG) return readContext(ctx);
   return readHostedForeignContext(ctx, "useContext");
 }
 const SSR_SUSPENSE = /* @__PURE__ */ Symbol("octane.ssr.suspense");
@@ -3939,7 +3934,7 @@ function use(usable, siteKey, directSite) {
       "Do not call use() inside a useMemo() factory. Cached factories can skip context or promise reads; call use() before useMemo() and memoize the returned value instead."
     );
   }
-  if (usable && usable.$$kind === CONTEXT_TAG) {
+  if (usable && usable.$$kind === import_runtime_tags.CONTEXT_TAG) {
     recordSkippedHydrationSite(SERIAL, directSite);
     return readContext(usable);
   }
@@ -4306,18 +4301,17 @@ function warmChild(comp, props) {
   }
 }
 let LAZY_ID = 0;
-const LAZY_COMPONENT = /* @__PURE__ */ Symbol.for("octane.lazy");
 function resolveLazyModule(mod) {
   let comp = mod;
   if (mod != null) {
     const defaultExport = mod.default;
     if (defaultExport !== void 0) comp = defaultExport;
   }
-  if (typeof comp !== "function" || comp[LAZY_COMPONENT] === true) {
+  if (typeof comp !== "function" || comp[import_runtime_tags.LAZY_COMPONENT_TAG] === true) {
     throw new Error(
       (0, import_error_codes_server_generated.formatServerError)(
         10,
-        comp?.[LAZY_COMPONENT] === true ? "lazy component" : typeof comp
+        comp?.[import_runtime_tags.LAZY_COMPONENT_TAG] === true ? "lazy component" : typeof comp
       )
     );
   }
@@ -4383,7 +4377,7 @@ function lazy(load) {
     }
     throw SSR_SUSPENSE;
   };
-  Object.defineProperty(lazyWrapper, LAZY_COMPONENT, {
+  Object.defineProperty(lazyWrapper, import_runtime_tags.LAZY_COMPONENT_TAG, {
     get() {
       return this === lazyWrapper;
     }
@@ -4555,7 +4549,7 @@ function useDebugValue(_value, _format) {
 function requestFormReset(_form) {
 }
 function useId() {
-  return ":" + ID_PREFIX + "in-" + (ID_COUNTER++).toString(36) + ":";
+  return (0, import_hydration_markers.formatUseId)(ID_PREFIX, ID_COUNTER++);
 }
 function throwOnServerEffectEventCall() {
   throw new Error((0, import_error_codes_server_generated.formatServerError)(11));
@@ -4691,10 +4685,9 @@ function startTransition(fn) {
 function flushSync(fn) {
   return fn();
 }
-const CHILDREN_BLOCK = /* @__PURE__ */ Symbol.for("octane.childrenBlock");
 function markChildrenBlock(fn) {
   if (typeof fn === "function") {
-    fn[CHILDREN_BLOCK] = true;
+    fn[import_runtime_tags.CHILDREN_BLOCK_TAG] = true;
   }
   return fn;
 }
@@ -4702,7 +4695,7 @@ function descriptorChildren(component) {
   return component;
 }
 function isChildrenBlock(value) {
-  return typeof value === "function" && value[CHILDREN_BLOCK] === true;
+  return typeof value === "function" && value[import_runtime_tags.CHILDREN_BLOCK_TAG] === true;
 }
 function injectStyle(id, css, nonce) {
   if (CSS !== null) {

package/dist/cjs/server/streamed-signals.cjs

@@ -183,6 +183,9 @@ function createStreamedRendererFrameStream(frames, options = {}) {
 function escapeAttribute(value) {
   return value.replace(/&/g, "&amp;").replace(/"/g, "&quot;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
 }
+function byteLength(value) {
+  return typeof globalThis.Buffer === "function" ? globalThis.Buffer.byteLength(value, "utf8") : new TextEncoder().encode(value).byteLength;
+}
 function streamedRendererFrameScript(frame, nonce) {
   const encoded = (0, import_streamed_signals_protocol.encodeStreamedRendererFrameForScript)(frame);
   return `<script ${import_stream_protocol.STREAM_SCRIPT_ATTR}${nonce === void 0 ? "" : ` nonce="${escapeAttribute(nonce)}"`}>globalThis.__octaneStreamedRenderer.receive(${encoded});</script>`;
@@ -201,7 +204,7 @@ function createSignalInjection(identity, result, options, timeoutMessage) {
   let queued = options.announceSelection ? streamedSignalSelectionScript(identity, options.nonce) : "";
   let pending = false;
   let awaitingAcceptance = false;
-  let queuedBytes = queued === "" ? 0 : new TextEncoder().encode(queued).byteLength;
+  let queuedBytes = queued === "" ? 0 : byteLength(queued);
   let finished = false;
   let subscribed = false;
   let totalBytes = 0;
@@ -247,7 +250,7 @@ function createSignalInjection(identity, result, options, timeoutMessage) {
           return;
         }
         const html = streamedRendererFrameScript(next.value, options.nonce);
-        const bytes = new TextEncoder().encode(html).byteLength;
+        const bytes = byteLength(html);
         if (bytes > budget.maxFrameBytes || totalBytes + bytes > budget.maxTotalBytes) {
           fail(new Error("Streamed renderer injection exceeded its byte budget."));
           return;
@@ -364,7 +367,7 @@ function createAutomaticStreamedSignalInjection(options, external) {
     for (const { identity, attempt } of selections ?? []) {
       if (attempt.signal.aborted) continue;
       const script = streamedSignalSelectionScript(identity, options.nonce);
-      const bytes = new TextEncoder().encode(script).byteLength;
+      const bytes = byteLength(script);
       if (bytes > budget.maxFrameBytes || totalBytes + bytes > budget.maxTotalBytes) {
         const error = new Error("Automatic streamed signals exceeded their byte budget.");
         fail(error);
@@ -397,7 +400,7 @@ function createAutomaticStreamedSignalInjection(options, external) {
           if (child.done && (child.attempt !== void 0 || renderComplete)) cleanupChild(child);
           continue;
         }
-        const bytes = child.attempt === void 0 ? new TextEncoder().encode(html).byteLength : child.source.queuedBytes;
+        const bytes = child.attempt === void 0 ? byteLength(html) : child.source.queuedBytes;
         if (bytes > budget.maxFrameBytes || totalBytes + bytes > budget.maxTotalBytes) {
           fail(new Error("Automatic streamed signals exceeded their byte budget."));
           return;

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

@@ -260,7 +260,8 @@ function __createBindingControls(owner = (0, import_owner_context.currentSignalO
             let snapshot;
             do {
               snapshot = (0, import_control_capture.snapshotHydrationControl)(control);
-              if (snapshot.editRevision > 0 && (0, import_handle_protocol.isWritableSignal)(active)) write(nativeValue());
+              if ((0, import_handle_protocol.isWritableSignal)(active) && (snapshot.editRevision > 0 || channel === "value" && (0, import_control_capture.isRestoredHydrationTextarea)(control, read(active))))
+                write(nativeValue());
               if (disposed) return;
             } while (!(0, import_control_capture.consumeHydrationControl)(control, snapshot.revision));
           },

package/dist/cjs/stream-protocol.cjs

@@ -30,15 +30,16 @@ __export(stream_protocol_exports, {
 });
 module.exports = __toCommonJS(stream_protocol_exports);
 var import_dom_binding_protocol = require("./dom-binding-protocol.cjs");
+var import_hydration_markers = require("./hydration-markers.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 ? "[" : "]";
+  const marker = open ? import_hydration_markers.HYDRATION_START : import_hydration_markers.HYDRATION_END;
   if (data === marker) return 1;
-  if (open && (data === "[f0" || data === "[f1")) return 1;
-  if (open && (data.startsWith("[b;") || data.startsWith("[f")) && (0, import_dom_binding_protocol.isBindingOpenComment)(data))
+  if (open && (data === import_hydration_markers.HYDRATION_FOR_EMPTY || data === import_hydration_markers.HYDRATION_FOR_ITEMS)) return 1;
+  if (open && (data.startsWith(import_dom_binding_protocol.BINDING_OPEN_PREFIX) || data.startsWith(import_hydration_markers.HYDRATION_FOR_PREFIX)) && (0, import_dom_binding_protocol.isBindingOpenComment)(data))
     return 1;
   if (data.length < 2 || data.charCodeAt(0) !== marker.charCodeAt(0)) return 0;
   const first = data.charCodeAt(1);
@@ -78,8 +79,8 @@ function getLeadingHydrationListRange(host) {
   let enclosingEnd = null;
   while (start !== null && start.nodeType === 8) {
     const data = start.data;
-    const list = data === "[f0" || data === "[f1" || (data.startsWith("[f0;b;") || data.startsWith("[f1;b;")) && (0, import_dom_binding_protocol.isBindingOpenComment)(data);
-    const wrapperMultiplicity = data === "[" ? 1 : data.charCodeAt(1) >= 49 && data.charCodeAt(1) <= 57 ? hydrationMarkerMultiplicity(data, true) : 0;
+    const list = data === import_hydration_markers.HYDRATION_FOR_EMPTY || data === import_hydration_markers.HYDRATION_FOR_ITEMS || (0, import_dom_binding_protocol.isForBindingOpenComment)(data);
+    const wrapperMultiplicity = data === import_hydration_markers.HYDRATION_START ? 1 : data.charCodeAt(1) >= 49 && data.charCodeAt(1) <= 57 ? hydrationMarkerMultiplicity(data, true) : 0;
     if (!list && wrapperMultiplicity === 0) return null;
     const end = rendererRangeClose(start);
     if (end === null || enclosingEnd !== null && (end.compareDocumentPosition(enclosingEnd) & 4) === 0)
@@ -87,12 +88,12 @@ function getLeadingHydrationListRange(host) {
     if (hydrationMarkerMultiplicity(end.data, false) !== (list ? 1 : wrapperMultiplicity))
       return null;
     if (list) {
-      const suffix = data.slice(3);
+      const suffix = data.slice(import_hydration_markers.HYDRATION_FOR_EMPTY.length);
       return {
         start,
         end,
-        emptyMarker: "[f0" + suffix,
-        itemsMarker: "[f1" + suffix
+        emptyMarker: import_hydration_markers.HYDRATION_FOR_EMPTY + suffix,
+        itemsMarker: import_hydration_markers.HYDRATION_FOR_ITEMS + suffix
       };
     }
     enclosingEnd = end;

package/dist/cjs/version.cjs

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

package/dist/compiler/compile.js

@@ -1444,6 +1444,7 @@ const INTERNAL_CLIENT_RUNTIME_HELPERS = new Set([
 	'bindSignalText',
 	'bindSignalChild',
 	'bindSignalAttribute',
+	'hydrateClaimedBindingCaches',
 	'bindSignalValue',
 	'bindSignalChecked',
 	'bindSignalHostPropSources',
@@ -15590,6 +15591,8 @@ function preparePresentationHydration(body, node, ctx, hostEnd) {
  * bodies. `cssHash` selects the enclosing scoped-style expression fallback.
  */
 function compileFunctionBody(node, ctx, name, parentNs = 'html', cssHash = null, options = null) {
+	const previousScalarBindingClaims = ctx.scalarBindingClaims;
+	ctx.scalarBindingClaims = node._octaneScalarBindingClaims;
 	const previousPresentationHydration = ctx.presentationHydration;
 	ctx.presentationHydration = node._octanePresentationHydration;
 	const returnedOutput = options?.returnedOutput === true;
@@ -16203,6 +16206,7 @@ function compileFunctionBody(node, ctx, name, parentNs = 'html', cssHash = null,
 		ctx,
 		presentationHostEnd,
 	);
+	ctx.scalarBindingClaims = previousScalarBindingClaims;
 	ctx.presentationHydration = previousPresentationHydration;
 	const emittedFunction = b.function_declaration(
 		b.id(name, node.id ?? node),
@@ -23870,16 +23874,9 @@ const INTRINSIC_MUTATION_METHODS = new Set([
 ]);
 
 function mayWriteTextIntrinsicMember(target) {
+	target = unwrapTsExpr(target);
 	if (!target || typeof target !== 'object') return false;
-	if (
-		target.type === 'TSAsExpression' ||
-		target.type === 'TSTypeAssertion' ||
-		target.type === 'TSNonNullExpression' ||
-		target.type === 'ParenthesizedExpression' ||
-		target.type === 'AssignmentPattern'
-	) {
-		return mayWriteTextIntrinsicMember(target.expression ?? target.left);
-	}
+	if (target.type === 'AssignmentPattern') return mayWriteTextIntrinsicMember(target.left);
 	if (target.type === 'MemberExpression') {
 		return target.computed
 			? target.property?.type !== 'Literal' || TEXT_INTRINSICS.has(target.property.value)
@@ -23930,15 +23927,8 @@ function isPossibleIntrinsicMutator(node) {
 // proofs for the module. Calls still evaluate the authored callee: a replacement
 // may return an element rather than the built-in's primitive result.
 function writesGlobalTextIntrinsic(target, lexical) {
+	target = unwrapTsExpr(target);
 	if (!target || typeof target !== 'object') return false;
-	if (
-		target.type === 'TSAsExpression' ||
-		target.type === 'TSTypeAssertion' ||
-		target.type === 'TSNonNullExpression' ||
-		target.type === 'ParenthesizedExpression'
-	) {
-		return writesGlobalTextIntrinsic(target.expression, lexical);
-	}
 	const unbound = (node, name) => {
 		const scope = lexical.nodeScopes.get(node);
 		return scope !== undefined && !lexical.isBound(scope, name);
@@ -25504,6 +25494,69 @@ function planJsx(
 		if (b.deferred) everyRenderLines.push(updateEmit);
 		else updateLines.push(updateEmit);
 	}
+	if (ctx.scalarBindingClaims) {
+		// Only opted-in scalar views can retain another writer's publication at
+		// hydration. Record their existing cache fields; ordinary output is unchanged.
+		const fields = [];
+		for (const binding of elementBindings) {
+			const key = binding.id;
+			const text = binding.kind === 'textOnlyChild' || binding.kind === 'text';
+			const host = text && !binding.signalDirect ? `_txt$${key}` : `_el$${key}`;
+			if (text && binding.signalDirect)
+				fields.push(bag.letter(`_sig$${key}`), bag.letter(host), '#text-token');
+			if (binding.kind === 'nativeStyle') {
+				fields.push(binding.slotIndex, bag.letter(host), 'style');
+			} else if (binding.kind === 'styleProperties') {
+				for (let i = 0; i < binding.properties.length; i++)
+					fields.push(
+						bag.letter(`_prev$${key}_${i}`),
+						bag.letter(host),
+						`style:${binding.properties[i].name}`,
+					);
+			} else if (binding.kind === 'style') {
+				fields.push(bag.letter(`_sty$${key}`), bag.letter(host), 'style');
+			} else if (
+				text ||
+				['attr', 'stringData', 'booleanAttr', 'ariaAttr', 'class', 'styleProperty'].includes(
+					binding.kind,
+				)
+			) {
+				const cache = binding.signalDirect && !text ? `_sig$${key}` : `_prev$${key}`;
+				fields.push(
+					bag.letter(cache),
+					bag.letter(host),
+					text
+						? '#text'
+						: binding.kind === 'styleProperty'
+							? `style:${binding.name}`
+							: binding.kind === 'class'
+								? 'class'
+								: ATTRIBUTE_ALIASES.get(binding.name) || binding.name,
+				);
+			}
+		}
+		if (fields.length) {
+			const name = `_claims$${ctx.nextHelperId++}`;
+			ctx.hoistedHelpers.push(
+				inheritOriginLoc(
+					b.const(name, b.array(fields.map((value) => b.literal(value)))),
+					planOrigin,
+				),
+			);
+			everyRenderLines.push(
+				inheritOriginLoc(
+					b.stmt(
+						b.call(
+							requireRuntimeForContext(ctx, 'hydrateClaimedBindingCaches'),
+							b.id('__s'),
+							b.id(name),
+						),
+					),
+					planOrigin,
+				),
+			);
+		}
+	}
 	if (keyedSelection !== null && single && !noTemplate) {
 		// Reuse the ordinary root-class write and its exact bag fields. Updating
 		// only the DOM would leave the normal row diff's previous value stale.

package/dist/compiler/dom-bindings.js

@@ -2300,6 +2300,11 @@ export function prepareDomBindings(ast, source, filename, selectedExport, helper
 			);
 		}
 		for (const [node, replacement] of rewritten) replacements.set(node, replacement);
+		if (!plan.hostHandoff)
+			replacements.set(node, {
+				...mapCow(node, rewritten),
+				_octaneScalarBindingClaims: true,
+			});
 		if (plan.hostHandoff)
 			replacements.set(node, {
 				...mapCow(node, rewritten),

package/dist/constants.d.ts

@@ -10,16 +10,13 @@
  *
  * The server emit (runtime.server `ssrBlock` and friends) writes these markers
  * around every dynamic site, and the client `hydrateRoot` cursor scans for them
- * to align with the server output. This module is the shared home both import.
+ * to align with the server output. This module is the public home both import;
+ * the marker payloads and boundary attribute names themselves are declared in
+ * `hydration-markers.js`, which stays off the `dom-tables.js` graph so the
+ * pre-root capture bundle can share them, and are re-exported here unchanged.
  */
-/** Single-character payload of a block-open comment. */
-export declare const HYDRATION_START = "[";
-/** Single-character payload of a block-close comment. */
-export declare const HYDRATION_END = "]";
-/** @for outer-open payload: the server rendered its @empty arm. */
-export declare const HYDRATION_FOR_EMPTY = "[f0";
-/** @for outer-open payload: the server rendered one or more direct-host items. */
-export declare const HYDRATION_FOR_ITEMS = "[f1";
+import { HYDRATION_START, HYDRATION_END, HYDRATION_FOR_EMPTY, HYDRATION_FOR_ITEMS } from './hydration-markers.js';
+export { HYDRATION_START, HYDRATION_END, HYDRATION_FOR_EMPTY, HYDRATION_FOR_ITEMS };
 /** Opens a hydratable block (component output / control-flow branch). */
 export declare const BLOCK_OPEN = "<!--[-->";
 /** Closes a hydratable block. */
@@ -87,17 +84,9 @@ export declare const HYDRATION_RANGE_BOUNDARY: unique symbol;
 export declare const HYDRATE_STATIC_ID_COUNT_PREFIX = "octane-static-hydrate:";
 /** Closing comment for a wrapper-free permanent-static range. */
 export declare const HYDRATE_STATIC_END = "/octane-static-hydrate";
-/** Stable id of a server-rendered deferred hydration boundary. */
-export declare const HYDRATE_ID_ATTR = "data-octane-hydrate-id";
-/** Serialized strategy kind (`visible`, `idle`, `dynamic`, …). */
-export declare const HYDRATE_WHEN_ATTR = "data-octane-hydrate-when";
-/** Number of `useId()` slots consumed while rendering the deferred child. */
-export declare const HYDRATE_ID_COUNT_ATTR = "data-octane-hydrate-id-count";
 /** Opaque renderer stream token authenticating pending descendants owned by this boundary. */
 export { HYDRATE_STREAM_TOKEN_ATTR } from './stream-protocol.js';
-/** Direct-child JSON script carrying this boundary's `use()` seed slice. */
-export declare const HYDRATE_SEED_ATTR = "data-octane-hydrate-seed";
-export { INDEPENDENT_HYDRATE_MANIFEST_ATTR, HYDRATE_INDEPENDENT_ATTR, HYDRATE_INPUT_ATTR, SIGNAL_CONTROL_ATTR, } from './hydration-markers.js';
+export { INDEPENDENT_HYDRATE_MANIFEST_ATTR, HYDRATE_INDEPENDENT_ATTR, HYDRATE_INPUT_ATTR, SIGNAL_CONTROL_ATTR, HYDRATE_ID_ATTR, HYDRATE_WHEN_ATTR, HYDRATE_ID_COUNT_ATTR, HYDRATE_SEED_ATTR, } from './hydration-markers.js';
 /** Sentinel <template> attribute marking a pending streamed boundary. */
 export { STREAM_BOUNDARY_ATTR } from './stream-protocol.js';
 /** Hidden segment container attribute carrying a completed boundary's content. */

package/dist/constants.js

@@ -1,7 +1,9 @@
-const HYDRATION_START = "[";
-const HYDRATION_END = "]";
-const HYDRATION_FOR_EMPTY = "[f0";
-const HYDRATION_FOR_ITEMS = "[f1";
+import {
+  HYDRATION_START,
+  HYDRATION_END,
+  HYDRATION_FOR_EMPTY,
+  HYDRATION_FOR_ITEMS
+} from "./hydration-markers.js";
 const BLOCK_OPEN = `<!--${HYDRATION_START}-->`;
 const BLOCK_CLOSE = `<!--${HYDRATION_END}-->`;
 const FOR_BLOCK_OPEN_EMPTY = `<!--${HYDRATION_FOR_EMPTY}-->`;
@@ -23,16 +25,16 @@ const HYDRATION_RANGE_BOUNDARY = /* @__PURE__ */ Symbol.for(
 );
 const HYDRATE_STATIC_ID_COUNT_PREFIX = "octane-static-hydrate:";
 const HYDRATE_STATIC_END = "/octane-static-hydrate";
-const HYDRATE_ID_ATTR = "data-octane-hydrate-id";
-const HYDRATE_WHEN_ATTR = "data-octane-hydrate-when";
-const HYDRATE_ID_COUNT_ATTR = "data-octane-hydrate-id-count";
 import { HYDRATE_STREAM_TOKEN_ATTR } from "./stream-protocol.js";
-const HYDRATE_SEED_ATTR = "data-octane-hydrate-seed";
 import {
   INDEPENDENT_HYDRATE_MANIFEST_ATTR,
   HYDRATE_INDEPENDENT_ATTR,
   HYDRATE_INPUT_ATTR,
-  SIGNAL_CONTROL_ATTR
+  SIGNAL_CONTROL_ATTR,
+  HYDRATE_ID_ATTR,
+  HYDRATE_WHEN_ATTR,
+  HYDRATE_ID_COUNT_ATTR,
+  HYDRATE_SEED_ATTR
 } from "./hydration-markers.js";
 import { STREAM_BOUNDARY_ATTR } from "./stream-protocol.js";
 const STREAM_SEGMENT_ATTR = "data-oct-s";

package/dist/css.d.ts

@@ -12,3 +12,10 @@ export declare function styleName(name: string): string;
 export declare function devWarnStyleProperty(name: string, value: unknown, server: boolean): void;
 /** @internal Development-only guidance after an existing CSS coercion fails. */
 export declare function devWarnStyleCoercion(name: string, value: unknown): void;
+/**
+ * The one stylesheet element-scoped `<ViewTransition>` needs. The client
+ * dedupes the injection by this id and the SSR serializer emits the same pair,
+ * so spelling either half twice ships the rule twice or drops it on one side.
+ */
+export declare const VIEW_TRANSITION_SCOPE_STYLE_ID = "octane-view-transition-scope";
+export declare const VIEW_TRANSITION_SCOPE_CSS = "[vt-scope=\"element\"]{view-transition-scope:all!important}";

package/dist/css.js

@@ -67,7 +67,11 @@ function devWarnStyleCoercion(name, value) {
     `The provided \`${name}\` CSS property is an unsupported type ${valueType}. This value must be coerced to a string before using it here.`
   );
 }
+const VIEW_TRANSITION_SCOPE_STYLE_ID = "octane-view-transition-scope";
+const VIEW_TRANSITION_SCOPE_CSS = '[vt-scope="element"]{view-transition-scope:all!important}';
 export {
+  VIEW_TRANSITION_SCOPE_CSS,
+  VIEW_TRANSITION_SCOPE_STYLE_ID,
   devWarnStyleCoercion,
   devWarnStyleProperty,
   mergeClass,