vinext 0.0.41 → 0.0.43

package/dist/shims/slot.js.map

@@ -1 +1 @@
-{"version":3,"file":"slot.js","names":["React"],"sources":["../../src/shims/slot.tsx"],"sourcesContent":["\"use client\";\n\nimport * as React from \"react\";\nimport { notFound } from \"./navigation.js\";\n\nexport type Elements = Record<string, React.ReactNode | typeof UNMATCHED_SLOT>;\n\n// Shared across requests — safe because the resolved value is frozen.\n// A Slot rendered outside an ElementsContext.Provider sees {} and returns null for all IDs.\nconst EMPTY_ELEMENTS_PROMISE = Promise.resolve<Elements>(Object.freeze({}));\n// Client-only optimisation: memoises merged promises by identity so React.use() sees a stable\n// reference across re-renders. During SSR each request creates fresh promises so the cache is\n// never hit, but the WeakMap entries are GC-eligible once the request's promises are collected.\nconst mergeCache = new WeakMap<Promise<Elements>, WeakMap<Promise<Elements>, Promise<Elements>>>();\n\nexport const UNMATCHED_SLOT = Symbol.for(\"vinext.unmatchedSlot\");\n\nexport const ElementsContext = React.createContext<Promise<Elements>>(EMPTY_ELEMENTS_PROMISE);\n\nexport const ChildrenContext = React.createContext<React.ReactNode>(null);\n\nexport const ParallelSlotsContext = React.createContext<Readonly<\n  Record<string, React.ReactNode>\n> | null>(null);\n\nexport function mergeElementsPromise(\n  prev: Promise<Elements>,\n  next: Promise<Elements>,\n): Promise<Elements> {\n  let nextCache = mergeCache.get(prev);\n  if (!nextCache) {\n    nextCache = new WeakMap();\n    mergeCache.set(prev, nextCache);\n  }\n\n  const cached = nextCache.get(next);\n  if (cached) {\n    return cached;\n  }\n\n  // Cached permanently including rejections — intentional because these promises come from\n  // createFromFetch() and a rejection means the navigation itself has failed.\n  const merged = Promise.all([prev, next]).then(([prevElements, nextElements]) => ({\n    ...prevElements,\n    ...nextElements,\n  }));\n  nextCache.set(next, merged);\n  return merged;\n}\n\nexport function Slot({\n  id,\n  children,\n  parallelSlots,\n}: {\n  id: string;\n  children?: React.ReactNode;\n  parallelSlots?: Readonly<Record<string, React.ReactNode>>;\n}) {\n  const elements = React.use(React.useContext(ElementsContext));\n\n  if (!Object.hasOwn(elements, id)) {\n    return null;\n  }\n\n  const element = elements[id];\n  if (element === UNMATCHED_SLOT) {\n    notFound(); // throws — never reaches the JSX below\n  }\n\n  return (\n    <ParallelSlotsContext.Provider value={parallelSlots ?? null}>\n      <ChildrenContext.Provider value={children ?? null}>{element}</ChildrenContext.Provider>\n    </ParallelSlotsContext.Provider>\n  );\n}\n\nexport function Children() {\n  return React.useContext(ChildrenContext);\n}\n\nexport function ParallelSlot({ name }: { name: string }) {\n  const slots = React.useContext(ParallelSlotsContext);\n  return slots?.[name] ?? null;\n}\n"],"mappings":";;;;;AASA,MAAM,yBAAyB,QAAQ,QAAkB,OAAO,OAAO,EAAE,CAAC,CAAC;AAI3E,MAAM,6BAAa,IAAI,SAA2E;AAElG,MAAa,iBAAiB,OAAO,IAAI,uBAAuB;AAEhE,MAAa,kBAAkBA,QAAM,cAAiC,uBAAuB;AAE7F,MAAa,kBAAkBA,QAAM,cAA+B,KAAK;AAEzE,MAAa,uBAAuBA,QAAM,cAEhC,KAAK;AAEf,SAAgB,qBACd,MACA,MACmB;CACnB,IAAI,YAAY,WAAW,IAAI,KAAK;AACpC,KAAI,CAAC,WAAW;AACd,8BAAY,IAAI,SAAS;AACzB,aAAW,IAAI,MAAM,UAAU;;CAGjC,MAAM,SAAS,UAAU,IAAI,KAAK;AAClC,KAAI,OACF,QAAO;CAKT,MAAM,SAAS,QAAQ,IAAI,CAAC,MAAM,KAAK,CAAC,CAAC,MAAM,CAAC,cAAc,mBAAmB;EAC/E,GAAG;EACH,GAAG;EACJ,EAAE;AACH,WAAU,IAAI,MAAM,OAAO;AAC3B,QAAO;;AAGT,SAAgB,KAAK,EACnB,IACA,UACA,iBAKC;CACD,MAAM,WAAWA,QAAM,IAAIA,QAAM,WAAW,gBAAgB,CAAC;AAE7D,KAAI,CAAC,OAAO,OAAO,UAAU,GAAG,CAC9B,QAAO;CAGT,MAAM,UAAU,SAAS;AACzB,KAAI,YAAY,eACd,WAAU;AAGZ,QACE,oBAAC,qBAAqB,UAAtB;EAA+B,OAAO,iBAAiB;YACrD,oBAAC,gBAAgB,UAAjB;GAA0B,OAAO,YAAY;aAAO;GAAmC,CAAA;EACzD,CAAA;;AAIpC,SAAgB,WAAW;AACzB,QAAOA,QAAM,WAAW,gBAAgB;;AAG1C,SAAgB,aAAa,EAAE,QAA0B;AAEvD,QADcA,QAAM,WAAW,qBAAqB,GACrC,SAAS"}
+{"version":3,"file":"slot.js","names":["React"],"sources":["../../src/shims/slot.tsx"],"sourcesContent":["\"use client\";\n\nimport * as React from \"react\";\nimport { UNMATCHED_SLOT, type AppElementValue, type AppElements } from \"../server/app-elements.js\";\nimport { notFound } from \"./navigation.js\";\n\nconst EMPTY_ELEMENTS: AppElements = Object.freeze({});\nconst warnedMissingEntryIds = new Set<string>();\n\nexport { UNMATCHED_SLOT };\n\n/**\n * Holds resolved AppElements (not a Promise). React 19's use(Promise) during\n * hydration triggers \"async Client Component\" for native Promises that lack\n * React's internal .status property. Storing resolved values sidesteps this.\n */\nexport const ElementsContext = React.createContext<AppElements>(EMPTY_ELEMENTS);\n\nexport const ChildrenContext = React.createContext<React.ReactNode>(null);\n\nexport const ParallelSlotsContext = React.createContext<Readonly<\n  Record<string, React.ReactNode>\n> | null>(null);\n\nexport function mergeElements(\n  prev: AppElements,\n  next: AppElements,\n  clearAbsentSlots = false,\n): AppElements {\n  const merged: Record<string, AppElementValue> = { ...prev, ...next };\n  // On soft navigation, unmatched parallel slots preserve their previous subtree\n  // instead of firing notFound(). Only hard navigation (full page load) should 404.\n  // This matches Next.js behavior for parallel route persistence.\n  for (const key of Object.keys(merged)) {\n    if (key.startsWith(\"slot:\") && merged[key] === UNMATCHED_SLOT && Object.hasOwn(prev, key)) {\n      merged[key] = prev[key];\n    }\n  }\n  // On traversal (browser back/forward), the server renders the full destination\n  // route tree. A slot absent from next means the destination route tree does not\n  // include it, so clear it rather than keeping the stale prev value. This only\n  // runs for traversals because soft forward navigations may omit parent layout\n  // slots that should be preserved.\n  if (clearAbsentSlots) {\n    for (const key of Object.keys(merged)) {\n      if (key.startsWith(\"slot:\") && !Object.hasOwn(next, key)) {\n        delete merged[key];\n      }\n    }\n  }\n  return merged;\n}\n\nexport function Slot({\n  id,\n  children,\n  parallelSlots,\n}: {\n  id: string;\n  children?: React.ReactNode;\n  parallelSlots?: Readonly<Record<string, React.ReactNode>>;\n}) {\n  const elements = React.useContext(ElementsContext);\n\n  if (!Object.hasOwn(elements, id)) {\n    if (process.env.NODE_ENV !== \"production\" && !id.startsWith(\"slot:\")) {\n      if (!warnedMissingEntryIds.has(id)) {\n        warnedMissingEntryIds.add(id);\n        console.warn(\"[vinext] Missing App Router element entry during render: \" + id);\n      }\n    }\n    return null;\n  }\n\n  const element = elements[id];\n  if (element === UNMATCHED_SLOT) {\n    notFound();\n  }\n\n  return (\n    <ParallelSlotsContext.Provider value={parallelSlots ?? null}>\n      <ChildrenContext.Provider value={children ?? null}>{element}</ChildrenContext.Provider>\n    </ParallelSlotsContext.Provider>\n  );\n}\n\nexport function Children() {\n  return React.useContext(ChildrenContext);\n}\n\nexport function ParallelSlot({ name }: { name: string }) {\n  const slots = React.useContext(ParallelSlotsContext);\n  return slots?.[name] ?? null;\n}\n"],"mappings":";;;;;;AAMA,MAAM,iBAA8B,OAAO,OAAO,EAAE,CAAC;AACrD,MAAM,wCAAwB,IAAI,KAAa;;;;;;AAS/C,MAAa,kBAAkBA,QAAM,cAA2B,eAAe;AAE/E,MAAa,kBAAkBA,QAAM,cAA+B,KAAK;AAEzE,MAAa,uBAAuBA,QAAM,cAEhC,KAAK;AAEf,SAAgB,cACd,MACA,MACA,mBAAmB,OACN;CACb,MAAM,SAA0C;EAAE,GAAG;EAAM,GAAG;EAAM;AAIpE,MAAK,MAAM,OAAO,OAAO,KAAK,OAAO,CACnC,KAAI,IAAI,WAAW,QAAQ,IAAI,OAAO,SAAS,kBAAkB,OAAO,OAAO,MAAM,IAAI,CACvF,QAAO,OAAO,KAAK;AAQvB,KAAI;OACG,MAAM,OAAO,OAAO,KAAK,OAAO,CACnC,KAAI,IAAI,WAAW,QAAQ,IAAI,CAAC,OAAO,OAAO,MAAM,IAAI,CACtD,QAAO,OAAO;;AAIpB,QAAO;;AAGT,SAAgB,KAAK,EACnB,IACA,UACA,iBAKC;CACD,MAAM,WAAWA,QAAM,WAAW,gBAAgB;AAElD,KAAI,CAAC,OAAO,OAAO,UAAU,GAAG,EAAE;AAChC,MAAI,QAAQ,IAAI,aAAa,gBAAgB,CAAC,GAAG,WAAW,QAAQ;OAC9D,CAAC,sBAAsB,IAAI,GAAG,EAAE;AAClC,0BAAsB,IAAI,GAAG;AAC7B,YAAQ,KAAK,8DAA8D,GAAG;;;AAGlF,SAAO;;CAGT,MAAM,UAAU,SAAS;AACzB,KAAI,YAAY,eACd,WAAU;AAGZ,QACE,oBAAC,qBAAqB,UAAtB;EAA+B,OAAO,iBAAiB;YACrD,oBAAC,gBAAgB,UAAjB;GAA0B,OAAO,YAAY;aAAO;GAAmC,CAAA;EACzD,CAAA;;AAIpC,SAAgB,WAAW;AACzB,QAAOA,QAAM,WAAW,gBAAgB;;AAG1C,SAAgB,aAAa,EAAE,QAA0B;AAEvD,QADcA,QAAM,WAAW,qBAAqB,GACrC,SAAS"}

package/dist/shims/unified-request-context.d.ts

@@ -29,6 +29,7 @@ declare function createRequestContext(opts?: Partial<UnifiedRequestContext>): Un
  * All shim modules will read/write their state from `ctx` for the
  * duration of the call, including async continuations.
  */
+declare function runWithRequestContext<T>(ctx: UnifiedRequestContext, fn: () => Promise<T>): Promise<T>;
 declare function runWithRequestContext<T>(ctx: UnifiedRequestContext, fn: () => T | Promise<T>): T | Promise<T>;
 /**
  * Run `fn` in a nested unified scope derived from the current request context.
@@ -39,6 +40,7 @@ declare function runWithRequestContext<T>(ctx: UnifiedRequestContext, fn: () =>
  *
  * @internal
  */
+declare function runWithUnifiedStateMutation<T>(mutate: (ctx: UnifiedRequestContext) => void, fn: () => Promise<T>): Promise<T>;
 declare function runWithUnifiedStateMutation<T>(mutate: (ctx: UnifiedRequestContext) => void, fn: () => T | Promise<T>): T | Promise<T>;
 /**
  * Get the current unified request context.

package/dist/shims/unified-request-context.js

@@ -44,23 +44,9 @@ function createRequestContext(opts) {
 		...opts
 	};
 }
-/**
-* Run `fn` within a unified request context scope.
-* All shim modules will read/write their state from `ctx` for the
-* duration of the call, including async continuations.
-*/
 function runWithRequestContext(ctx, fn) {
 	return _als.run(ctx, fn);
 }
-/**
-* Run `fn` in a nested unified scope derived from the current request context.
-* Used by legacy runWith* wrappers to reset or override one sub-state while
-* preserving proper async isolation for continuations created inside `fn`.
-* The child scope is a shallow clone of the parent store, so untouched fields
-* keep sharing their existing references while overridden slices can be reset.
-*
-* @internal
-*/
 function runWithUnifiedStateMutation(mutate, fn) {
 	const parentCtx = _als.getStore();
 	if (!parentCtx) return fn();

package/dist/shims/unified-request-context.js.map

@@ -1 +1 @@
-{"version":3,"file":"unified-request-context.js","names":[],"sources":["../../src/shims/unified-request-context.ts"],"sourcesContent":["/**\n * Unified per-request context backed by a single AsyncLocalStorage.\n *\n * Consolidates the 5–6 nested ALS scopes that previously wrapped every\n * App Router request (headers, navigation, cache-state, private-cache,\n * fetch-cache, execution-context) into one flat store.\n *\n * Each shim module checks `isInsideUnifiedScope()` and reads its sub-fields\n * from the unified store, falling back to its own standalone ALS when\n * outside (SSR environment, Pages Router, tests).\n */\n\nimport { AsyncLocalStorage } from \"node:async_hooks\";\nimport type {\n  CacheState,\n  ExecutionContextLike,\n  FetchCacheState,\n  HeadState,\n  I18nState,\n  NavigationState,\n  PrivateCacheState,\n  RouterState,\n  VinextHeadersShimState,\n} from \"./request-state-types.js\";\n\n// ---------------------------------------------------------------------------\n// Unified context shape\n// ---------------------------------------------------------------------------\n\n/**\n * Flat union of all per-request state previously spread across\n * VinextHeadersShimState, NavigationState, CacheState, PrivateCacheState,\n * FetchCacheState, and ExecutionContextLike.\n *\n * Each field group is documented with its source shim module.\n */\nexport type UnifiedRequestContext = {\n  // ── request-context.ts ─────────────────────────────────────────────\n  /** Cloudflare Workers ExecutionContext, or null on Node.js dev. */\n  executionContext: ExecutionContextLike | null;\n\n  // ── cache-for-request.ts ──────────────────────────────────────────\n  /** Per-request cache for cacheForRequest(). Keyed by factory function reference. */\n  // oxlint-disable-next-line @typescript-eslint/no-explicit-any\n  requestCache: WeakMap<(...args: any[]) => any, unknown>;\n} & VinextHeadersShimState &\n  I18nState &\n  NavigationState &\n  CacheState &\n  PrivateCacheState &\n  FetchCacheState &\n  RouterState &\n  HeadState;\n\n// ---------------------------------------------------------------------------\n// ALS setup — stored on globalThis via Symbol.for so all Vite environments\n// (RSC/SSR/client) share the same instance.\n// ---------------------------------------------------------------------------\n\nconst _ALS_KEY = Symbol.for(\"vinext.unifiedRequestContext.als\");\nconst _REQUEST_CONTEXT_ALS_KEY = Symbol.for(\"vinext.requestContext.als\");\nconst _g = globalThis as unknown as Record<PropertyKey, unknown>;\nconst _als = (_g[_ALS_KEY] ??=\n  new AsyncLocalStorage<UnifiedRequestContext>()) as AsyncLocalStorage<UnifiedRequestContext>;\n\nfunction _getInheritedExecutionContext(): ExecutionContextLike | null {\n  const unifiedStore = _als.getStore();\n  if (unifiedStore) return unifiedStore.executionContext;\n\n  const executionContextAls = _g[_REQUEST_CONTEXT_ALS_KEY] as\n    | AsyncLocalStorage<ExecutionContextLike | null>\n    | undefined;\n  return executionContextAls?.getStore() ?? null;\n}\n\n// ---------------------------------------------------------------------------\n// Public API\n// ---------------------------------------------------------------------------\n\n/**\n * Create a fresh `UnifiedRequestContext` with defaults for all fields.\n * Pass partial overrides for the fields you need to pre-populate.\n */\nexport function createRequestContext(opts?: Partial<UnifiedRequestContext>): UnifiedRequestContext {\n  return {\n    headersContext: null,\n    dynamicUsageDetected: false,\n    pendingSetCookies: [],\n    draftModeCookieHeader: null,\n    phase: \"render\",\n    i18nContext: null,\n    serverContext: null,\n    serverInsertedHTMLCallbacks: [],\n    requestScopedCacheLife: null,\n    _privateCache: null,\n    currentRequestTags: [],\n    executionContext: _getInheritedExecutionContext(), // inherits from standalone ALS if present\n    requestCache: new WeakMap(),\n    ssrContext: null,\n    ssrHeadChildren: [],\n    ...opts,\n  };\n}\n\n/**\n * Run `fn` within a unified request context scope.\n * All shim modules will read/write their state from `ctx` for the\n * duration of the call, including async continuations.\n */\nexport function runWithRequestContext<T>(\n  ctx: UnifiedRequestContext,\n  fn: () => T | Promise<T>,\n): T | Promise<T> {\n  return _als.run(ctx, fn);\n}\n\n/**\n * Run `fn` in a nested unified scope derived from the current request context.\n * Used by legacy runWith* wrappers to reset or override one sub-state while\n * preserving proper async isolation for continuations created inside `fn`.\n * The child scope is a shallow clone of the parent store, so untouched fields\n * keep sharing their existing references while overridden slices can be reset.\n *\n * @internal\n */\nexport function runWithUnifiedStateMutation<T>(\n  mutate: (ctx: UnifiedRequestContext) => void,\n  fn: () => T | Promise<T>,\n): T | Promise<T> {\n  const parentCtx = _als.getStore();\n  if (!parentCtx) return fn();\n\n  const childCtx = { ...parentCtx };\n  // NOTE: This is a shallow clone. Array fields (pendingSetCookies,\n  // serverInsertedHTMLCallbacks, currentRequestTags, ssrHeadChildren), the\n  // _privateCache Map, requestCache WeakMap, and object fields (headersContext,\n  // i18nContext, serverContext, ssrContext, executionContext,\n  // requestScopedCacheLife) still share references with the parent until\n  // replaced. requestCache is intentionally shared — nested scopes within\n  // the same request should see the same cached values. The mutate\n  // callback must replace those reference-typed slices (for example\n  // `ctx.currentRequestTags = []`) rather than mutating them in-place (for\n  // example `ctx.currentRequestTags.push(...)`) or the parent scope will\n  // observe those changes too. Keep this enumeration in sync with\n  // UnifiedRequestContext: when adding a new reference-typed field, add it\n  // here too and verify callers still follow the replace-not-mutate rule.\n  mutate(childCtx);\n  return _als.run(childCtx, fn);\n}\n\n/**\n * Get the current unified request context.\n * Returns the ALS store when inside a `runWithRequestContext()` scope,\n * or a fresh detached context otherwise. Unlike the legacy per-shim fallback\n * singletons, this detached value is ephemeral — mutations do not persist\n * across calls. This is intentional to prevent state leakage outside request\n * scopes.\n *\n * Only direct callers observe this detached fallback. Shim `_getState()`\n * helpers should continue to gate on `isInsideUnifiedScope()` and fall back\n * to their standalone ALS/fallback singletons outside the unified scope.\n * If called inside a standalone `runWithExecutionContext()` scope, the\n * detached context still reflects that inherited `executionContext`.\n */\nexport function getRequestContext(): UnifiedRequestContext {\n  return _als.getStore() ?? createRequestContext();\n}\n\n/**\n * Check whether the current execution is inside a `runWithRequestContext()` scope.\n * Shim modules use this to decide whether to read from the unified store\n * or fall back to their own standalone ALS.\n */\nexport function isInsideUnifiedScope(): boolean {\n  return _als.getStore() != null;\n}\n"],"mappings":";;;;;;;;;;;;;AA2DA,MAAM,WAAW,OAAO,IAAI,mCAAmC;AAC/D,MAAM,2BAA2B,OAAO,IAAI,4BAA4B;AACxE,MAAM,KAAK;AACX,MAAM,OAAQ,GAAG,cACf,IAAI,mBAA0C;AAEhD,SAAS,gCAA6D;CACpE,MAAM,eAAe,KAAK,UAAU;AACpC,KAAI,aAAc,QAAO,aAAa;AAKtC,QAH4B,GAAG,2BAGH,UAAU,IAAI;;;;;;AAW5C,SAAgB,qBAAqB,MAA8D;AACjG,QAAO;EACL,gBAAgB;EAChB,sBAAsB;EACtB,mBAAmB,EAAE;EACrB,uBAAuB;EACvB,OAAO;EACP,aAAa;EACb,eAAe;EACf,6BAA6B,EAAE;EAC/B,wBAAwB;EACxB,eAAe;EACf,oBAAoB,EAAE;EACtB,kBAAkB,+BAA+B;EACjD,8BAAc,IAAI,SAAS;EAC3B,YAAY;EACZ,iBAAiB,EAAE;EACnB,GAAG;EACJ;;;;;;;AAQH,SAAgB,sBACd,KACA,IACgB;AAChB,QAAO,KAAK,IAAI,KAAK,GAAG;;;;;;;;;;;AAY1B,SAAgB,4BACd,QACA,IACgB;CAChB,MAAM,YAAY,KAAK,UAAU;AACjC,KAAI,CAAC,UAAW,QAAO,IAAI;CAE3B,MAAM,WAAW,EAAE,GAAG,WAAW;AAcjC,QAAO,SAAS;AAChB,QAAO,KAAK,IAAI,UAAU,GAAG;;;;;;;;;;;;;;;;AAiB/B,SAAgB,oBAA2C;AACzD,QAAO,KAAK,UAAU,IAAI,sBAAsB;;;;;;;AAQlD,SAAgB,uBAAgC;AAC9C,QAAO,KAAK,UAAU,IAAI"}
+{"version":3,"file":"unified-request-context.js","names":[],"sources":["../../src/shims/unified-request-context.ts"],"sourcesContent":["/**\n * Unified per-request context backed by a single AsyncLocalStorage.\n *\n * Consolidates the 5–6 nested ALS scopes that previously wrapped every\n * App Router request (headers, navigation, cache-state, private-cache,\n * fetch-cache, execution-context) into one flat store.\n *\n * Each shim module checks `isInsideUnifiedScope()` and reads its sub-fields\n * from the unified store, falling back to its own standalone ALS when\n * outside (SSR environment, Pages Router, tests).\n */\n\nimport { AsyncLocalStorage } from \"node:async_hooks\";\nimport type {\n  CacheState,\n  ExecutionContextLike,\n  FetchCacheState,\n  HeadState,\n  I18nState,\n  NavigationState,\n  PrivateCacheState,\n  RouterState,\n  VinextHeadersShimState,\n} from \"./request-state-types.js\";\n\n// ---------------------------------------------------------------------------\n// Unified context shape\n// ---------------------------------------------------------------------------\n\n/**\n * Flat union of all per-request state previously spread across\n * VinextHeadersShimState, NavigationState, CacheState, PrivateCacheState,\n * FetchCacheState, and ExecutionContextLike.\n *\n * Each field group is documented with its source shim module.\n */\nexport type UnifiedRequestContext = {\n  // ── request-context.ts ─────────────────────────────────────────────\n  /** Cloudflare Workers ExecutionContext, or null on Node.js dev. */\n  executionContext: ExecutionContextLike | null;\n\n  // ── cache-for-request.ts ──────────────────────────────────────────\n  /** Per-request cache for cacheForRequest(). Keyed by factory function reference. */\n  // oxlint-disable-next-line @typescript-eslint/no-explicit-any\n  requestCache: WeakMap<(...args: any[]) => any, unknown>;\n} & VinextHeadersShimState &\n  I18nState &\n  NavigationState &\n  CacheState &\n  PrivateCacheState &\n  FetchCacheState &\n  RouterState &\n  HeadState;\n\n// ---------------------------------------------------------------------------\n// ALS setup — stored on globalThis via Symbol.for so all Vite environments\n// (RSC/SSR/client) share the same instance.\n// ---------------------------------------------------------------------------\n\nconst _ALS_KEY = Symbol.for(\"vinext.unifiedRequestContext.als\");\nconst _REQUEST_CONTEXT_ALS_KEY = Symbol.for(\"vinext.requestContext.als\");\nconst _g = globalThis as unknown as Record<PropertyKey, unknown>;\nconst _als = (_g[_ALS_KEY] ??=\n  new AsyncLocalStorage<UnifiedRequestContext>()) as AsyncLocalStorage<UnifiedRequestContext>;\n\nfunction _getInheritedExecutionContext(): ExecutionContextLike | null {\n  const unifiedStore = _als.getStore();\n  if (unifiedStore) return unifiedStore.executionContext;\n\n  const executionContextAls = _g[_REQUEST_CONTEXT_ALS_KEY] as\n    | AsyncLocalStorage<ExecutionContextLike | null>\n    | undefined;\n  return executionContextAls?.getStore() ?? null;\n}\n\n// ---------------------------------------------------------------------------\n// Public API\n// ---------------------------------------------------------------------------\n\n/**\n * Create a fresh `UnifiedRequestContext` with defaults for all fields.\n * Pass partial overrides for the fields you need to pre-populate.\n */\nexport function createRequestContext(opts?: Partial<UnifiedRequestContext>): UnifiedRequestContext {\n  return {\n    headersContext: null,\n    dynamicUsageDetected: false,\n    pendingSetCookies: [],\n    draftModeCookieHeader: null,\n    phase: \"render\",\n    i18nContext: null,\n    serverContext: null,\n    serverInsertedHTMLCallbacks: [],\n    requestScopedCacheLife: null,\n    _privateCache: null,\n    currentRequestTags: [],\n    executionContext: _getInheritedExecutionContext(), // inherits from standalone ALS if present\n    requestCache: new WeakMap(),\n    ssrContext: null,\n    ssrHeadChildren: [],\n    ...opts,\n  };\n}\n\n/**\n * Run `fn` within a unified request context scope.\n * All shim modules will read/write their state from `ctx` for the\n * duration of the call, including async continuations.\n */\nexport function runWithRequestContext<T>(\n  ctx: UnifiedRequestContext,\n  fn: () => Promise<T>,\n): Promise<T>;\nexport function runWithRequestContext<T>(\n  ctx: UnifiedRequestContext,\n  fn: () => T | Promise<T>,\n): T | Promise<T>;\nexport function runWithRequestContext<T>(\n  ctx: UnifiedRequestContext,\n  fn: () => T | Promise<T>,\n): T | Promise<T> {\n  return _als.run(ctx, fn);\n}\n\n/**\n * Run `fn` in a nested unified scope derived from the current request context.\n * Used by legacy runWith* wrappers to reset or override one sub-state while\n * preserving proper async isolation for continuations created inside `fn`.\n * The child scope is a shallow clone of the parent store, so untouched fields\n * keep sharing their existing references while overridden slices can be reset.\n *\n * @internal\n */\nexport function runWithUnifiedStateMutation<T>(\n  mutate: (ctx: UnifiedRequestContext) => void,\n  fn: () => Promise<T>,\n): Promise<T>;\nexport function runWithUnifiedStateMutation<T>(\n  mutate: (ctx: UnifiedRequestContext) => void,\n  fn: () => T | Promise<T>,\n): T | Promise<T>;\nexport function runWithUnifiedStateMutation<T>(\n  mutate: (ctx: UnifiedRequestContext) => void,\n  fn: () => T | Promise<T>,\n): T | Promise<T> {\n  const parentCtx = _als.getStore();\n  if (!parentCtx) return fn();\n\n  const childCtx = { ...parentCtx };\n  // NOTE: This is a shallow clone. Array fields (pendingSetCookies,\n  // serverInsertedHTMLCallbacks, currentRequestTags, ssrHeadChildren), the\n  // _privateCache Map, requestCache WeakMap, and object fields (headersContext,\n  // i18nContext, serverContext, ssrContext, executionContext,\n  // requestScopedCacheLife) still share references with the parent until\n  // replaced. requestCache is intentionally shared — nested scopes within\n  // the same request should see the same cached values. The mutate\n  // callback must replace those reference-typed slices (for example\n  // `ctx.currentRequestTags = []`) rather than mutating them in-place (for\n  // example `ctx.currentRequestTags.push(...)`) or the parent scope will\n  // observe those changes too. Keep this enumeration in sync with\n  // UnifiedRequestContext: when adding a new reference-typed field, add it\n  // here too and verify callers still follow the replace-not-mutate rule.\n  mutate(childCtx);\n  return _als.run(childCtx, fn);\n}\n\n/**\n * Get the current unified request context.\n * Returns the ALS store when inside a `runWithRequestContext()` scope,\n * or a fresh detached context otherwise. Unlike the legacy per-shim fallback\n * singletons, this detached value is ephemeral — mutations do not persist\n * across calls. This is intentional to prevent state leakage outside request\n * scopes.\n *\n * Only direct callers observe this detached fallback. Shim `_getState()`\n * helpers should continue to gate on `isInsideUnifiedScope()` and fall back\n * to their standalone ALS/fallback singletons outside the unified scope.\n * If called inside a standalone `runWithExecutionContext()` scope, the\n * detached context still reflects that inherited `executionContext`.\n */\nexport function getRequestContext(): UnifiedRequestContext {\n  return _als.getStore() ?? createRequestContext();\n}\n\n/**\n * Check whether the current execution is inside a `runWithRequestContext()` scope.\n * Shim modules use this to decide whether to read from the unified store\n * or fall back to their own standalone ALS.\n */\nexport function isInsideUnifiedScope(): boolean {\n  return _als.getStore() != null;\n}\n"],"mappings":";;;;;;;;;;;;;AA2DA,MAAM,WAAW,OAAO,IAAI,mCAAmC;AAC/D,MAAM,2BAA2B,OAAO,IAAI,4BAA4B;AACxE,MAAM,KAAK;AACX,MAAM,OAAQ,GAAG,cACf,IAAI,mBAA0C;AAEhD,SAAS,gCAA6D;CACpE,MAAM,eAAe,KAAK,UAAU;AACpC,KAAI,aAAc,QAAO,aAAa;AAKtC,QAH4B,GAAG,2BAGH,UAAU,IAAI;;;;;;AAW5C,SAAgB,qBAAqB,MAA8D;AACjG,QAAO;EACL,gBAAgB;EAChB,sBAAsB;EACtB,mBAAmB,EAAE;EACrB,uBAAuB;EACvB,OAAO;EACP,aAAa;EACb,eAAe;EACf,6BAA6B,EAAE;EAC/B,wBAAwB;EACxB,eAAe;EACf,oBAAoB,EAAE;EACtB,kBAAkB,+BAA+B;EACjD,8BAAc,IAAI,SAAS;EAC3B,YAAY;EACZ,iBAAiB,EAAE;EACnB,GAAG;EACJ;;AAgBH,SAAgB,sBACd,KACA,IACgB;AAChB,QAAO,KAAK,IAAI,KAAK,GAAG;;AAoB1B,SAAgB,4BACd,QACA,IACgB;CAChB,MAAM,YAAY,KAAK,UAAU;AACjC,KAAI,CAAC,UAAW,QAAO,IAAI;CAE3B,MAAM,WAAW,EAAE,GAAG,WAAW;AAcjC,QAAO,SAAS;AAChB,QAAO,KAAK,IAAI,UAAU,GAAG;;;;;;;;;;;;;;;;AAiB/B,SAAgB,oBAA2C;AACzD,QAAO,KAAK,UAAU,IAAI,sBAAsB;;;;;;;AAQlD,SAAgB,uBAAgC;AAC9C,QAAO,KAAK,UAAU,IAAI"}

package/dist/utils/mdx-scan.d.ts

@@ -0,0 +1,10 @@
+//#region src/utils/mdx-scan.d.ts
+/** Module-level cache for hasMdxFiles — avoids re-scanning per Vite environment. */
+declare const mdxScanCache: Map<string, boolean>;
+/**
+ * Check if the project has .mdx files in app/ or pages/ directories.
+ */
+declare function hasMdxFiles(root: string, appDir: string | null, pagesDir: string | null): boolean;
+//#endregion
+export { hasMdxFiles, mdxScanCache };
+//# sourceMappingURL=mdx-scan.d.ts.map

package/dist/utils/mdx-scan.js

@@ -0,0 +1,36 @@
+import fs from "node:fs";
+import path from "node:path";
+//#region src/utils/mdx-scan.ts
+/** Module-level cache for hasMdxFiles — avoids re-scanning per Vite environment. */
+const mdxScanCache = /* @__PURE__ */ new Map();
+/**
+* Check if the project has .mdx files in app/ or pages/ directories.
+*/
+function hasMdxFiles(root, appDir, pagesDir) {
+	const cacheKey = `${root}\0${appDir ?? ""}\0${pagesDir ?? ""}`;
+	if (mdxScanCache.has(cacheKey)) return mdxScanCache.get(cacheKey);
+	const dirs = [appDir, pagesDir].filter(Boolean);
+	for (const dir of dirs) if (fs.existsSync(dir) && scanDirForMdx(dir)) {
+		mdxScanCache.set(cacheKey, true);
+		return true;
+	}
+	mdxScanCache.set(cacheKey, false);
+	return false;
+}
+function scanDirForMdx(dir) {
+	try {
+		const entries = fs.readdirSync(dir, { withFileTypes: true });
+		for (const entry of entries) {
+			if (entry.name.startsWith(".") || entry.name === "node_modules") continue;
+			const full = path.join(dir, entry.name);
+			if (entry.isDirectory()) {
+				if (scanDirForMdx(full)) return true;
+			} else if (entry.isFile() && entry.name.toLowerCase().endsWith(".mdx")) return true;
+		}
+	} catch {}
+	return false;
+}
+//#endregion
+export { hasMdxFiles, mdxScanCache };
+
+//# sourceMappingURL=mdx-scan.js.map

package/dist/utils/mdx-scan.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"mdx-scan.js","names":[],"sources":["../../src/utils/mdx-scan.ts"],"sourcesContent":["import fs from \"node:fs\";\nimport path from \"node:path\";\n\n/** Module-level cache for hasMdxFiles — avoids re-scanning per Vite environment. */\nexport const mdxScanCache = new Map<string, boolean>();\n\n/**\n * Check if the project has .mdx files in app/ or pages/ directories.\n */\nexport function hasMdxFiles(root: string, appDir: string | null, pagesDir: string | null): boolean {\n  const cacheKey = `${root}\\0${appDir ?? \"\"}\\0${pagesDir ?? \"\"}`;\n  if (mdxScanCache.has(cacheKey)) return mdxScanCache.get(cacheKey)!;\n  const dirs = [appDir, pagesDir].filter(Boolean) as string[];\n  for (const dir of dirs) {\n    if (fs.existsSync(dir) && scanDirForMdx(dir)) {\n      mdxScanCache.set(cacheKey, true);\n      return true;\n    }\n  }\n  mdxScanCache.set(cacheKey, false);\n  return false;\n}\n\nfunction scanDirForMdx(dir: string): boolean {\n  try {\n    const entries = fs.readdirSync(dir, { withFileTypes: true });\n    for (const entry of entries) {\n      if (entry.name.startsWith(\".\") || entry.name === \"node_modules\") continue;\n      const full = path.join(dir, entry.name);\n      if (entry.isDirectory()) {\n        if (scanDirForMdx(full)) return true;\n      } else if (entry.isFile() && entry.name.toLowerCase().endsWith(\".mdx\")) {\n        return true;\n      }\n    }\n  } catch {\n    // ignore unreadable dirs\n  }\n  return false;\n}\n"],"mappings":";;;;AAIA,MAAa,+BAAe,IAAI,KAAsB;;;;AAKtD,SAAgB,YAAY,MAAc,QAAuB,UAAkC;CACjG,MAAM,WAAW,GAAG,KAAK,IAAI,UAAU,GAAG,IAAI,YAAY;AAC1D,KAAI,aAAa,IAAI,SAAS,CAAE,QAAO,aAAa,IAAI,SAAS;CACjE,MAAM,OAAO,CAAC,QAAQ,SAAS,CAAC,OAAO,QAAQ;AAC/C,MAAK,MAAM,OAAO,KAChB,KAAI,GAAG,WAAW,IAAI,IAAI,cAAc,IAAI,EAAE;AAC5C,eAAa,IAAI,UAAU,KAAK;AAChC,SAAO;;AAGX,cAAa,IAAI,UAAU,MAAM;AACjC,QAAO;;AAGT,SAAS,cAAc,KAAsB;AAC3C,KAAI;EACF,MAAM,UAAU,GAAG,YAAY,KAAK,EAAE,eAAe,MAAM,CAAC;AAC5D,OAAK,MAAM,SAAS,SAAS;AAC3B,OAAI,MAAM,KAAK,WAAW,IAAI,IAAI,MAAM,SAAS,eAAgB;GACjE,MAAM,OAAO,KAAK,KAAK,KAAK,MAAM,KAAK;AACvC,OAAI,MAAM,aAAa;QACjB,cAAc,KAAK,CAAE,QAAO;cACvB,MAAM,QAAQ,IAAI,MAAM,KAAK,aAAa,CAAC,SAAS,OAAO,CACpE,QAAO;;SAGL;AAGR,QAAO"}

package/dist/utils/public-routes.d.ts

@@ -0,0 +1,5 @@
+//#region src/utils/public-routes.d.ts
+declare function scanPublicFileRoutes(root: string): string[];
+//#endregion
+export { scanPublicFileRoutes };
+//# sourceMappingURL=public-routes.d.ts.map

package/dist/utils/public-routes.js

@@ -0,0 +1,50 @@
+import fs from "node:fs";
+import path from "node:path";
+//#region src/utils/public-routes.ts
+function scanPublicFileRoutes(root) {
+	const publicDir = path.join(root, "public");
+	const routes = [];
+	const visitedDirs = /* @__PURE__ */ new Set();
+	function walk(dir) {
+		let realDir;
+		try {
+			realDir = fs.realpathSync(dir);
+		} catch {
+			return;
+		}
+		if (visitedDirs.has(realDir)) return;
+		visitedDirs.add(realDir);
+		const entries = fs.readdirSync(dir, { withFileTypes: true });
+		for (const entry of entries) {
+			const fullPath = path.join(dir, entry.name);
+			if (entry.isDirectory()) {
+				walk(fullPath);
+				continue;
+			}
+			if (entry.isSymbolicLink()) {
+				let stat;
+				try {
+					stat = fs.statSync(fullPath);
+				} catch {
+					continue;
+				}
+				if (stat.isDirectory()) {
+					walk(fullPath);
+					continue;
+				}
+				if (!stat.isFile()) continue;
+			} else if (!entry.isFile()) continue;
+			const relativePath = path.relative(publicDir, fullPath).split(path.sep).join("/");
+			routes.push("/" + relativePath);
+		}
+	}
+	if (fs.existsSync(publicDir)) try {
+		walk(publicDir);
+	} catch {}
+	routes.sort();
+	return routes;
+}
+//#endregion
+export { scanPublicFileRoutes };
+
+//# sourceMappingURL=public-routes.js.map

package/dist/utils/public-routes.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"public-routes.js","names":[],"sources":["../../src/utils/public-routes.ts"],"sourcesContent":["import fs from \"node:fs\";\nimport path from \"node:path\";\n\nexport function scanPublicFileRoutes(root: string): string[] {\n  const publicDir = path.join(root, \"public\");\n  const routes: string[] = [];\n  const visitedDirs = new Set<string>();\n\n  function walk(dir: string): void {\n    let realDir: string;\n    try {\n      realDir = fs.realpathSync(dir);\n    } catch {\n      return;\n    }\n    if (visitedDirs.has(realDir)) return;\n    visitedDirs.add(realDir);\n\n    const entries = fs.readdirSync(dir, { withFileTypes: true });\n    for (const entry of entries) {\n      const fullPath = path.join(dir, entry.name);\n      if (entry.isDirectory()) {\n        walk(fullPath);\n        continue;\n      }\n      if (entry.isSymbolicLink()) {\n        let stat: fs.Stats;\n        try {\n          stat = fs.statSync(fullPath);\n        } catch {\n          continue;\n        }\n        if (stat.isDirectory()) {\n          walk(fullPath);\n          continue;\n        }\n        if (!stat.isFile()) continue;\n      } else if (!entry.isFile()) {\n        continue;\n      }\n      const relativePath = path.relative(publicDir, fullPath).split(path.sep).join(\"/\");\n      routes.push(\"/\" + relativePath);\n    }\n  }\n\n  if (fs.existsSync(publicDir)) {\n    try {\n      walk(publicDir);\n    } catch {\n      // ignore unreadable dirs\n    }\n  }\n\n  routes.sort();\n  return routes;\n}\n"],"mappings":";;;AAGA,SAAgB,qBAAqB,MAAwB;CAC3D,MAAM,YAAY,KAAK,KAAK,MAAM,SAAS;CAC3C,MAAM,SAAmB,EAAE;CAC3B,MAAM,8BAAc,IAAI,KAAa;CAErC,SAAS,KAAK,KAAmB;EAC/B,IAAI;AACJ,MAAI;AACF,aAAU,GAAG,aAAa,IAAI;UACxB;AACN;;AAEF,MAAI,YAAY,IAAI,QAAQ,CAAE;AAC9B,cAAY,IAAI,QAAQ;EAExB,MAAM,UAAU,GAAG,YAAY,KAAK,EAAE,eAAe,MAAM,CAAC;AAC5D,OAAK,MAAM,SAAS,SAAS;GAC3B,MAAM,WAAW,KAAK,KAAK,KAAK,MAAM,KAAK;AAC3C,OAAI,MAAM,aAAa,EAAE;AACvB,SAAK,SAAS;AACd;;AAEF,OAAI,MAAM,gBAAgB,EAAE;IAC1B,IAAI;AACJ,QAAI;AACF,YAAO,GAAG,SAAS,SAAS;YACtB;AACN;;AAEF,QAAI,KAAK,aAAa,EAAE;AACtB,UAAK,SAAS;AACd;;AAEF,QAAI,CAAC,KAAK,QAAQ,CAAE;cACX,CAAC,MAAM,QAAQ,CACxB;GAEF,MAAM,eAAe,KAAK,SAAS,WAAW,SAAS,CAAC,MAAM,KAAK,IAAI,CAAC,KAAK,IAAI;AACjF,UAAO,KAAK,MAAM,aAAa;;;AAInC,KAAI,GAAG,WAAW,UAAU,CAC1B,KAAI;AACF,OAAK,UAAU;SACT;AAKV,QAAO,MAAM;AACb,QAAO"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vinext",
-  "version": "0.0.41",
+  "version": "0.0.43",
   "description": "Run Next.js apps on Vite. Drop-in replacement for the next CLI.",
   "license": "MIT",
   "repository": {
@@ -68,8 +68,8 @@
     "@vitejs/plugin-react": "^6.0.1",
     "@vitejs/plugin-rsc": "^0.5.23",
     "react-server-dom-webpack": "^19.2.5",
-    "vite": "npm:@voidzero-dev/vite-plus-core@0.1.12",
-    "vite-plus": "0.1.12"
+    "vite": "npm:@voidzero-dev/vite-plus-core@0.1.17",
+    "vite-plus": "0.1.17"
   },
   "peerDependencies": {
     "@mdx-js/rollup": "^3.0.0",

package/dist/plugins/fix-use-server-closure-collision.d.ts

@@ -1,29 +0,0 @@
-import { Plugin } from "vite";
-
-//#region src/plugins/fix-use-server-closure-collision.d.ts
-/**
- * Fix 'use server' closure variable collision with local declarations.
- *
- * @vitejs/plugin-rsc uses `periscopic` to find closure variables for
- * 'use server' inline functions. Due to how periscopic handles block scopes,
- * `const X = ...` declared inside a 'use server' function body is tracked in
- * the BlockStatement scope (not the FunctionDeclaration scope). When periscopic
- * searches for the owner of a reference `X`, it finds the block scope — which
- * is neither the function scope nor the module scope — so it incorrectly
- * classifies `X` as a closure variable from the outer scope.
- *
- * The result: plugin-rsc injects `const [X] = await decryptActionBoundArgs(...)`
- * at the top of the hoisted function, colliding with the existing `const X = ...`
- * declaration in the body. This causes a SyntaxError.
- *
- * Fix: before plugin-rsc sees the file, detect any 'use server' function whose
- * local `const/let/var` declarations shadow an outer-scope variable, and rename
- * the inner declarations (+ usages within that function) to `__local_X`. This
- * eliminates the collision without changing semantics.
- *
- * This is a general fix that works for any library — not just @payloadcms/next.
- */
-declare const fixUseServerClosureCollisionPlugin: Plugin;
-//#endregion
-export { fixUseServerClosureCollisionPlugin };
-//# sourceMappingURL=fix-use-server-closure-collision.d.ts.map

package/dist/plugins/fix-use-server-closure-collision.js

@@ -1,204 +0,0 @@
-import { parseAst } from "vite";
-import MagicString from "magic-string";
-//#region src/plugins/fix-use-server-closure-collision.ts
-/**
-* Fix 'use server' closure variable collision with local declarations.
-*
-* @vitejs/plugin-rsc uses `periscopic` to find closure variables for
-* 'use server' inline functions. Due to how periscopic handles block scopes,
-* `const X = ...` declared inside a 'use server' function body is tracked in
-* the BlockStatement scope (not the FunctionDeclaration scope). When periscopic
-* searches for the owner of a reference `X`, it finds the block scope — which
-* is neither the function scope nor the module scope — so it incorrectly
-* classifies `X` as a closure variable from the outer scope.
-*
-* The result: plugin-rsc injects `const [X] = await decryptActionBoundArgs(...)`
-* at the top of the hoisted function, colliding with the existing `const X = ...`
-* declaration in the body. This causes a SyntaxError.
-*
-* Fix: before plugin-rsc sees the file, detect any 'use server' function whose
-* local `const/let/var` declarations shadow an outer-scope variable, and rename
-* the inner declarations (+ usages within that function) to `__local_X`. This
-* eliminates the collision without changing semantics.
-*
-* This is a general fix that works for any library — not just @payloadcms/next.
-*/
-const fixUseServerClosureCollisionPlugin = {
-	name: "vinext:fix-use-server-closure-collision",
-	enforce: "pre",
-	transform(code, id) {
-		if (!code.includes("use server")) return null;
-		if (!/\.(js|jsx|ts|tsx|mjs|cjs)$/.test(id.split("?")[0])) return null;
-		let ast;
-		try {
-			ast = parseAst(code);
-		} catch {
-			return null;
-		}
-		function collectPatternNames(pattern, names) {
-			if (!pattern) return;
-			if (pattern.type === "Identifier") names.add(pattern.name);
-			else if (pattern.type === "ObjectPattern") for (const prop of pattern.properties) collectPatternNames(prop.value ?? prop.argument, names);
-			else if (pattern.type === "ArrayPattern") for (const elem of pattern.elements) collectPatternNames(elem, names);
-			else if (pattern.type === "RestElement" || pattern.type === "AssignmentPattern") collectPatternNames(pattern.left ?? pattern.argument, names);
-		}
-		function hasUseServerDirective(body) {
-			for (const stmt of body) {
-				if (stmt.type === "ExpressionStatement" && stmt.expression?.type === "Literal" && typeof stmt.expression.value === "string") {
-					if (stmt.expression.value === "use server") return true;
-					continue;
-				}
-				break;
-			}
-			return false;
-		}
-		const s = new MagicString(code);
-		const renamedRanges = /* @__PURE__ */ new Set();
-		let changed = false;
-		function visitNode(node, ancestorNames) {
-			if (!node || typeof node !== "object") return;
-			if (!(node.type === "FunctionDeclaration" || node.type === "FunctionExpression" || node.type === "ArrowFunctionExpression")) {
-				const namesForChildren = new Set(ancestorNames);
-				if (node.type === "CatchClause" && node.param) collectPatternNames(node.param, namesForChildren);
-				collectFunctionScopedNames(node, namesForChildren);
-				const immediateStmts = node.type === "Program" ? node.body : node.type === "BlockStatement" ? node.body : [];
-				for (const stmt of immediateStmts) if (stmt?.type === "VariableDeclaration") for (const decl of stmt.declarations) collectPatternNames(decl.id, namesForChildren);
-				else if (stmt?.type === "ClassDeclaration" && stmt.id?.name) namesForChildren.add(stmt.id.name);
-				else if (stmt?.type === "ImportDeclaration") {
-					for (const spec of stmt.specifiers ?? []) if (spec.local?.name) namesForChildren.add(spec.local.name);
-				}
-				for (const key of Object.keys(node)) {
-					if (key === "type") continue;
-					const child = node[key];
-					if (Array.isArray(child)) for (const c of child) visitNode(c, namesForChildren);
-					else if (child && typeof child === "object" && child.type) visitNode(child, namesForChildren);
-				}
-				return;
-			}
-			const namesForBody = new Set(ancestorNames);
-			for (const p of node.params ?? []) collectPatternNames(p, namesForBody);
-			const bodyStmts = node.body?.type === "BlockStatement" ? node.body.body : [];
-			if (hasUseServerDirective(bodyStmts)) {
-				const localDecls = /* @__PURE__ */ new Set();
-				collectAllDeclaredNames(node.body, localDecls);
-				const collisionRenames = /* @__PURE__ */ new Map();
-				for (const name of localDecls) if (namesForBody.has(name)) {
-					let to = `__local_${name}`;
-					let suffix = 0;
-					while (localDecls.has(to) || namesForBody.has(to)) {
-						to = `__local_${suffix}_${name}`;
-						suffix++;
-					}
-					collisionRenames.set(name, to);
-				}
-				if (collisionRenames.size > 0) {
-					for (const [name, to] of collisionRenames) renamingWalk(node.body, name, to);
-					changed = true;
-				}
-				const namesForChildren = new Set(namesForBody);
-				for (const name of localDecls) if (collisionRenames.has(name)) {
-					namesForChildren.delete(name);
-					namesForChildren.add(collisionRenames.get(name));
-				} else namesForChildren.add(name);
-				for (const stmt of bodyStmts) visitNode(stmt, namesForChildren);
-				for (const p of node.params ?? []) visitNode(p, ancestorNames);
-				return;
-			}
-			const namesForChildren = new Set(namesForBody);
-			collectFunctionScopedNames(node.body, namesForChildren);
-			for (const stmt of bodyStmts) if (stmt?.type === "VariableDeclaration" && stmt.kind !== "var") for (const decl of stmt.declarations) collectPatternNames(decl.id, namesForChildren);
-			for (const key of Object.keys(node)) {
-				if (key === "type") continue;
-				const child = node[key];
-				if (Array.isArray(child)) for (const c of child) visitNode(c, namesForChildren);
-				else if (child && typeof child === "object" && child.type) visitNode(child, namesForChildren);
-			}
-		}
-		function renamingWalk(node, from, to, parent) {
-			if (!node || typeof node !== "object") return;
-			if (node.type === "Identifier" && node.name === from) {
-				if (parent?.type === "MemberExpression" && parent.property === node && !parent.computed) return;
-				if (parent?.type === "Property" && parent.key === node && !parent.computed) {
-					if (parent.shorthand) {
-						const rangeKey = `${node.start}:${node.end}`;
-						if (!renamedRanges.has(rangeKey)) {
-							renamedRanges.add(rangeKey);
-							s.update(node.start, node.end, `${from}: ${to}`);
-						}
-					}
-					return;
-				}
-				if (parent?.type === "Property" && parent.shorthand && parent.value === node) return;
-				if (parent?.type === "LabeledStatement" && parent.label === node) return;
-				if ((parent?.type === "BreakStatement" || parent?.type === "ContinueStatement") && parent.label === node) return;
-				const rangeKey = `${node.start}:${node.end}`;
-				if (!renamedRanges.has(rangeKey)) {
-					renamedRanges.add(rangeKey);
-					s.update(node.start, node.end, to);
-				}
-				return;
-			}
-			if (node.type === "FunctionDeclaration" || node.type === "FunctionExpression" || node.type === "ArrowFunctionExpression") {
-				const nestedDecls = /* @__PURE__ */ new Set();
-				for (const p of node.params ?? []) collectPatternNames(p, nestedDecls);
-				collectAllDeclaredNames(node.body, nestedDecls);
-				if (nestedDecls.has(from)) return;
-				if (node.body?.type === "BlockStatement" && hasUseServerDirective(node.body.body)) return;
-			}
-			for (const key of Object.keys(node)) {
-				if (key === "type" || key === "start" || key === "end") continue;
-				const child = node[key];
-				if (Array.isArray(child)) for (const c of child) renamingWalk(c, from, to, node);
-				else if (child && typeof child === "object" && child.type) renamingWalk(child, from, to, node);
-			}
-		}
-		function collectFunctionScopedNames(node, names) {
-			if (!node || typeof node !== "object") return;
-			if (node.type === "FunctionDeclaration") {
-				if (node.id?.name) names.add(node.id.name);
-				return;
-			}
-			if (node.type === "ClassDeclaration") {
-				if (node.id?.name) names.add(node.id.name);
-				return;
-			}
-			if (node.type === "FunctionExpression" || node.type === "ArrowFunctionExpression") return;
-			if (node.type === "VariableDeclaration" && node.kind === "var") for (const decl of node.declarations) collectPatternNames(decl.id, names);
-			for (const key of Object.keys(node)) {
-				if (key === "type") continue;
-				const child = node[key];
-				if (Array.isArray(child)) for (const c of child) collectFunctionScopedNames(c, names);
-				else if (child && typeof child === "object" && child.type) collectFunctionScopedNames(child, names);
-			}
-		}
-		function collectAllDeclaredNames(node, names) {
-			if (!node || typeof node !== "object") return;
-			if (node.type === "VariableDeclaration") for (const decl of node.declarations) collectPatternNames(decl.id, names);
-			if (node.type === "FunctionDeclaration") {
-				if (node.id?.name) names.add(node.id.name);
-				return;
-			}
-			if (node.type === "ClassDeclaration") {
-				if (node.id?.name) names.add(node.id.name);
-				return;
-			}
-			if (node.type === "FunctionExpression" || node.type === "ArrowFunctionExpression") return;
-			for (const key of Object.keys(node)) {
-				if (key === "type") continue;
-				const child = node[key];
-				if (Array.isArray(child)) for (const c of child) collectAllDeclaredNames(c, names);
-				else if (child && typeof child === "object" && child.type) collectAllDeclaredNames(child, names);
-			}
-		}
-		visitNode(ast, /* @__PURE__ */ new Set());
-		if (!changed) return null;
-		return {
-			code: s.toString(),
-			map: s.generateMap({ hires: "boundary" })
-		};
-	}
-};
-//#endregion
-export { fixUseServerClosureCollisionPlugin };
-
-//# sourceMappingURL=fix-use-server-closure-collision.js.map

package/dist/plugins/fix-use-server-closure-collision.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"fix-use-server-closure-collision.js","names":[],"sources":["../../src/plugins/fix-use-server-closure-collision.ts"],"sourcesContent":["import type { Plugin } from \"vite\";\nimport { parseAst } from \"vite\";\nimport MagicString from \"magic-string\";\n\n/**\n * Fix 'use server' closure variable collision with local declarations.\n *\n * @vitejs/plugin-rsc uses `periscopic` to find closure variables for\n * 'use server' inline functions. Due to how periscopic handles block scopes,\n * `const X = ...` declared inside a 'use server' function body is tracked in\n * the BlockStatement scope (not the FunctionDeclaration scope). When periscopic\n * searches for the owner of a reference `X`, it finds the block scope — which\n * is neither the function scope nor the module scope — so it incorrectly\n * classifies `X` as a closure variable from the outer scope.\n *\n * The result: plugin-rsc injects `const [X] = await decryptActionBoundArgs(...)`\n * at the top of the hoisted function, colliding with the existing `const X = ...`\n * declaration in the body. This causes a SyntaxError.\n *\n * Fix: before plugin-rsc sees the file, detect any 'use server' function whose\n * local `const/let/var` declarations shadow an outer-scope variable, and rename\n * the inner declarations (+ usages within that function) to `__local_X`. This\n * eliminates the collision without changing semantics.\n *\n * This is a general fix that works for any library — not just @payloadcms/next.\n */\nexport const fixUseServerClosureCollisionPlugin: Plugin = {\n  name: \"vinext:fix-use-server-closure-collision\",\n  enforce: \"pre\" as const,\n  transform(code: string, id: string) {\n    // Quick bail-out: only files that contain 'use server' inline\n    if (!code.includes(\"use server\")) return null;\n    // Only JS/TS files\n    if (!/\\.(js|jsx|ts|tsx|mjs|cjs)$/.test(id.split(\"?\")[0])) return null;\n\n    // oxlint-disable-next-line @typescript-eslint/no-explicit-any\n    let ast: any;\n    try {\n      ast = parseAst(code);\n    } catch {\n      return null;\n    }\n\n    // oxlint-disable-next-line @typescript-eslint/no-explicit-any\n    function collectPatternNames(pattern: any, names: Set<string>) {\n      if (!pattern) return;\n      if (pattern.type === \"Identifier\") {\n        names.add(pattern.name);\n      } else if (pattern.type === \"ObjectPattern\") {\n        for (const prop of pattern.properties) {\n          collectPatternNames(prop.value ?? prop.argument, names);\n        }\n      } else if (pattern.type === \"ArrayPattern\") {\n        for (const elem of pattern.elements) {\n          collectPatternNames(elem, names);\n        }\n      } else if (pattern.type === \"RestElement\" || pattern.type === \"AssignmentPattern\") {\n        collectPatternNames(pattern.left ?? pattern.argument, names);\n      }\n    }\n\n    // Check if a block body has 'use server' as its leading directive prologue.\n    // Only the first contiguous run of string-literal expression statements\n    // counts — a \"use server\" string mid-function is not a directive.\n    // oxlint-disable-next-line @typescript-eslint/no-explicit-any\n    function hasUseServerDirective(body: any[]): boolean {\n      for (const stmt of body) {\n        if (\n          stmt.type === \"ExpressionStatement\" &&\n          stmt.expression?.type === \"Literal\" &&\n          typeof stmt.expression.value === \"string\"\n        ) {\n          if (stmt.expression.value === \"use server\") return true;\n          // Any other string literal in the prologue — keep scanning\n          continue;\n        }\n        // First non-string-literal statement ends the prologue\n        break;\n      }\n      return false;\n    }\n\n    // Find all 'use server' inline functions and check for collisions.\n    //\n    // `ancestorNames` accumulates the names that are in scope in all ancestor\n    // function/program bodies as we descend — this is the correct set to\n    // compare against, not a whole-AST walk (which would pick up siblings).\n    const s = new MagicString(code);\n    // Track source ranges already rewritten so renamingWalk never calls\n    // s.update() twice on the same span (MagicString throws if it does).\n    const renamedRanges = new Set<string>();\n    let changed = false;\n\n    // oxlint-disable-next-line @typescript-eslint/no-explicit-any\n    function visitNode(node: any, ancestorNames: Set<string>) {\n      if (!node || typeof node !== \"object\") return;\n\n      const isFn =\n        node.type === \"FunctionDeclaration\" ||\n        node.type === \"FunctionExpression\" ||\n        node.type === \"ArrowFunctionExpression\";\n\n      if (!isFn) {\n        // Non-function nodes (Program, BlockStatement, IfStatement, CatchClause,\n        // etc.) don't introduce a new function scope, but they may contain\n        // variable declarations and catch bindings that are visible to nested\n        // functions as ancestor names.  Accumulate those into a new set before\n        // recursing so we don't mutate the caller's set.\n        const namesForChildren = new Set(ancestorNames);\n\n        // CatchClause: `catch (e)` — `e` is in scope for the catch body\n        if (node.type === \"CatchClause\" && node.param) {\n          collectPatternNames(node.param, namesForChildren);\n        }\n\n        // Collect names visible at function scope from this node:\n        //   - FunctionDeclaration names (hoisted to enclosing scope)\n        //   - ClassDeclaration names (block-scoped like let, but treated as\n        //     function-scoped for our purposes since periscopic sees them)\n        //   - var declarations (hoisted to function scope, found anywhere)\n        // We do NOT collect let/const from nested blocks here — those are\n        // block-scoped and not visible to sibling/outer function declarations.\n        collectFunctionScopedNames(node, namesForChildren);\n        // Also collect let/const/var/class/import declared as immediate children\n        // of this node (e.g. top-level Program statements, or the direct body of\n        // a BlockStatement) — those ARE in scope for everything in the same block.\n        const immediateStmts =\n          node.type === \"Program\" ? node.body : node.type === \"BlockStatement\" ? node.body : [];\n        for (const stmt of immediateStmts) {\n          if (stmt?.type === \"VariableDeclaration\") {\n            for (const decl of stmt.declarations) collectPatternNames(decl.id, namesForChildren);\n          } else if (stmt?.type === \"ClassDeclaration\" && stmt.id?.name) {\n            namesForChildren.add(stmt.id.name);\n          } else if (stmt?.type === \"ImportDeclaration\") {\n            for (const spec of stmt.specifiers ?? []) {\n              // ImportDefaultSpecifier, ImportNamespaceSpecifier, ImportSpecifier\n              // all have `local.name` as the binding name in this module.\n              if (spec.local?.name) namesForChildren.add(spec.local.name);\n            }\n          }\n        }\n\n        for (const key of Object.keys(node)) {\n          if (key === \"type\") continue;\n          const child = node[key];\n          if (Array.isArray(child)) {\n            for (const c of child) visitNode(c, namesForChildren);\n          } else if (child && typeof child === \"object\" && child.type) {\n            visitNode(child, namesForChildren);\n          }\n        }\n        return;\n      }\n\n      // Build the ancestor name set visible inside this function:\n      // everything the parent saw, plus this function's own params.\n      const namesForBody = new Set(ancestorNames);\n      for (const p of node.params ?? []) collectPatternNames(p, namesForBody);\n\n      // Check whether the body has the 'use server' directive.\n      const bodyStmts = node.body?.type === \"BlockStatement\" ? node.body.body : [];\n      const isServerFn = hasUseServerDirective(bodyStmts);\n\n      if (isServerFn) {\n        // Collect ALL variables declared anywhere in this function body.\n        // This includes direct bodyStmts, but also for...of/for...in loop\n        // variables, declarations inside if/try/while blocks, etc.\n        // periscopic puts these in the BlockStatement scope (not the function\n        // scope), so they get mis-classified as closure vars from the outer scope.\n        // We use collectAllDeclaredNames (recursive, crosses blocks, stops at\n        // nested function bodies) to catch every possible declaration site.\n        const localDecls = new Set<string>();\n        collectAllDeclaredNames(node.body, localDecls);\n\n        // Find collisions: local decls that shadow a name from ancestor scopes.\n        // collisionRenames maps original name → chosen rename target, taking\n        // into account that `__local_${name}` may itself already be declared\n        // (e.g. the user wrote `const __local_cookies = ...`).  In that case\n        // we try `__local_0_${name}`, `__local_1_${name}`, … until we find a\n        // free name.  This prevents a secondary collision.\n        const collisionRenames = new Map<string, string>();\n        for (const name of localDecls) {\n          if (namesForBody.has(name)) {\n            let to = `__local_${name}`;\n            let suffix = 0;\n            while (localDecls.has(to) || namesForBody.has(to)) {\n              to = `__local_${suffix}_${name}`;\n              suffix++;\n            }\n            collisionRenames.set(name, to);\n          }\n        }\n\n        if (collisionRenames.size > 0) {\n          for (const [name, to] of collisionRenames) {\n            renamingWalk(node.body, name, to);\n          }\n          changed = true;\n        }\n\n        // Build the ancestor set for children of this server function.\n        // Colliding names have been renamed in this body, e.g. `cookies` →\n        // `__local_cookies`.  The original name no longer exists as a binding\n        // in this scope, so we must remove it from the set and add the renamed\n        // version instead.  Leaving the original name in would cause nested\n        // server functions to see it as an ancestor binding and spuriously flag\n        // their own independent `const cookies` as a collision.\n        const namesForChildren = new Set(namesForBody);\n        for (const name of localDecls) {\n          if (collisionRenames.has(name)) {\n            namesForChildren.delete(name);\n            namesForChildren.add(collisionRenames.get(name)!);\n          } else {\n            namesForChildren.add(name);\n          }\n        }\n\n        // Recurse into children — nested 'use server' functions must be visited.\n        // Skip node.body itself (already handled by renamingWalk above for\n        // collisions); we recurse into each statement individually so that\n        // nested functions inside the body get their own visitNode pass with\n        // the correct ancestorNames.\n        for (const stmt of bodyStmts) {\n          visitNode(stmt, namesForChildren);\n        }\n        // Also visit params (they can contain default expressions with closures)\n        for (const p of node.params ?? []) visitNode(p, ancestorNames);\n        return;\n      }\n\n      // Not a server function — build the ancestor set for nested functions:\n      //   - var declarations anywhere in this function body (function-scoped)\n      //   - FunctionDeclaration names anywhere in this function body\n      //   - let/const only from the top-level statements of this function body\n      //     (block-scoped — not visible to nested fns in sibling blocks)\n      const namesForChildren = new Set(namesForBody);\n      collectFunctionScopedNames(node.body, namesForChildren);\n      for (const stmt of bodyStmts) {\n        if (stmt?.type === \"VariableDeclaration\" && stmt.kind !== \"var\") {\n          for (const decl of stmt.declarations) collectPatternNames(decl.id, namesForChildren);\n        }\n      }\n\n      for (const key of Object.keys(node)) {\n        if (key === \"type\") continue;\n        const child = node[key];\n        if (Array.isArray(child)) {\n          for (const c of child) visitNode(c, namesForChildren);\n        } else if (child && typeof child === \"object\" && child.type) {\n          visitNode(child, namesForChildren);\n        }\n      }\n    }\n\n    // Walk an AST subtree renaming all variable-reference Identifier nodes\n    // matching `from` to `to`.\n    //\n    // Correctness rules:\n    //   - Non-computed MemberExpression.property is NOT a variable reference\n    //   - Non-computed Property.key is NOT a variable reference\n    //   - Shorthand Property { x } must be expanded to { x: __local_x }\n    //   - A nested function that re-declares `from` in its params OR anywhere\n    //     in its body via var/const/let (including inside control flow) is a\n    //     new binding — stop descending into it\n    //   - Never call s.update() on the same source range twice\n    //\n    // `parent` is the direct parent AST node, used to detect property contexts.\n    // oxlint-disable-next-line @typescript-eslint/no-explicit-any\n    function renamingWalk(node: any, from: string, to: string, parent?: any) {\n      if (!node || typeof node !== \"object\") return;\n\n      if (node.type === \"Identifier\" && node.name === from) {\n        // Non-computed member expression property: obj.cookies — not a ref\n        if (parent?.type === \"MemberExpression\" && parent.property === node && !parent.computed) {\n          return;\n        }\n\n        // Non-computed property key in an object literal\n        if (parent?.type === \"Property\" && parent.key === node && !parent.computed) {\n          if (parent.shorthand) {\n            // { cookies } — key and value are the same AST node.\n            // Expand to { cookies: __local_cookies } by rewriting at the key\n            // visit; skip the value visit via the guard below.\n            const rangeKey = `${node.start}:${node.end}`;\n            if (!renamedRanges.has(rangeKey)) {\n              renamedRanges.add(rangeKey);\n              s.update(node.start, node.end, `${from}: ${to}`);\n            }\n          }\n          // Either way, key is not a variable reference — do not rename it.\n          return;\n        }\n\n        // Value side of a shorthand property — same node as key, already handled\n        if (parent?.type === \"Property\" && parent.shorthand && parent.value === node) {\n          return;\n        }\n\n        // LabeledStatement label: `cookies: for (...)` — not a variable reference\n        if (parent?.type === \"LabeledStatement\" && parent.label === node) {\n          return;\n        }\n\n        // break/continue label: `break cookies` / `continue cookies` — not a variable reference\n        if (\n          (parent?.type === \"BreakStatement\" || parent?.type === \"ContinueStatement\") &&\n          parent.label === node\n        ) {\n          return;\n        }\n\n        const rangeKey = `${node.start}:${node.end}`;\n        if (!renamedRanges.has(rangeKey)) {\n          renamedRanges.add(rangeKey);\n          s.update(node.start, node.end, to);\n        }\n        return;\n      }\n\n      // For nested function nodes, check whether they re-declare `from`.\n      // If they do, stop — the name in that nested scope is a different binding.\n      // We must check ALL var declarations anywhere in the body (var hoists),\n      // not just top-level statements.\n      if (\n        node.type === \"FunctionDeclaration\" ||\n        node.type === \"FunctionExpression\" ||\n        node.type === \"ArrowFunctionExpression\"\n      ) {\n        const nestedDecls = new Set<string>();\n        // Params\n        for (const p of node.params ?? []) collectPatternNames(p, nestedDecls);\n        // Recursively find all var/const/let declarations in the body,\n        // including those nested inside if/for/while/etc.\n        collectAllDeclaredNames(node.body, nestedDecls);\n        if (nestedDecls.has(from)) return;\n\n        // Also stop at nested 'use server' functions — visitNode will handle them\n        // independently with the correct collision set, preventing double-rewrites.\n        if (node.body?.type === \"BlockStatement\" && hasUseServerDirective(node.body.body)) {\n          return;\n        }\n      }\n\n      for (const key of Object.keys(node)) {\n        if (key === \"type\" || key === \"start\" || key === \"end\") continue;\n        const child = node[key];\n        if (Array.isArray(child)) {\n          for (const c of child) renamingWalk(c, from, to, node);\n        } else if (child && typeof child === \"object\" && child.type) {\n          renamingWalk(child, from, to, node);\n        }\n      }\n    }\n\n    // Collect names that are visible at function scope from a given subtree.\n    //\n    // Two separate helpers with different traversal rules:\n    //\n    //   collectFunctionScopedNames(node, names)\n    //     Collects `var` declarations and `FunctionDeclaration` names anywhere\n    //     in the subtree, crossing block boundaries (if/for/while/try/catch)\n    //     but NOT crossing nested function bodies.  `let`/`const` in nested\n    //     blocks are intentionally skipped — they are block-scoped and not\n    //     visible outside that block.\n    //     Use this when building ancestorNames for nested functions.\n    //\n    //   collectAllDeclaredNames(node, names)\n    //     Collects ALL var/let/const declarations anywhere in the subtree,\n    //     crossing block boundaries but not nested function bodies.\n    //     Used only by renamingWalk's re-declaration check, where we want to\n    //     know if ANY declaration of `from` exists in a nested function's scope\n    //     (params already handled separately).\n\n    // oxlint-disable-next-line @typescript-eslint/no-explicit-any\n    function collectFunctionScopedNames(node: any, names: Set<string>) {\n      if (!node || typeof node !== \"object\") return;\n      // FunctionDeclaration: its name is a binding in the enclosing scope.\n      // Record it, then stop — don't recurse into the body (different scope).\n      if (node.type === \"FunctionDeclaration\") {\n        if (node.id?.name) names.add(node.id.name);\n        return;\n      }\n      // ClassDeclaration: like FunctionDeclaration, its name is a binding in\n      // the enclosing scope.  Don't recurse into the body.\n      if (node.type === \"ClassDeclaration\") {\n        if (node.id?.name) names.add(node.id.name);\n        return;\n      }\n      // FunctionExpression / ArrowFunctionExpression names are only in scope\n      // inside their own body, not the enclosing scope — skip entirely.\n      if (node.type === \"FunctionExpression\" || node.type === \"ArrowFunctionExpression\") {\n        return;\n      }\n      // var declarations are function-scoped — collect them wherever they appear.\n      // let/const at a nested block level are block-scoped and NOT visible to\n      // sibling or outer function declarations, so skip them here.\n      if (node.type === \"VariableDeclaration\" && node.kind === \"var\") {\n        for (const decl of node.declarations) collectPatternNames(decl.id, names);\n      }\n      for (const key of Object.keys(node)) {\n        if (key === \"type\") continue;\n        const child = node[key];\n        if (Array.isArray(child)) {\n          for (const c of child) collectFunctionScopedNames(c, names);\n        } else if (child && typeof child === \"object\" && child.type) {\n          collectFunctionScopedNames(child, names);\n        }\n      }\n    }\n\n    // Collect ALL declared names (var/let/const/class/function) in a subtree,\n    // crossing blocks but not nested function bodies or class bodies.\n    // Used by renamingWalk's re-declaration check where any shadowing\n    // declaration — regardless of kind — must stop the rename from descending\n    // further, and by the server-function local-decl scan to detect all\n    // possible collision sites (including class declarations in the body).\n    // oxlint-disable-next-line @typescript-eslint/no-explicit-any\n    function collectAllDeclaredNames(node: any, names: Set<string>) {\n      if (!node || typeof node !== \"object\") return;\n      if (node.type === \"VariableDeclaration\") {\n        for (const decl of node.declarations) collectPatternNames(decl.id, names);\n      }\n      // FunctionDeclaration name is a binding in the enclosing scope — record it.\n      if (node.type === \"FunctionDeclaration\") {\n        if (node.id?.name) names.add(node.id.name);\n        return; // don't recurse into its body\n      }\n      // ClassDeclaration name is a binding in the enclosing scope — record it.\n      if (node.type === \"ClassDeclaration\") {\n        if (node.id?.name) names.add(node.id.name);\n        return; // don't recurse into the class body (separate scope)\n      }\n      if (node.type === \"FunctionExpression\" || node.type === \"ArrowFunctionExpression\") {\n        return; // different scope — stop\n      }\n      for (const key of Object.keys(node)) {\n        if (key === \"type\") continue;\n        const child = node[key];\n        if (Array.isArray(child)) {\n          for (const c of child) collectAllDeclaredNames(c, names);\n        } else if (child && typeof child === \"object\" && child.type) {\n          collectAllDeclaredNames(child, names);\n        }\n      }\n    }\n\n    visitNode(ast, new Set());\n\n    if (!changed) return null;\n    return { code: s.toString(), map: s.generateMap({ hires: \"boundary\" }) };\n  },\n};\n"],"mappings":"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"}