octane 0.3.1 → 0.3.2

package/dist/cjs/runtime.cjs

@@ -149,6 +149,7 @@ __export(runtime_exports, {
   hostComponent: () => hostComponent,
   htext: () => htext,
   htextSwap: () => htextSwap,
+  hydrateClaimedBindingCaches: () => hydrateClaimedBindingCaches,
   hydrateRoot: () => hydrateRoot,
   ifBlock: () => ifBlock,
   injectStyle: () => injectStyle,
@@ -336,12 +337,15 @@ var import_profiling = require("./profiling.cjs");
 var import_devtools_hook = require("./devtools-hook.cjs");
 var import_interaction_config = require("./hydration/interaction-config.cjs");
 var import_event_capture = require("./hydration/event-capture.cjs");
+var import_control_capture = require("./hydration/control-capture.cjs");
 var import_sanitize_url = require("./sanitize-url.cjs");
 var import_html_tree_validation = require("./html-tree-validation.cjs");
 var import_component_flags = require("./component-flags.cjs");
 var import_error_codes_client_generated = require("./error-codes.client.generated.cjs");
 var import_form_diagnostics = require("./form-diagnostics.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_dom_focused_move = require("./dom-focused-move.cjs");
 var import_stream_protocol = require("./stream-protocol.cjs");
 var import_renderer_bridge = require("./renderer-bridge.cjs");
@@ -381,7 +385,7 @@ function profileTrackComponent(subject, fallback) {
 function profilePortalComponent(rawBody) {
   if (typeof rawBody === "function" && (0, import_profiling.__profileHasComponentMetadata)(rawBody)) return rawBody;
   const descriptor = rawBody;
-  return descriptor != null && descriptor.$$kind === ELEMENT_TAG && typeof descriptor.type === "function" ? descriptor.type : null;
+  return descriptor != null && descriptor.$$kind === import_runtime_tags.ELEMENT_TAG && typeof descriptor.type === "function" ? descriptor.type : null;
 }
 function ensureHooks(scope) {
   return scope.hooks ?? (scope.hooks = /* @__PURE__ */ new Map());
@@ -1139,7 +1143,6 @@ let NEXT_EFFECT_RENDER_VERSION = 1;
 const ACTIVE_WARM_PLANS = [];
 let NEXT_WARM_EPISODE = 1;
 let CURRENT_WARM_EPISODE = 0;
-const RENDERER_REGION_OWNER = /* @__PURE__ */ Symbol.for("octane.renderer-region.owner");
 const RENDERER_REGION_DOM_OWNERS = /* @__PURE__ */ new WeakMap();
 let RENDERER_REGION_OWNER_COUNT = 0;
 const RENDERER_REGION_DOM_BINDINGS = /* @__PURE__ */ new WeakMap();
@@ -3016,19 +3019,17 @@ function vtCaptureElements(block, owner) {
 }
 const VT_SCOPE_OWNERS = /* @__PURE__ */ new WeakMap();
 const VT_INVALID_SCOPE_WARNED = /* @__PURE__ */ new WeakSet();
-const VT_SCOPE_STYLE_ID = "octane-view-transition-scope";
-const VT_SCOPE_CSS = '[vt-scope="element"]{view-transition-scope:all!important}';
 const VT_SCOPE_STYLED_DOCUMENTS = /* @__PURE__ */ new WeakSet();
 function vtInjectScopeStyle(host) {
   if (DEFERRED_LAYOUT_DRIVER?.stageAction(() => vtInjectScopeStyle(host), true) === true) return;
   const owner = host.ownerDocument;
   if (VT_SCOPE_STYLED_DOCUMENTS.has(owner)) return;
   if ((STAGED_DOM?.view(owner) ?? owner).querySelector(
-    `style[data-octane="${VT_SCOPE_STYLE_ID}"],style[data-href~="octane-${VT_SCOPE_STYLE_ID}"]`
+    `style[data-octane="${import_css.VIEW_TRANSITION_SCOPE_STYLE_ID}"],style[data-href~="octane-${import_css.VIEW_TRANSITION_SCOPE_STYLE_ID}"]`
   ) === null) {
     const style = (STAGED_DOM?.view(owner) ?? owner).createElement("style");
-    (STAGED_DOM?.view(style) ?? style).setAttribute("data-octane", VT_SCOPE_STYLE_ID);
-    (STAGED_DOM?.view(style) ?? style).textContent = VT_SCOPE_CSS;
+    (STAGED_DOM?.view(style) ?? style).setAttribute("data-octane", import_css.VIEW_TRANSITION_SCOPE_STYLE_ID);
+    (STAGED_DOM?.view(style) ?? style).textContent = import_css.VIEW_TRANSITION_SCOPE_CSS;
     domNode(owner.head).appendChild(style);
   }
   VT_SCOPE_STYLED_DOCUMENTS.add(owner);
@@ -6832,7 +6833,7 @@ function returnSlotTail(block, state) {
   return null;
 }
 function renderReturnedValue(block, out) {
-  const isComponentDescriptor = out !== null && out.$$kind === ELEMENT_TAG && out.key == null && typeof out.type === "function";
+  const isComponentDescriptor = out !== null && out.$$kind === import_runtime_tags.ELEMENT_TAG && out.key == null && typeof out.type === "function";
   const existingRet = block.slots[0];
   let replacedStart = null;
   let replacedEnd = null;
@@ -8403,7 +8404,6 @@ function useEffectEvent(fn, slot) {
     return cell.impl.apply(void 0, args);
   });
 }
-const CONTEXT_TAG = /* @__PURE__ */ Symbol.for("octane.context");
 // @__NO_SIDE_EFFECTS__
 function createContext(defaultValue) {
   const ctx = function ProviderBody(props, scope) {
@@ -8437,7 +8437,7 @@ function __createCompiledContext(defaultValue) {
   return initializeContext(ctx, defaultValue);
 }
 function initializeContext(ctx, defaultValue) {
-  ctx.$$kind = CONTEXT_TAG;
+  ctx.$$kind = import_runtime_tags.CONTEXT_TAG;
   ctx.defaultValue = defaultValue;
   ctx.$$version = 0;
   (0, import_context_identity.registerContext)(ctx);
@@ -8527,7 +8527,6 @@ function provideContext(scope, context, value) {
   }
   values.set(context, value);
 }
-const CHILDREN_BLOCK = /* @__PURE__ */ Symbol.for("octane.childrenBlock");
 const CHILDREN_BODY = /* @__PURE__ */ Symbol.for("octane.childrenBody");
 function markSingleRoot(component) {
   component.$$singleRoot = true;
@@ -8535,7 +8534,7 @@ function markSingleRoot(component) {
 }
 function markChildrenBlock(fn, body) {
   if (typeof fn === "function") {
-    fn[CHILDREN_BLOCK] = true;
+    fn[import_runtime_tags.CHILDREN_BLOCK_TAG] = true;
     if (body !== void 0) fn[CHILDREN_BODY] = body;
   }
   return fn;
@@ -8544,7 +8543,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 childrenAsBody(children) {
   if (typeof children === "function") return children;
@@ -8680,7 +8679,6 @@ const HYDRATE_STRATEGY_TYPES = /* @__PURE__ */ new Set([
   "never",
   "dynamic"
 ]);
-const HYDRATE_MARKER_SELECTOR = "[data-octane-hydrate-id]";
 const HYDRATE_STREAM_ERROR_ATTR = "data-oct-err";
 const HYDRATE_STREAM_BOUNDARY_SELECTOR = `template[${import_constants.STREAM_BOUNDARY_ATTR}]`;
 const HYDRATE_STREAM_SCAN_MASK = 1 | 128;
@@ -9044,7 +9042,7 @@ function installHydrateInteraction(state, strategy) {
   // whose strategy could not yet be evaluated. Resolved boundaries get none.
   (state.delegatedDynamicIntent ? import_event_capture.HYDRATE_SUPPORTED_INTERACTION_EVENTS : []);
   const events = new Set(ownEvents);
-  const descendants = domNode(state.wrapper).querySelectorAll(HYDRATE_MARKER_SELECTOR);
+  const descendants = domNode(state.wrapper).querySelectorAll(import_hydration_markers.HYDRATE_MARKER_SELECTOR);
   for (let i = 0; i < descendants.length; i++) {
     const nestedEvents = hydrateMarkerInteractionEvents(descendants[i]);
     if (nestedEvents !== null) {
@@ -9057,7 +9055,7 @@ function installHydrateInteraction(state, strategy) {
     if (state.hydrated) return;
     const rawTarget = event.target;
     let target = rawTarget instanceof Element ? rawTarget : rawTarget instanceof Node ? (STAGED_DOM?.view(rawTarget) ?? rawTarget).parentElement : null;
-    let marker = (STAGED_DOM?.view(target) ?? target)?.closest(HYDRATE_MARKER_SELECTOR) ?? state.wrapper;
+    let marker = (STAGED_DOM?.view(target) ?? target)?.closest(import_hydration_markers.HYDRATE_MARKER_SELECTOR) ?? state.wrapper;
     let matches = ownEvents.includes(event.type);
     const delegatedDynamicMarkers = [];
     while (marker !== null && domNode(state.wrapper).contains(marker)) {
@@ -9072,7 +9070,7 @@ function installHydrateInteraction(state, strategy) {
       }
       if (marker === state.wrapper) break;
       marker = domNode((STAGED_DOM?.view(marker) ?? marker).parentElement)?.closest(
-        HYDRATE_MARKER_SELECTOR
+        import_hydration_markers.HYDRATE_MARKER_SELECTOR
       ) ?? null;
     }
     if (!matches) return;
@@ -9702,7 +9700,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
 );
 function initializeViewTransitionComponent() {
   return (0, import_component_flags.markComponentFlags)(
@@ -9768,7 +9766,7 @@ function use(usable) {
       "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) {
     return useContextInternal(usable);
   }
   if (usable == null || typeof usable.then !== "function") {
@@ -9776,13 +9774,12 @@ function use(usable) {
   }
   return useThenable(usable);
 }
-const REACT_FOREIGN_CONTEXT_TAG = /* @__PURE__ */ Symbol.for("react.context");
 function useForeignContext(usable, api) {
   if (usable !== null && typeof usable === "object") {
     const bridge = rendererRegionOwnerForBlock(CURRENT_BLOCK);
     const mirror = bridge?.resolveForeignContext?.(usable);
     if (mirror != null) return useContextInternal(mirror);
-    if (usable.$$typeof === REACT_FOREIGN_CONTEXT_TAG) {
+    if (usable.$$typeof === import_runtime_tags.REACT_CONTEXT_TAG) {
       throw new Error((0, import_error_codes_client_generated.formatClientError)(18, api));
     }
   }
@@ -9792,7 +9789,7 @@ function useRendererThenable(thenable) {
   return useThenable(thenable, true);
 }
 function useContext(context) {
-  if (context && context.$$kind === CONTEXT_TAG) {
+  if (context && context.$$kind === import_runtime_tags.CONTEXT_TAG) {
     return useContextInternal(context);
   }
   return useForeignContext(context, "useContext");
@@ -9821,7 +9818,7 @@ function rendererRegionSuspenseHandler(block) {
   };
 }
 function bindRendererRegionOwner(props) {
-  const bridge = props?.[RENDERER_REGION_OWNER];
+  const bridge = props?.[import_runtime_tags.RENDERER_REGION_OWNER_TAG];
   if (bridge === void 0) {
     throw new Error((0, import_error_codes_client_generated.formatClientError)(19));
   }
@@ -10786,7 +10783,6 @@ function memoPublish(slot, value, ...deps) {
 function memoPublishAlways(slot, value) {
   return publishMemoEntry(CURRENT_SCOPE, slot, void 0, value);
 }
-const LAZY_COMPONENT = /* @__PURE__ */ Symbol.for("octane.lazy");
 const LAZY_BODY_CHECK = /* @__PURE__ */ Symbol.for("octane.lazyBodyCheck");
 function markLazyBodyCheck(body, check) {
   Object.defineProperty(body, LAZY_BODY_CHECK, {
@@ -10801,11 +10797,11 @@ function resolveLazyModule(mod) {
     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_client_generated.formatClientError)(
         10,
-        comp?.[LAZY_COMPONENT] === true ? "lazy component" : typeof comp
+        comp?.[import_runtime_tags.LAZY_COMPONENT_TAG] === true ? "lazy component" : typeof comp
       )
     );
   }
@@ -10929,7 +10925,7 @@ function lazy(load) {
     const nestedCheck = current[LAZY_BODY_CHECK];
     return nestedCheck === void 0 || nestedCheck(scope);
   });
-  Object.defineProperty(lazyWrapper, LAZY_COMPONENT, {
+  Object.defineProperty(lazyWrapper, import_runtime_tags.LAZY_COMPONENT_TAG, {
     get() {
       return this === lazyWrapper;
     }
@@ -10954,7 +10950,7 @@ function useId(slot) {
     while (owner.limit !== void 0 && owner.next >= owner.limit && owner.overflow !== void 0) {
       owner = owner.overflow;
     }
-    s = { id: ":" + owner.prefix + "in-" + (owner.next++).toString(36) + ":" };
+    s = { id: (0, import_hydration_markers.formatUseId)(owner.prefix, owner.next++) };
     ensureHooks(scope).set(slot, s);
   }
   return s.id;
@@ -12250,6 +12246,8 @@ function preparePresentationSignalValue(args, frame) {
       runWithBlockSignalOwner(scope, () => {
         if (!valid()) throw new Error((0, import_error_codes_client_generated.formatClientError)(77));
         const before = (0, import_event_capture.snapshotHydrationControl)(element);
+        const priorValue = readSignalBinding(handle);
+        const restored = lease === void 0 ? (0, import_control_capture.isRestoredHydrationTextarea)(element, priorValue) : !before.composing && !lease.composing() && typeof priorValue === "string" && before.value !== priorValue.replace(/\r\n?/g, "\n");
         const ctrl = armControlled(element);
         ctrl.composing = before.composing || lease?.composing() === true;
         if (ctrl.composing) element.addEventListener("blur", onCtrlCompositionEnd);
@@ -12271,11 +12269,15 @@ function preparePresentationSignalValue(args, frame) {
         if (lease !== void 0) owner.controlLeases.delete(element);
         if (!binding.disposed && !scope.block.disposed) {
           const snapshot = (0, import_event_capture.snapshotHydrationControl)(element);
-          binding.value = element.value;
-          binding.pendingControl = snapshot.editRevision > (lease === void 0 ? 0 : before.editRevision);
+          binding.value = priorValue;
+          binding.pendingControl = snapshot.editRevision > (lease === void 0 ? 0 : before.editRevision) || restored;
           installDirectSignalControl(binding);
           if (!binding.pendingControl) (0, import_event_capture.consumeHydrationControl)(element, snapshot.revision);
-          if (binding.pendingControl) queueDirectSignalControlAdoption(binding);
+          if (binding.pendingControl)
+            queueDirectSignalControlAdoption(
+              binding,
+              lease === void 0 ? 0 : before.editRevision
+            );
           else {
             const current = readSignalBinding(handle);
             ctrl.sawV = true;
@@ -12419,7 +12421,7 @@ function presentationWrite(writer, kind, ...args) {
   return result;
 }
 function bindPresentationView(view, id) {
-  view[BINDING_VIEW_ROOT] = "[b;" + id + ";root";
+  view[BINDING_VIEW_ROOT] = (0, import_dom_binding_protocol.bindingRootMarker)(id);
   return (0, import_component_flags.markComponentFlags)(view, import_component_flags.COMPONENT_FLAG_BOUNDARY, view.name);
 }
 const BINDING_CHILDREN_SITE = /* @__PURE__ */ Symbol.for("octane.binding.children-site");
@@ -12449,7 +12451,8 @@ function presentationStructure(writer, kind, marker, ...args) {
   }
   const range = presentationRange(frame, start, marker, kind);
   const expected = args[3][BINDING_VIEW_ROOT];
-  if (expected !== "[b;" + range.view + ";root") presentationMiss(false);
+  if (range.view === void 0 || expected !== (0, import_dom_binding_protocol.bindingRootMarker)(range.view))
+    presentationMiss(false);
   writer(...args);
 }
 function setBindingClass(element, receipt, values) {
@@ -12469,7 +12472,7 @@ function hydrationMarkerMultiplicity(data, open) {
   const marker = open ? import_constants.HYDRATION_START : import_constants.HYDRATION_END;
   if (data === marker) return 1;
   if (open && (data === import_constants.HYDRATION_FOR_EMPTY || data === import_constants.HYDRATION_FOR_ITEMS)) return 1;
-  if (open && (data.startsWith("[b;") || data.startsWith("[f")) && (0, import_dom_binding_protocol.isBindingOpenComment)(data))
+  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);
@@ -12531,7 +12534,7 @@ function ssrForMarkerState(node) {
   const data = (STAGED_DOM?.view(node) ?? node).data;
   if (data === import_constants.HYDRATION_FOR_EMPTY) return 0;
   if (data === import_constants.HYDRATION_FOR_ITEMS) return 1;
-  return (0, import_dom_binding_protocol.isBindingOpenComment)(data) && data.startsWith("[f") ? data.charCodeAt(2) === 48 ? 0 : 1 : -1;
+  return (0, import_dom_binding_protocol.isForBindingOpenComment)(data) ? data.charCodeAt(import_hydration_markers.HYDRATION_FOR_ARM_INDEX) === 48 ? 0 : 1 : -1;
 }
 function child(node) {
   if (currentHydration !== null) return (STAGED_DOM?.view(node) ?? node).firstChild;
@@ -12565,6 +12568,46 @@ function setText(node, value) {
   (STAGED_DOM?.view(node) ?? node).nodeValue = text;
 }
 const DIRECT_SIGNAL_BINDING = /* @__PURE__ */ Symbol("octane.direct-signal-binding");
+const CLAIMED_BINDING_VALUE = /* @__PURE__ */ Symbol("octane.claimed-binding-value");
+function hydrateClaimedBindingCaches(scope, fields) {
+  if (activeHydration() === null) return;
+  const bag = scope.slots[0];
+  for (let i = 0; i < fields.length; i += 3) {
+    const field = fields[i];
+    const node = bag[fields[i + 1]];
+    const element = node.nodeType === 3 ? (STAGED_DOM?.view(node) ?? node).parentNode : node;
+    const claims = import_dom_binding_claims.domBindingClaims.get(element);
+    if (claims === void 0) continue;
+    const channel = fields[i + 2];
+    const tokenOnly = channel === "#text-token";
+    let claimed = claims.has(
+      tokenOnly ? "#text" : channel.startsWith("style:") ? "style:" + (0, import_css.styleName)(channel.slice(6)) : channel
+    );
+    if (channel === "style") {
+      for (const name of claims.keys())
+        if (name.startsWith("style:")) {
+          claimed = true;
+          break;
+        }
+    }
+    if (!claimed) continue;
+    const value = channel === "style" ? (STAGED_DOM?.view(element) ?? element).style.cssText : CLAIMED_BINDING_VALUE;
+    if (typeof field === "number") {
+      const slots = scope.slots[field].block.slots;
+      journalRootProperty(slots, 0, slots[0]);
+      slots[0] = value;
+    } else {
+      const cached = bag[field];
+      if (cached?.[DIRECT_SIGNAL_BINDING] === true) {
+        if (TRANSITION_JOURNAL !== null) journalObjectOnce(cached);
+        cached.value = value;
+      } else if (!tokenOnly) {
+        if (TRANSITION_JOURNAL !== null) journalBag();
+        bag[field] = value;
+      }
+    }
+  }
+}
 function isSignalHandle(value) {
   return (typeof value === "object" || typeof value === "function") && value !== null && value[import_types.SIGNAL_HANDLE] === true;
 }
@@ -12637,7 +12680,7 @@ function writeDirectSignalBoundValue(binding, value) {
   const element = binding.target;
   const tag = element.localName;
   if (tag === "select") setSelectValue(element, value);
-  else setValue(element, value, tag === "textarea" && isWritableSignal(binding.handle));
+  else setValue(element, value);
 }
 function writeDirectSignalBoundChecked(binding, value) {
   setChecked(binding.target, value);
@@ -12766,19 +12809,19 @@ function installDirectSignalControl(binding) {
     )
   );
 }
-function queueDirectSignalControlAdoption(binding) {
+function queueDirectSignalControlAdoption(binding, priorEditRevision = 0) {
   enqueueEffectEventCommitAction(() => {
     if (binding.disposed || binding.scope.block.disposed || !binding.pendingControl) return;
     (0, import_transition_state.withoutSignalCandidate)(
       () => runWithBlockSignalOwner(binding.scope, () => {
         const element = binding.target;
         const snapshot = (0, import_event_capture.snapshotHydrationControl)(element);
-        if (snapshot.editRevision > 0 && isWritableSignal(binding.handle)) {
+        if (isWritableSignal(binding.handle) && (snapshot.editRevision > priorEditRevision || element.localName === "textarea" && Object.is(readSignalBinding(binding.handle), binding.value))) {
           binding.handle.set(directSignalControlValue(binding, snapshot));
         }
         if (binding.disposed || binding.scope.block.disposed) return;
         if (!(0, import_event_capture.consumeHydrationControl)(element, snapshot.revision)) {
-          queueDirectSignalControlAdoption(binding);
+          queueDirectSignalControlAdoption(binding, priorEditRevision);
           return;
         }
         binding.pendingControl = false;
@@ -12812,8 +12855,9 @@ function createDirectSignalBinding(scope, target, value, site, policy, name, att
   };
   if (text !== void 0) binding.text = text;
   const controlSnapshot = policy.control?.snapshot(target, site) ?? null;
-  binding.pendingControl = activeHydration() !== null && isWritableSignal(handle) && controlSnapshot !== null && controlSnapshot.editRevision > 0;
   const initial = handle === null ? value : readSignalBinding(handle);
+  binding.pendingControl = activeHydration() !== null && isWritableSignal(handle) && controlSnapshot !== null && (controlSnapshot.editRevision > 0 || (0, import_control_capture.isRestoredHydrationTextarea)(target, initial));
+  if (binding.pendingControl) binding.value = initial;
   if (!binding.pendingControl) writeDirectSignalBinding(binding, initial);
   if (STAGED_COMMIT_CAPTURE !== null) {
     DEFERRED_LAYOUT_DRIVER.stageAction(() => {
@@ -13217,10 +13261,10 @@ function applyRefValue(ref, el, prevTarget) {
   }
   ref.current = el;
 }
-const Fragment = /* @__PURE__ */ Symbol.for("octane.Fragment");
+const Fragment = import_runtime_tags.FRAGMENT_TAG;
 let activityDescriptorDispatch = null;
 function initializeActivitySentinel() {
-  const type = /* @__PURE__ */ Symbol.for("octane.Activity");
+  const type = import_runtime_tags.ACTIVITY_TAG;
   activityDescriptorDispatch = { type, body: renderActivityDescriptor };
   return type;
 }
@@ -14440,7 +14484,7 @@ function resolveHostPropSources(el, sources, props, readStyle) {
   if (readStyle !== void 0 && "style" in resolved) resolved.style = readStyle(resolved.style);
   return resolved;
 }
-function setHostPropSources(el, sources, prev, scope, hasNestedChildren = false, readStyle, deferControl = false, writableTextareaValue = false) {
+function setHostPropSources(el, sources, prev, scope, hasNestedChildren = false, readStyle, deferControl = false) {
   const props = /* @__PURE__ */ new Map();
   const resolved = resolveHostPropSources(el, sources, props, readStyle);
   const tag = el.localName;
@@ -14455,8 +14499,7 @@ function setHostPropSources(el, sources, prev, scope, hasNestedChildren = false,
       props.get("defaultValue")?.value,
       props.get("checked")?.value,
       props.get("defaultChecked")?.value,
-      props.get("multiple")?.value,
-      writableTextareaValue
+      props.get("multiple")?.value
     );
   return resolved;
 }
@@ -14477,14 +14520,12 @@ function resolveSignalStyle(value, handles, read) {
   }
   return copy ?? value;
 }
-function resolveSignalHostPropSources(sources, readStyle, read = readSignalBinding, textarea = false) {
+function resolveSignalHostPropSources(sources, readStyle, read = readSignalBinding) {
   const handles = /* @__PURE__ */ new Set();
   let rows;
-  let writableTextareaValue = false;
   for (let i = 0; i < sources.length; i++) {
     const source = sources[i];
     if (!source[0]) {
-      if (textarea && source[1] === "value") writableTextareaValue = isWritableSignal(source[2]);
       const value = source[1] === "children" || source[1] === "style" && readStyle !== void 0 ? source[2] : source[1] === "style" ? resolveSignalStyle(source[2], handles, read) : isSignalHandle(source[2]) ? (handles.add(source[2]), read(source[2])) : source[2];
       if (value !== source[2]) {
         rows ??= sources.slice();
@@ -14497,7 +14538,6 @@ function resolveSignalHostPropSources(sources, readStyle, read = readSignalBindi
     let copy;
     for (const name of Object.keys(spread)) {
       const current = spread[name];
-      if (textarea && name === "value") writableTextareaValue = isWritableSignal(current);
       const value = name === "children" || name === "style" && readStyle !== void 0 ? current : name === "style" ? resolveSignalStyle(current, handles, read) : isSignalHandle(current) ? (handles.add(current), read(current)) : current;
       if (value !== current) {
         copy ??= { ...spread };
@@ -14509,7 +14549,7 @@ function resolveSignalHostPropSources(sources, readStyle, read = readSignalBindi
       rows[i] = [true, copy];
     }
   }
-  return textarea ? { sources: rows ?? sources, handles, writableTextareaValue } : { sources: rows ?? sources, handles };
+  return { sources: rows ?? sources, handles };
 }
 function winningSignalHostControl(sources, name) {
   let winner;
@@ -14529,21 +14569,14 @@ function updateSignalHostPropSources(binding) {
   if (binding.disposed || binding.pendingControl || binding.scope.block.disposed) return;
   try {
     runWithBlockSignalOwner(binding.scope, () => {
-      const next = resolveSignalHostPropSources(
-        binding.sources,
-        binding.readStyle,
-        void 0,
-        binding.element.localName === "textarea"
-      );
+      const next = resolveSignalHostPropSources(binding.sources, binding.readStyle);
       binding.resolved = setHostPropSources(
         binding.element,
         next.sources,
         binding.resolved,
         binding.scope,
         binding.hasNestedChildren,
-        binding.readStyle,
-        false,
-        next.writableTextareaValue
+        binding.readStyle
       );
       if (process.env.NODE_ENV !== "production" && STAGED_DOM === null)
         drainDevFormDiagnostics(binding.element);
@@ -14680,22 +14713,22 @@ function disposeSignalHostPropSources(binding) {
     domNode(binding.element).removeEventListener("input", binding.input);
   queueOwnRefDetach(binding.resolved, binding.element);
 }
-function queueSignalHostControlAdoption(binding) {
+function queueSignalHostControlAdoption(binding, priorValue) {
   enqueueEffectEventCommitAction(() => {
     if (binding.disposed || binding.scope.block.disposed || !binding.pendingControl) return;
     (0, import_transition_state.withoutSignalCandidate)(
       () => runWithBlockSignalOwner(binding.scope, () => {
         const snapshot = (0, import_event_capture.snapshotHydrationControl)(binding.element);
-        if (snapshot.editRevision > 0) {
+        const value = winningSignalHostControl(binding.sources, "value");
+        if (snapshot.editRevision > 0 || binding.element.localName === "textarea" && isWritableSignal(value) && Object.is(readSignalBinding(value), priorValue)) {
           const checked = winningSignalHostControl(binding.sources, "checked");
-          const value = winningSignalHostControl(binding.sources, "value");
           if (isWritableSignal(checked) && snapshot.checked !== void 0)
             checked.set(snapshot.checked);
           if (isWritableSignal(value)) value.set(snapshot.selectedValues ?? snapshot.value);
         }
         if (binding.disposed || binding.scope.block.disposed) return;
         if (!(0, import_event_capture.consumeHydrationControl)(binding.element, snapshot.revision)) {
-          queueSignalHostControlAdoption(binding);
+          queueSignalHostControlAdoption(binding, priorValue);
           return;
         }
         binding.pendingControl = false;
@@ -14808,14 +14841,9 @@ function bindSignalHostPropSources(scope, previous, element, sources, site, hasN
   const controlSnapshot = isWritableSignal(valueControl) || isWritableSignal(checkedControl) ? (0, import_event_capture.snapshotHydrationControl)(element) : null;
   if (controlSnapshot !== null) {
     validateDirectSignalControl(element, site);
-    binding.pendingControl ||= activeHydration() !== null && controlSnapshot.editRevision > 0;
+    binding.pendingControl ||= activeHydration() !== null && (controlSnapshot.editRevision > 0 || isWritableSignal(valueControl) && (0, import_control_capture.isRestoredHydrationTextarea)(element, readSignalBinding(valueControl)));
   }
-  const next = resolveSignalHostPropSources(
-    sources,
-    readStyle,
-    void 0,
-    element.localName === "textarea"
-  );
+  const next = resolveSignalHostPropSources(sources, readStyle);
   binding.resolved = setHostPropSources(
     element,
     next.sources,
@@ -14823,8 +14851,7 @@ function bindSignalHostPropSources(scope, previous, element, sources, site, hasN
     scope,
     hasNestedChildren,
     readStyle,
-    binding.pendingControl,
-    next.writableTextareaValue
+    binding.pendingControl
   );
   if (STAGED_COMMIT_CAPTURE !== null) {
     DEFERRED_LAYOUT_DRIVER.stageAction(() => {
@@ -14846,7 +14873,7 @@ function bindSignalHostPropSources(scope, previous, element, sources, site, hasN
     if (!binding.pendingControl && controlSnapshot !== null)
       (0, import_event_capture.consumeHydrationControl)(element, controlSnapshot.revision);
   }
-  if (binding.pendingControl) queueSignalHostControlAdoption(committed);
+  if (binding.pendingControl) queueSignalHostControlAdoption(committed, binding.resolved?.value);
   return committed;
 }
 function isAggregatedFormControlProp(el, name) {
@@ -16492,7 +16519,7 @@ function setNativeChangeDiagnosticMetadata(el, value) {
   if (state !== void 0) state.staticNativeChange = false;
   if (value === "runtime") queueDevFormDiagnostic(el, CURRENT_SCOPE ?? void 0, true);
 }
-function setValue(el, value, writableTextareaEcho = false) {
+function setValue(el, value) {
   if (CURRENT_SCOPE?.block.idState.renderOwner?.controlLeases?.has(el)) presentationMiss(false);
   const input = el;
   const ctrl = armControlled(el);
@@ -16524,17 +16551,14 @@ function setValue(el, value, writableTextareaEcho = false) {
   const prev = ctrl.v;
   ctrl.v = value;
   if (process.env.NODE_ENV !== "production") queueDevFormDiagnostic(el, CURRENT_SCOPE ?? void 0);
-  if (writableTextareaEcho) {
-    if ((STAGED_DOM?.view(input) ?? input).value === s) return;
-    if (!(ctrl.composing && Object.is(prev, value))) (STAGED_DOM?.view(input) ?? input).value = s;
-    if ((STAGED_DOM?.view(input) ?? input).defaultValue !== s)
-      (STAGED_DOM?.view(input) ?? input).defaultValue = s;
-    return;
-  }
   if (!(ctrl.composing && Object.is(prev, value)) && valueNeedsWrite(input, value))
     (STAGED_DOM?.view(input) ?? input).value = s;
-  if ((STAGED_DOM?.view(input) ?? input).defaultValue !== s)
-    (STAGED_DOM?.view(input) ?? input).defaultValue = s;
+  if ((STAGED_DOM?.view(input) ?? input).defaultValue !== s) {
+    const text = STAGED_DOM === null && el.localName === "textarea" ? getFirstChild(el) : null;
+    if (text !== null && text.nodeType === 3 && getNextSibling(text) === null)
+      domNode(text).data = s;
+    else (STAGED_DOM?.view(input) ?? input).defaultValue = s;
+  }
 }
 function setCheckedState(input, value, ctrl) {
   const first = !ctrl.sawC;
@@ -16835,7 +16859,7 @@ function setFormControlSources(el, sources) {
   }
   applyFormControlValues(el, tag, value, defaultValue, checked, defaultChecked, multiple);
 }
-function applyFormControlValues(el, tag, value, defaultValue, checked, defaultChecked, multiple, writableTextareaValue = false) {
+function applyFormControlValues(el, tag, value, defaultValue, checked, defaultChecked, multiple) {
   const ctrl = armControlled(el);
   const first = !ctrl.formSeen;
   const previousMultiple = ctrl.formMultiple;
@@ -16865,7 +16889,7 @@ function applyFormControlValues(el, tag, value, defaultValue, checked, defaultCh
   }
   if (tag === "textarea") {
     const textarea = el;
-    setValue(textarea, value, writableTextareaValue);
+    setValue(textarea, value);
     if (value == null) {
       if (defaultValue != null) setDefaultValue(textarea, defaultValue, first);
       else if (!first && (STAGED_DOM?.view(textarea) ?? textarea).defaultValue !== "")
@@ -17477,7 +17501,7 @@ function normalizePortalBody(rawBody, rawProps) {
   if (typeof rawBody === "function") {
     return { body: rawBody, props: rawProps };
   }
-  if (rawBody != null && rawBody.$$kind === ELEMENT_TAG && typeof rawBody.type === "function") {
+  if (rawBody != null && rawBody.$$kind === import_runtime_tags.ELEMENT_TAG && typeof rawBody.type === "function") {
     return {
       body: rawBody.type,
       props: rawBody.props
@@ -17491,16 +17515,14 @@ function normalizePortalBody(rawBody, rawProps) {
 function genericPortalBody(value, scope) {
   childSlot(scope, 0, scope.parentNode, value, scope.endMarker);
 }
-const PORTAL_TAG = /* @__PURE__ */ Symbol.for("octane.portal");
 function portalKey(value) {
   return typeof value === "string" || typeof value === "number" ? String(value) : null;
 }
 // @__NO_SIDE_EFFECTS__
 function createPortal(body, target, props = void 0) {
   const key = portalKey(props);
-  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 ELEMENT_TAG = /* @__PURE__ */ Symbol.for("octane.element");
 const KEYED_ELEMENT_DESCRIPTORS = /* @__PURE__ */ new WeakSet();
 function elementKeyWasProvided(descriptor) {
   return descriptor.key !== null || KEYED_ELEMENT_DESCRIPTORS.has(descriptor);
@@ -17603,7 +17625,7 @@ function copyScopedElementConfig(type, config, resolve) {
   return props;
 }
 function scopedElementRecord(type, props, key, ref, resolve, invocationSite) {
-  const descriptor = { $$kind: ELEMENT_TAG, type, props, key, ref };
+  const descriptor = { $$kind: import_runtime_tags.ELEMENT_TAG, type, props, key, ref };
   if (invocationSite !== void 0) descriptor.__octaneInvocationSite = invocationSite;
   Object.defineProperty(descriptor, SCOPED_CHILDREN_RESOLVER, { value: resolve });
   Object.defineProperty(descriptor, "children", SCOPED_CHILDREN_PROPERTY);
@@ -17659,7 +17681,7 @@ function nativeCreateScopedValue(readElement) {
   return scopedValueDescriptor(createNativeScopedResolver(readElement));
 }
 function scopedValueDescriptor(resolve) {
-  const descriptor = { $$kind: ELEMENT_TAG };
+  const descriptor = { $$kind: import_runtime_tags.ELEMENT_TAG };
   Object.defineProperty(descriptor, SCOPED_VALUE_RECORD, { value: resolve });
   Object.defineProperty(descriptor, "type", SCOPED_VALUE_PROPERTIES.type);
   Object.defineProperty(descriptor, "props", SCOPED_VALUE_PROPERTIES.props);
@@ -17727,7 +17749,7 @@ function createElementFromConfig(invocationSite, type, props, children = EMPTY_A
   (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,
@@ -17741,10 +17763,10 @@ function createElementFromConfig(invocationSite, type, props, children = EMPTY_A
   return finalizeElementDescriptor(descriptor);
 }
 function isElementDescriptor(v) {
-  return v != null && v.$$kind === ELEMENT_TAG;
+  return v != null && v.$$kind === import_runtime_tags.ELEMENT_TAG;
 }
 function isHostDescriptor(v) {
-  return v != null && v.$$kind === ELEMENT_TAG && typeof v.type === "string";
+  return v != null && v.$$kind === import_runtime_tags.ELEMENT_TAG && typeof v.type === "string";
 }
 function isValidElement(v) {
   return isElementDescriptor(v);
@@ -17824,7 +17846,7 @@ function cloneElement(element, config, ...children) {
     );
   } else {
     descriptor = {
-      $$kind: ELEMENT_TAG,
+      $$kind: import_runtime_tags.ELEMENT_TAG,
       type: element.type,
       props,
       key,
@@ -17866,7 +17888,7 @@ function cloneAndReplaceElementKey(element, key) {
     } else {
       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,
@@ -17883,7 +17905,7 @@ function cloneAndReplaceElementKey(element, key) {
     }
   } else {
     descriptor = {
-      $$kind: ELEMENT_TAG,
+      $$kind: import_runtime_tags.ELEMENT_TAG,
       type: element.type,
       props: element.props,
       key,
@@ -17926,7 +17948,7 @@ function mapIntoChildren(children, out, escapedPrefix, nameSoFar, callback, vali
     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 child2 = children;
     let mapped = callback(child2);
@@ -18052,7 +18074,7 @@ function componentSlot(parentScope, slotKey, domParent, comp, props, anchor, key
     }
   }
   const renderProps = typeof comp === "string" ? {
-    $$kind: ELEMENT_TAG,
+    $$kind: import_runtime_tags.ELEMENT_TAG,
     type: comp,
     props,
     key: null,
@@ -18733,8 +18755,8 @@ function warnMissingListKey(owner) {
   }
 }
 function deoptKey(item, index) {
-  const element = item != null && item.$$kind === ELEMENT_TAG;
-  if (item?.$$kind === PORTAL_TAG && item.key != null) return item.key;
+  const element = item != null && item.$$kind === import_runtime_tags.ELEMENT_TAG;
+  if (item?.$$kind === import_runtime_tags.PORTAL_TAG && item.key != null) return item.key;
   if (element && item.key != null && !ELEMENTS_MISSING_LIST_KEY.has(item)) return item.key;
   if (element && process.env.NODE_ENV !== "production" && activeHydration() === null) {
     warnMissingListKey(CURRENT_BLOCK);
@@ -18743,7 +18765,7 @@ function deoptKey(item, index) {
 }
 const POSITIONAL_CHILDREN = /* @__PURE__ */ new WeakSet();
 function deoptKeyPositional(item, index) {
-  return item != null && (item.$$kind === ELEMENT_TAG || item.$$kind === PORTAL_TAG) && item.key != null ? item.key : index;
+  return item != null && (item.$$kind === import_runtime_tags.ELEMENT_TAG || item.$$kind === import_runtime_tags.PORTAL_TAG) && item.key != null ? item.key : index;
 }
 function positionalChildren(children) {
   POSITIONAL_CHILDREN.add(children);
@@ -18995,7 +19017,7 @@ function setDeoptDesc(el, d) {
     const children = record.children;
     const previous = getDeoptDesc(el);
     record = sameDeoptDesc(previous, record, children) ? previous : {
-      $$kind: ELEMENT_TAG,
+      $$kind: import_runtime_tags.ELEMENT_TAG,
       type: record.type,
       props: record.props,
       key: record.key,
@@ -19018,7 +19040,7 @@ function fragmentDescriptorChildren(value) {
 }
 function fragmentRefDescriptor(value) {
   return {
-    $$kind: ELEMENT_TAG,
+    $$kind: import_runtime_tags.ELEMENT_TAG,
     type: renderFragmentRefDescriptor,
     props: value,
     key: value.key,
@@ -19083,7 +19105,7 @@ function nestedDeoptKeyPrefix(path) {
   return "[" + JSON.stringify(path) + ",";
 }
 function appendScopedDeoptKey(outKeys, path, item, index, key, keyPrefix) {
-  const explicit = (isElementDescriptor(item) || item?.$$kind === PORTAL_TAG) && item.key != null;
+  const explicit = (isElementDescriptor(item) || item?.$$kind === import_runtime_tags.PORTAL_TAG) && item.key != null;
   if (path.length === 0) {
     outKeys.push(explicit ? "k" + String(key) : index);
     return keyPrefix;
@@ -19136,7 +19158,7 @@ function flattenReactChildContainer(outItems, outKeys, children, kind, path) {
   }
 }
 function singleDeoptKey(item, key) {
-  return (isElementDescriptor(item) || item?.$$kind === PORTAL_TAG) && item.key != null ? "k" + String(key) : 0;
+  return (isElementDescriptor(item) || item?.$$kind === import_runtime_tags.PORTAL_TAG) && item.key != null ? "k" + String(key) : 0;
 }
 function prepareDeoptList(value, forceSingle = false, includeKeyedSingle = true) {
   if (isFragmentDescriptor(value)) {
@@ -19200,7 +19222,7 @@ function flattenDeoptChildrenKeyed(outVals, outKeys, v, prefix) {
         if (prefix === "") {
           outKeys.push(typeof k2 === "string" && k2[0] === ":" ? ":" + k2 : k2);
         } else {
-          const explicit = item?.$$kind === ELEMENT_TAG && item.key != null;
+          const explicit = item?.$$kind === import_runtime_tags.ELEMENT_TAG && item.key != null;
           outKeys.push(prefix + ":" + (explicit ? "k" : "i") + String(k2));
         }
       }
@@ -19208,7 +19230,7 @@ function flattenDeoptChildrenKeyed(outVals, outKeys, v, prefix) {
     return;
   }
   outVals.push(v);
-  const k = v?.$$kind === ELEMENT_TAG && v.key != null ? v.key : 0;
+  const k = v?.$$kind === import_runtime_tags.ELEMENT_TAG && v.key != null ? v.key : 0;
   outKeys.push(
     prefix === "" ? typeof k === "string" && k[0] === ":" ? ":" + k : k : prefix + ":i0"
   );
@@ -19599,12 +19621,12 @@ function descNeedsBlocks(value) {
     return false;
   }
   if (!isElementDescriptor(value) && (0, import_shared_value_helpers.childrenIterator)(value) !== null) return true;
-  if (value.$$kind === ELEMENT_TAG) {
+  if (value.$$kind === import_runtime_tags.ELEMENT_TAG) {
     if (value.type === Fragment || activityDescriptorDispatch !== null && value.type === activityDescriptorDispatch.type)
       return true;
     return typeof value.type === "function" || descNeedsBlocks(value.children);
   }
-  if (value.$$kind === PORTAL_TAG) return true;
+  if (value.$$kind === import_runtime_tags.PORTAL_TAG) return true;
   return false;
 }
 function hostElementBody(d, block) {
@@ -19858,7 +19880,7 @@ function compilerCacheArray(value, previous) {
       continue;
     }
     if (item !== null && typeof item === "object") {
-      if (item.$$kind !== ELEMENT_TAG) {
+      if (item.$$kind !== import_runtime_tags.ELEMENT_TAG) {
         renderable = false;
         continue;
       }
@@ -20400,7 +20422,7 @@ function childSlot(parentScope, slotKey, domParent, value, anchor, ownEnd, ownsH
     return;
   }
   while (value !== null && (typeof value === "object" || typeof value === "function")) {
-    if (value.$$kind === CONTEXT_TAG) {
+    if (value.$$kind === import_runtime_tags.CONTEXT_TAG) {
       value = useContextInternal(value);
       continue;
     }
@@ -20556,7 +20578,7 @@ function childSlot(parentScope, slotKey, domParent, value, anchor, ownEnd, ownsH
     state.start = start;
     state.end = end;
   }
-  const portalDesc = value != null && value.$$kind === PORTAL_TAG ? value : null;
+  const portalDesc = value != null && value.$$kind === import_runtime_tags.PORTAL_TAG ? value : null;
   if (portalDesc === null && state.portal != null) {
     teardownPortalState(state.portal);
     state.portal = null;
@@ -28139,6 +28161,7 @@ function scriptResource(attrs) {
   hostComponent,
   htext,
   htextSwap,
+  hydrateClaimedBindingCaches,
   hydrateRoot,
   ifBlock,
   injectStyle,