octane 0.14.3 → 0.16.0

package/dist/cjs/dom-focused-move.cjs

@@ -18,54 +18,83 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var dom_focused_move_exports = {};
 __export(dom_focused_move_exports, {
+  isChildOf: () => isChildOf,
   moveNativeNodeBefore: () => moveNativeNodeBefore
 });
 module.exports = __toCommonJS(dom_focused_move_exports);
 function moveNativeNodeBefore(parent, node, anchor, focused, contentEditable) {
-  let containsFocused = node === focused;
-  if (!containsFocused && focused !== null && node.nodeType === 1) {
-    let candidate = focused;
-    do {
-      if (node.contains(candidate)) {
-        containsFocused = true;
-        break;
-      }
-      const root = candidate.getRootNode();
-      candidate = root.nodeType === 11 ? root.host : void 0;
-    } while (candidate !== void 0);
-  }
-  if (!containsFocused) {
-    parent.insertBefore(node, anchor);
+  const move = nativeMove(parent);
+  if (move !== null && node.isConnected === true && parent.ownerDocument === node.ownerDocument && !(contentEditable && containsFocus(node, focused))) {
+    move.call(parent, node, anchor);
     return;
   }
-  const moveBefore = parent.moveBefore;
-  if (!contentEditable && typeof moveBefore === "function" && parent.isConnected && node.isConnected && parent.ownerDocument === node.ownerDocument) {
-    moveBefore.call(parent, node, anchor);
+  if (!containsFocus(node, focused)) {
+    parent.insertBefore(node, anchor);
     return;
   }
-  if (node.parentNode !== parent || anchor !== null && anchor.parentNode !== parent) {
+  if (!isChildOf(node, parent) || anchor !== null && !isChildOf(anchor, parent)) {
     parent.insertBefore(node, anchor);
     return;
   }
-  if (node === anchor || node.nextSibling === anchor) return;
-  if (anchor === null || (node.compareDocumentPosition(anchor) & Node.DOCUMENT_POSITION_FOLLOWING) !== 0) {
-    let cursor = node.nextSibling;
-    while (cursor !== anchor) {
-      const next = cursor.nextSibling;
-      parent.insertBefore(cursor, node);
-      cursor = next;
-    }
-  } else {
-    const end = node.nextSibling;
-    let cursor = anchor;
-    while (cursor !== node) {
-      const next = cursor.nextSibling;
-      parent.insertBefore(cursor, end);
-      cursor = next;
+  if (node === anchor || nextOf(node) === anchor) return;
+  const forward = anchor === null || // 4 is Node.DOCUMENT_POSITION_FOLLOWING.
+  (nodeProto(node).compareDocumentPosition.call(node, anchor) & 4) !== 0;
+  const siblings = [];
+  for (let cursor = forward ? nextOf(node) : anchor; cursor !== null && cursor !== (forward ? anchor : node); cursor = nextOf(cursor))
+    siblings.push(cursor);
+  const rotate = move ?? parent.insertBefore;
+  let after = node;
+  for (let i = 0; i < siblings.length; i++) {
+    const sibling = siblings[i];
+    if (!isChildOf(sibling, parent)) continue;
+    if (forward) rotate.call(parent, sibling, node);
+    else {
+      rotate.call(parent, sibling, nextOf(after));
+      if (isChildOf(sibling, parent)) after = sibling;
     }
   }
 }
+let NODE_PROTO;
+let parentNodeGetter;
+let nextSiblingGetter;
+function nodeProto(node) {
+  if (NODE_PROTO === void 0) {
+    let proto = Object.getPrototypeOf(node);
+    while (!Object.prototype.hasOwnProperty.call(proto, "nextSibling"))
+      proto = Object.getPrototypeOf(proto);
+    NODE_PROTO = proto;
+  }
+  return NODE_PROTO;
+}
+function nodeGetter(node, name) {
+  return Object.getOwnPropertyDescriptor(nodeProto(node), name).get;
+}
+function isChildOf(node, parent) {
+  parentNodeGetter ??= nodeGetter(node, "parentNode");
+  return parentNodeGetter.call(node) === parent;
+}
+function nextOf(node) {
+  nextSiblingGetter ??= nodeGetter(node, "nextSibling");
+  return nextSiblingGetter.call(node);
+}
+function nativeMove(parent) {
+  if (parent.isConnected !== true) return null;
+  const move = parent.moveBefore;
+  return typeof move === "function" ? move : null;
+}
+function containsFocus(node, focused) {
+  if (node === focused) return true;
+  if (focused === null || node.nodeType !== 1) return false;
+  let candidate = focused;
+  do {
+    if (nodeProto(node).contains.call(node, candidate)) return true;
+    const root = candidate.getRootNode();
+    candidate = root.nodeType === 11 ? root.host : void 0;
+  } while (candidate !== void 0);
+  return false;
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  isChildOf,
   moveNativeNodeBefore
 });

package/dist/cjs/hydration/dev-values.cjs

@@ -77,7 +77,7 @@ function unpatchedHTML(pass, el, next) {
   let client;
   if (el.localName === "script") {
     server = el.textContent ?? "";
-    client = next.replace(
+    client = String(next).replace(
       INLINE_SCRIPT_TOKEN,
       (_match, prefix, s, suffix) => `${prefix}${s === "s" ? "\\u0073" : "\\u0053"}${suffix}`
     ).replace(SCRIPT_DATA_NORMALIZATION, (match) => match === "\0" ? "\uFFFD" : "\n");

package/dist/cjs/index.cjs

@@ -44,6 +44,7 @@ __export(index_exports, {
   __runOnCatch: () => import_runtime.__runOnCatch,
   __s: () => import_runtime.markSingleRoot,
   __serverRpc: () => import_server_rpc_client.__serverRpc,
+  __serverRpcStream: () => import_server_rpc_client.__serverRpcStream,
   __useCommittedState: () => import_runtime.__useCommittedState,
   __useLinkedStateWithGetter: () => import_runtime.__useLinkedStateWithGetter,
   __useReducerWithGetter: () => import_runtime.__useReducerWithGetter,
@@ -88,6 +89,7 @@ __export(index_exports, {
   compilerOwnsContextProvider: () => import_runtime.compilerOwnsContextProvider,
   componentSlot: () => import_runtime.componentSlot,
   componentSlotFromConfig: () => import_runtime.componentSlotFromConfig,
+  componentSlotFunction: () => import_runtime.componentSlotFunction,
   componentSlotLite: () => import_runtime.componentSlotLite,
   componentSlotVoid: () => import_runtime.componentSlotVoid,
   createCompiledContext: () => import_runtime.createCompiledContext,
@@ -301,6 +303,7 @@ var import_method_dep = require("./method-dep.cjs");
   __runOnCatch,
   __s,
   __serverRpc,
+  __serverRpcStream,
   __useCommittedState,
   __useLinkedStateWithGetter,
   __useReducerWithGetter,
@@ -345,6 +348,7 @@ var import_method_dep = require("./method-dep.cjs");
   compilerOwnsContextProvider,
   componentSlot,
   componentSlotFromConfig,
+  componentSlotFunction,
   componentSlotLite,
   componentSlotVoid,
   createCompiledContext,

package/dist/cjs/internal/universal-children.cjs

@@ -0,0 +1,30 @@
+"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 universal_children_exports = {};
+__export(universal_children_exports, {
+  createUniversalChildren: () => import_universal_children.createUniversalChildren,
+  descriptorChildren: () => import_universal_children.descriptorChildren
+});
+module.exports = __toCommonJS(universal_children_exports);
+var import_universal_children = require("../universal-children.cjs");
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  createUniversalChildren,
+  descriptorChildren
+});

package/dist/cjs/runtime/actions.cjs

@@ -44,6 +44,7 @@ var import_hydration = require("./hydration.cjs");
 var import_portals = require("./portals.cjs");
 var import_suspense = require("./suspense.cjs");
 var import_render = require("./render.cjs");
+var import_commit = require("./commit.cjs");
 var import_host_props = require("./host-props.cjs");
 var import_events = require("./events.cjs");
 var import_forms = require("./forms.cjs");
@@ -405,33 +406,38 @@ function useOptimistic(passthrough, updateFnOrSlot, slot) {
   const block = import_render.CURRENT_BLOCK;
   let s = scope.hooks?.get(slot);
   if (s === void 0) {
-    let unownedIndices = null;
-    const clear = (indices) => {
-      if (indices !== void 0 && unownedIndices !== indices) return;
-      unownedIndices = null;
-      const hadUpdates = slotRef.queue.length > 0;
-      if (indices === void 0) {
-        slotRef.armed = false;
-        slotRef.queue.length = 0;
-      } else {
-        let write = indices[0];
-        let skip = 0;
-        for (let read = write; read < slotRef.queue.length; read++) {
-          if (read === indices[skip]) skip++;
-          else slotRef.queue[write++] = slotRef.queue[read];
-        }
-        slotRef.queue.length = write;
+    const compact = (owner) => {
+      const queue2 = slotRef.queue;
+      const owners2 = slotRef.owners;
+      if (owners2 === null) {
+        if (owner !== null || queue2.length === 0) return false;
+        queue2.length = 0;
+        return true;
       }
-      if (hadUpdates && !block.disposed) {
-        if (typeof __OCTANE_PROFILE_ENABLED__ !== "undefined" && __OCTANE_PROFILE_ENABLED__)
-          (0, import_profiling.__profileSchedule)(block, "optimistic-revert", slot);
-        if (indices === void 0) (0, import_engine.scheduleRender)(block);
-        else (0, import_engine.scheduleUrgentRender)(block);
+      let write = 0;
+      for (let read = 0; read < queue2.length; read++) {
+        if (owners2[read] === owner) continue;
+        queue2[write] = queue2[read];
+        owners2[write++] = owners2[read];
       }
+      const removed = write !== queue2.length;
+      queue2.length = write;
+      owners2.length = write;
+      if (slotRef.batches === null || slotRef.batches.size === 0) slotRef.owners = null;
+      return removed;
+    };
+    const revert = () => {
+      if (block.disposed) return;
+      if (typeof __OCTANE_PROFILE_ENABLED__ !== "undefined" && __OCTANE_PROFILE_ENABLED__)
+        (0, import_profiling.__profileSchedule)(block, "optimistic-revert", slot);
+      (0, import_engine.scheduleHookPublication)(block);
     };
     const slotRef = {
       queue: [],
-      armed: false,
+      owners: null,
+      batches: null,
+      unownedPending: false,
+      compact,
       add: (value) => {
         const inAction = (0, import_engine.isTransitionUpdateContext)();
         if (__octaneDev && !inAction) {
@@ -440,13 +446,33 @@ function useOptimistic(passthrough, updateFnOrSlot, slot) {
           );
         }
         slotRef.queue.push(value);
-        if (inAction && import_engine.TRANSITION_PENDING_COUNT > 0) {
-          slotRef.armed = true;
+        const batch = inAction ? (0, import_transitions.transitionActionBatchForUpdate)() : null;
+        if (batch !== null) {
+          const owners2 = slotRef.owners ?? (slotRef.owners = new Array(slotRef.queue.length - 1).fill(null));
+          owners2.push(batch);
+          if (batch.finished) compact(batch);
+          else {
+            let batches = slotRef.batches;
+            if (batches === null) slotRef.batches = batches = /* @__PURE__ */ new Map();
+            if (!batches.has(batch))
+              batches.set(
+                batch,
+                (0, import_transitions.onTransitionBatchFinished)(batch, () => {
+                  batches.delete(batch);
+                  if (batches.size === 0) slotRef.batches = null;
+                  if (compact(batch)) revert();
+                })
+              );
+          }
         } else {
-          if (unownedIndices === null) {
-            const indices = unownedIndices = [slotRef.queue.length - 1];
-            queueMicrotask(() => clear(indices));
-          } else unownedIndices.push(slotRef.queue.length - 1);
+          slotRef.owners?.push(null);
+          if (!slotRef.unownedPending) {
+            slotRef.unownedPending = true;
+            queueMicrotask(() => {
+              slotRef.unownedPending = false;
+              if (compact(null)) revert();
+            });
+          }
         }
         if (!block.disposed) {
           if (typeof __OCTANE_PROFILE_ENABLED__ !== "undefined" && __OCTANE_PROFILE_ENABLED__)
@@ -458,15 +484,28 @@ function useOptimistic(passthrough, updateFnOrSlot, slot) {
     };
     s = slotRef;
     (0, import_hooks.ensureHooks)(scope).set(slot, slotRef);
-    const listener = () => {
-      if (import_engine.TRANSITION_PENDING_COUNT === 0 && slotRef.armed) clear();
-    };
-    import_transitions.TRANSITION_LISTENERS.add(listener);
-    (0, import_hooks.registerHookCleanup)(scope, () => import_transitions.TRANSITION_LISTENERS.delete(listener));
+    (0, import_hooks.registerHookCleanup)(scope, () => {
+      const batches = slotRef.batches;
+      if (batches === null) return;
+      for (const unsubscribe of batches.values()) unsubscribe();
+      batches.clear();
+      slotRef.batches = null;
+    });
   }
   let optimistic = passthrough;
   const reduce = updateFn ?? basicOptimisticReducer;
-  for (let i = 0; i < s.queue.length; i++) optimistic = reduce(optimistic, s.queue[i]);
+  const queue = s.queue;
+  const owners = s.owners;
+  const transition = block.currentRenderMode === "transition";
+  let reverted = null;
+  for (let i = 0; i < queue.length; i++) {
+    const owner = owners === null ? null : owners[i];
+    if (owner !== null && import_drivers.TRANSITION_ROOT_DRIVER && (transition || ((0, import_transitions.rootTransitionBatch)(owner).pendingHolds ?? 0) !== 0) && import_drivers.TRANSITION_ROOT_DRIVER.fold(owner, transition, import_render.ROOT_RENDER_TRANSACTION)) {
+      if (reverted === null) reverted = [owner];
+      else if (reverted.indexOf(owner) === -1) reverted.push(owner);
+    } else optimistic = reduce(optimistic, queue[i]);
+  }
+  if (reverted !== null) for (const owner of reverted) (0, import_commit.atCommit)(s.compact, owner);
   return [optimistic, s.add];
 }
 // Annotate the CommonJS export names for ESM import in node:

package/dist/cjs/runtime/block.cjs

@@ -351,7 +351,7 @@ function renderReturnedValue(block, out, reset) {
           (0, import_profile_probes.withProfileComponentOverride)(
             d.type,
             null,
-            () => (0, import_component_slots.componentSlot)(
+            () => (0, import_component_slots.componentSlotFunction)(
               block,
               0,
               domParent,
@@ -366,7 +366,7 @@ function renderReturnedValue(block, out, reset) {
             )
           );
         } else {
-          (0, import_component_slots.componentSlot)(
+          (0, import_component_slots.componentSlotFunction)(
             block,
             0,
             domParent,

package/dist/cjs/runtime/child-slots.cjs

@@ -30,6 +30,7 @@ __export(child_slots_exports, {
   compilerCacheImmutableArrayFilter: () => compilerCacheImmutableArrayFilter,
   compilerCacheMappedArray: () => compilerCacheMappedArray,
   mapSlot: () => mapSlot,
+  renderSignalChildSlot: () => renderSignalChildSlot,
   textHole: () => textHole,
   textHoleUpdate: () => textHoleUpdate,
   textSlot: () => textSlot
@@ -267,6 +268,13 @@ function mapSlot(scopeOrItems, slotOrMethod, domParent, items, method, native, c
     }
   }
 }
+function renderSignalChildSlot(parentScope, slotKey, domParent, value, anchor, ownEnd, ownsHost, compactable, onlyChild, bindingMarker, cachedText) {
+  if (onlyChild) return childTextHole(parentScope, slotKey, domParent, value, cachedText);
+  if (bindingMarker === void 0)
+    childSlot(parentScope, slotKey, domParent, value, anchor, ownEnd, ownsHost, compactable);
+  else bindingChildSlot(parentScope, slotKey, domParent, value, bindingMarker, anchor, ownEnd);
+  return null;
+}
 function bindingChildSlot(parentScope, slotKey, domParent, value, marker, anchor, ownEnd) {
   const frame = import_hydration_flag.hydrationStarted ? import_hydration_presentation.PRESENTATION_HYDRATION : null;
   if (frame?.revision !== void 0) {
@@ -337,6 +345,7 @@ function childSlot(parentScope, slotKey, domParent, value, anchor, ownEnd, ownsH
   }
   if (import_drivers.SIGNAL_CHILD) {
     if ((0, import_drivers.SIGNAL_CHILD)(
+      renderSignalChildSlot,
       parentScope,
       slotKey,
       domParent,
@@ -349,6 +358,7 @@ function childSlot(parentScope, slotKey, domParent, value, anchor, ownEnd, ownsH
     ))
       return;
   } else if (import_read_protocol.nativeSignalHydration && (0, import_signal_bindings.bindImplicitSignalChild)(
+    renderSignalChildSlot,
     parentScope,
     slotKey,
     domParent,
@@ -1108,6 +1118,7 @@ function childTextHole(parentScope, slotKey, domParent, value, cachedNode) {
   compilerCacheImmutableArrayFilter,
   compilerCacheMappedArray,
   mapSlot,
+  renderSignalChildSlot,
   textHole,
   textHoleUpdate,
   textSlot

package/dist/cjs/runtime/commit.cjs

@@ -42,6 +42,7 @@ __export(commit_exports, {
   bagRecord: () => bagRecord,
   captureFocusSelection: () => captureFocusSelection,
   captureQueuedFocusSelection: () => captureQueuedFocusSelection,
+  commitQueuedBag: () => commitQueuedBag,
   defersRootUnmount: () => defersRootUnmount,
   discardMarker: () => discardMarker,
   dropRootOps: () => dropRootOps,
@@ -130,7 +131,7 @@ function bagRecord(s, next, cell, value, committed, bundle, a0, a1) {
       next[size] = s;
       next[size + 1] = transaction.ops.length;
       bag.$ = state | BAG_QUEUED;
-      transaction.ops.push(next[size + 2], bag);
+      transaction.ops.push(commitQueuedBag, bag);
     }
   }
   next[cell] = changed ? value : bag;
@@ -147,9 +148,19 @@ function bagResume(bag) {
     journalObjectOnce(next);
   return next;
 }
-function bagDone(s, bag, commit) {
-  bag.next[bag.$ & BAG_SIZE] = s;
-  commit(bag, import_render.TRANSITION_JOURNAL !== null || import_events._dispatchDepth !== 0 && import_events.CAPTURE_SLOTS.length !== 0);
+function bagDone(s, bag) {
+  const next = bag.next;
+  const size = bag.$ &= BAG_SIZE;
+  next[size] = s;
+  next[size + 2](
+    bag,
+    next,
+    import_render.TRANSITION_JOURNAL !== null || import_events._dispatchDepth !== 0 && import_events.CAPTURE_SLOTS.length !== 0
+  );
+}
+function commitQueuedBag(bag, careful) {
+  const next = bag.next;
+  next[(bag.$ &= BAG_SIZE) + 2](bag, next, careful);
 }
 function slotNext(slot) {
   const tx = import_render.ROOT_RENDER_TRANSACTION;
@@ -404,7 +415,7 @@ function dropRootOps(transaction, from, retired) {
   for (let i = from; i < ops.length; i += 2) {
     const target = ops[i + 1];
     if (ops[i] === applySlotNext) target.next = null;
-    else if (typeof target?.$ === "number") target.$ &= BAG_SIZE;
+    else if (ops[i] === commitQueuedBag) target.$ &= BAG_SIZE;
   }
   ops.length = from;
   const set = transaction.retired;
@@ -1061,6 +1072,7 @@ function withRegisteredRefDetachSuppression(entries, fn) {
   bagRecord,
   captureFocusSelection,
   captureQueuedFocusSelection,
+  commitQueuedBag,
   defersRootUnmount,
   discardMarker,
   dropRootOps,

package/dist/cjs/runtime/component-slots.cjs

@@ -31,6 +31,7 @@ __export(component_slots_exports, {
   compilerCacheContext: () => compilerCacheContext,
   compilerOpaqueTag: () => compilerOpaqueTag,
   componentSlot: () => componentSlot,
+  componentSlotFunction: () => componentSlotFunction,
   componentSlotImpl: () => componentSlotImpl,
   componentSlotVoid: () => componentSlotVoid,
   ctxDirectChanged: () => ctxDirectChanged,
@@ -387,6 +388,7 @@ function componentSlot(parentScope, slotKey, domParent, comp, props, invocationS
   if (!activity && typeof comp !== "function" && typeof comp !== "string") {
     throw (0, import_elements.invalidElementTypeError)(comp);
   }
+  if (typeof comp === "string" && !import_deopt.DESCRIPTOR_HOST_PROPS) (0, import_deopt.enableHostDescriptors)();
   const body = activity ? dispatch.body : typeof comp === "string" ? import_deopt.hostStringTagBody : comp;
   if (activity) {
     singleRoot = false;
@@ -422,6 +424,25 @@ function componentSlot(parentScope, slotKey, domParent, comp, props, invocationS
     typeof comp === "string" ? import_signal_owners.RENDERER_INVOCATION_SITE : invocationSite
   );
 }
+function componentSlotFunction(parentScope, slotKey, domParent, comp, props, invocationSite, anchor, singleRoot, inherit, key, hasKey) {
+  if (typeof comp !== "function") throw (0, import_elements.invalidElementTypeError)(comp);
+  componentSlotImpl(
+    import_block.renderReturnedValue,
+    parentScope,
+    slotKey,
+    domParent,
+    comp,
+    comp,
+    props,
+    props,
+    anchor,
+    key,
+    singleRoot,
+    inherit,
+    hasKey,
+    invocationSite
+  );
+}
 function componentSlotVoid(parentScope, slotKey, domParent, comp, props, invocationSite, anchor, singleRoot, inherit, key, hasKey) {
   if (typeof comp !== "function") throw (0, import_elements.invalidElementTypeError)(comp);
   componentSlotImpl(
@@ -1342,7 +1363,6 @@ function hmr(fn) {
           meta.liveBlocks.delete(b);
           continue;
         }
-        b.body = wrapper;
         if (typeof __OCTANE_PROFILE_ENABLED__ !== "undefined" && __OCTANE_PROFILE_ENABLED__)
           (0, import_profiling.__profileSchedule)(b, "hmr");
         (0, import_block.resetHmrBlock)(b);
@@ -1385,6 +1405,7 @@ function hmr(fn) {
   compilerCacheContext,
   compilerOpaqueTag,
   componentSlot,
+  componentSlotFunction,
   componentSlotImpl,
   componentSlotVoid,
   ctxDirectChanged,

package/dist/cjs/runtime/deopt.cjs

@@ -20,11 +20,13 @@ var deopt_exports = {};
 __export(deopt_exports, {
   DEOPT_DESC: () => DEOPT_DESC,
   DEOPT_REFS_STAMPED: () => DEOPT_REFS_STAMPED,
+  DESCRIPTOR_HOST_PROPS: () => DESCRIPTOR_HOST_PROPS,
   POSITIONAL_CHILDREN: () => POSITIONAL_CHILDREN,
   adoptsPureHost: () => adoptsPureHost,
   deoptItemBody: () => deoptItemBody,
   descNeedsBlocks: () => descNeedsBlocks,
   enableDescriptorFragmentRefs: () => enableDescriptorFragmentRefs,
+  enableHostDescriptors: () => enableHostDescriptors,
   getDeoptDesc: () => getDeoptDesc,
   hostComponent: () => hostComponent,
   hostElementBody: () => hostElementBody,
@@ -50,6 +52,7 @@ module.exports = __toCommonJS(deopt_exports);
 var import_branches = require("./branches.cjs");
 var import_hydration_flag = require("../hydration-flag.cjs");
 var import_has_own = require("../has-own.cjs");
+var import_dom_focused_move = require("../dom-focused-move.cjs");
 var import_shared_value_helpers = require("../shared-value-helpers.cjs");
 var import_profiling = require("../profiling.cjs");
 var import_error_codes_client_generated = require("../error-codes.client.generated.cjs");
@@ -77,6 +80,10 @@ var import_templates = require("./templates.cjs");
 var import_events = require("./events.cjs");
 var import_forms = require("./forms.cjs");
 const __octaneDev = process.env.NODE_ENV !== "production";
+let DESCRIPTOR_HOST_PROPS = null;
+function enableHostDescriptors() {
+  DESCRIPTOR_HOST_PROPS = import_host_props.setHostProps;
+}
 const DEOPT_KEY_WARNED_BLOCKS = /* @__PURE__ */ new WeakSet();
 let DEOPT_KEY_WARNED_WITHOUT_BLOCK = false;
 function warnMissingListKey(owner) {
@@ -553,7 +560,13 @@ function reconcileDeoptNode(prev, value, ownerBlock, ns) {
         pending = pendingDeoptOrder(el);
         desc = changedDeoptRecord(el, value, pending);
       } else {
-        (0, import_host_props.setHostProps)(el, value.props, getDeoptDesc(el)?.props ?? null, ownerBlock, import_host_props.DESCRIPTOR_HOST);
+        DESCRIPTOR_HOST_PROPS(
+          el,
+          value.props,
+          getDeoptDesc(el)?.props ?? null,
+          ownerBlock,
+          import_host_props.DESCRIPTOR_HOST
+        );
         if (import_hydration_flag.hydrating && import_hydration.CURSOR !== null && import_render.ROOT_RENDER_TRANSACTION !== null) {
           defer = true;
           desc = deoptRecord(el, value);
@@ -565,7 +578,7 @@ function reconcileDeoptNode(prev, value, ownerBlock, ns) {
       if (hydration !== null)
         return hydration.suspend(() => reconcileDeoptNode(null, value, ownerBlock, ns));
       el = elNs !== void 0 ? document.createElementNS(elNs, value.type) : document.createElement(value.type);
-      (0, import_host_props.setHostProps)(el, value.props, void 0, ownerBlock, import_host_props.DESCRIPTOR_HOST);
+      DESCRIPTOR_HOST_PROPS(el, value.props, void 0, ownerBlock, import_host_props.DESCRIPTOR_HOST);
     }
     if (desc === null) setDeoptDesc(el, value);
     const nodes = hasHostPropContent(value) ? null : reconcileDeoptChildren(
@@ -783,13 +796,13 @@ function applyDeoptOrder(order) {
   }
   if (order.desc !== null) {
     if (order.owner === null) stampDeoptDesc(node, order.desc);
-    else (0, import_render.commitInScope)(order.owner, commitDeoptHost, node, order.desc);
+    else (0, import_render.commitInScope)((0, import_branches.owningBlock)(order.owner), commitDeoptHost, node, order.desc);
   }
   if (order.nodes !== null) placeDeoptChildren(node, order.nodes, true, false);
 }
 function commitDeoptHost(el, record, owner) {
   const committed = el[DEOPT_DESC];
-  (0, import_host_props.setHostProps)(el, record.props, committed?.props ?? null, owner, import_host_props.DESCRIPTOR_HOST);
+  DESCRIPTOR_HOST_PROPS(el, record.props, committed?.props ?? null, owner, import_host_props.DESCRIPTOR_HOST);
   stampDeoptDesc(el, record);
 }
 function placeDeoptChildren(el, result, skip, adopt) {
@@ -798,7 +811,7 @@ function placeDeoptChildren(el, result, skip, adopt) {
     const want = result[i];
     const at = skip ? nextDeoptOwnedChild(cursor, adopt) : cursor;
     if (at !== want) {
-      if (import_engine.renderingFocus === null) el.insertBefore(want, at);
+      if (import_engine.renderingFocus === null) (0, import_dom_focused_move.moveNativeNodeBefore)(el, want, at, null, false);
       else {
         (0, import_engine.captureFocusedMovement)(el, import_engine.renderingFocus);
         (0, import_lists.moveFocusedNodeBefore)(el, want, at, import_engine.renderingFocus);
@@ -998,7 +1011,7 @@ function mappedDeoptItemBody(item, scope) {
         }
       }
       try {
-        (0, import_component_slots.componentSlot)(
+        (0, import_component_slots.componentSlotFunction)(
           scope,
           0,
           parent,
@@ -1102,7 +1115,7 @@ function hostElementBody(d, block) {
   if (el === null && hydration !== null && hydration.node !== null && hydration.node.nodeType === 1 && (0, import_host_props.isHostElementOfType)(hydration.node, d.type) && (elNs === void 0 || hydration.node.namespaceURI === elNs)) {
     el = hydration.node;
     block.deoptNode = el;
-    (0, import_host_props.setHostProps)(el, d.props, void 0, block, import_host_props.DESCRIPTOR_HOST);
+    DESCRIPTOR_HOST_PROPS(el, d.props, void 0, block, import_host_props.DESCRIPTOR_HOST);
     setDeoptDesc(el, d);
     const savedCursor = (0, import_templates.getNextSibling)(hydration.node);
     if (!hasHostPropContent(d)) {
@@ -1148,11 +1161,11 @@ function hostElementBody(d, block) {
       const frag = (0, import_commit.queueFrontier)(block, parent, block.endMarker);
       frag.appendChild(el);
     } else parent.insertBefore(el, block.endMarker);
-    (0, import_host_props.setHostProps)(el, d.props, void 0, block, import_host_props.DESCRIPTOR_HOST);
+    DESCRIPTOR_HOST_PROPS(el, d.props, void 0, block, import_host_props.DESCRIPTOR_HOST);
   } else if ((0, import_commit.usesFrontier)(block, el)) {
     desc = changedDeoptRecord(el, d, pendingDeoptOrder(el));
   } else {
-    (0, import_host_props.setHostProps)(el, d.props, getDeoptDesc(el)?.props ?? null, block, import_host_props.DESCRIPTOR_HOST);
+    DESCRIPTOR_HOST_PROPS(el, d.props, getDeoptDesc(el)?.props ?? null, block, import_host_props.DESCRIPTOR_HOST);
   }
   if (desc === null) setDeoptDesc(el, d);
   if (!hasHostPropContent(d)) deoptHostChildren(block, el, d, elNs);
@@ -1169,7 +1182,7 @@ function hostStringTagBody(d, block) {
     if (hydration !== null && hydration.node !== null && hydration.node.nodeType === 1 && (0, import_host_props.isHostElementOfType)(hydration.node, tag) && (elNs === void 0 || hydration.node.namespaceURI === elNs)) {
       el = hydration.node;
       block.deoptNode = el;
-      (0, import_host_props.setHostProps)(el, d.props, void 0, block, import_host_props.DESCRIPTOR_HOST);
+      DESCRIPTOR_HOST_PROPS(el, d.props, void 0, block, import_host_props.DESCRIPTOR_HOST);
       setDeoptDesc(el, d);
       const savedCursor = (0, import_templates.getNextSibling)(hydration.node);
       if (!hasHostPropContent(d)) {
@@ -1190,11 +1203,11 @@ function hostStringTagBody(d, block) {
     block.deoptNode = el;
     const parent = block.parentNode;
     parent.insertBefore(el, block.endMarker);
-    (0, import_host_props.setHostProps)(el, d.props, void 0, block, import_host_props.DESCRIPTOR_HOST);
+    DESCRIPTOR_HOST_PROPS(el, d.props, void 0, block, import_host_props.DESCRIPTOR_HOST);
   } else if ((0, import_commit.usesFrontier)(block, el)) {
     desc = changedDeoptRecord(el, d, pendingDeoptOrder(el));
   } else {
-    (0, import_host_props.setHostProps)(el, d.props, getDeoptDesc(el)?.props ?? null, block, import_host_props.DESCRIPTOR_HOST);
+    DESCRIPTOR_HOST_PROPS(el, d.props, getDeoptDesc(el)?.props ?? null, block, import_host_props.DESCRIPTOR_HOST);
   }
   if (desc === null) setDeoptDesc(el, d);
   if (!hasHostPropContent(d)) renderHostTagChildren(d, block, el);
@@ -1576,11 +1589,13 @@ function renderPreparedChildList(state, parentBlock, domParent, preparedList, hy
 0 && (module.exports = {
   DEOPT_DESC,
   DEOPT_REFS_STAMPED,
+  DESCRIPTOR_HOST_PROPS,
   POSITIONAL_CHILDREN,
   adoptsPureHost,
   deoptItemBody,
   descNeedsBlocks,
   enableDescriptorFragmentRefs,
+  enableHostDescriptors,
   getDeoptDesc,
   hostComponent,
   hostElementBody,