octane 0.14.1 → 0.14.2

package/dist/cjs/runtime/actions.cjs

@@ -290,12 +290,65 @@ function useActionState(action, initialState, permalinkOrSlot, slot) {
   s.action = action;
   return [s.state, s.dispatch, s.isPending];
 }
-function findAncestorForm(block) {
+function findPortalAncestor(block) {
+  while (block !== null && block.kind !== "portal") block = block.parentBlock;
+  return block;
+}
+function findAncestorFormInBlocks(block) {
+  while (block !== null) {
+    const root = block.startMarker;
+    if (root?.nodeName === "FORM") return root;
+    let n = block.parentNode;
+    let portal = findPortalAncestor(block);
+    while (n !== null) {
+      if (portal !== null && n === portal.parentNode) {
+        const host = portal.startMarker?.$$portalParent;
+        n = host ?? n.parentNode;
+        portal = findPortalAncestor(portal.parentBlock);
+        continue;
+      }
+      if (n.nodeName === "FORM") return n;
+      const parent = n.parentNode;
+      n = parent ?? (n.nodeType === 11 ? n.$$next?.parent ?? null : null);
+    }
+    block = block.parentBlock;
+  }
+  return null;
+}
+function findAncestorFormInDetachedHost(node, block) {
+  let portal = findPortalAncestor(block);
+  let n = node;
+  while (n !== null) {
+    if (portal !== null && n === portal.parentNode) {
+      const host = portal.startMarker?.$$portalParent;
+      n = host ?? n.parentNode;
+      portal = findPortalAncestor(portal.parentBlock);
+      continue;
+    }
+    if (n.nodeName === "FORM") return n;
+    n = n.parentNode;
+  }
+  return null;
+}
+function findAncestorForm(block, portal) {
   const start = block.startMarker;
   let n = start ? start.parentNode : block.parentNode ?? null;
   while (n) {
+    if (portal !== null && n === portal.parentNode) {
+      const host = portal.startMarker?.$$portalParent;
+      if (host !== void 0 && !host.isConnected) {
+        const localForm = findAncestorFormInDetachedHost(host, portal.parentBlock);
+        if (localForm !== null) return localForm;
+        const form = findAncestorFormInBlocks(portal.parentBlock);
+        if (form !== null) return form;
+      }
+      n = host ?? n.parentNode;
+      portal = findPortalAncestor(portal.parentBlock);
+      continue;
+    }
     if (n.nodeName === "FORM") return n;
-    n = n.parentNode;
+    const parent = n.parentNode;
+    n = parent ?? (n.nodeType === 11 ? n.$$next?.parent ?? null : null);
   }
   return null;
 }
@@ -306,7 +359,7 @@ function useFormStatus(slot) {
   const block = import_render.CURRENT_BLOCK;
   let s = scope.hooks?.get(slot);
   if (s === void 0) {
-    s = { form: null, listener: null };
+    s = { form: null, listener: null, portal: findPortalAncestor(scope.block) };
     const slotRef = s;
     (0, import_hooks.ensureHooks)(scope).set(slot, slotRef);
     (0, import_hooks.registerHookCleanup)(scope, () => {
@@ -314,7 +367,7 @@ function useFormStatus(slot) {
         FORM_STATUS_LISTENERS.get(slotRef.form)?.delete(slotRef.listener);
     });
   }
-  const form = findAncestorForm(scope.block);
+  const form = findAncestorForm(scope.block, s.portal);
   if (form !== s.form) {
     if (s.form && s.listener) FORM_STATUS_LISTENERS.get(s.form)?.delete(s.listener);
     s.form = form;

package/dist/cjs/runtime/commit.cjs

@@ -284,6 +284,7 @@ function rehomeSlot(member, frag, parent) {
   }
   if (member.host !== frag) return;
   member.host = parent;
+  if (member.start.$$portalParent === frag) member.start.$$portalParent = parent;
   for (let n = (0, import_templates.getNextSibling)(member.start); n !== null && n !== member.end; n = (0, import_templates.getNextSibling)(n))
     if (n.$$portalParent === frag) n.$$portalParent = parent;
 }

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

@@ -1037,7 +1037,8 @@ function ctxDepsChanged(block) {
 function ctxDirectChanged(block) {
   const direct = block.$$ctxDirect;
   if (direct === null) return false;
-  for (const [ctx, read] of direct) {
+  for (let entry = direct; entry !== null; entry = entry.next) {
+    const { context: ctx, read } = entry;
     const version = typeof read === "number" ? read : read.version;
     if (ctx.$$version === version) continue;
     if (typeof read === "number" || ctx.$$providerVersion !== ctx.$$version || !Object.is(read.owner.$$ctxValues?.get(ctx), read.value))
@@ -1093,7 +1094,7 @@ function restampCtxDeps(block) {
   const reads = block.$$ctxReads;
   const direct = block.$$ctxDirect;
   const hasReads = reads !== null && reads.size > 0;
-  const hasDirect = direct !== null && direct.size > 0;
+  const hasDirect = direct !== null;
   if (!hasReads && !hasDirect) return;
   for (let b = block.parentBlock; b !== null; b = b.parentBlock) {
     if (b.body?.__memo !== true && b.$$implicitBail !== true) continue;
@@ -1111,7 +1112,8 @@ function restampCtxDeps(block) {
       }
     }
     if (hasDirect) {
-      for (const [ctx, read] of direct) {
+      for (let entry = direct; entry !== null; entry = entry.next) {
+        const { context: ctx, read } = entry;
         const v = typeof read === "number" ? read : read.version;
         const cur = m.get(ctx);
         if (cur !== v) {
@@ -1132,7 +1134,7 @@ function restampCachedContextScope(scope) {
       restampCtxDeps(block);
       return;
     }
-    if (block.$$ctxDirect !== null && block.$$ctxDirect.size !== 0) {
+    if (block.$$ctxDirect !== null) {
       restampCtxDeps(block);
     }
   }

package/dist/cjs/runtime/context.cjs

@@ -372,12 +372,18 @@ function promoteMemoAncestry(scope) {
   block.memoInChain = true;
   (0, import_activity.forEachSubtreeChild)(scope, promoteMemoAncestry);
 }
+function findDirectContextRead(direct, context) {
+  while (direct !== null && direct.context !== context) direct = direct.next;
+  return direct;
+}
 function recordContextDependency(block, context) {
   if (block === null || !block.memoInChain) return;
   SKIPPED_ROW_REFRESH = import_lists.refreshSkippedRows;
-  const direct = block.$$ctxDirect ??= /* @__PURE__ */ new Map();
-  const previous = direct.get(context);
-  direct.set(context, context.$$version);
+  const direct = findDirectContextRead(block.$$ctxDirect, context);
+  const previous = direct?.read;
+  if (direct === null) {
+    block.$$ctxDirect = { context, read: context.$$version, next: block.$$ctxDirect };
+  } else direct.read = context.$$version;
   for (let current = block; current !== null; current = current.parentBlock) {
     if (current.body?.__memo === true || current.$$implicitBail === true) {
       (current.$$ctxReads ??= /* @__PURE__ */ new Map()).set(context, context.$$version);
@@ -391,12 +397,13 @@ function recordLocalContextValue(reader, block, context, value, previous) {
   const cache = reader.$$ctxCache;
   const owner = cache === context ? reader.$$ctxCacheOwner : cache !== null && reader.$$ctxCacheOwner === null ? cache.get(context) : void 0;
   if (owner === null || owner === void 0 || owner === DEFAULT_CTX) return;
+  const direct = findDirectContextRead(block.$$ctxDirect, context);
   if (previous !== void 0) {
     if (previous.owner !== owner || !Object.is(previous.value, value)) return;
     previous.version = context.$$version;
-    block.$$ctxDirect.set(context, previous);
+    direct.read = previous;
   } else {
-    block.$$ctxDirect.set(context, { version: context.$$version, owner, value });
+    direct.read = { version: context.$$version, owner, value };
   }
 }
 let SCOPED_READ_TRACKING = false;

package/dist/cjs/runtime/portals.cjs

@@ -280,6 +280,7 @@ function renderPortalState(prev, parentBlock, target, rawBody, rawProps, host, e
     const start = document.createComment("portal");
     const end = document.createComment("/portal");
     start.$$portalEnd = end;
+    start.$$portalParent = host;
     const transaction = import_render.ROOT_RENDER_TRANSACTION;
     const into = transaction !== null && !transaction.aborted && !import_engine.ROOT_RENDER_ROLLBACK ? (0, import_commit.queueFrontier)(parentBlock, target, null) : target;
     into.appendChild(start);
@@ -323,7 +324,11 @@ function renderPortalState(prev, parentBlock, target, rawBody, rawProps, host, e
     }
     (0, import_signal_owners.renderBlock)(block);
   } else {
-    if (state.host !== host) (0, import_engine.journalRootProperty)(state, "host", state.host);
+    if (state.host !== host) {
+      (0, import_engine.journalRootProperty)(state, "host", state.host);
+      (0, import_engine.journalRootProperty)(state.start, "$$portalParent", state.start.$$portalParent);
+      state.start.$$portalParent = host;
+    }
     state.host = host;
     if (state.block.body !== norm.body)
       (0, import_engine.journalRootProperty)(state.block, "body", state.block.body);

package/dist/cjs/runtime/render.cjs

@@ -427,7 +427,7 @@ function renderBlockInner(block) {
     if (state?.__kind === "hydrateBlockSlot" && state.parentBlock === block && !state.independent && !state.hydrated) {
       state.contextChanged = block.$$ctxDepsEpoch !== import_context_epoch.EPOCH_CELL.value && (0, import_component_slots.ctxDirectChanged)(block);
     }
-    block.$$ctxDirect.clear();
+    block.$$ctxDirect = null;
   }
   block.$$ctxDepsEpoch = import_context_epoch.EPOCH_CELL.value;
   block.currentRenderMode = keepsTransition !== null ? "urgent" : block.pendingMode ?? prevBlock?.currentRenderMode ?? "urgent";
@@ -1104,7 +1104,24 @@ function renderVisibleTry(state, source) {
     disarmTransitionJournal(journalCheckpoint);
   }
 }
-function renderInitialSuspenseHydration(state, initial, updated = false) {
+function acceptInitialHydrationQuery(state, initial, query) {
+  if (query.refined || initial.query !== query || state.pendingThenable !== query.waiting || import_suspense.initialSuspenseHydrations?.get(state) !== initial)
+    return;
+  (0, import_engine.journalRootProperty)(query, "refined", void 0);
+  query.refined = true;
+}
+function renderInitialSuspenseHydration(state, initial, updated = false, queryCapture, refineQuery) {
+  if (refineQuery !== void 0) {
+    if (!refineQuery.refined) {
+      if (WIP_CAPTURE === null) acceptInitialHydrationQuery(state, initial, refineQuery);
+      else
+        (WIP_CAPTURE.renderCleanups ??= []).push((discarded) => {
+          if (!discarded) acceptInitialHydrationQuery(state, initial, refineQuery);
+        });
+    }
+    if (import_hydration.HYDRATION_PASS !== null) import_hydration.HYDRATION_PASS.node = (0, import_templates.getNextSibling)(state.end);
+    return;
+  }
   if (state.pendingThenable !== null && ROOT_RENDER_TRANSACTION?.rootRequest === true)
     (0, import_commit.journalObjectOnce)(state);
   state.pendingThenable = null;
@@ -1118,11 +1135,14 @@ function renderInitialSuspenseHydration(state, initial, updated = false) {
     return;
   }
   if (initial.waits !== void 0) {
+    queryCapture ??= initial.queryCapture;
+    if (queryCapture !== void 0) initial.queryCapture = queryCapture;
     const taken = (0, import_suspense.waitForStreamedArm)(state, initial);
     if (taken === null) return;
     initial = taken;
   }
   state.idState.next = initial.idStart;
+  const firstAttempt = state.branch === -1;
   const block = import_suspense.TRY_OPS.createBody(state, initial.start, initial.end);
   state.block = block;
   import_suspense.TRY_OPS.setBranch(state, 1);
@@ -1145,6 +1165,7 @@ function renderInitialSuspenseHydration(state, initial, updated = false) {
   const previousNative = (0, import_read_protocol.setNativeAdoptionResolver)(null);
   const diagnostics = (0, import_hydration.holdDiagnostics)();
   let suspended = null;
+  let finishQuery = void 0;
   let failed = false;
   let failure;
   try {
@@ -1152,6 +1173,7 @@ function renderInitialSuspenseHydration(state, initial, updated = false) {
       hydration.nativeAdoption = (0, import_engine.ownNativeAdoption)(block, initial.nativeRaw);
       (0, import_read_protocol.setNativeAdoptionResolver)(hydration.nativeAdoption.resolve);
     }
+    finishQuery = firstAttempt && state.env !== void 0 ? queryCapture?.(state.env) : void 0;
     (0, import_signal_owners.renderBlock)(block);
     if (hydration.deferred !== null) (0, import_hydration.claimDeferred)(hydration);
     (0, import_engine.drainHydrationRenderPhaseUpdates)(block, true);
@@ -1161,7 +1183,13 @@ function renderInitialSuspenseHydration(state, initial, updated = false) {
   } catch (error) {
     failed = true;
     failure = (0, import_hydration.hydrationFailure)(hydration, error);
-    if ((0, import_use.isSuspenseException)(error)) suspended = error.thenable;
+    const finish = finishQuery;
+    finishQuery = void 0;
+    if ((0, import_use.isSuspenseException)(error)) {
+      suspended = error.thenable;
+      const retains = finish?.(suspended);
+      if (retains !== void 0) initial.query = { waiting: suspended, retains };
+    } else finish?.();
     if (typeof __OCTANE_PROFILE_ENABLED__ !== "undefined" && __OCTANE_PROFILE_ENABLED__)
       (0, import_profiling.__profileCount)(import_profiling.ProfileCounter.ROLLBACK_HYDRATION);
     if (transaction !== null) (0, import_commit.dropRootOps)(transaction, opsMark, retiredMark);
@@ -1185,6 +1213,7 @@ function renderInitialSuspenseHydration(state, initial, updated = false) {
     state.tryBlock = null;
     (0, import_component_slots.discardOffscreenCapture)(capture);
   } finally {
+    finishQuery?.();
     (0, import_hydration.releaseDiagnostics)(diagnostics, failed && !(failure instanceof import_hydration.HydrationMismatch));
     if (failure instanceof import_hydration.HydrationMismatch || failure === import_hydration_input_control.INITIAL_ADOPTION_INPUT_CHANGED || suspended !== null)
       (0, import_hydration.discardSeeds)(hydration);

package/dist/cjs/runtime/suspense.cjs

@@ -914,6 +914,7 @@ function tryBlock(parentScope, slotKey, domParent, tryBody, catchBody, pendingBo
   let supersedesInputs = false;
   let initial = state === void 0 || !import_hydration_flag.hydrationStarted ? void 0 : initialSuspenseHydrations?.get(state);
   let updated = false;
+  let refineQuery;
   if (state === void 0) {
     let start;
     let end;
@@ -983,9 +984,23 @@ function tryBlock(parentScope, slotKey, domParent, tryBody, catchBody, pendingBo
     if (domParent.nodeType === 11) (0, import_commit.noteFrontierMember)(domParent, newState);
     state = newState;
   } else {
-    const unchangedCapture = initial !== void 0 && (preserveHydrationCapture === 2 || preserveHydrationCapture === 1 && initial.waits !== void 0) && hydrationInputsEqual !== void 0 && state.tryBody === tryBody && state.env !== env && !(0, import_hooks.depsChanged)(state.env, env);
+    const unchangedCapture = initial !== void 0 && (preserveHydrationCapture === 2 || typeof preserveHydrationCapture === "function" || preserveHydrationCapture === 1 && initial.waits !== void 0) && hydrationInputsEqual !== void 0 && state.tryBody === tryBody && state.env !== env && !(0, import_hooks.depsChanged)(state.env, env);
     const retains = state.branch === 2 || state.retrySignalOwners !== void 0;
-    const changed = (retains || initial !== void 0) && (state.tryBody !== tryBody || state.env !== env && (initial !== void 0 && hydrationInputsEqual && state.env && env ? !(unchangedCapture && preserveHydrationCapture === 1) && !hydrationInputsEqual(state.env, env) : (0, import_hooks.depsChanged)(state.env, env)));
+    let changed = false;
+    if (retains || initial !== void 0) {
+      changed = state.tryBody !== tryBody;
+      if (!changed && state.env !== env) {
+        if (initial !== void 0 && hydrationInputsEqual && state.env && env) {
+          const equal = unchangedCapture && preserveHydrationCapture === 1 ? true : hydrationInputsEqual(state.env, env);
+          if (equal === 2) {
+            const query = initial.query;
+            if (query !== void 0 && state.pendingThenable === query.waiting && query.retains())
+              refineQuery = query;
+            else changed = true;
+          } else changed = !equal;
+        } else changed = (0, import_hooks.depsChanged)(state.env, env);
+      }
+    }
     if (unchangedCapture && !changed) env = state.env;
     supersedesInputs = retains && changed;
     updated = initial !== void 0 && changed;
@@ -1009,7 +1024,13 @@ function tryBlock(parentScope, slotKey, domParent, tryBody, catchBody, pendingBo
     if (initial !== void 0) registerInitialSuspenseHydration(s, initial);
   }
   if (initial !== void 0) {
-    (0, import_hydration.initialSuspenseHydrationRenderer)(s, initial, updated);
+    (0, import_hydration.initialSuspenseHydrationRenderer)(
+      s,
+      initial,
+      updated,
+      typeof preserveHydrationCapture === "function" ? preserveHydrationCapture : void 0,
+      refineQuery
+    );
   } else if (s.passthrough) {
     renderPassthroughTry(s);
     return s.reset;
@@ -1318,7 +1339,10 @@ function clientRenderDehydratedTry(state, outer) {
 function retryInitialSuspenseHydration(state, initial) {
   const hiddenActivity = TRY_OPS.hiddenActivity(state.parentBlock);
   try {
-    (0, import_render.renderInitialSuspenseHydration)(state, initial);
+    const query = initial.query;
+    const updated = query?.refined === true && state.pendingThenable === query.waiting && !query.retains();
+    if (updated) (0, import_signal_owners.supersedeSignalRetryOwners)(state);
+    (0, import_render.renderInitialSuspenseHydration)(state, initial, updated);
   } catch (error) {
     TRY_OPS.resumeError(state.parentBlock, error);
   } finally {

package/dist/cjs/signals/graph.cjs

@@ -42,6 +42,7 @@ __export(graph_exports, {
   isThenable: () => isThenable,
   linkReads: () => linkReads,
   originalScopedNodeGet: () => originalScopedNodeGet,
+  originalScopedNodeStateGetter: () => originalScopedNodeStateGetter,
   pendingState: () => pendingState,
   presentDuringFlush: () => presentDuringFlush,
   promoteDeclarationView: () => promoteDeclarationView,
@@ -715,6 +716,7 @@ class ScopedNode {
 }
 const hasScopedNodeBrand = /* @__PURE__ */ (() => ScopedNode.hasNativeBrand)();
 const originalScopedNodeGet = /* @__PURE__ */ (() => ScopedNode.prototype.get)();
+const originalScopedNodeStateGetter = /* @__PURE__ */ (() => Object.getOwnPropertyDescriptor(ScopedNode.prototype, "state").get)();
 function inspectNativeNode(node, read) {
   const dependencies = [];
   for (let link = node.deps; link; link = link.nextDep) {
@@ -1402,6 +1404,7 @@ function retireGraph(owner, nodes) {
   isThenable,
   linkReads,
   originalScopedNodeGet,
+  originalScopedNodeStateGetter,
   pendingState,
   presentDuringFlush,
   promoteDeclarationView,

package/dist/cjs/version.cjs

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