octane 0.2.13 → 0.2.15

package/dist/dom-bindings.js

@@ -1,5 +1,9 @@
 import { normalizeClass } from "./class-names.js";
+import { domBindingClaims } from "./dom-binding-claims.js";
 import { sanitizeURL } from "./sanitize-url.js";
+import { STREAM_SCRIPT_ATTR, SUSPENSE_SCRIPT_ATTR } from "./stream-protocol.js";
+import { NATIVE_SIGNAL_SEED_ATTR } from "./signals/native-read-seeds.js";
+import { BINDING_HANDOFF } from "./signals/control-handoff.js";
 import { captureSignalOwner, currentSignalOwner } from "./signals/owner-context.js";
 import {
   NATIVE_TRANSITION_CONSUMER,
@@ -59,6 +63,11 @@ function __releaseBinding(node, name) {
   const channels = claims.get(node);
   channels.delete(name);
   if (channels.size === 0) claims.delete(node);
+  const published = domBindingClaims.get(node);
+  if (published) {
+    published.delete(name);
+    if (published.size === 0) domBindingClaims.delete(node);
+  }
 }
 function resolveNodes(root, descriptor) {
   if (root?.nodeType !== 1 || root.getAttribute("data-octane-bindings") !== descriptor.id || descriptor.nodes.length === 0) {
@@ -68,9 +77,9 @@ function resolveNodes(root, descriptor) {
   const nodes = [];
   const childIndices = [];
   for (let i = 0; i < descriptor.nodes.length; i++) {
-    const [parent, tag, namespace, children] = descriptor.nodes[i];
+    const [parent, tag, namespace, children, , text] = descriptor.nodes[i];
     const node = i === 0 ? parent === -1 ? root : void 0 : parent >= 0 && parent < i && descriptor.nodes[parent][3] !== null ? nodes[parent]?.children[childIndices[parent]++] : void 0;
-    if (node === void 0 || descriptor.nodes[i][4] === true || node.localName !== tag || node.namespaceURI !== namespaces[namespace] || children !== null && (node.childNodes.length !== children || node.children.length !== children)) {
+    if (node === void 0 || descriptor.nodes[i][4] === true || node.localName !== tag || node.namespaceURI !== namespaces[namespace] || (text ? node.childNodes.length > 1 || node.firstChild !== null && node.firstChild.nodeType !== 3 : children !== null && (node.childNodes.length !== children || node.children.length !== children))) {
       throw new Error("DOM bindings cannot adopt a mismatched static element topology.");
     }
     nodes.push(node);
@@ -111,9 +120,9 @@ function resolveAddressedNodes(root, descriptor) {
   }
   const childCounts = new Array(descriptor.nodes.length).fill(0);
   for (let i = 0; i < descriptor.nodes.length; i++) {
-    const [parent, tag, namespace, children, openChildren] = descriptor.nodes[i];
+    const [parent, tag, namespace, children, openChildren, text] = descriptor.nodes[i];
     const node = nodes[i];
-    if (node === void 0 || node.localName !== tag || node.namespaceURI !== namespaces[namespace] || (i === 0 ? parent !== -1 || node !== root : parent < 0 || parent >= i || descriptor.nodes[parent][3] === null || node.parentElement !== nodes[parent] || descriptor.nodes[parent][4] !== true && nodes[parent].children[childCounts[parent]] !== node) || openChildren && children === null || children !== null && !openChildren && (node.childNodes.length !== children || node.children.length !== children)) {
+    if (node === void 0 || node.localName !== tag || node.namespaceURI !== namespaces[namespace] || (i === 0 ? parent !== -1 || node !== root : parent < 0 || parent >= i || descriptor.nodes[parent][3] === null || node.parentElement !== nodes[parent] || descriptor.nodes[parent][4] !== true && nodes[parent].children[childCounts[parent]] !== node) || openChildren && children === null || (text ? node.childNodes.length > 1 || node.firstChild !== null && node.firstChild.nodeType !== 3 : children !== null && !openChildren && (node.childNodes.length !== children || node.children.length !== children))) {
       throw new Error("DOM bindings cannot adopt a mismatched addressed element topology.");
     }
     if (parent !== -1) childCounts[parent]++;
@@ -128,6 +137,11 @@ function resolveAddressedNodes(root, descriptor) {
 function normalize(binding, value) {
   const type = typeof value;
   switch (binding[1]) {
+    case "text":
+      if (value == null || value === false) return "";
+      if (type !== "string" && type !== "number" && type !== "bigint" && type !== "boolean")
+        throw new TypeError("DOM binding text must be a synchronous scalar.");
+      return String(value);
     case "styleObject":
       return value;
     case "class":
@@ -155,7 +169,11 @@ function normalize(binding, value) {
 }
 function write(node, binding, value) {
   const name = binding[2];
-  if (binding[1] === "classToken") {
+  if (binding[1] === "text") {
+    const text = node.firstChild;
+    if (text === null) node.appendChild(node.ownerDocument.createTextNode(value));
+    else if (text.nodeValue !== value) text.nodeValue = value;
+  } else if (binding[1] === "classToken") {
     node.classList.toggle(name, value !== null);
   } else if (binding[1] === "url") {
     if (value === "" && !(name === "href" && node.localName === "a")) value = null;
@@ -254,16 +272,28 @@ function __adoptBindings(root, descriptor, source, options) {
   let dirty = false;
   let revision = 0;
   let unsubscribe;
+  let publicationRetries;
+  let published;
   const signal = options?.signal;
-  const dispose = () => {
-    if (disposed) return;
+  const dispose = (_disposal, publish, preservePresentation = false) => {
+    if (disposed) {
+      publish?.();
+      return;
+    }
     disposed = true;
+    publicationRetries?.clear();
     signal?.removeEventListener("abort", dispose);
     let failed = false;
     let failure;
+    try {
+      publish?.();
+    } catch (error) {
+      failed = true;
+      failure = error;
+    }
     for (const connection of signalConnections?.values() ?? []) {
       try {
-        connection.dispose();
+        connection.dispose(preservePresentation);
       } catch (error) {
         if (!failed) {
           failed = true;
@@ -273,7 +303,7 @@ function __adoptBindings(root, descriptor, source, options) {
     }
     for (const connection of projections ? new Set(projections.values()) : []) {
       try {
-        connection.dispose();
+        connection.dispose(preservePresentation);
       } catch (error) {
         if (!failed) {
           failed = true;
@@ -298,9 +328,9 @@ function __adoptBindings(root, descriptor, source, options) {
     for (let i = 0; i < owned.length; i++) {
       const [node, name] = owned[i];
       try {
-        groups?.get(i)?.dispose();
-        styles?.get(i)?.dispose();
-        if (bindings[i][1] === "classToken" && previous[i] === "")
+        groups?.get(i)?.dispose(preservePresentation);
+        styles?.get(i)?.dispose(preservePresentation);
+        if (!preservePresentation && bindings[i][1] === "classToken" && previous[i] === "")
           node.classList.remove(bindings[i][2]);
       } catch (error) {
         if (!failed) {
@@ -356,7 +386,21 @@ function __adoptBindings(root, descriptor, source, options) {
           styles.set(i, style = __createBindingStyleRestoration(nodes[binding[0]], binding));
         style.write(next[i]);
       } else write(nodes[binding[0]], binding, next[i]);
-      if (!disposed) previous[i] = next[i];
+      if (!disposed) {
+        previous[i] = next[i];
+        if (binding[1] === "attr" || binding[1] === "boolean" || binding[1] === "aria" || binding[1] === "class" || binding[1] === "styleProperty" || binding[1] === "text") {
+          const [node, name] = owned[i];
+          let published2 = next[i];
+          if (binding[1] === "styleProperty") {
+            const style = node.style;
+            const value = style.getPropertyValue(binding[2]);
+            published2 = value === "" ? null : value + (style.getPropertyPriority(binding[2]) ? " !important" : "");
+          }
+          let claims2 = domBindingClaims.get(node);
+          if (claims2 === void 0) domBindingClaims.set(node, claims2 = /* @__PURE__ */ new Map());
+          claims2.set(name, published2);
+        }
+      }
     }
   };
   const drain = (preview = false) => {
@@ -571,6 +615,7 @@ function __adoptBindings(root, descriptor, source, options) {
                 writePrepared(next, indices, preparedControls, preparedGroups);
               } finally {
                 busy = false;
+                published?.();
               }
             }
           };
@@ -593,6 +638,7 @@ function __adoptBindings(root, descriptor, source, options) {
         for (const index of previousUpdates ?? []) signalUpdates.add(index);
       }
       busy = false;
+      if (!preview) published?.();
     }
   };
   const refresh = () => {
@@ -608,6 +654,52 @@ function __adoptBindings(root, descriptor, source, options) {
     prepare: () => run(() => drain(true))
   };
   const handle = { refresh, dispose };
+  if (descriptor.handoff === "host") {
+    published = () => {
+      if (!publicationRetries?.size) return;
+      const pending = [...publicationRetries];
+      publicationRetries.clear();
+      for (const retry of pending)
+        queueMicrotask(() => {
+          if (!disposed) retry();
+        });
+    };
+    const host = root;
+    const document = host.ownerDocument;
+    const ancestry = [];
+    for (let node = host; node !== null; node = node.parentNode)
+      ancestry.push([node, node.parentNode]);
+    const sibling = (node, previous2) => {
+      let next = previous2 ? node.previousSibling : node.nextSibling;
+      while (next?.nodeType === 1 && next.localName === "script" && (next.hasAttribute(NATIVE_SIGNAL_SEED_ATTR) || next.hasAttribute(SUSPENSE_SCRIPT_ATTR) || next.hasAttribute(STREAM_SCRIPT_ATTR)))
+        next = previous2 ? next.previousSibling : next.nextSibling;
+      return next;
+    };
+    const previousSibling = sibling(host, true);
+    const nextSibling = sibling(host, false);
+    let handoff;
+    handle[BINDING_HANDOFF] = () => {
+      if (handoff !== void 0) return handoff;
+      return handoff = {
+        id: descriptor.id,
+        root: host,
+        anchor: host,
+        host: new Set(
+          bindings.map(
+            (binding) => binding[1] === "styleProperty" ? "style:" + binding[2] : binding[1].startsWith("style") ? "style" : binding[2]
+          )
+        ),
+        revision: () => busy ? -1 : revision,
+        afterPublication: (callback) => {
+          (publicationRetries ??= /* @__PURE__ */ new Set()).add(callback);
+          return () => publicationRetries.delete(callback);
+        },
+        valid: () => host.parentNode !== null && host.ownerDocument === document && ancestry.every(([node, parent]) => node.parentNode === parent) && sibling(host, true) === previousSibling && sibling(host, false) === nextSibling && host.getAttribute("data-octane-bindings") === descriptor.id,
+        active: () => !disposed,
+        retire: (publish) => dispose(void 0, publish, true)
+      };
+    };
+  }
   if (signal?.aborted) {
     dispose();
     return handle;

package/dist/runtime.d.ts

@@ -14,6 +14,7 @@
  */
 import type { BindingHandle } from './dom-bindings.js';
 import { type BindingHandoff } from './dom-binding-handoff.js';
+import { type ControlHandoff, type SignalControlBinding } from './signals/control-handoff.js';
 import { EXTERNAL_HYDRATION_PROMISE, HYDRATION_RANGE_BOUNDARY } from './constants.js';
 import type { HydrateProps } from './hydration/types.js';
 import type { IndependentHydrateActivator } from './hydration/independent-island.js';
@@ -23,7 +24,7 @@ import { SignalCandidateFrame } from './signals/transition-candidate.js';
 import { setNativeAdoptionResolver } from './signals/read-protocol.js';
 import { type NativeAdoptionState } from './signals/native-read-seeds.js';
 export { documentSignalOwner, installStreamedSignalOwnerActivator, } from './signals/document-owner.js';
-import { type SignalOwner, type SignalRendererOwnerIdentity } from './signals/types.js';
+import { type SignalHandle, type SignalOwner, type SignalRendererOwnerIdentity } from './signals/types.js';
 export { EXTERNAL_HYDRATION_PROMISE, HYDRATION_RANGE_BOUNDARY };
 export { validateNativeReadWitness };
 export type ComponentBody<P = any, E = any> = (props: P, scope: Scope, extra: E) => void;
@@ -526,6 +527,7 @@ interface RootRenderOwner {
     /** Shared document/account data owner; distinct from this root's presentation owner. */
     signalOwner?: SignalOwner;
     bindingLeases?: Set<BindingHandoff>;
+    controlLeases?: Map<Element, ControlHandoff | undefined>;
     preservePresentation?: boolean;
     bindingContainer?: Node;
     adopt?: (block: Block) => void;
@@ -1428,10 +1430,18 @@ interface PresentationHydrationFrame {
     readToken: number;
     witnessToken: number;
     witnesses: Map<object, NativeReadWitness | null>;
+    /** Successor native writers only; a host receipt never tears down children. */
+    hostSuccessors?: Map<object, () => void>;
+    controls?: Map<Element, {
+        valid: (retired?: boolean) => boolean;
+        binding: DirectSignalBinding;
+        lease: ControlHandoff | undefined;
+        stop?: () => void;
+    }>;
     completed: boolean;
     lease: BindingHandoff;
     revision?: number;
-    /** Installed only for structural receipts so ordinary commits do not retain the validator. */
+    /** Installed only for structural/control/host receipts, not ordinary fixed presentations. */
     current?: typeof currentPresentation;
     hydration: HydrationCapability | null;
 }
@@ -1439,7 +1449,7 @@ interface PresentationHydrationFrame {
 export declare function presentationFailure(error: unknown): never;
 declare function currentPresentation(frame: PresentationHydrationFrame): boolean;
 /** @internal Only compiler-proven native views enter this publication boundary. */
-export declare function beginPresentationHydration(scope: Scope, id: string, supported?: boolean, structural?: boolean, conditionalRest?: boolean): PresentationHydrationFrame | null;
+export declare function beginPresentationHydration(scope: Scope, id: string, supported?: boolean, structural?: boolean, conditionalRest?: boolean, host?: boolean): PresentationHydrationFrame | null;
 /** @internal Restore the read frame even when preparation suspends or throws. */
 export declare function endPresentationHydration(frame: PresentationHydrationFrame | null, completed?: boolean): void;
 /** @internal Only authored host spreads retain generic host preparation. */
@@ -1465,7 +1475,26 @@ export declare function child<T extends Node>(node: T): Node | null;
  */
 export declare function sibling(node: Node, n?: number): Node | null;
 export declare function setText(node: Text, value: any): void;
+declare const DIRECT_SIGNAL_BINDING: unique symbol;
+type DirectSignalBindingKind = 'text' | 'textOnlyChild' | 'attribute' | 'value' | 'checked';
 type DirectSignalAttributeKind = 'attr' | 'class' | 'booleanAttr' | 'ariaAttr' | 'stringData';
+interface DirectSignalBinding {
+    readonly [DIRECT_SIGNAL_BINDING]: true;
+    readonly scope: Scope;
+    readonly kind: DirectSignalBindingKind;
+    readonly target: Node;
+    readonly site: string;
+    readonly name?: string;
+    readonly attributeKind?: DirectSignalAttributeKind;
+    readonly handle: SignalHandle<unknown> | null;
+    text?: Text;
+    value: unknown;
+    unsubscribe?: () => void;
+    input?: EventListener;
+    controlWriterCleanup?: () => void;
+    pendingControl?: boolean;
+    disposed: boolean;
+}
 /** @internal Compiler target for a direct signal/scalar text binding. */
 export declare function bindSignalText(scope: Scope, previous: unknown, position: Node, value: unknown, site: string, onlyChild?: boolean, seededText?: 1 | undefined, bindingMarker?: string, previousValue?: unknown): unknown;
 /** @internal Compiler target for a direct signal/scalar attribute binding. */
@@ -2284,6 +2313,8 @@ export interface Root {
 export interface RootOptions {
     /** Adopt fixed native early bindings only when their matching hydration capture commits. */
     bindingLeases?: readonly BindingHandle[];
+    /** Offer an existing textarea value owner for accepted presentation hydration, never early disposal. */
+    controlLeases?: readonly SignalControlBinding[];
     /**
      * Shared document/account owner for module signals. Roots borrow this owner;
      * unmounting a presentation root never retires shared data state.