vinext 0.0.50 → 0.0.52

package/dist/shims/pages-router-runtime.js

@@ -0,0 +1,16 @@
+//#region src/shims/pages-router-runtime.ts
+let pagesRouterPopStateHandler;
+let pagesRouterRuntimeInstalled = false;
+function setPagesRouterPopStateHandler(handler) {
+	pagesRouterPopStateHandler = handler;
+}
+function installPagesRouterRuntime() {
+	if (typeof window === "undefined" || pagesRouterRuntimeInstalled) return;
+	if (!pagesRouterPopStateHandler) throw new Error("[vinext] Pages Router runtime installed before next/router was initialized");
+	pagesRouterRuntimeInstalled = true;
+	window.addEventListener("popstate", pagesRouterPopStateHandler);
+}
+//#endregion
+export { installPagesRouterRuntime, setPagesRouterPopStateHandler };
+
+//# sourceMappingURL=pages-router-runtime.js.map

package/dist/shims/pages-router-runtime.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"pages-router-runtime.js","names":[],"sources":["../../src/shims/pages-router-runtime.ts"],"sourcesContent":["type PagesRouterPopStateHandler = (event: PopStateEvent) => void;\n\nlet pagesRouterPopStateHandler: PagesRouterPopStateHandler | undefined;\nlet pagesRouterRuntimeInstalled = false;\n\nexport function setPagesRouterPopStateHandler(handler: PagesRouterPopStateHandler): void {\n  pagesRouterPopStateHandler = handler;\n}\n\nexport function installPagesRouterRuntime(): void {\n  if (typeof window === \"undefined\" || pagesRouterRuntimeInstalled) {\n    return;\n  }\n\n  if (!pagesRouterPopStateHandler) {\n    throw new Error(\"[vinext] Pages Router runtime installed before next/router was initialized\");\n  }\n\n  pagesRouterRuntimeInstalled = true;\n  window.addEventListener(\"popstate\", pagesRouterPopStateHandler);\n}\n"],"mappings":";AAEA,IAAI;AACJ,IAAI,8BAA8B;AAElC,SAAgB,8BAA8B,SAA2C;CACvF,6BAA6B;;AAG/B,SAAgB,4BAAkC;CAChD,IAAI,OAAO,WAAW,eAAe,6BACnC;CAGF,IAAI,CAAC,4BACH,MAAM,IAAI,MAAM,6EAA6E;CAG/F,8BAA8B;CAC9B,OAAO,iBAAiB,YAAY,2BAA2B"}

package/dist/shims/request-state-types.d.ts

@@ -2,8 +2,8 @@ import { PrivateCacheState } from "./cache-runtime.js";
 import { ExecutionContextLike } from "./request-context.js";
 import { CacheLifeConfig, CacheState } from "./cache.js";
 import { NavigationContext } from "./navigation.js";
-import { FetchCacheState } from "./fetch-cache.js";
 import { RootParamsState } from "./root-params.js";
+import { FetchCacheState } from "./fetch-cache.js";
 import { HeadersAccessPhase, HeadersContext, VinextHeadersShimState } from "./headers.js";
 import { RouterState, SSRContext } from "./router-state.js";
 import { HeadState } from "./head-state.js";

package/dist/shims/root-params.d.ts

@@ -6,6 +6,8 @@ type RootParamsState = {
 declare function pickRootParams(params: RootParams, rootParamNames: readonly string[] | null | undefined): RootParams;
 declare function setRootParams(params: RootParams | null): void;
 declare function getRootParam(name: string): Promise<string | string[] | undefined>;
+declare function runWithRootParamsScope<T>(params: RootParams, fn: () => Promise<T>): Promise<T>;
+declare function runWithRootParamsScope<T>(params: RootParams, fn: () => T | Promise<T>): T | Promise<T>;
 //#endregion
-export { RootParams, RootParamsState, getRootParam, pickRootParams, setRootParams };
+export { RootParams, RootParamsState, getRootParam, pickRootParams, runWithRootParamsScope, setRootParams };
 //# sourceMappingURL=root-params.d.ts.map

package/dist/shims/root-params.js

@@ -1,11 +1,13 @@
-import { getRequestContext, isInsideUnifiedScope } from "./unified-request-context.js";
+import { getOrCreateAls } from "./internal/als-registry.js";
+import { getRequestContext, isInsideUnifiedScope, runWithUnifiedStateMutation } from "./unified-request-context.js";
 //#region src/shims/root-params.ts
 const _FALLBACK_KEY = Symbol.for("vinext.rootParams.fallback");
 const _g = globalThis;
+const _als = getOrCreateAls("vinext.rootParams.als");
 const _fallbackState = _g[_FALLBACK_KEY] ??= { rootParams: null };
 function getState() {
 	if (isInsideUnifiedScope()) return getRequestContext();
-	return _fallbackState;
+	return _als.getStore() ?? _fallbackState;
 }
 function pickRootParams(params, rootParamNames) {
 	const picked = {};
@@ -18,7 +20,13 @@ function setRootParams(params) {
 function getRootParam(name) {
 	return Promise.resolve(getState().rootParams?.[name]);
 }
+function runWithRootParamsScope(params, fn) {
+	if (isInsideUnifiedScope()) return runWithUnifiedStateMutation((ctx) => {
+		ctx.rootParams = params;
+	}, fn);
+	else return _als.run({ rootParams: params }, fn);
+}
 //#endregion
-export { getRootParam, pickRootParams, setRootParams };
+export { getRootParam, pickRootParams, runWithRootParamsScope, setRootParams };
 
 //# sourceMappingURL=root-params.js.map

package/dist/shims/root-params.js.map

@@ -1 +1 @@
-{"version":3,"file":"root-params.js","names":[],"sources":["../../src/shims/root-params.ts"],"sourcesContent":["import { getRequestContext, isInsideUnifiedScope } from \"./unified-request-context.js\";\n\nexport type RootParams = Record<string, string | string[] | undefined>;\n\nexport type RootParamsState = {\n  rootParams: RootParams | null;\n};\n\nconst _FALLBACK_KEY = Symbol.for(\"vinext.rootParams.fallback\");\nconst _g = globalThis as unknown as Record<PropertyKey, unknown>;\n\nconst _fallbackState = (_g[_FALLBACK_KEY] ??= {\n  rootParams: null,\n} satisfies RootParamsState) as RootParamsState;\n\nfunction getState(): RootParamsState {\n  if (isInsideUnifiedScope()) {\n    return getRequestContext();\n  }\n  return _fallbackState;\n}\n\nexport function pickRootParams(\n  params: RootParams,\n  rootParamNames: readonly string[] | null | undefined,\n): RootParams {\n  const picked: RootParams = {};\n  for (const name of rootParamNames ?? []) {\n    picked[name] = params[name];\n  }\n  return picked;\n}\n\nexport function setRootParams(params: RootParams | null): void {\n  getState().rootParams = params;\n}\n\nexport function getRootParam(name: string): Promise<string | string[] | undefined> {\n  return Promise.resolve(getState().rootParams?.[name]);\n}\n"],"mappings":";;AAQA,MAAM,gBAAgB,OAAO,IAAI,6BAA6B;AAC9D,MAAM,KAAK;AAEX,MAAM,iBAAkB,GAAG,mBAAmB,EAC5C,YAAY,MACb;AAED,SAAS,WAA4B;CACnC,IAAI,sBAAsB,EACxB,OAAO,mBAAmB;CAE5B,OAAO;;AAGT,SAAgB,eACd,QACA,gBACY;CACZ,MAAM,SAAqB,EAAE;CAC7B,KAAK,MAAM,QAAQ,kBAAkB,EAAE,EACrC,OAAO,QAAQ,OAAO;CAExB,OAAO;;AAGT,SAAgB,cAAc,QAAiC;CAC7D,UAAU,CAAC,aAAa;;AAG1B,SAAgB,aAAa,MAAsD;CACjF,OAAO,QAAQ,QAAQ,UAAU,CAAC,aAAa,MAAM"}
+{"version":3,"file":"root-params.js","names":[],"sources":["../../src/shims/root-params.ts"],"sourcesContent":["import { getOrCreateAls } from \"./internal/als-registry.js\";\nimport {\n  getRequestContext,\n  isInsideUnifiedScope,\n  runWithUnifiedStateMutation,\n} from \"./unified-request-context.js\";\n\nexport type RootParams = Record<string, string | string[] | undefined>;\n\nexport type RootParamsState = {\n  rootParams: RootParams | null;\n};\n\nconst _FALLBACK_KEY = Symbol.for(\"vinext.rootParams.fallback\");\nconst _g = globalThis as unknown as Record<PropertyKey, unknown>;\nconst _als = getOrCreateAls<RootParamsState>(\"vinext.rootParams.als\");\n\nconst _fallbackState = (_g[_FALLBACK_KEY] ??= {\n  rootParams: null,\n} satisfies RootParamsState) as RootParamsState;\n\nfunction getState(): RootParamsState {\n  if (isInsideUnifiedScope()) {\n    return getRequestContext();\n  }\n  return _als.getStore() ?? _fallbackState;\n}\n\nexport function pickRootParams(\n  params: RootParams,\n  rootParamNames: readonly string[] | null | undefined,\n): RootParams {\n  const picked: RootParams = {};\n  for (const name of rootParamNames ?? []) {\n    picked[name] = params[name];\n  }\n  return picked;\n}\n\nexport function setRootParams(params: RootParams | null): void {\n  getState().rootParams = params;\n}\n\nexport function getRootParam(name: string): Promise<string | string[] | undefined> {\n  return Promise.resolve(getState().rootParams?.[name]);\n}\n\nexport function runWithRootParamsScope<T>(params: RootParams, fn: () => Promise<T>): Promise<T>;\nexport function runWithRootParamsScope<T>(\n  params: RootParams,\n  fn: () => T | Promise<T>,\n): T | Promise<T>;\nexport function runWithRootParamsScope<T>(\n  params: RootParams,\n  fn: () => T | Promise<T>,\n): T | Promise<T> {\n  if (isInsideUnifiedScope()) {\n    return runWithUnifiedStateMutation((ctx) => {\n      ctx.rootParams = params;\n    }, fn);\n  } else {\n    return _als.run({ rootParams: params }, fn);\n  }\n}\n"],"mappings":";;;AAaA,MAAM,gBAAgB,OAAO,IAAI,6BAA6B;AAC9D,MAAM,KAAK;AACX,MAAM,OAAO,eAAgC,wBAAwB;AAErE,MAAM,iBAAkB,GAAG,mBAAmB,EAC5C,YAAY,MACb;AAED,SAAS,WAA4B;CACnC,IAAI,sBAAsB,EACxB,OAAO,mBAAmB;CAE5B,OAAO,KAAK,UAAU,IAAI;;AAG5B,SAAgB,eACd,QACA,gBACY;CACZ,MAAM,SAAqB,EAAE;CAC7B,KAAK,MAAM,QAAQ,kBAAkB,EAAE,EACrC,OAAO,QAAQ,OAAO;CAExB,OAAO;;AAGT,SAAgB,cAAc,QAAiC;CAC7D,UAAU,CAAC,aAAa;;AAG1B,SAAgB,aAAa,MAAsD;CACjF,OAAO,QAAQ,QAAQ,UAAU,CAAC,aAAa,MAAM;;AAQvD,SAAgB,uBACd,QACA,IACgB;CAChB,IAAI,sBAAsB,EACxB,OAAO,6BAA6B,QAAQ;EAC1C,IAAI,aAAa;IAChB,GAAG;MAEN,OAAO,KAAK,IAAI,EAAE,YAAY,QAAQ,EAAE,GAAG"}

package/dist/shims/router-state.d.ts

@@ -15,6 +15,7 @@ type SSRContext = {
   locale?: string;
   locales?: string[];
   defaultLocale?: string;
+  isFallback?: boolean;
 };
 type RouterState = {
   ssrContext: SSRContext | null;

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

@@ -1 +1 @@
-{"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 { _registerRouterStateAccessors } from \"./router.js\";\nimport { getOrCreateAls } from \"./internal/als-registry.js\";\nimport {\n  getRequestContext,\n  isInsideUnifiedScope,\n  runWithUnifiedStateMutation,\n} from \"./unified-request-context.js\";\n\n// ---------------------------------------------------------------------------\n// ALS setup\n// ---------------------------------------------------------------------------\n\nexport type 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 type RouterState = {\n  ssrContext: SSRContext | null;\n};\n\nconst _FALLBACK_KEY = Symbol.for(\"vinext.router.fallback\");\nconst _g = globalThis as unknown as Record<PropertyKey, unknown>;\nconst _als = getOrCreateAls<RouterState>(\"vinext.router.als\");\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: () => Promise<T>): Promise<T>;\nexport function runWithRouterState<T>(fn: () => T | Promise<T>): T | Promise<T>;\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,gBAAgB,OAAO,IAAI,yBAAyB;AAC1D,MAAM,KAAK;AACX,MAAM,OAAO,eAA4B,oBAAoB;AAE7D,MAAM,iBAAkB,GAAG,mBAAmB,EAC5C,YAAY,MACb;AAED,SAAS,YAAyB;CAChC,IAAI,sBAAsB,EACxB,OAAO,mBAAmB;CAE5B,OAAO,KAAK,UAAU,IAAI;;AAU5B,SAAgB,mBAAsB,IAA0C;CAC9E,IAAI,sBAAsB,EACxB,OAAO,6BAA6B,SAAS;EAC3C,KAAK,aAAa;IACjB,GAAG;CAMR,OAAO,KAAK,IAAI,EAFd,YAAY,MAEO,EAAE,GAAG;;AAO5B,8BAA8B;CAC5B,gBAAmC;EACjC,OAAO,WAAW,CAAC;;CAGrB,cAAc,KAA8B;EAC1C,WAAW,CAAC,aAAa;;CAE5B,CAAC"}
+{"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 { _registerRouterStateAccessors } from \"./router.js\";\nimport { getOrCreateAls } from \"./internal/als-registry.js\";\nimport {\n  getRequestContext,\n  isInsideUnifiedScope,\n  runWithUnifiedStateMutation,\n} from \"./unified-request-context.js\";\n\n// ---------------------------------------------------------------------------\n// ALS setup\n// ---------------------------------------------------------------------------\n\nexport type SSRContext = {\n  pathname: string;\n  query: Record<string, string | string[]>;\n  asPath: string;\n  locale?: string;\n  locales?: string[];\n  defaultLocale?: string;\n  isFallback?: boolean;\n};\n\nexport type RouterState = {\n  ssrContext: SSRContext | null;\n};\n\nconst _FALLBACK_KEY = Symbol.for(\"vinext.router.fallback\");\nconst _g = globalThis as unknown as Record<PropertyKey, unknown>;\nconst _als = getOrCreateAls<RouterState>(\"vinext.router.als\");\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: () => Promise<T>): Promise<T>;\nexport function runWithRouterState<T>(fn: () => T | Promise<T>): T | Promise<T>;\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":";;;;;;;;;;;;;AAoCA,MAAM,gBAAgB,OAAO,IAAI,yBAAyB;AAC1D,MAAM,KAAK;AACX,MAAM,OAAO,eAA4B,oBAAoB;AAE7D,MAAM,iBAAkB,GAAG,mBAAmB,EAC5C,YAAY,MACb;AAED,SAAS,YAAyB;CAChC,IAAI,sBAAsB,EACxB,OAAO,mBAAmB;CAE5B,OAAO,KAAK,UAAU,IAAI;;AAU5B,SAAgB,mBAAsB,IAA0C;CAC9E,IAAI,sBAAsB,EACxB,OAAO,6BAA6B,SAAS;EAC3C,KAAK,aAAa;IACjB,GAAG;CAMR,OAAO,KAAK,IAAI,EAFd,YAAY,MAEO,EAAE,GAAG;;AAO5B,8BAA8B;CAC5B,gBAAmC;EACjC,OAAO,WAAW,CAAC;;CAGrB,cAAc,KAA8B;EAC1C,WAAW,CAAC,aAAa;;CAE5B,CAAC"}

package/dist/shims/router.d.ts

@@ -38,7 +38,7 @@ type UrlObject = {
 type TransitionOptions = {
   shallow?: boolean;
   scroll?: boolean;
-  locale?: string;
+  locale?: string | false;
 };
 type RouterEvents = {
   on(event: string, handler: (...args: unknown[]) => void): void;
@@ -65,6 +65,14 @@ type SSRContext = {
   locales?: string[];
   defaultLocale?: string;
   domainLocales?: VinextNextData["domainLocales"];
+  /**
+   * True when rendering a `getStaticPaths` fallback shell for a path that
+   * hasn't been pre-rendered yet (`fallback: true` + unlisted path). Mirrors
+   * `renderContext.isFallback` in Next.js's `render.tsx`: `getStaticProps`
+   * is skipped, the page renders with empty props, and `useRouter().isFallback`
+   * returns `true` so user code can show a loading state.
+   */
+  isFallback?: boolean;
 };
 /**
  * Register ALS-backed state accessors. Called by router-state.ts on import.
@@ -75,18 +83,42 @@ declare function _registerRouterStateAccessors(accessors: {
   setSSRContext: (ctx: SSRContext | null) => void;
 }): void;
 declare function setSSRContext(ctx: SSRContext | null): void;
+type PagesNavigationContextShape = {
+  pathname: string;
+  searchParams: URLSearchParams;
+  params: Record<string, string | string[]>;
+};
+/**
+ * Cross-router compat shim source for `next/navigation` hooks.
+ *
+ * Returns the current Pages Router state shaped as a navigation context so
+ * the App Router hooks (useParams/useSearchParams/usePathname) can act as
+ * compat shims when invoked inside a Pages Router render. Mirrors Next.js's
+ * `adaptForPathParams` and `adaptForSearchParams` in
+ * .nextjs-ref/packages/next/src/shared/lib/router/adapters.tsx, which Next.js
+ * uses to populate SearchParamsContext / PathParamsContext for the Pages
+ * Router (see packages/next/src/server/render.tsx and
+ * packages/next/src/client/index.tsx).
+ *
+ * Returns `null` when there is no Pages Router state available — e.g. App
+ * Router pages, RSC-only renders, or pre-router renders. Callers should
+ * treat null as "App Router context, use normal app-router state".
+ */
+declare function getPagesNavigationContext(): PagesNavigationContextShape | null;
 /**
  * useRouter hook - Pages Router compatible.
+ *
+ * Ported from Next.js: packages/next/src/client/router.ts
+ * https://github.com/vercel/next.js/blob/canary/packages/next/src/client/router.ts
  */
 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.
  *
- * This is a plain function, NOT a React component — it builds the router
- * value object directly from the current SSR context (server) or
- * window.location + Router singleton (client), avoiding duplicate state
- * that a hook-based component would create.
+ * The provider owns the reactive Pages Router snapshot so next/router and
+ * next/compat/router consumers share one context value instead of each hook
+ * installing its own global URL-change listener.
  */
 declare function wrapWithRouterContext(element: ReactElement): ReactElement;
 /**
@@ -125,7 +157,7 @@ type ExcludeRouterProps<P> = Pick<P, Exclude<keyof P, keyof WithRouterProps>>;
  *   define `getInitialProps`.
  */
 declare function withRouter<P extends WithRouterProps>(ComposedComponent: ComponentType<P>): ComponentType<ExcludeRouterProps<P>>;
-declare const Router: {
+declare const RouterMethods: {
   push: (url: string | UrlObject, as?: string, options?: TransitionOptions) => Promise<boolean>;
   replace: (url: string | UrlObject, as?: string, options?: TransitionOptions) => Promise<boolean>;
   back: () => void;
@@ -134,6 +166,7 @@ declare const Router: {
   beforePopState: (cb: BeforePopStateCallback) => void;
   events: RouterEvents;
 };
+declare const Router: typeof RouterMethods & Omit<NextRouter, keyof typeof RouterMethods>;
 //#endregion
-export { ExcludeRouterProps, NextRouter, WithRouterProps, _registerRouterStateAccessors, applyNavigationLocale, Router as default, isExternalUrl, isHashOnlyChange, setSSRContext, useRouter, withRouter, wrapWithRouterContext };
+export { ExcludeRouterProps, NextRouter, WithRouterProps, _registerRouterStateAccessors, applyNavigationLocale, Router as default, getPagesNavigationContext, isExternalUrl, isHashOnlyChange, setSSRContext, useRouter, withRouter, wrapWithRouterContext };
 //# sourceMappingURL=router.d.ts.map