vinext 0.0.29 → 0.0.31

package/dist/shims/router-state.js

@@ -1,52 +1,45 @@
-/**
- * Server-only Pages Router state backed by AsyncLocalStorage.
- *
- * Provides request-scoped isolation for SSR context (pathname, query,
- * locale) so concurrent requests on Workers don't share state.
- *
- * This module is server-only — it imports node:async_hooks and must NOT
- * be bundled for the browser.
- */
-import { AsyncLocalStorage } from "node:async_hooks";
+import { getRequestContext, isInsideUnifiedScope, runWithUnifiedStateMutation } from "./unified-request-context.js";
 import { _registerRouterStateAccessors } from "./router.js";
+import { AsyncLocalStorage } from "node:async_hooks";
+//#region src/shims/router-state.ts
+/**
+* Server-only Pages Router state backed by AsyncLocalStorage.
+*
+* Provides request-scoped isolation for SSR context (pathname, query,
+* locale) so concurrent requests on Workers don't share state.
+*
+* This module is server-only — it imports node:async_hooks and must NOT
+* be bundled for the browser.
+*/
 const _ALS_KEY = Symbol.for("vinext.router.als");
 const _FALLBACK_KEY = Symbol.for("vinext.router.fallback");
 const _g = globalThis;
-const _als = (_g[_ALS_KEY] ??=
-    new AsyncLocalStorage());
-const _fallbackState = (_g[_FALLBACK_KEY] ??= {
-    ssrContext: null,
-});
+const _als = _g[_ALS_KEY] ??= new AsyncLocalStorage();
+const _fallbackState = _g[_FALLBACK_KEY] ??= { ssrContext: null };
 function _getState() {
-    return _als.getStore() ?? _fallbackState;
+	if (isInsideUnifiedScope()) return getRequestContext();
+	return _als.getStore() ?? _fallbackState;
 }
 /**
- * Run a function within a router state ALS scope.
- * Ensures per-request isolation for Pages Router SSR context
- * on concurrent runtimes.
- */
-export function runWithRouterState(fn) {
-    const state = {
-        ssrContext: null,
-    };
-    return _als.run(state, fn);
+* Run a function within a router state ALS scope.
+* Ensures per-request isolation for Pages Router SSR context
+* on concurrent runtimes.
+*/
+function runWithRouterState(fn) {
+	if (isInsideUnifiedScope()) return runWithUnifiedStateMutation((uCtx) => {
+		uCtx.ssrContext = null;
+	}, fn);
+	return _als.run({ ssrContext: null }, fn);
 }
-// ---------------------------------------------------------------------------
-// Register ALS-backed accessors into router.ts
-// ---------------------------------------------------------------------------
 _registerRouterStateAccessors({
-    getSSRContext() {
-        return _getState().ssrContext;
-    },
-    setSSRContext(ctx) {
-        const state = _als.getStore();
-        if (state) {
-            state.ssrContext = ctx;
-        }
-        else {
-            // No ALS scope — fallback for environments without als.run() wrapping.
-            _fallbackState.ssrContext = ctx;
-        }
-    },
+	getSSRContext() {
+		return _getState().ssrContext;
+	},
+	setSSRContext(ctx) {
+		_getState().ssrContext = ctx;
+	}
 });
+//#endregion
+export { runWithRouterState };
+
 //# sourceMappingURL=router-state.js.map

package/dist/shims/router-state.js.map

@@ -1 +1 @@
-{"version":3,"file":"router-state.js","sourceRoot":"","sources":["../../src/shims/router-state.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,6BAA6B,EAAE,MAAM,aAAa,CAAC;AAmB5D,MAAM,QAAQ,GAAG,MAAM,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC;AACjD,MAAM,aAAa,GAAG,MAAM,CAAC,GAAG,CAAC,wBAAwB,CAAC,CAAC;AAC3D,MAAM,EAAE,GAAG,UAAqD,CAAC;AACjE,MAAM,IAAI,GAAG,CAAC,EAAE,CAAC,QAAQ,CAAC;IACxB,IAAI,iBAAiB,EAAe,CAAmC,CAAC;AAE1E,MAAM,cAAc,GAAG,CAAC,EAAE,CAAC,aAAa,CAAC,KAAK;IAC5C,UAAU,EAAE,IAAI;CACK,CAAgB,CAAC;AAExC,SAAS,SAAS;IAChB,OAAO,IAAI,CAAC,QAAQ,EAAE,IAAI,cAAc,CAAC;AAC3C,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,kBAAkB,CAAI,EAAwB;IAC5D,MAAM,KAAK,GAAgB;QACzB,UAAU,EAAE,IAAI;KACjB,CAAC;IACF,OAAO,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;AAC7B,CAAC;AAED,8EAA8E;AAC9E,+CAA+C;AAC/C,8EAA8E;AAE9E,6BAA6B,CAAC;IAC5B,aAAa;QACX,OAAO,SAAS,EAAE,CAAC,UAAU,CAAC;IAChC,CAAC;IAED,aAAa,CAAC,GAAsB;QAClC,MAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC;QAC9B,IAAI,KAAK,EAAE,CAAC;YACV,KAAK,CAAC,UAAU,GAAG,GAAG,CAAC;QACzB,CAAC;aAAM,CAAC;YACN,uEAAuE;YACvE,cAAc,CAAC,UAAU,GAAG,GAAG,CAAC;QAClC,CAAC;IACH,CAAC;CACF,CAAC,CAAC","sourcesContent":["/**\n * Server-only Pages Router state backed by AsyncLocalStorage.\n *\n * Provides request-scoped isolation for SSR context (pathname, query,\n * locale) so concurrent requests on Workers don't share state.\n *\n * This module is server-only — it imports node:async_hooks and must NOT\n * be bundled for the browser.\n */\n\nimport { AsyncLocalStorage } from \"node:async_hooks\";\nimport { _registerRouterStateAccessors } from \"./router.js\";\n\n// ---------------------------------------------------------------------------\n// ALS setup\n// ---------------------------------------------------------------------------\n\ninterface SSRContext {\n  pathname: string;\n  query: Record<string, string | string[]>;\n  asPath: string;\n  locale?: string;\n  locales?: string[];\n  defaultLocale?: string;\n}\n\ninterface RouterState {\n  ssrContext: SSRContext | null;\n}\n\nconst _ALS_KEY = Symbol.for(\"vinext.router.als\");\nconst _FALLBACK_KEY = Symbol.for(\"vinext.router.fallback\");\nconst _g = globalThis as unknown as Record<PropertyKey, unknown>;\nconst _als = (_g[_ALS_KEY] ??=\n  new AsyncLocalStorage<RouterState>()) as AsyncLocalStorage<RouterState>;\n\nconst _fallbackState = (_g[_FALLBACK_KEY] ??= {\n  ssrContext: null,\n} satisfies RouterState) as RouterState;\n\nfunction _getState(): RouterState {\n  return _als.getStore() ?? _fallbackState;\n}\n\n/**\n * Run a function within a router state ALS scope.\n * Ensures per-request isolation for Pages Router SSR context\n * on concurrent runtimes.\n */\nexport function runWithRouterState<T>(fn: () => T | Promise<T>): T | Promise<T> {\n  const state: RouterState = {\n    ssrContext: null,\n  };\n  return _als.run(state, fn);\n}\n\n// ---------------------------------------------------------------------------\n// Register ALS-backed accessors into router.ts\n// ---------------------------------------------------------------------------\n\n_registerRouterStateAccessors({\n  getSSRContext(): SSRContext | null {\n    return _getState().ssrContext;\n  },\n\n  setSSRContext(ctx: SSRContext | null): void {\n    const state = _als.getStore();\n    if (state) {\n      state.ssrContext = ctx;\n    } else {\n      // No ALS scope — fallback for environments without als.run() wrapping.\n      _fallbackState.ssrContext = ctx;\n    }\n  },\n});\n"]}
+{"version":3,"file":"router-state.js","names":[],"sources":["../../src/shims/router-state.ts"],"sourcesContent":["/**\n * Server-only Pages Router state backed by AsyncLocalStorage.\n *\n * Provides request-scoped isolation for SSR context (pathname, query,\n * locale) so concurrent requests on Workers don't share state.\n *\n * This module is server-only — it imports node:async_hooks and must NOT\n * be bundled for the browser.\n */\n\nimport { AsyncLocalStorage } from \"node:async_hooks\";\nimport { _registerRouterStateAccessors } from \"./router.js\";\nimport {\n  getRequestContext,\n  isInsideUnifiedScope,\n  runWithUnifiedStateMutation,\n} from \"./unified-request-context.js\";\n\n// ---------------------------------------------------------------------------\n// ALS setup\n// ---------------------------------------------------------------------------\n\nexport interface SSRContext {\n  pathname: string;\n  query: Record<string, string | string[]>;\n  asPath: string;\n  locale?: string;\n  locales?: string[];\n  defaultLocale?: string;\n}\n\nexport interface RouterState {\n  ssrContext: SSRContext | null;\n}\n\nconst _ALS_KEY = Symbol.for(\"vinext.router.als\");\nconst _FALLBACK_KEY = Symbol.for(\"vinext.router.fallback\");\nconst _g = globalThis as unknown as Record<PropertyKey, unknown>;\nconst _als = (_g[_ALS_KEY] ??=\n  new AsyncLocalStorage<RouterState>()) as AsyncLocalStorage<RouterState>;\n\nconst _fallbackState = (_g[_FALLBACK_KEY] ??= {\n  ssrContext: null,\n} satisfies RouterState) as RouterState;\n\nfunction _getState(): RouterState {\n  if (isInsideUnifiedScope()) {\n    return getRequestContext();\n  }\n  return _als.getStore() ?? _fallbackState;\n}\n\n/**\n * Run a function within a router state ALS scope.\n * Ensures per-request isolation for Pages Router SSR context\n * on concurrent runtimes.\n */\nexport function runWithRouterState<T>(fn: () => T | Promise<T>): T | Promise<T> {\n  if (isInsideUnifiedScope()) {\n    return runWithUnifiedStateMutation((uCtx) => {\n      uCtx.ssrContext = null;\n    }, fn);\n  }\n\n  const state: RouterState = {\n    ssrContext: null,\n  };\n  return _als.run(state, fn);\n}\n\n// ---------------------------------------------------------------------------\n// Register ALS-backed accessors into router.ts\n// ---------------------------------------------------------------------------\n\n_registerRouterStateAccessors({\n  getSSRContext(): SSRContext | null {\n    return _getState().ssrContext;\n  },\n\n  setSSRContext(ctx: SSRContext | null): void {\n    _getState().ssrContext = ctx;\n  },\n});\n"],"mappings":";;;;;;;;;;;;;AAmCA,MAAM,WAAW,OAAO,IAAI,oBAAoB;AAChD,MAAM,gBAAgB,OAAO,IAAI,yBAAyB;AAC1D,MAAM,KAAK;AACX,MAAM,OAAQ,GAAG,cACf,IAAI,mBAAgC;AAEtC,MAAM,iBAAkB,GAAG,mBAAmB,EAC5C,YAAY,MACb;AAED,SAAS,YAAyB;AAChC,KAAI,sBAAsB,CACxB,QAAO,mBAAmB;AAE5B,QAAO,KAAK,UAAU,IAAI;;;;;;;AAQ5B,SAAgB,mBAAsB,IAA0C;AAC9E,KAAI,sBAAsB,CACxB,QAAO,6BAA6B,SAAS;AAC3C,OAAK,aAAa;IACjB,GAAG;AAMR,QAAO,KAAK,IAHe,EACzB,YAAY,MACb,EACsB,GAAG;;AAO5B,8BAA8B;CAC5B,gBAAmC;AACjC,SAAO,WAAW,CAAC;;CAGrB,cAAc,KAA8B;AAC1C,aAAW,CAAC,aAAa;;CAE5B,CAAC"}

package/dist/shims/router.d.ts

@@ -1,104 +1,103 @@
-/**
- * next/router shim
- *
- * Provides useRouter() hook and Router singleton for Pages Router.
- * Backed by the browser History API. Supports client-side navigation
- * by fetching new page data and re-rendering the React root.
- */
-import { type ReactElement } from "react";
-import { type UrlQuery } from "../utils/query.js";
+import { VinextNextData } from "../client/vinext-next-data.js";
+import { UrlQuery } from "../utils/query.js";
+import { ReactElement } from "react";
+
+//#region src/shims/router.d.ts
 type BeforePopStateCallback = (state: {
-    url: string;
-    as: string;
-    options: {
-        shallow: boolean;
-    };
+  url: string;
+  as: string;
+  options: {
+    shallow: boolean;
+  };
 }) => boolean;
 interface NextRouter {
-    /** Current pathname */
-    pathname: string;
-    /** Current route pattern (e.g., "/posts/[id]") */
-    route: string;
-    /** Query parameters */
-    query: Record<string, string | string[]>;
-    /** Full URL including query string */
-    asPath: string;
-    /** Base path */
-    basePath: string;
-    /** Current locale */
-    locale?: string;
-    /** Available locales */
-    locales?: string[];
-    /** Default locale */
-    defaultLocale?: string;
-    /** Whether the router is ready */
-    isReady: boolean;
-    /** Whether this is a preview */
-    isPreview: boolean;
-    /** Whether this is a fallback page */
-    isFallback: boolean;
-    /** Navigate to a new URL */
-    push(url: string | UrlObject, as?: string, options?: TransitionOptions): Promise<boolean>;
-    /** Replace current URL */
-    replace(url: string | UrlObject, as?: string, options?: TransitionOptions): Promise<boolean>;
-    /** Go back */
-    back(): void;
-    /** Reload the page */
-    reload(): void;
-    /** Prefetch a page (injects <link rel="prefetch">) */
-    prefetch(url: string): Promise<void>;
-    /** Register a callback to run before popstate navigation */
-    beforePopState(cb: BeforePopStateCallback): void;
-    /** Listen for route changes */
-    events: RouterEvents;
+  /** Current pathname */
+  pathname: string;
+  /** Current route pattern (e.g., "/posts/[id]") */
+  route: string;
+  /** Query parameters */
+  query: Record<string, string | string[]>;
+  /** Full URL including query string */
+  asPath: string;
+  /** Base path */
+  basePath: string;
+  /** Current locale */
+  locale?: string;
+  /** Available locales */
+  locales?: string[];
+  /** Default locale */
+  defaultLocale?: string;
+  /** Configured domain locales */
+  domainLocales?: VinextNextData["domainLocales"];
+  /** Whether the router is ready */
+  isReady: boolean;
+  /** Whether this is a preview */
+  isPreview: boolean;
+  /** Whether this is a fallback page */
+  isFallback: boolean;
+  /** Navigate to a new URL */
+  push(url: string | UrlObject, as?: string, options?: TransitionOptions): Promise<boolean>;
+  /** Replace current URL */
+  replace(url: string | UrlObject, as?: string, options?: TransitionOptions): Promise<boolean>;
+  /** Go back */
+  back(): void;
+  /** Reload the page */
+  reload(): void;
+  /** Prefetch a page (injects <link rel="prefetch">) */
+  prefetch(url: string): Promise<void>;
+  /** Register a callback to run before popstate navigation */
+  beforePopState(cb: BeforePopStateCallback): void;
+  /** Listen for route changes */
+  events: RouterEvents;
 }
 interface UrlObject {
-    pathname?: string;
-    query?: UrlQuery;
+  pathname?: string;
+  query?: UrlQuery;
 }
 interface TransitionOptions {
-    shallow?: boolean;
-    scroll?: boolean;
-    locale?: string;
+  shallow?: boolean;
+  scroll?: boolean;
+  locale?: string;
 }
 interface RouterEvents {
-    on(event: string, handler: (...args: unknown[]) => void): void;
-    off(event: string, handler: (...args: unknown[]) => void): void;
-    emit(event: string, ...args: unknown[]): void;
+  on(event: string, handler: (...args: unknown[]) => void): void;
+  off(event: string, handler: (...args: unknown[]) => void): void;
+  emit(event: string, ...args: unknown[]): void;
 }
 /**
  * Apply locale prefix to a URL for client-side navigation.
  * Same logic as Link's applyLocaleToHref but reads from window globals.
  */
-export declare function applyNavigationLocale(url: string, locale?: string): string;
+declare function applyNavigationLocale(url: string, locale?: string): string;
 /** Check if a URL is external (any URL scheme per RFC 3986, or protocol-relative) */
-export declare function isExternalUrl(url: string): boolean;
+declare function isExternalUrl(url: string): boolean;
 /** Check if a href is only a hash change relative to the current URL */
-export declare function isHashOnlyChange(href: string): boolean;
+declare function isHashOnlyChange(href: string): boolean;
 /**
  * SSR context - set by the dev server before rendering each page.
  */
 interface SSRContext {
-    pathname: string;
-    query: Record<string, string | string[]>;
-    asPath: string;
-    locale?: string;
-    locales?: string[];
-    defaultLocale?: string;
+  pathname: string;
+  query: Record<string, string | string[]>;
+  asPath: string;
+  locale?: string;
+  locales?: string[];
+  defaultLocale?: string;
+  domainLocales?: VinextNextData["domainLocales"];
 }
 /**
  * Register ALS-backed state accessors. Called by router-state.ts on import.
  * @internal
  */
-export declare function _registerRouterStateAccessors(accessors: {
-    getSSRContext: () => SSRContext | null;
-    setSSRContext: (ctx: SSRContext | null) => void;
+declare function _registerRouterStateAccessors(accessors: {
+  getSSRContext: () => SSRContext | null;
+  setSSRContext: (ctx: SSRContext | null) => void;
 }): void;
-export declare function setSSRContext(ctx: SSRContext | null): void;
+declare function setSSRContext(ctx: SSRContext | null): void;
 /**
  * useRouter hook - Pages Router compatible.
  */
-export declare function useRouter(): NextRouter;
+declare function useRouter(): NextRouter;
 /**
  * Wrap a React element in a RouterContext.Provider so that
  * next/compat/router's useRouter() returns the real Pages Router value.
@@ -108,15 +107,16 @@ export declare function useRouter(): NextRouter;
  * window.location + Router singleton (client), avoiding duplicate state
  * that a hook-based component would create.
  */
-export declare function wrapWithRouterContext(element: ReactElement): ReactElement;
+declare function wrapWithRouterContext(element: ReactElement): ReactElement;
 declare const Router: {
-    push: (url: string | UrlObject, as?: string, options?: TransitionOptions) => Promise<boolean>;
-    replace: (url: string | UrlObject, as?: string, options?: TransitionOptions) => Promise<boolean>;
-    back: () => void;
-    reload: () => void;
-    prefetch: (url: string) => Promise<void>;
-    beforePopState: (cb: BeforePopStateCallback) => void;
-    events: RouterEvents;
+  push: (url: string | UrlObject, as?: string, options?: TransitionOptions) => Promise<boolean>;
+  replace: (url: string | UrlObject, as?: string, options?: TransitionOptions) => Promise<boolean>;
+  back: () => void;
+  reload: () => void;
+  prefetch: (url: string) => Promise<void>;
+  beforePopState: (cb: BeforePopStateCallback) => void;
+  events: RouterEvents;
 };
-export default Router;
+//#endregion
+export { _registerRouterStateAccessors, applyNavigationLocale, Router as default, isExternalUrl, isHashOnlyChange, setSSRContext, useRouter, wrapWithRouterContext };
 //# sourceMappingURL=router.d.ts.map