octane 0.3.0 → 0.3.2

package/dist/cjs/runtime.server.cjs

@@ -196,6 +196,8 @@ var import_trusted_html = require("./trusted-html.cjs");
 var import_read_protocol = require("./signals/read-protocol.cjs");
 var import_hook_slot_cache = require("./hook-slot-cache.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_constants = require("./constants.cjs");
 var import_independent_hydration_protocol = require("./independent-hydration-protocol.cjs");
 var import_has_own = require("./has-own.cjs");
@@ -372,7 +374,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;
@@ -546,10 +548,8 @@ function ssrNestingText(value) {
 }
 const NOOP = () => {
 };
-const ELEMENT_TAG = /* @__PURE__ */ Symbol.for("octane.element");
-const PORTAL_TAG = /* @__PURE__ */ Symbol.for("octane.portal");
-const Fragment = /* @__PURE__ */ Symbol.for("octane.Fragment");
-const Activity = /* @__PURE__ */ Symbol.for("octane.Activity");
+const Fragment = import_runtime_tags.FRAGMENT_TAG;
+const Activity = import_runtime_tags.ACTIVITY_TAG;
 const SCOPED_ELEMENT_PROPS = /* @__PURE__ */ new WeakSet();
 const SCOPED_CHILDREN_RESOLVER = /* @__PURE__ */ Symbol("octane.scopedChildrenResolver");
 const SCOPED_VALUE_RESOLVER = /* @__PURE__ */ Symbol("octane.scopedValueResolver");
@@ -750,7 +750,7 @@ function nativeCreateScopedValue(readElement) {
   return scopedValueDescriptor(createNativeServerScopedResolver(readElement));
 }
 function scopedValueDescriptor(resolve) {
-  const descriptor = { $$kind: ELEMENT_TAG };
+  const descriptor = { $$kind: import_runtime_tags.ELEMENT_TAG };
   Object.defineProperty(descriptor, SCOPED_VALUE_RESOLVER, { value: resolve });
   Object.defineProperty(descriptor, "type", SCOPED_VALUE_PROPERTIES.type);
   Object.defineProperty(descriptor, "props", SCOPED_VALUE_PROPERTIES.props);
@@ -800,7 +800,7 @@ function scopedElementDescriptor(type, copiedProps, key, children, invocationSit
   setScopedChildrenResolver(copiedProps, children);
   SCOPED_ELEMENT_PROPS.add(copiedProps);
   const descriptor = {
-    $$kind: ELEMENT_TAG,
+    $$kind: import_runtime_tags.ELEMENT_TAG,
     type,
     props: copiedProps,
     key,
@@ -834,7 +834,7 @@ function createElementFromConfig(invocationSite, type, props, children) {
   (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,
@@ -850,7 +850,7 @@ function positionalChildren(children) {
   return children;
 }
 function isElementDescriptor(v) {
-  return v != null && v.$$kind === ELEMENT_TAG;
+  return v != null && v.$$kind === import_runtime_tags.ELEMENT_TAG;
 }
 function isFragmentDescriptor(value) {
   return isElementDescriptor(value) && value.type === Fragment;
@@ -862,7 +862,7 @@ function fragmentDescriptorChildren(value) {
 }
 function fragmentRefDescriptor(value) {
   return {
-    $$kind: ELEMENT_TAG,
+    $$kind: import_runtime_tags.ELEMENT_TAG,
     type: renderFragmentRefDescriptor,
     props: value,
     key: value.key,
@@ -1052,7 +1052,7 @@ function cloneElement(element, config, ...children) {
   let descriptor;
   if (preserveScopedChildren) {
     descriptor = {
-      $$kind: ELEMENT_TAG,
+      $$kind: import_runtime_tags.ELEMENT_TAG,
       type: element.type,
       props,
       key,
@@ -1066,7 +1066,7 @@ function cloneElement(element, config, ...children) {
     if (scopedResolver !== void 0) setScopedChildrenResolver(descriptor, scopedResolver);
   } else {
     descriptor = {
-      $$kind: ELEMENT_TAG,
+      $$kind: import_runtime_tags.ELEMENT_TAG,
       type: element.type,
       props,
       key,
@@ -1085,7 +1085,7 @@ function cloneAndReplaceElementKey(element, key) {
     const get = Object.getOwnPropertyDescriptor(element, "children").get;
     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,
@@ -1104,7 +1104,7 @@ function cloneAndReplaceElementKey(element, key) {
     }
   } else {
     descriptor = {
-      $$kind: ELEMENT_TAG,
+      $$kind: import_runtime_tags.ELEMENT_TAG,
       type: element.type,
       props: element.props,
       key,
@@ -1167,7 +1167,7 @@ function mapIntoChildren(children, out, escapedPrefix, nameSoFar, callback) {
     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 child = children;
     let mapped = callback(child);
@@ -1266,7 +1266,7 @@ const Children = {
 };
 function createPortal(body, target, props = void 0) {
   const key = typeof props === "string" || typeof props === "number" ? String(props) : null;
-  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 HTML_ESCAPE_RE = /[&<>]/;
 const SERVER_HTML = /* @__PURE__ */ Symbol.for("octane.serverHtml");
@@ -1301,7 +1301,7 @@ function ssrHtml(html) {
 const BINDING_HTML_ROOT = /* @__PURE__ */ Symbol.for("octane.binding.html");
 function ssrBindingHtml(html, id) {
   const output = new ServerHtml(html);
-  output[BINDING_HTML_ROOT] = "[b;" + id + ";root";
+  output[BINDING_HTML_ROOT] = (0, import_dom_binding_protocol.bindingRootMarker)(id);
   return output;
 }
 function bindPresentationView(view, _id) {
@@ -1396,7 +1396,7 @@ function ssrChildValue(v, scope, includeKeyedSingle, selfMarkItem = false) {
     return v[SERVER_HTML];
   }
   if (v == null || v === false || v === true) return ssrBlock("");
-  if ((typeof v === "object" || typeof v === "function") && (v.$$kind === CONTEXT_TAG || typeof v.then === "function")) {
+  if ((typeof v === "object" || typeof v === "function") && (v.$$kind === import_runtime_tags.CONTEXT_TAG || typeof v.then === "function")) {
     return ssrChildValue(
       use(v),
       scope,
@@ -1420,7 +1420,7 @@ function ssrChildValue(v, scope, includeKeyedSingle, selfMarkItem = false) {
   if (typeof v === "function")
     return ssrComponent(scope, v, {}, void 0, void 0, true);
   if (typeof v === "object") {
-    if (v.$$kind === ELEMENT_TAG) {
+    if (v.$$kind === import_runtime_tags.ELEMENT_TAG) {
       const d = v;
       const render = () => {
         if (typeof d.type === "string") {
@@ -1435,7 +1435,7 @@ function ssrChildValue(v, scope, includeKeyedSingle, selfMarkItem = false) {
       const renderType = () => withAsyncIdentity("child-type", d.type, render);
       return d.key != null ? withAsyncIdentity("child-key", d.key, renderType, true) : renderType();
     }
-    if (v.$$kind === PORTAL_TAG) return ssrBlock(ssrPortal());
+    if (v.$$kind === import_runtime_tags.PORTAL_TAG) return ssrBlock(ssrPortal());
     throw invalidChildError(v);
   }
   return ssrBlock(escapeHtml(v));
@@ -1576,14 +1576,14 @@ function ssrDeoptBlockChildren(children, scope) {
 }
 function serverDescNeedsBlocks(v) {
   if (v == null || typeof v !== "object") return false;
-  if (v.$$kind === CONTEXT_TAG || typeof v.then === "function") return true;
+  if (v.$$kind === import_runtime_tags.CONTEXT_TAG || typeof v.then === "function") return true;
   if (Array.isArray(v)) {
     for (let i = 0; i < v.length; i++) if (serverDescNeedsBlocks(v[i])) return true;
     return false;
   }
   if (!isElementDescriptor(v) && (0, import_shared_value_helpers.childrenIterator)(v) !== null) return true;
   const d = v;
-  if (d.$$kind === ELEMENT_TAG) {
+  if (d.$$kind === import_runtime_tags.ELEMENT_TAG) {
     if (d.type === Fragment || d.type === Activity) return true;
     return typeof d.type === "function" || serverDescNeedsBlocks(d.children);
   }
@@ -1607,7 +1607,7 @@ function serverHostHasPrimitiveChildren(children) {
   return children === null || typeof children !== "object" && typeof children !== "function";
 }
 function ssrDeoptItemContent(value, scope) {
-  if (value !== null && typeof value === "object" && value.$$kind === ELEMENT_TAG) {
+  if (value !== null && typeof value === "object" && value.$$kind === import_runtime_tags.ELEMENT_TAG) {
     const descriptor = value;
     if (typeof descriptor.type === "string") {
       const type = descriptor.type;
@@ -1627,7 +1627,7 @@ function ssrDescriptorContent(v, scope) {
     for (let i = 0; i < v.length; i++) out += ssrDescriptorContent(v[i], scope);
     return out;
   }
-  if (typeof v === "object" && v.$$kind === ELEMENT_TAG) {
+  if (typeof v === "object" && v.$$kind === import_runtime_tags.ELEMENT_TAG) {
     const d = v;
     if (typeof d.type === "string") return ssrHostElement(d.type, d.props, d.children, scope);
     return ssrComponentDescriptor(d, scope);
@@ -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 {
@@ -3312,7 +3328,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
 );
 let VT_SSR_TRY_SEQ = 0;
 let VT_SSR_HAS_CANDIDATES = false;
@@ -3495,11 +3511,7 @@ function vtSsrAnnotateScope(html) {
     true
   );
   const valid = roots === 1 && !sentinel && !text;
-  if (valid)
-    injectStyle(
-      "octane-view-transition-scope",
-      '[vt-scope="element"]{view-transition-scope:all!important}'
-    );
+  if (valid) injectStyle(import_css.VIEW_TRANSITION_SCOPE_STYLE_ID, import_css.VIEW_TRANSITION_SCOPE_CSS);
   return vtSsrMapTags(
     html,
     (open) => vtSsrInject(open, [["vt-scope", valid ? "element" : "none"]]),
@@ -3691,12 +3703,11 @@ const ErrorBoundary = /* @__PURE__ */ (0, import_component_flags.markComponentFl
   import_component_flags.COMPONENT_FLAG_BOUNDARY,
   "ErrorBoundary"
 );
-const CONTEXT_TAG = /* @__PURE__ */ Symbol.for("octane.context");
 function createContext(defaultValue) {
   const ctx = function ProviderBody(props, scope) {
     return ssrHtml(renderServerContextProvider(ctx, props, scope));
   };
-  ctx.$$kind = CONTEXT_TAG;
+  ctx.$$kind = import_runtime_tags.CONTEXT_TAG;
   ctx.defaultValue = defaultValue;
   (0, import_context_identity.registerContext)(ctx);
   if (process.env.NODE_ENV !== "production") {
@@ -3731,7 +3742,7 @@ function readContext(ctx) {
   return ctx.defaultValue;
 }
 function useContext(ctx) {
-  if (ctx && ctx.$$kind === CONTEXT_TAG) return readContext(ctx);
+  if (ctx && ctx.$$kind === import_runtime_tags.CONTEXT_TAG) return readContext(ctx);
   return readHostedForeignContext(ctx, "useContext");
 }
 const SSR_SUSPENSE = /* @__PURE__ */ Symbol("octane.ssr.suspense");
@@ -3923,7 +3934,7 @@ function use(usable, siteKey, directSite) {
       "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) {
     recordSkippedHydrationSite(SERIAL, directSite);
     return readContext(usable);
   }
@@ -4290,18 +4301,17 @@ function warmChild(comp, props) {
   }
 }
 let LAZY_ID = 0;
-const LAZY_COMPONENT = /* @__PURE__ */ Symbol.for("octane.lazy");
 function resolveLazyModule(mod) {
   let comp = mod;
   if (mod != null) {
     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_server_generated.formatServerError)(
         10,
-        comp?.[LAZY_COMPONENT] === true ? "lazy component" : typeof comp
+        comp?.[import_runtime_tags.LAZY_COMPONENT_TAG] === true ? "lazy component" : typeof comp
       )
     );
   }
@@ -4367,7 +4377,7 @@ function lazy(load) {
     }
     throw SSR_SUSPENSE;
   };
-  Object.defineProperty(lazyWrapper, LAZY_COMPONENT, {
+  Object.defineProperty(lazyWrapper, import_runtime_tags.LAZY_COMPONENT_TAG, {
     get() {
       return this === lazyWrapper;
     }
@@ -4539,7 +4549,7 @@ function useDebugValue(_value, _format) {
 function requestFormReset(_form) {
 }
 function useId() {
-  return ":" + ID_PREFIX + "in-" + (ID_COUNTER++).toString(36) + ":";
+  return (0, import_hydration_markers.formatUseId)(ID_PREFIX, ID_COUNTER++);
 }
 function throwOnServerEffectEventCall() {
   throw new Error((0, import_error_codes_server_generated.formatServerError)(11));
@@ -4675,10 +4685,9 @@ function startTransition(fn) {
 function flushSync(fn) {
   return fn();
 }
-const CHILDREN_BLOCK = /* @__PURE__ */ Symbol.for("octane.childrenBlock");
 function markChildrenBlock(fn) {
   if (typeof fn === "function") {
-    fn[CHILDREN_BLOCK] = true;
+    fn[import_runtime_tags.CHILDREN_BLOCK_TAG] = true;
   }
   return fn;
 }
@@ -4686,7 +4695,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 injectStyle(id, css, nonce) {
   if (CSS !== null) {
@@ -5050,7 +5059,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 +5181,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 +6532,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 +6626,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 +6643,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 +6958,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 +7002,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 +7170,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 +7183,7 @@ function renderToPipeableStream(entryComponent, props, options) {
           options?.onShellReady?.();
         },
         shellError(err) {
+          cancelInjection(err);
           releaseServerRenderResources(resolved);
           shellFailure = { error: err };
           options?.onShellError?.(err);
@@ -7170,14 +7194,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 +7388,7 @@ function renderToReadableStream(entryComponent, props, options) {
       };
     }
     const resolved = newResolvedMap(renderOptions);
+    const cancelInjection = createInjectionCanceler(renderOptions.injection);
     const release = () => {
       if (released) return;
       released = true;
@@ -7369,6 +7397,7 @@ function renderToReadableStream(entryComponent, props, options) {
     const settleFailure = (error) => {
       if (terminal) return;
       terminal = true;
+      cancelInjection(error);
       try {
         release();
       } catch (err) {
@@ -7421,7 +7450,8 @@ function renderToReadableStream(entryComponent, props, options) {
           settleFailure(err);
         }
       },
-      resolved
+      resolved,
+      cancelInjection
     ).catch((err) => {
       renderOptions.onError?.(err);
       settleFailure(err);