vinext 1.0.0-beta.9 → 1.0.1

package/dist/shims/head.d.ts

@@ -4,19 +4,19 @@ type HeadProps = {
   children?: React.ReactNode;
 };
 /** @internal — exposed for unit tests of the client head projection. */
-declare const _clientHeadChildren: Map<symbol, React.ReactNode>;
+export declare const _clientHeadChildren: Map<symbol, React.ReactNode>;
 /**
  * Register ALS-backed state accessors. Called by head-state.ts on import.
  * @internal
  */
-declare function _registerHeadStateAccessors(accessors: {
+export declare function _registerHeadStateAccessors(accessors: {
   getSSRHeadChildren: () => React.ReactNode[];
   resetSSRHead: () => void;
   getDocumentInitialHead?: () => React.ReactNode[];
   setDocumentInitialHead?: (head: React.ReactNode[]) => void;
 }): void;
 /** Reset the SSR head collector. Call before render. */
-declare function resetSSRHead(): void;
+export declare function resetSSRHead(): void;
 /**
  * Register head tags returned by a user `_document.getInitialProps()` call.
  * Mirrors Next.js: `_document` may extend the head array passed to its render,
@@ -26,7 +26,7 @@ declare function resetSSRHead(): void;
  *
  * Pass an empty array (or simply don't call this) to skip the merge.
  */
-declare function setDocumentInitialHead(head: React.ReactNode[]): void;
+export declare function setDocumentInitialHead(head: React.ReactNode[]): void;
 /**
  * Default head tags emitted alongside every Pages Router render — charset
  * first, then viewport. Mirrors Next.js's `defaultHead()` in
@@ -37,13 +37,13 @@ declare function setDocumentInitialHead(head: React.ReactNode[]): void;
  * then user tags, all with `data-next-head=""`. See assertion in
  * `test/e2e/next-head/index.test.ts`.
  */
-declare function defaultHead(): React.ReactElement[];
+export declare function defaultHead(): React.ReactElement[];
 /** Get collected head HTML. Call after render. */
-declare function getSSRHeadHTML(): string;
+export declare function getSSRHeadHTML(): string;
 type HeadDOMElement = Pick<HTMLElement, "innerHTML" | "setAttribute" | "textContent">;
-declare function reduceHeadChildren(headChildren: React.ReactNode[]): React.ReactElement[];
-declare function isSafeAttrName(name: string): boolean;
-declare function escapeAttr(s: string): string;
+export declare function reduceHeadChildren(headChildren: React.ReactNode[]): React.ReactElement[];
+export declare function isSafeAttrName(name: string): boolean;
+export declare function escapeAttr(s: string): string;
 /**
  * Escape content that will be placed inside a raw <script> or <style> tag
  * during SSR. The HTML parser treats `</script>` (or `</style>`) as the end
@@ -54,8 +54,8 @@ declare function escapeAttr(s: string): string;
  * and `<\/style` respectively. The `<\/` form is harmless in JS/CSS string
  * context but prevents the HTML parser from seeing a closing tag.
  */
-declare function escapeInlineContent(content: string, tag: string): string;
-declare function _applyHeadPropsToElement(domEl: HeadDOMElement, props: Record<string, unknown>): void;
+export declare function escapeInlineContent(content: string, tag: string): string;
+export declare function _applyHeadPropsToElement(domEl: HeadDOMElement, props: Record<string, unknown>): void;
 /**
  * Compare an existing head element with a newly-created projection.
  *
@@ -66,11 +66,11 @@ declare function _applyHeadPropsToElement(domEl: HeadDOMElement, props: Record<s
  *
  * Ported from Next.js: packages/next/src/client/head-manager.ts.
  */
-declare function isEqualHeadNode(oldTag: Element, newTag: Element): boolean;
+export declare function isEqualHeadNode(oldTag: Element, newTag: Element): boolean;
 /** @internal — register/update one mounted Head instance and batch reconciliation. */
-declare function _updateClientHeadInstance(instanceId: symbol, children: React.ReactNode): void;
+export declare function _updateClientHeadInstance(instanceId: symbol, children: React.ReactNode): void;
 /** @internal — unregister one mounted Head instance and batch reconciliation. */
-declare function _removeClientHeadInstance(instanceId: symbol): void;
+export declare function _removeClientHeadInstance(instanceId: symbol): void;
 /**
  * Reconcile the document <head> against the desired projection.
  *
@@ -90,7 +90,7 @@ declare function _removeClientHeadInstance(instanceId: symbol): void;
  *
  * @internal — exported for unit tests; called from the Head client effect.
  */
-declare function _syncClientHead(): void;
+export declare function _syncClientHead(): void;
 declare function Head({ children }: HeadProps): React.ReactElement;
 //#endregion
-export { _applyHeadPropsToElement, _clientHeadChildren, _registerHeadStateAccessors, _removeClientHeadInstance, _syncClientHead, _updateClientHeadInstance, Head as default, defaultHead, escapeAttr, escapeInlineContent, getSSRHeadHTML, isEqualHeadNode, isSafeAttrName, reduceHeadChildren, resetSSRHead, setDocumentInitialHead };
+export { Head as default };

package/dist/shims/head.js

@@ -75,7 +75,7 @@ function getSSRHeadHTML() {
 		...defaultHead(),
 		..._getSSRHeadChildren(),
 		..._getDocumentInitialHead()
-	]).map((child) => headChildToHTML(child.type, child.props)).filter(Boolean).join("\n  ");
+	]).map((child) => headChildToHTML(child.type, child.props)).filter(Boolean).join("");
 }
 /**
 * Tags allowed inside <head>. Anything else is silently dropped.
@@ -138,8 +138,10 @@ function createUniqueHeadFilter() {
 		let isUnique = true;
 		const normalizedKey = normalizeHeadKey(child.key);
 		const hasKey = normalizedKey !== null;
-		if (normalizedKey) if (keys.has(normalizedKey)) isUnique = false;
-		else keys.add(normalizedKey);
+		if (normalizedKey) {
+			if (keys.has(normalizedKey)) isUnique = false;
+			else keys.add(normalizedKey);
+		}
 		switch (child.type) {
 			case "title":
 			case "base":
@@ -167,7 +169,6 @@ function createUniqueHeadFilter() {
 				}
 				break;
 			}
-			default: break;
 		}
 		return isUnique;
 	};

package/dist/shims/headers.d.ts

@@ -1,8 +1,9 @@
 import { RenderRequestApiKind } from "../server/cache-proof.js";
+import { ConnectionProbeResult, HeadersAccessPhase, RenderDynamicLatch, VinextHeadersShimState, createRenderDynamicLatch, getHeadersAccessPhase, isInsideAnyCacheScope, isRenderDynamicLatched, markDynamicUsage, markRenderRequestApiUsage, onRenderDynamicLatched, throwIfInsideCacheScope, throwIfStaticGenerationAccessError } from "./internal/headers-state.js";
 import { ReadonlyRequestCookies } from "@vinext/types/next/upstream/dist/server/web/spec-extension/adapters/request-cookies";
 import { ResponseCookie } from "@vinext/types/next/upstream/dist/compiled/@edge-runtime/cookies/index";
 //#region src/shims/headers.d.ts
-type HeadersContext = {
+export type HeadersContext = {
   headers: Headers;
   cookies: Map<string, string>;
   accessError?: Error;
@@ -16,67 +17,20 @@ type HeadersContext = {
 type HeadersContextFromRequestOptions = {
   draftModeSecret?: string;
 };
-type HeadersAccessPhase = "render" | "action" | "route-handler";
-type VinextHeadersShimState = {
-  headersContext: HeadersContext | null;
-  dynamicUsageDetected: boolean;
-  renderRequestApiUsage: Set<RenderRequestApiKind>;
-  connectionProbe: ConnectionProbeState | null;
-  /** Error recorded by throwIfInsideCacheScope for dev diagnostics, persists even if caught by user code. */
-  invalidDynamicUsageError: unknown;
-  pendingSetCookies: string[];
-  draftModeCookieHeader: string | null;
-  phase: HeadersAccessPhase;
-};
-type ConnectionProbeState = {
-  active: boolean;
-  dynamicUsageTarget: VinextHeadersShimState;
-  interrupted: boolean;
-  interrupt: () => void;
-  pending: Promise<never>;
-};
-type ConnectionProbeResult<T> = {
-  completed: true;
-  result: T;
-} | {
-  completed: false;
-};
-/**
- * Dynamic usage flag — set when a component calls connection(), cookies(),
- * headers(), or noStore() during rendering. When true, ISR caching is
- * bypassed and the response gets Cache-Control: no-store.
- */
-/**
- * Mark the current render as requiring dynamic (uncached) rendering.
- * Called by connection(), cookies(), headers(), and noStore().
- */
-declare function markDynamicUsage(): void;
 /**
  * Measure dynamic usage in a child async scope without clearing the parent.
  * Concurrent work that already belongs to the request (such as deferred
  * metadata) keeps writing to the parent state and therefore remains visible
  * to the final cache policy.
  */
-declare function runWithIsolatedDynamicUsage<T>(fn: () => T | Promise<T>): Promise<{
+export declare function runWithIsolatedDynamicUsage<T>(fn: () => T | Promise<T>): Promise<{
   result: T;
   dynamicDetected: boolean;
 }>;
-declare function markRenderRequestApiUsage(kind: RenderRequestApiKind): void;
-declare function throwIfStaticGenerationAccessError(): void;
-declare function runWithConnectionProbe<T>(fn: () => T | Promise<T>): Promise<ConnectionProbeResult<T>>;
-declare function suspendConnectionProbe(): Promise<never> | null;
-declare function peekRenderRequestApiUsage(): RenderRequestApiKind[];
-declare function consumeRenderRequestApiUsage(): RenderRequestApiKind[];
-/** Whether work is executing inside a cache boundary that owns its reuse. */
-declare function isInsideAnyCacheScope(): boolean;
-/**
- * Throw if the current execution is inside a "use cache" or unstable_cache()
- * scope. Called by dynamic request APIs (headers, cookies, connection) to
- * prevent request-specific data from being frozen into cached results.
- *
- * @param apiName - The name of the API being called (e.g. "connection()")
- */
-declare function throwIfInsideCacheScope(apiName: string): void;
+export declare function runWithConnectionProbe<T>(fn: () => T | Promise<T>): Promise<ConnectionProbeResult<T>>;
+export declare function suspendConnectionProbe(): Promise<never> | null;
+export declare function peekRenderRequestApiUsage(): RenderRequestApiKind[];
+export declare function consumeRenderRequestApiUsage(): RenderRequestApiKind[];
 /**
  * Check, consume, and return any invalid dynamic usage error recorded during
  * the render (e.g. cookies() called inside "use cache"). This error persists
@@ -86,12 +40,12 @@ declare function throwIfInsideCacheScope(apiName: string): void;
  * packages/next/src/server/app-render/app-render.tsx
  * https://github.com/vercel/next.js/commit/f5e54c06726b571a042fce67417e40a29f6b8689
  */
-declare function consumeInvalidDynamicUsageError(): unknown;
+export declare function consumeInvalidDynamicUsageError(): unknown;
 /**
  * Check and reset the dynamic usage flag.
  * Called by the server after rendering to decide on caching.
  */
-declare function consumeDynamicUsage(): boolean;
+export declare function consumeDynamicUsage(): boolean;
 /**
  * Read the dynamic usage flag without resetting it.
  * Used by the layout probe to fold a probe-scoped `markDynamicUsage()` into the
@@ -99,9 +53,8 @@ declare function consumeDynamicUsage(): boolean;
  * observation captures `markDynamicUsage()` paths (e.g. `"use cache: private"`)
  * that leave no other observable trace.
  */
-declare function peekDynamicUsage(): boolean;
-declare function setHeadersAccessPhase(phase: HeadersAccessPhase): HeadersAccessPhase;
-declare function getHeadersAccessPhase(): HeadersAccessPhase;
+export declare function peekDynamicUsage(): boolean;
+export declare function setHeadersAccessPhase(phase: HeadersAccessPhase): HeadersAccessPhase;
 /**
  * Set the headers/cookies context for the current RSC render.
  * Called by the framework's RSC entry before rendering each request.
@@ -116,8 +69,24 @@ declare function getHeadersAccessPhase(): HeadersAccessPhase;
  * Used after applyMiddlewareRequestHeaders() to build a post-middleware
  * request context for afterFiles/fallback rewrite has/missing evaluation.
  */
-declare function getHeadersContext(): HeadersContext | null;
-declare function setHeadersContext(ctx: HeadersContext | null): void;
+export declare function getHeadersContext(): HeadersContext | null;
+/** Serialize the effective request-cookie view, including middleware Set-Cookie overlays. */
+export declare function getEffectiveRequestCookieHeader(): string | null;
+export declare function hasEffectiveRequestCookieChanges(cookieHeader: string | null): boolean;
+/**
+ * Replace only the request-cookie view for the active request scope.
+ *
+ * Middleware Set-Cookie mutations are visible through `cookies()` during the
+ * same request in Next.js, but they do not rewrite the raw `Cookie` value
+ * returned by `headers()`. The staged App renderer uses this seam to restore
+ * that split view without changing the request Headers object.
+ */
+export declare function applyEffectiveRequestCookieHeader(cookieHeader: string): void;
+/** Restore a middleware draft-mode transition inside a staged render scope. */
+export declare function restoreDraftModeTransition(cookieHeader: string): void;
+/** Replace request API inputs while retaining dynamic usage and pending mutations. */
+export declare function replaceHeadersContext(ctx: HeadersContext): void;
+export declare function setHeadersContext(ctx: HeadersContext | null): void;
 /**
  * Run a function with headers context, ensuring the context propagates
  * through all async operations (including RSC streaming).
@@ -128,8 +97,8 @@ declare function setHeadersContext(ctx: HeadersContext | null): void;
  * so RSC streaming works correctly — components that render when the
  * stream is consumed still see the correct request's context.
  */
-declare function runWithHeadersContext<T>(ctx: HeadersContext, fn: () => Promise<T>): Promise<T>;
-declare function runWithHeadersContext<T>(ctx: HeadersContext, fn: () => T | Promise<T>): T | Promise<T>;
+export declare function runWithHeadersContext<T>(ctx: HeadersContext, fn: () => Promise<T>): Promise<T>;
+export declare function runWithHeadersContext<T>(ctx: HeadersContext, fn: () => T | Promise<T>): T | Promise<T>;
 /**
  * Apply middleware-forwarded request headers to the current headers context.
  *
@@ -149,7 +118,7 @@ declare function runWithHeadersContext<T>(ctx: HeadersContext, fn: () => T | Pro
  * from a Server Component would return that stale snapshot instead of the
  * middleware-modified view.
  */
-declare function applyMiddlewareRequestHeaders(middlewareResponseHeaders: Headers): void;
+export declare function applyMiddlewareRequestHeaders(middlewareResponseHeaders: Headers): void;
 /**
  * Create a HeadersContext from a standard Request object.
  *
@@ -171,39 +140,41 @@ declare function applyMiddlewareRequestHeaders(middlewareResponseHeaders: Header
  * Cookie parsing is also deferred: the `cookie` header string is not split
  * until the first call to `cookies()` or `draftMode()`.
  */
-declare function headersContextFromRequest(request: Request, options?: HeadersContextFromRequestOptions): HeadersContext;
+export declare function headersContextFromRequest(request: Request, options?: HeadersContextFromRequestOptions): HeadersContext;
 /**
  * Read-only Headers instance from the incoming request.
  * Returns a Promise in Next.js 15+ style (but resolves synchronously since
  * the context is already available).
  */
-declare function headers(): Promise<Headers> & Headers;
+export declare function headers(): Promise<Headers> & Headers;
 type VinextReadonlyRequestCookies = Omit<ReadonlyRequestCookies, keyof RequestCookies> & RequestCookies;
-declare function cookies(): Promise<VinextReadonlyRequestCookies> & VinextReadonlyRequestCookies;
+export declare function cookies(): Promise<VinextReadonlyRequestCookies> & VinextReadonlyRequestCookies;
 /** Accumulated Set-Cookie headers from cookies().set() / .delete() calls */
 /**
  * Get and clear all pending Set-Cookie headers generated by cookies().set()/delete().
  * Called by the framework after rendering to attach headers to the response.
  */
-declare function getAndClearPendingCookies(): string[];
+export declare function getAndClearPendingCookies(): string[];
 /**
  * Get any Set-Cookie header generated by draftMode().enable()/disable().
  * Called by the framework after rendering to attach the header to the response.
  */
-declare function getDraftModeCookieHeader(): string | null;
-declare function isDraftModeRequest(request: Request, draftModeSecret: string): boolean;
+/** Check a pending draft transition without consuming its outgoing cookie. */
+export declare function hasDraftModeCookieHeader(): boolean;
+export declare function getDraftModeCookieHeader(): string | null;
+export declare function isDraftModeRequest(request: Request, draftModeSecret: string): boolean;
 /**
  * Read draft mode from the live request context without recording request API
  * usage. `null` means there is no active request context, which lets framework
  * callers fall back to an explicitly supplied request when needed.
  */
-declare function getActiveDraftModeState(): boolean | null;
+export declare function getActiveDraftModeState(): boolean | null;
 /**
  * Read the active request's draft-mode state without recording request API usage.
  * Internal cache implementations use this to bypass persistent reads and writes,
  * matching Next.js's request-level `workStore.isDraftMode` guard.
  */
-declare function isDraftModeEnabled(): boolean;
+export declare function isDraftModeEnabled(): boolean;
 type DraftModeResult = {
   readonly isEnabled: boolean;
   enable(): void;
@@ -223,7 +194,7 @@ type DraftModeResult = {
  * Ported from Next.js: packages/next/src/server/request/draft-mode.ts
  * (`getDraftModeProviderForCacheScope` + `trackDynamicDraftMode`).
  */
-declare function draftMode(): Promise<DraftModeResult>;
+export declare function draftMode(): Promise<DraftModeResult>;
 declare const APPLY_RESPONSE_COOKIE: unique symbol;
 declare const SYNCHRONIZE_REQUEST_COOKIES: unique symbol;
 declare class RequestCookies {
@@ -254,4 +225,4 @@ declare class RequestCookies {
   [SYNCHRONIZE_REQUEST_COOKIES](): void;
 }
 //#endregion
-export { HeadersAccessPhase, HeadersContext, type RequestCookies, VinextHeadersShimState, applyMiddlewareRequestHeaders, consumeDynamicUsage, consumeInvalidDynamicUsageError, consumeRenderRequestApiUsage, cookies, draftMode, getActiveDraftModeState, getAndClearPendingCookies, getDraftModeCookieHeader, getHeadersAccessPhase, getHeadersContext, headers, headersContextFromRequest, isDraftModeEnabled, isDraftModeRequest, isInsideAnyCacheScope, markDynamicUsage, markRenderRequestApiUsage, peekDynamicUsage, peekRenderRequestApiUsage, runWithConnectionProbe, runWithHeadersContext, runWithIsolatedDynamicUsage, setHeadersAccessPhase, setHeadersContext, suspendConnectionProbe, throwIfInsideCacheScope, throwIfStaticGenerationAccessError };
+export { type HeadersAccessPhase, type RenderDynamicLatch, type RequestCookies, type VinextHeadersShimState, createRenderDynamicLatch, getHeadersAccessPhase, isInsideAnyCacheScope, isRenderDynamicLatched, markDynamicUsage, markRenderRequestApiUsage, onRenderDynamicLatched, throwIfInsideCacheScope, throwIfStaticGenerationAccessError };