octane 0.3.0 → 0.3.1

package/dist/cjs/index.cjs

@@ -33,6 +33,7 @@ __export(index_exports, {
   TsrxErrorBoundary: () => import_runtime.TsrxErrorBoundary,
   ViewTransition: () => import_runtime.ViewTransition,
   ViewTransitionPseudoElement: () => import_runtime.ViewTransitionPseudoElement,
+  __HydrateCompiled: () => import_runtime.__HydrateCompiled,
   __createVoidRoot: () => import_runtime.__createVoidRoot,
   __hydrateVoidRoot: () => import_runtime.__hydrateVoidRoot,
   __methodDep: () => import_method_dep.__methodDep,
@@ -272,6 +273,7 @@ var import_method_dep = require("./method-dep.cjs");
   TsrxErrorBoundary,
   ViewTransition,
   ViewTransitionPseudoElement,
+  __HydrateCompiled,
   __createVoidRoot,
   __hydrateVoidRoot,
   __methodDep,

package/dist/cjs/runtime.cjs

@@ -31,6 +31,8 @@ __export(runtime_exports, {
   TsrxErrorBoundary: () => TsrxErrorBoundary,
   ViewTransition: () => ViewTransition,
   ViewTransitionPseudoElement: () => ViewTransitionPseudoElement,
+  __HydrateCompiled: () => __HydrateCompiled,
+  __createCompiledContext: () => __createCompiledContext,
   __createVoidRoot: () => __createVoidRoot,
   __hydrateVoidRoot: () => __hydrateVoidRoot,
   __useLinkedStateWithGetter: () => __useLinkedStateWithGetter,
@@ -8407,6 +8409,34 @@ function createContext(defaultValue) {
   const ctx = function ProviderBody(props, scope) {
     return renderClientContextProvider(ctx, props, scope);
   };
+  return initializeContext(ctx, defaultValue);
+}
+// @__NO_SIDE_EFFECTS__
+function __createCompiledContext(defaultValue) {
+  const ctx = function ProviderBody(props, scope) {
+    provideContext(scope, ctx, props.value);
+    const children = props.children;
+    if (children == null) return;
+    const dialect = children[CHILDREN_BODY] ?? children;
+    const previous = scope.hooks?.get(CHILDREN_DIALECT_SLOT);
+    if (previous !== dialect) {
+      if (previous !== void 0 && (previous === 2 || dialect === 2)) {
+        resetScopeChildren(scope);
+        if (scope.block.disposed) return;
+      } else if (previous !== void 0) {
+        invalidateSharedBodyOutput(scope);
+        if (TRANSITION_JOURNAL !== null && !ROOT_RENDER_ROLLBACK) {
+          const hooks = scope.hooks;
+          journalUndo(() => hooks.set(CHILDREN_DIALECT_SLOT, previous));
+        }
+      }
+      ensureHooks(scope).set(CHILDREN_DIALECT_SLOT, dialect);
+    }
+    renderSharedBody(children, void 0, scope, void 0);
+  };
+  return initializeContext(ctx, defaultValue);
+}
+function initializeContext(ctx, defaultValue) {
   ctx.$$kind = CONTEXT_TAG;
   ctx.defaultValue = defaultValue;
   ctx.$$version = 0;
@@ -8785,7 +8815,23 @@ function renderHydrateChild(state, scope, extra) {
   }
   childrenAsBody(state.props.children)(void 0, scope, extra);
 }
+function renderCompiledHydrateChild(state, scope, extra) {
+  if (state.loadedBody !== null) {
+    state.loadedBody(state.props.__data, scope, extra);
+  } else {
+    state.props.children(void 0, scope, extra);
+  }
+}
+const EMPTY_HYDRATE_PENDING = () => void 0;
 function hydrateBoundaryBody(state) {
+  return createHydrateBoundaryBody(state, renderHydrateChild, (_props, scope) => {
+    childSlot(scope, 0, scope.block.parentNode, state.props.fallback, scope.block.endMarker);
+  });
+}
+function compiledHydrateBoundaryBody(state) {
+  return createHydrateBoundaryBody(state, renderCompiledHydrateChild, EMPTY_HYDRATE_PENDING);
+}
+function createHydrateBoundaryBody(state, renderChild, pendingBody) {
   const contentBody = (_props, scope, extra) => {
     try {
       if (state.loadedBody === null) {
@@ -8797,7 +8843,7 @@ function hydrateBoundaryBody(state) {
           if (thenable.status !== "fulfilled") throw new SuspenseException(thenable);
         }
       }
-      renderHydrateChild(state, scope, extra);
+      renderChild(state, scope, extra);
     } catch (error) {
       const hydration = activeHydration();
       if (!state.serverPreserved || state.hydrated || hydration === null || !isSuspenseException(error)) {
@@ -8809,9 +8855,6 @@ function hydrateBoundaryBody(state) {
     state.hydrated = true;
     useEffect(notifyHydrateBoundary, [state, scope], HYDRATE_NOTIFY_SLOT);
   };
-  const pendingBody = (_props, scope) => {
-    childSlot(scope, 0, scope.block.parentNode, state.props.fallback, scope.block.endMarker);
-  };
   return (_props, scope) => {
     tryBlock(
       scope,
@@ -9207,7 +9250,7 @@ function findHydrateSeedSidecar(wrapper, attribute = import_constants.HYDRATE_SE
   }
   return null;
 }
-function createHydrateSlot(props, scope, boundaryId) {
+function createHydrateSlot(props, scope, boundaryId, boundaryBody) {
   const parentBlock = scope.block;
   const parentNode = parentBlock.parentNode;
   const hydration = activeHydration();
@@ -9325,7 +9368,7 @@ function createHydrateSlot(props, scope, boundaryId) {
   scope.slots[0] = state;
   registerSlot(scope, state);
   if (!state.independent) (0, import_event_capture.registerHydrationIntentBoundary)(wrapper, intentBoundary);
-  block.body = hydrateBoundaryBody(state);
+  block.body = boundaryBody(state);
   const initialStrategy = resolveHydrateStrategy(state);
   const pendingIntents = state.independent ? void 0 : (0, import_event_capture.takePendingHydrationIntents)(wrapper);
   if (state.independent) {
@@ -9582,7 +9625,7 @@ function notifyHydrateBoundary(state, scope) {
     }
   }
 }
-function initializeHydrateComponent() {
+function initializeHydrateComponent(boundaryBody) {
   const hydrate = (0, import_component_flags.markComponentFlags)(
     function Hydrate2(rawProps, scope) {
       const props = rawProps;
@@ -9590,7 +9633,7 @@ function initializeHydrateComponent() {
       let state = scope.slots[0];
       let renderedChild = false;
       if (state === void 0) {
-        state = createHydrateSlot(props, scope, boundaryId);
+        state = createHydrateSlot(props, scope, boundaryId, boundaryBody);
       } else {
         if (state.independent !== (props.__independent !== void 0)) {
           throw new Error((0, import_error_codes_client_generated.formatClientError)(66));
@@ -9639,7 +9682,8 @@ function initializeHydrateComponent() {
   Object.defineProperty(hydrate, "__octanePermanentStatic", { value: permanentStatic });
   return hydrate;
 }
-const Hydrate = /* @__PURE__ */ initializeHydrateComponent();
+const Hydrate = /* @__PURE__ */ initializeHydrateComponent(hydrateBoundaryBody);
+const __HydrateCompiled = /* @__PURE__ */ initializeHydrateComponent(compiledHydrateBoundaryBody);
 const Suspense = /* @__PURE__ */ (0, import_component_flags.markComponentFlags)(
   function Suspense2(props, scope) {
     const block = scope.block;
@@ -12877,6 +12921,8 @@ function bindSignalText(scope, previous, position, value, site, onlyChild = fals
   );
 }
 function bindSignalAttribute(scope, previous, element, name, value, site, attributeKind = "attr") {
+  if (previous === value && value !== void 0 && (value === null || typeof value !== "object" && typeof value !== "function"))
+    return previous;
   return bindDirectSignal(
     scope,
     previous,
@@ -14148,7 +14194,14 @@ function setStyleProperty(el, name, value, staticCss, previous) {
   }
   const remove = value == null || typeof value === "boolean";
   if (remove && previous === CURRENT_SCOPE) return;
-  if (TRANSITION_JOURNAL !== null) journalAttr(el, "style");
+  if (TRANSITION_JOURNAL !== null) {
+    const log = TRANSITION_JOURNAL;
+    let tail = log.length - 4;
+    if (log[tail] === JOURNAL_BAG && log[tail + 1] === CURRENT_SCOPE?.slots[0]) tail -= 4;
+    if (tail < TRANSITION_JOURNAL_CHECKPOINT || log[tail] !== JOURNAL_ATTR || log[tail + 1] !== el || log[tail + 2] !== "style")
+      journalAttr(el, "style");
+    else journalBag();
+  }
   if (hiddenStyleWriter !== null && hiddenStyleWriter(el, value, previous, name)) return;
   const style = (STAGED_DOM?.view(el) ?? el).style;
   if (remove) style.removeProperty((0, import_css.styleName)(name));
@@ -15189,14 +15242,16 @@ function setEventHandler(el, key, handler) {
         SCOPE_SIGNAL_OWNERS.set(owner, false);
       const owners = SIGNAL_EVENT_OWNERS ??= /* @__PURE__ */ new WeakMap();
       if (STAGED_COMMIT_CAPTURE !== null)
-        DEFERRED_LAYOUT_DRIVER.stageAction(() => owners.set(el, owner));
+        DEFERRED_LAYOUT_DRIVER.stageAction(() => {
+          if (owners.get(el) !== owner) owners.set(el, owner);
+        });
       else {
-        if (TRANSITION_JOURNAL !== null) {
-          const previous = owners.get(el);
-          if (previous !== owner)
+        const previous = owners.get(el);
+        if (previous !== owner) {
+          if (TRANSITION_JOURNAL !== null)
             TRANSITION_JOURNAL.push(JOURNAL_EVENT_OWNER, owners, el, previous);
+          owners.set(el, owner);
         }
-        owners.set(el, owner);
       }
     }
   }
@@ -15208,9 +15263,11 @@ function evt0(el, key, fn) {
 }
 function evt0u(d, fn) {
   if (STAGED_COMMIT_CAPTURE !== null) d = DEFERRED_LAYOUT_DRIVER.projectEventBundle(d);
-  if (_dispatchDepth !== 0) preserveDispatchedBundle(d);
-  if (TRANSITION_JOURNAL !== null) journalObjectOnce(d);
-  d.fn = fn;
+  if (d.fn !== fn) {
+    if (_dispatchDepth !== 0) preserveDispatchedBundle(d);
+    if (TRANSITION_JOURNAL !== null) journalObjectOnce(d);
+    d.fn = fn;
+  }
   if ((SIGNAL_BINDINGS_ENABLED || import_document_owner.signalDocumentEnabled || import_owner_context.activeSynchronousSignalOwner !== null || import_owner_context.activeSignalOwnerEnvironment !== void 0 || SIGNAL_EVENT_OWNERS !== null) && (import_owner_context.activeSynchronousSignalOwner !== null || import_owner_context.activeSignalOwnerEnvironment !== void 0 || STAGED_COMMIT_CAPTURE !== null || import_document_owner.signalDocumentEnabled || CURRENT_SCOPE?.block.idState.renderOwner?.signalOwner !== void 0 || SIGNAL_EVENT_OWNERS?.get(d.el) !== CURRENT_SCOPE))
     setEventHandler(d.el);
 }
@@ -15221,10 +15278,12 @@ function evt1(el, key, fn, a0) {
 }
 function evt1u(d, fn, a0) {
   if (STAGED_COMMIT_CAPTURE !== null) d = DEFERRED_LAYOUT_DRIVER.projectEventBundle(d);
-  if (_dispatchDepth !== 0) preserveDispatchedBundle(d);
-  if (TRANSITION_JOURNAL !== null) journalObjectOnce(d);
-  d.fn = fn;
-  d.a0 = a0;
+  if (d.fn !== fn || !Object.is(d.a0, a0)) {
+    if (_dispatchDepth !== 0) preserveDispatchedBundle(d);
+    if (TRANSITION_JOURNAL !== null) journalObjectOnce(d);
+    d.fn = fn;
+    d.a0 = a0;
+  }
   if ((SIGNAL_BINDINGS_ENABLED || import_document_owner.signalDocumentEnabled || import_owner_context.activeSynchronousSignalOwner !== null || import_owner_context.activeSignalOwnerEnvironment !== void 0 || SIGNAL_EVENT_OWNERS !== null) && (import_owner_context.activeSynchronousSignalOwner !== null || import_owner_context.activeSignalOwnerEnvironment !== void 0 || STAGED_COMMIT_CAPTURE !== null || import_document_owner.signalDocumentEnabled || CURRENT_SCOPE?.block.idState.renderOwner?.signalOwner !== void 0 || SIGNAL_EVENT_OWNERS?.get(d.el) !== CURRENT_SCOPE))
     setEventHandler(d.el);
 }
@@ -15235,11 +15294,13 @@ function evt2(el, key, fn, a0, a1) {
 }
 function evt2u(d, fn, a0, a1) {
   if (STAGED_COMMIT_CAPTURE !== null) d = DEFERRED_LAYOUT_DRIVER.projectEventBundle(d);
-  if (_dispatchDepth !== 0) preserveDispatchedBundle(d);
-  if (TRANSITION_JOURNAL !== null) journalObjectOnce(d);
-  d.fn = fn;
-  d.a0 = a0;
-  d.a1 = a1;
+  if (d.fn !== fn || !Object.is(d.a0, a0) || !Object.is(d.a1, a1)) {
+    if (_dispatchDepth !== 0) preserveDispatchedBundle(d);
+    if (TRANSITION_JOURNAL !== null) journalObjectOnce(d);
+    d.fn = fn;
+    d.a0 = a0;
+    d.a1 = a1;
+  }
   if ((SIGNAL_BINDINGS_ENABLED || import_document_owner.signalDocumentEnabled || import_owner_context.activeSynchronousSignalOwner !== null || import_owner_context.activeSignalOwnerEnvironment !== void 0 || SIGNAL_EVENT_OWNERS !== null) && (import_owner_context.activeSynchronousSignalOwner !== null || import_owner_context.activeSignalOwnerEnvironment !== void 0 || STAGED_COMMIT_CAPTURE !== null || import_document_owner.signalDocumentEnabled || CURRENT_SCOPE?.block.idState.renderOwner?.signalOwner !== void 0 || SIGNAL_EVENT_OWNERS?.get(d.el) !== CURRENT_SCOPE))
     setEventHandler(d.el);
 }
@@ -15260,10 +15321,12 @@ function evtN(el, key, fn, args) {
 }
 function evtNu(d, fn, args) {
   if (STAGED_COMMIT_CAPTURE !== null) d = DEFERRED_LAYOUT_DRIVER.projectEventBundle(d);
-  if (_dispatchDepth !== 0) preserveDispatchedBundle(d);
-  if (TRANSITION_JOURNAL !== null) journalObjectOnce(d);
-  d.fn = fn;
-  d.args = args;
+  if (d.fn !== fn || d.args !== args) {
+    if (_dispatchDepth !== 0) preserveDispatchedBundle(d);
+    if (TRANSITION_JOURNAL !== null) journalObjectOnce(d);
+    d.fn = fn;
+    d.args = args;
+  }
   if ((SIGNAL_BINDINGS_ENABLED || import_document_owner.signalDocumentEnabled || import_owner_context.activeSynchronousSignalOwner !== null || import_owner_context.activeSignalOwnerEnvironment !== void 0 || SIGNAL_EVENT_OWNERS !== null) && (import_owner_context.activeSynchronousSignalOwner !== null || import_owner_context.activeSignalOwnerEnvironment !== void 0 || STAGED_COMMIT_CAPTURE !== null || import_document_owner.signalDocumentEnabled || CURRENT_SCOPE?.block.idState.renderOwner?.signalOwner !== void 0 || SIGNAL_EVENT_OWNERS?.get(d.el) !== CURRENT_SCOPE))
     setEventHandler(d.el);
 }
@@ -25090,6 +25153,7 @@ function forBlock(parentScope, slotKey, domParent, inputItems, getKey, itemBody,
     parentScope.slots[slotKey] = state;
     registerSlot(parentScope, state);
   }
+  if (hydration !== null && state.size === 0) hydration.node = getNextSibling(state.start);
   const serverMarkerState = hydration?.markerState(state.start) ?? -1;
   if (ROOT_RENDER_TRANSACTION !== null && state.env !== deps)
     journalRootProperty(state, "env", state.env);
@@ -25183,6 +25247,7 @@ function forBlock(parentScope, slotKey, domParent, inputItems, getKey, itemBody,
       (f & 2) !== 0,
       (f & 16) !== 0
     );
+    if (hydration !== null) discardLeftoverHydrationItems(state.end, hydration);
   } else {
     reconcileKeyed(
       parentBlock,
@@ -25197,10 +25262,7 @@ function forBlock(parentScope, slotKey, domParent, inputItems, getKey, itemBody,
       (f & 16) !== 0
     );
   }
-  if (hydration !== null) {
-    discardLeftoverHydrationItems(state.end, hydration);
-    hydration.node = getNextSibling(state.end);
-  }
+  if (hydration !== null) hydration.node = getNextSibling(state.end);
 }
 function keyedForBlock(parentScope, slotKey, domParent, items, getKey, itemBody, flags, deps, emptyBody, anchor, ownEnd, selectionBody) {
   if (CURRENT_BLOCK?.pending && !CURRENT_BLOCK.crossRenderUpdate) return;
@@ -27959,6 +28021,8 @@ function scriptResource(attrs) {
   TsrxErrorBoundary,
   ViewTransition,
   ViewTransitionPseudoElement,
+  __HydrateCompiled,
+  __createCompiledContext,
   __createVoidRoot,
   __hydrateVoidRoot,
   __useLinkedStateWithGetter,

package/dist/cjs/runtime.server.cjs

@@ -372,7 +372,7 @@ let SIGNAL_COMPONENT_INSTANCE_KEY = "";
 let SERVER_SIGNAL_OWNER_ACTIVE = false;
 let SIGNAL_CONTROL_SITE = "";
 const EMPTY_SIGNAL_LIST_KEYS = [];
-let SIGNAL_LIST_KEYS = EMPTY_SIGNAL_LIST_KEYS;
+let SIGNAL_LIST_KEYS = null;
 function newStyleCollector() {
   const collector = /* @__PURE__ */ new Map();
   collector.replay = null;
@@ -1751,10 +1751,7 @@ function enterAsyncArm(armKey, mapped = false) {
   const occurrence = frame === null ? 0 : nextFrameOccurrence(frame, "@arm-position:");
   const fallbackPosition = armKey !== null && (typeof armKey === "object" || typeof armKey === "function" || typeof armKey === "symbol") ? previous + "|@arm-position:" + occurrence : void 0;
   if (SERVER_SIGNAL_BINDINGS_POTENTIAL && SIGNAL_CONTROL_SITE.charCodeAt(0) === 102) {
-    SIGNAL_LIST_KEYS = [
-      ...SIGNAL_LIST_KEYS,
-      signalIdentityKey(mapped ? "k" + String(armKey) : armKey)
-    ];
+    SIGNAL_LIST_KEYS = { parent: SIGNAL_LIST_KEYS, key: armKey, mapped, values: null };
   }
   ASYNC_SCOPE = previous + "|@arm:" + asyncIdentityKey(armKey, false, fallbackPosition);
 }
@@ -2823,10 +2820,27 @@ function signalIdentityKey(value) {
 function serverStructuralSignalInstanceKey(invocationSite, key) {
   return resolveServerSignalInstanceKey(SIGNAL_COMPONENT_INSTANCE_KEY) + JSON.stringify([
     invocationSite ?? "legacy",
-    SIGNAL_LIST_KEYS,
+    resolveServerSignalListKeys(SIGNAL_LIST_KEYS),
     key != null ? signalIdentityKey(key) : ""
   ]);
 }
+function resolveServerSignalListKeys(keys) {
+  if (keys === null) return EMPTY_SIGNAL_LIST_KEYS;
+  if (keys.values !== null) return keys.values;
+  const pending = [];
+  let parent = keys;
+  while (parent !== null && parent.values === null) {
+    pending.push(parent);
+    parent = parent.parent;
+  }
+  let values = parent?.values ?? EMPTY_SIGNAL_LIST_KEYS;
+  for (let index = pending.length - 1; index >= 0; index--) {
+    const entry = pending[index];
+    values = [...values, signalIdentityKey(entry.mapped ? "k" + String(entry.key) : entry.key)];
+    entry.values = values;
+  }
+  return values;
+}
 function resolveServerSignalInstanceKey(identity) {
   if (typeof identity === "string") return identity;
   if (identity.signalInstanceKey !== void 0) return identity.signalInstanceKey;
@@ -2843,8 +2857,8 @@ function resolveServerSignalInstanceKey(identity) {
     const frame = pending[index];
     identity += JSON.stringify([
       frame.signalInvocationSite ?? "legacy",
-      frame.signalListKeys,
-      frame.signalKey
+      resolveServerSignalListKeys(frame.signalListKeys ?? null),
+      frame.signalKey != null ? signalIdentityKey(frame.signalKey) : ""
     ]);
     frame.signalInstanceKey = identity;
   }
@@ -2949,7 +2963,7 @@ function renderComponentFramed(comp, props, parent, frame, inherit, instanceKey,
   ASYNC_SCOPE = frame.asyncScope;
   if (instanceKey !== void 0) SIGNAL_COMPONENT_INSTANCE_KEY = instanceKey;
   SIGNAL_CONTROL_SITE = "";
-  SIGNAL_LIST_KEYS = EMPTY_SIGNAL_LIST_KEYS;
+  SIGNAL_LIST_KEYS = null;
   const nativeToken = NATIVE_READ_COLLECTOR === null ? -1 : beginActiveNativeReadScope(scope);
   let nativeCompleted = false;
   try {
@@ -3048,34 +3062,36 @@ function ssrComponent(parent, comp, props, inherit, key, identityScoped, invocat
       });
     }
     const pf = FRAME;
-    const frame = pf === null ? {
-      parent: null,
-      seg: 0,
+    const seg = pf === null ? 0 : nextChildSegment(pf);
+    const namespace = explicitNamespace ?? pf?.namespace;
+    const potentialSignalKey = signalInstanceKey === void 0 && SERVER_SIGNAL_BINDINGS_POTENTIAL;
+    const frame = potentialSignalKey ? {
+      parent: pf,
+      seg,
       nextChild: 0,
       scopedChildren: null,
       occ: null,
       path: null,
       deferred: false,
       asyncScope: ASYNC_SCOPE,
-      namespace: explicitNamespace ?? void 0
+      namespace,
+      signalParentKey: SIGNAL_COMPONENT_INSTANCE_KEY,
+      signalInvocationSite: invocationSite,
+      signalListKeys: SIGNAL_LIST_KEYS,
+      signalKey: key,
+      signalInstanceKey: void 0
     } : {
       parent: pf,
-      seg: nextChildSegment(pf),
+      seg,
       nextChild: 0,
       scopedChildren: null,
       occ: null,
       path: null,
       deferred: false,
       asyncScope: ASYNC_SCOPE,
-      namespace: explicitNamespace ?? pf.namespace
+      namespace
     };
-    if (signalInstanceKey === void 0 && SERVER_SIGNAL_BINDINGS_POTENTIAL) {
-      frame.signalParentKey = SIGNAL_COMPONENT_INSTANCE_KEY;
-      frame.signalInvocationSite = invocationSite;
-      frame.signalListKeys = SIGNAL_LIST_KEYS;
-      frame.signalKey = key != null ? signalIdentityKey(key) : "";
-      signalInstanceKey = frame;
-    }
+    if (potentialSignalKey) signalInstanceKey = frame;
     return renderComponentFramed(
       comp,
       props,
@@ -3158,7 +3174,7 @@ function withServerIndependentIdentity(prefix, idSeed, render) {
   SIGNAL_INSTANCE_PREFIX = prefix;
   SIGNAL_COMPONENT_INSTANCE_KEY = JSON.stringify([prefix, "root"]);
   SIGNAL_CONTROL_SITE = "";
-  SIGNAL_LIST_KEYS = EMPTY_SIGNAL_LIST_KEYS;
+  SIGNAL_LIST_KEYS = null;
   ID_PREFIX = prefix + "-";
   ID_COUNTER = idSeed;
   try {
@@ -5050,7 +5066,7 @@ function runFullFramedPass(component, props, resolved, nonceAttr = "", identifie
   SIGNAL_COMPONENT_INSTANCE_KEY = JSON.stringify([identifierPrefix, "root"]);
   SERVER_SIGNAL_OWNER_ACTIVE = false;
   SIGNAL_CONTROL_SITE = "";
-  SIGNAL_LIST_KEYS = EMPTY_SIGNAL_LIST_KEYS;
+  SIGNAL_LIST_KEYS = null;
   NONCE_ATTR = nonceAttr;
   ASYNC_SCOPE = "";
   MARKERS = markers;
@@ -5172,7 +5188,7 @@ function runDiscoveryRound(jobs, resolved, identifierPrefix) {
   SIGNAL_COMPONENT_INSTANCE_KEY = JSON.stringify([identifierPrefix, "root"]);
   SERVER_SIGNAL_OWNER_ACTIVE = false;
   SIGNAL_CONTROL_SITE = "";
-  SIGNAL_LIST_KEYS = EMPTY_SIGNAL_LIST_KEYS;
+  SIGNAL_LIST_KEYS = null;
   NONCE_ATTR = "";
   ASYNC_SCOPE = "";
   MARKERS = true;
@@ -6523,7 +6539,19 @@ function boundaryErrorChunk(b, nonceAttr) {
   const serverOwnedStatic = b.serverOwnedStatic ? ",1" : "";
   return "<script " + import_constants.STREAM_SCRIPT_ATTR + nonceAttr + ">$OCTRX(" + JSON.stringify(b.id).replace(/</g, "\\u003c") + serverOwnedStatic + ")</script>";
 }
-async function runStream(component, props, options, sink, resolved) {
+function createInjectionCanceler(injection) {
+  if (injection === void 0) return NOOP;
+  let cancelled = false;
+  return (error) => {
+    if (cancelled) return;
+    cancelled = true;
+    try {
+      injection.cancel?.(error);
+    } catch {
+    }
+  };
+}
+async function runStream(component, props, options, sink, resolved, cancelInjection) {
   const timeoutMs = options?.timeoutMs ?? SUSPENSE_TIMEOUT_MS;
   const signal = options?.signal;
   const nonceAttr = nonceAttrOf(options);
@@ -6605,7 +6633,15 @@ async function runStream(component, props, options, sink, resolved) {
       injection.accepted?.();
     });
   };
-  const recoveryInjection = injection === void 0 ? void 0 : async () => {
+  const recoveryInjection = injection === void 0 ? void 0 : async (error) => {
+    let queued = "";
+    if (!injectionFailed) {
+      try {
+        queued = injection.take();
+      } catch {
+      }
+    }
+    cancelInjection(error);
     if (signal?.aborted) {
       await writeChain;
       for (const html of unacceptedInjection) {
@@ -6614,13 +6650,6 @@ async function runStream(component, props, options, sink, resolved) {
       }
       unacceptedInjection.length = 0;
     }
-    if (injectionFailed) return "";
-    let queued;
-    try {
-      queued = injection.take();
-    } catch {
-      return "";
-    }
     if (queued !== "" && signal?.aborted) {
       const replay = write(queued, "recovery");
       if (replay !== void 0) await replay;
@@ -6936,7 +6965,7 @@ async function runStream(component, props, options, sink, resolved) {
     let tail = "";
     if (recoveryInjection !== void 0) {
       try {
-        tail = await recoveryInjection();
+        tail = await recoveryInjection(err);
       } catch {
       }
     }
@@ -6980,7 +7009,7 @@ async function runStream(component, props, options, sink, resolved) {
       injectionUnsubscribe = void 0;
       let terminal = "";
       try {
-        terminal = await recoveryInjection();
+        terminal = await recoveryInjection(err);
       } catch {
       }
       terminal += heldDocumentTail;
@@ -7148,6 +7177,7 @@ function renderToPipeableStream(entryComponent, props, options) {
   const beginRender = (preparedOptions) => {
     const renderOptions = { ...preparedOptions, signal: controller.signal };
     const resolved = newResolvedMap(renderOptions);
+    const cancelInjection = createInjectionCanceler(renderOptions.injection);
     void runStream(
       component,
       props,
@@ -7160,6 +7190,7 @@ function renderToPipeableStream(entryComponent, props, options) {
           options?.onShellReady?.();
         },
         shellError(err) {
+          cancelInjection(err);
           releaseServerRenderResources(resolved);
           shellFailure = { error: err };
           options?.onShellError?.(err);
@@ -7170,14 +7201,17 @@ function renderToPipeableStream(entryComponent, props, options) {
           options?.onAllReady?.();
           flushEnd();
         },
-        fatal() {
+        fatal(err) {
+          cancelInjection(err);
           releaseServerRenderResources(resolved);
           options?.onAllReady?.();
           flushEnd();
         }
       },
-      resolved
+      resolved,
+      cancelInjection
     ).catch((err) => {
+      cancelInjection(err);
       releaseServerRenderResources(resolved);
       options?.onError?.(err);
       flushEnd();
@@ -7361,6 +7395,7 @@ function renderToReadableStream(entryComponent, props, options) {
       };
     }
     const resolved = newResolvedMap(renderOptions);
+    const cancelInjection = createInjectionCanceler(renderOptions.injection);
     const release = () => {
       if (released) return;
       released = true;
@@ -7369,6 +7404,7 @@ function renderToReadableStream(entryComponent, props, options) {
     const settleFailure = (error) => {
       if (terminal) return;
       terminal = true;
+      cancelInjection(error);
       try {
         release();
       } catch (err) {
@@ -7421,7 +7457,8 @@ function renderToReadableStream(entryComponent, props, options) {
           settleFailure(err);
         }
       },
-      resolved
+      resolved,
+      cancelInjection
     ).catch((err) => {
       renderOptions.onError?.(err);
       settleFailure(err);