octane 0.3.0 → 0.3.2

package/dist/runtime.server.d.ts

@@ -1,5 +1,6 @@
 export { trustHTML, type TrustedHTML } from './trusted-html.js';
 export { readNativeDomStyle, readNativeDomProps } from './signals/read-protocol.js';
+import { CONTEXT_TAG, ELEMENT_TAG, FRAGMENT_TAG } from './runtime-tags.js';
 import { EXTERNAL_HYDRATION_PROMISE, HYDRATION_RANGE_BOUNDARY } from './constants.js';
 import { type IndependentHydrateBuildRecord } from './independent-hydration-protocol.js';
 import { normalizeClass } from './css.js';
@@ -46,6 +47,12 @@ export declare function finishNativeReadWitness(token: number, completed: boolea
 /** @internal Shared automatic-cache witness ABI. */
 export declare function replayNativeReadWitness(witness: NativeReadWitness | null | undefined): void;
 type ServerSignalInstanceKey = string | Frame;
+interface ServerSignalListKeys {
+    parent: ServerSignalListKeys | null;
+    key: unknown;
+    mapped: boolean;
+    values: readonly string[] | null;
+}
 interface InjectedStyle {
     css: string;
     nonce?: string;
@@ -63,8 +70,8 @@ interface Frame {
     namespace: 'html' | 'svg' | 'mathml' | undefined;
     signalParentKey?: ServerSignalInstanceKey;
     signalInvocationSite?: string;
-    signalListKeys?: readonly string[];
-    signalKey?: string;
+    signalListKeys?: ServerSignalListKeys | null;
+    signalKey?: unknown;
     signalInstanceKey?: string;
 }
 type ScopedCounts = (string | number)[] | Map<string, number>;
@@ -72,13 +79,12 @@ type ScopedCounts = (string | number)[] | Map<string, number>;
 export declare function ssrElement(tag: string, location: string | undefined, render: () => string, htmlIntegrationPoint?: boolean): string;
 /** Compiler ABI: validate one authored static or dynamic text child in DEV SSR. */
 export declare function ssrNestingText(value: unknown): string;
-declare const ELEMENT_TAG: unique symbol;
 /**
  * React-compatible Fragment sentinel. Value-position `<Fragment>` sites compile
  * to ordinary element descriptors in both modes; ssrChild recognizes this type
  * and flattens its children with the same wrapper/key rules as the client.
  */
-export declare const Fragment: unique symbol;
+export declare const Fragment: typeof FRAGMENT_TAG;
 /**
  * React-19 `<Activity>` sentinel. Direct template sites lower to `ssrActivity`;
  * generic component and descriptor sites dispatch by this same symbol identity.
@@ -418,7 +424,6 @@ export declare const ErrorBoundary: (props: {
     fallback?: unknown;
     children?: unknown;
 }, scope: SSRScope) => string;
-declare const CONTEXT_TAG: unique symbol;
 export interface Context<T> {
     (props: {
         value: T;

package/dist/runtime.server.js

@@ -1,7 +1,22 @@
 import { trustHTML } from "./trusted-html.js";
 import { readNativeDomStyle, readNativeDomProps } from "./signals/read-protocol.js";
 import { resolveHookPath } from "./hook-slot-cache.js";
-import { encodeBindingKey, isBindingOpenComment } from "./dom-binding-protocol.js";
+import {
+  bindingRootMarker,
+  encodeBindingKey,
+  isBindingOpenComment
+} from "./dom-binding-protocol.js";
+import { formatUseId } from "./hydration-markers.js";
+import {
+  ACTIVITY_TAG,
+  CHILDREN_BLOCK_TAG as CHILDREN_BLOCK,
+  CONTEXT_TAG,
+  ELEMENT_TAG,
+  FRAGMENT_TAG,
+  LAZY_COMPONENT_TAG as LAZY_COMPONENT,
+  PORTAL_TAG,
+  SUSPENSE_TAG
+} from "./runtime-tags.js";
 import {
   BLOCK_OPEN,
   BLOCK_CLOSE,
@@ -75,7 +90,9 @@ import {
   devWarnStyleProperty,
   mergeClass,
   normalizeClass,
-  styleName
+  styleName,
+  VIEW_TRANSITION_SCOPE_CSS,
+  VIEW_TRANSITION_SCOPE_STYLE_ID
 } from "./css.js";
 import {
   invalidHtmlNestingWithAncestor,
@@ -269,7 +286,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;
@@ -443,10 +460,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 = FRAGMENT_TAG;
+const Activity = 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");
@@ -1198,7 +1213,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] = bindingRootMarker(id);
   return output;
 }
 function bindPresentationView(view, _id) {
@@ -1648,10 +1663,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);
 }
@@ -2720,10 +2732,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;
@@ -2740,8 +2769,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;
   }
@@ -2846,7 +2875,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 {
@@ -2945,34 +2974,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,
@@ -3055,7 +3086,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 {
@@ -3209,7 +3240,7 @@ const Suspense = /* @__PURE__ */ markComponentFlags(
   },
   COMPONENT_FLAG_BOUNDARY,
   "Suspense",
-  /* @__PURE__ */ Symbol.for("octane.suspense")
+  SUSPENSE_TAG
 );
 let VT_SSR_TRY_SEQ = 0;
 let VT_SSR_HAS_CANDIDATES = false;
@@ -3392,11 +3423,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(VIEW_TRANSITION_SCOPE_STYLE_ID, VIEW_TRANSITION_SCOPE_CSS);
   return vtSsrMapTags(
     html,
     (open) => vtSsrInject(open, [["vt-scope", valid ? "element" : "none"]]),
@@ -3588,7 +3615,6 @@ const ErrorBoundary = /* @__PURE__ */ markComponentFlags(
   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));
@@ -4187,7 +4213,6 @@ 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) {
@@ -4436,7 +4461,7 @@ function useDebugValue(_value, _format) {
 function requestFormReset(_form) {
 }
 function useId() {
-  return ":" + ID_PREFIX + "in-" + (ID_COUNTER++).toString(36) + ":";
+  return formatUseId(ID_PREFIX, ID_COUNTER++);
 }
 function throwOnServerEffectEventCall() {
   throw new Error(formatServerError(11));
@@ -4572,7 +4597,6 @@ 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;
@@ -4947,7 +4971,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;
@@ -5069,7 +5093,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;
@@ -6420,7 +6444,19 @@ function boundaryErrorChunk(b, nonceAttr) {
   const serverOwnedStatic = b.serverOwnedStatic ? ",1" : "";
   return "<script " + 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);
@@ -6502,7 +6538,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) {
@@ -6511,13 +6555,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;
@@ -6833,7 +6870,7 @@ async function runStream(component, props, options, sink, resolved) {
     let tail = "";
     if (recoveryInjection !== void 0) {
       try {
-        tail = await recoveryInjection();
+        tail = await recoveryInjection(err);
       } catch {
       }
     }
@@ -6877,7 +6914,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;
@@ -7045,6 +7082,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,
@@ -7057,6 +7095,7 @@ function renderToPipeableStream(entryComponent, props, options) {
           options?.onShellReady?.();
         },
         shellError(err) {
+          cancelInjection(err);
           releaseServerRenderResources(resolved);
           shellFailure = { error: err };
           options?.onShellError?.(err);
@@ -7067,14 +7106,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();
@@ -7258,6 +7300,7 @@ function renderToReadableStream(entryComponent, props, options) {
       };
     }
     const resolved = newResolvedMap(renderOptions);
+    const cancelInjection = createInjectionCanceler(renderOptions.injection);
     const release = () => {
       if (released) return;
       released = true;
@@ -7266,6 +7309,7 @@ function renderToReadableStream(entryComponent, props, options) {
     const settleFailure = (error) => {
       if (terminal) return;
       terminal = true;
+      cancelInjection(error);
       try {
         release();
       } catch (err) {
@@ -7318,7 +7362,8 @@ function renderToReadableStream(entryComponent, props, options) {
           settleFailure(err);
         }
       },
-      resolved
+      resolved,
+      cancelInjection
     ).catch((err) => {
       renderOptions.onError?.(err);
       settleFailure(err);

package/dist/server/streamed-signals.d.ts

@@ -4,6 +4,7 @@ import type { ServerSignalQueryAttempt } from '../signals/query-attempt-observer
 export interface StreamedRendererLimits {
     readonly maxFrameBytes?: number;
     readonly maxTotalBytes?: number;
+    /** Maximum wait for producer progress; queued data and sink backpressure pause it. */
     readonly timeoutMs?: number;
 }
 export interface StreamedSignalResultOptions extends StreamedRendererLimits {