Unverified Commit 192fcaf7 authored by Josh Story's avatar Josh Story Committed by GitHub

Generalize the build-time generator work-unit store name (#98891)

## Summary

Rename the internal `GenerateStaticParamsStore` work-unit context to
`BuildTimeGeneratorStore`, with discriminant `build-time-generator`.
Carry the public export name in a required `functionName` field so
shared error paths identify the generator that is actually running.

This is a behavior-preserving preparatory refactor.
`generateStaticParams` remains the only producer. Every consumer retains
the same branch, so public-cache support, unavailable request APIs,
inherited root parameters, and existing error messages are unchanged.

The name describes a build-time generator's execution context rather
than one function. For example, another generator that loads
configuration through a cached helper should be able to reuse this
context without introducing another work-unit variant throughout the
framework. Function-specific contexts can be added later if their
semantics actually diverge.

For example, a generator that calls `headers()` needs an error naming
that generator, not an error that always says `generateStaticParams`.
The field is set explicitly rather than read from `Function.name`, which
may change during bundling. Request APIs, private-cache rejection,
revalidation, and rendering invariants use this name. Missing-root-param
advice about parent gSP calls remains specific to gSP; other generators
report that the value is unavailable in their own scope.

This independent prerequisite for #97393 introduces no API or feature
flag. The API-specific initializer and its error fixtures live in
#97393, so this PR remains independently landable and
behavior-preserving for existing gSP users.

## Verification

- Existing `generate-static-params-errors`,
`app-root-params-getters/generate-static-params`, and
`generate-static-params-error` fixtures: all ten production Webpack
tests pass, including unchanged error strings and parent root-param
behavior.
- Existing `use-cache/use-cache.test.ts` static-HTML assertion passes,
exercising cached helpers called from gSP in both a page and route
handler.
- Full bootstrap and TypeScript declaration build pass.

<!-- NEXT_JS_LLM -->
parent c20c1d41
...@@ -34,7 +34,7 @@ import type { NormalizedAppRoute } from '../../shared/lib/router/routes/app' ...@@ -34,7 +34,7 @@ import type { NormalizedAppRoute } from '../../shared/lib/router/routes/app'
import { interceptionPrefixFromParamType } from '../../shared/lib/router/utils/interception-prefix-from-param-type' import { interceptionPrefixFromParamType } from '../../shared/lib/router/utils/interception-prefix-from-param-type'
import { isPlainObject } from '../../shared/lib/is-plain-object' import { isPlainObject } from '../../shared/lib/is-plain-object'
import { import {
type GenerateStaticParamsStore, type BuildTimeGeneratorStore,
workUnitAsyncStorage, workUnitAsyncStorage,
} from '../../server/app-render/work-unit-async-storage.external' } from '../../server/app-render/work-unit-async-storage.external'
import type { ImplicitTags } from '../../server/lib/implicit-tags' import type { ImplicitTags } from '../../server/lib/implicit-tags'
...@@ -625,8 +625,9 @@ async function callGenerateStaticParams( ...@@ -625,8 +625,9 @@ async function callGenerateStaticParams(
} }
} }
const workUnitStore: GenerateStaticParamsStore = { const workUnitStore: BuildTimeGeneratorStore = {
type: 'generate-static-params', type: 'build-time-generator',
functionName: 'generateStaticParams',
phase: 'render', phase: 'render',
implicitTags, implicitTags,
rootParams, rootParams,
......
...@@ -23,7 +23,7 @@ export function handleISRError({ error }: { error: any }) { ...@@ -23,7 +23,7 @@ export function handleISRError({ error }: { error: any }) {
case 'cache': case 'cache':
case 'private-cache': case 'private-cache':
case 'unstable-cache': case 'unstable-cache':
case 'generate-static-params': case 'build-time-generator':
case undefined: case undefined:
return return
default: default:
......
...@@ -37,7 +37,7 @@ export function instrumentParamsForClientValidation<TPArams extends Params>( ...@@ -37,7 +37,7 @@ export function instrumentParamsForClientValidation<TPArams extends Params>(
case 'request': case 'request':
case 'private-cache': case 'private-cache':
case 'unstable-cache': case 'unstable-cache':
case 'generate-static-params': case 'build-time-generator':
break break
default: default:
workUnitStore satisfies never workUnitStore satisfies never
...@@ -76,7 +76,7 @@ export function expectCompleteParamsInClientValidation( ...@@ -76,7 +76,7 @@ export function expectCompleteParamsInClientValidation(
case 'request': case 'request':
case 'private-cache': case 'private-cache':
case 'unstable-cache': case 'unstable-cache':
case 'generate-static-params': case 'build-time-generator':
break break
default: default:
workUnitStore satisfies never workUnitStore satisfies never
...@@ -112,7 +112,7 @@ export function instrumentSearchParamsForClientValidation( ...@@ -112,7 +112,7 @@ export function instrumentSearchParamsForClientValidation(
case 'request': case 'request':
case 'private-cache': case 'private-cache':
case 'unstable-cache': case 'unstable-cache':
case 'generate-static-params': case 'build-time-generator':
break break
default: default:
workUnitStore satisfies never workUnitStore satisfies never
......
...@@ -29,7 +29,7 @@ function hasFallbackRouteParams(): boolean { ...@@ -29,7 +29,7 @@ function hasFallbackRouteParams(): boolean {
case 'cache': case 'cache':
case 'private-cache': case 'private-cache':
case 'unstable-cache': case 'unstable-cache':
case 'generate-static-params': case 'build-time-generator':
break break
default: default:
workUnitStore satisfies never workUnitStore satisfies never
......
...@@ -2599,7 +2599,7 @@ function installGlobalModuleLoadingHandlers( ...@@ -2599,7 +2599,7 @@ function installGlobalModuleLoadingHandlers(
case 'prerender-legacy': case 'prerender-legacy':
case 'request': case 'request':
case 'unstable-cache': case 'unstable-cache':
case 'generate-static-params': case 'build-time-generator':
return false return false
default: default:
workUnitStore satisfies never workUnitStore satisfies never
......
...@@ -368,7 +368,7 @@ async function createComponentTreeInternal( ...@@ -368,7 +368,7 @@ async function createComponentTreeInternal(
case 'prerender-client': case 'prerender-client':
case 'validation-client': case 'validation-client':
case 'unstable-cache': case 'unstable-cache':
case 'generate-static-params': case 'build-time-generator':
break break
default: default:
workUnitStore satisfies never workUnitStore satisfies never
...@@ -412,7 +412,7 @@ async function createComponentTreeInternal( ...@@ -412,7 +412,7 @@ async function createComponentTreeInternal(
case 'prerender-client': case 'prerender-client':
case 'validation-client': case 'validation-client':
case 'unstable-cache': case 'unstable-cache':
case 'generate-static-params': case 'build-time-generator':
break break
default: default:
workUnitStore satisfies never workUnitStore satisfies never
......
...@@ -63,9 +63,9 @@ export function useDynamicRouteParams(expression: string) { ...@@ -63,9 +63,9 @@ export function useDynamicRouteParams(expression: string) {
throw new InvariantError( throw new InvariantError(
`\`${expression}\` was called inside a cache scope. Next.js should be preventing ${expression} from being included in server components statically, but did not in this case.` `\`${expression}\` was called inside a cache scope. Next.js should be preventing ${expression} from being included in server components statically, but did not in this case.`
) )
case 'generate-static-params': case 'build-time-generator':
throw new InvariantError( throw new InvariantError(
`\`${expression}\` was called in \`generateStaticParams\`. Next.js should be preventing ${expression} from being included in server component files statically, but did not in this case.` `\`${expression}\` was called in \`${workUnitStore.functionName}\`. Next.js should be preventing ${expression} from being included in server component files statically, but did not in this case.`
) )
case 'prerender-legacy': case 'prerender-legacy':
case 'request': case 'request':
...@@ -127,9 +127,9 @@ export function useDynamicSearchParams(expression: string) { ...@@ -127,9 +127,9 @@ export function useDynamicSearchParams(expression: string) {
throw new InvariantError( throw new InvariantError(
`\`${expression}\` was called inside a cache scope. Next.js should be preventing ${expression} from being included in server components statically, but did not in this case.` `\`${expression}\` was called inside a cache scope. Next.js should be preventing ${expression} from being included in server components statically, but did not in this case.`
) )
case 'generate-static-params': case 'build-time-generator':
throw new InvariantError( throw new InvariantError(
`\`${expression}\` was called in \`generateStaticParams\`. Next.js should be preventing ${expression} from being included in server component files statically, but did not in this case.` `\`${expression}\` was called in \`${workUnitStore.functionName}\`. Next.js should be preventing ${expression} from being included in server component files statically, but did not in this case.`
) )
case 'request': case 'request':
return return
......
...@@ -182,7 +182,7 @@ export function markCurrentScopeAsDynamic( ...@@ -182,7 +182,7 @@ export function markCurrentScopeAsDynamic(
return return
case 'prerender-legacy': case 'prerender-legacy':
case 'request': case 'request':
case 'generate-static-params': case 'build-time-generator':
break break
default: default:
workUnitStore satisfies never workUnitStore satisfies never
...@@ -219,7 +219,7 @@ export function markCurrentScopeAsDynamic( ...@@ -219,7 +219,7 @@ export function markCurrentScopeAsDynamic(
workUnitStore.usedDynamic = true workUnitStore.usedDynamic = true
} }
break break
case 'generate-static-params': case 'build-time-generator':
break break
default: default:
workUnitStore satisfies never workUnitStore satisfies never
...@@ -275,7 +275,7 @@ export function trackDynamicDataInDynamicRender(workUnitStore: WorkUnitStore) { ...@@ -275,7 +275,7 @@ export function trackDynamicDataInDynamicRender(workUnitStore: WorkUnitStore) {
case 'prerender-legacy': case 'prerender-legacy':
case 'prerender-client': case 'prerender-client':
case 'validation-client': case 'validation-client':
case 'generate-static-params': case 'build-time-generator':
break break
case 'request': case 'request':
if (process.env.NODE_ENV !== 'production') { if (process.env.NODE_ENV !== 'production') {
...@@ -515,7 +515,7 @@ export function createHangingInputAbortSignal( ...@@ -515,7 +515,7 @@ export function createHangingInputAbortSignal(
case 'cache': case 'cache':
case 'private-cache': case 'private-cache':
case 'unstable-cache': case 'unstable-cache':
case 'generate-static-params': case 'build-time-generator':
return undefined return undefined
default: default:
workUnitStore satisfies never workUnitStore satisfies never
......
...@@ -298,7 +298,7 @@ export async function decryptActionBoundArgs( ...@@ -298,7 +298,7 @@ export async function decryptActionBoundArgs(
case 'cache': case 'cache':
case 'private-cache': case 'private-cache':
case 'unstable-cache': case 'unstable-cache':
case 'generate-static-params': case 'build-time-generator':
case undefined: case undefined:
return controller.close() return controller.close()
default: default:
......
...@@ -30,7 +30,7 @@ function getValidationBoundaryTracking(): ValidationBoundaryTracking | null { ...@@ -30,7 +30,7 @@ function getValidationBoundaryTracking(): ValidationBoundaryTracking | null {
case 'cache': case 'cache':
case 'private-cache': case 'private-cache':
case 'unstable-cache': case 'unstable-cache':
case 'generate-static-params': case 'build-time-generator':
break break
default: default:
store satisfies never store satisfies never
......
...@@ -45,7 +45,7 @@ function getExpectedSampleTracking(): InstantValidationSampleTracking { ...@@ -45,7 +45,7 @@ function getExpectedSampleTracking(): InstantValidationSampleTracking {
case 'prerender-client': case 'prerender-client':
case 'prerender': case 'prerender':
case 'prerender-runtime': case 'prerender-runtime':
case 'generate-static-params': case 'build-time-generator':
break break
default: default:
workUnitStore satisfies never workUnitStore satisfies never
......
...@@ -111,7 +111,7 @@ function isUseCacheStore(workUnitStore: WorkUnitStore | undefined): boolean { ...@@ -111,7 +111,7 @@ function isUseCacheStore(workUnitStore: WorkUnitStore | undefined): boolean {
case 'prerender-legacy': case 'prerender-legacy':
case 'prerender-runtime': case 'prerender-runtime':
case 'validation-client': case 'validation-client':
case 'generate-static-params': case 'build-time-generator':
return false return false
default: default:
return workUnitStore satisfies never return workUnitStore satisfies never
......
...@@ -140,7 +140,7 @@ export function getFlightStream<T>( ...@@ -140,7 +140,7 @@ export function getFlightStream<T>(
case 'cache': case 'cache':
case 'private-cache': case 'private-cache':
case 'unstable-cache': case 'unstable-cache':
case 'generate-static-params': case 'build-time-generator':
break break
default: default:
workUnitStore satisfies never workUnitStore satisfies never
......
...@@ -436,8 +436,10 @@ export interface UnstableCacheStore extends CommonCacheStore { ...@@ -436,8 +436,10 @@ export interface UnstableCacheStore extends CommonCacheStore {
*/ */
export type CacheStore = UseCacheStore | UnstableCacheStore export type CacheStore = UseCacheStore | UnstableCacheStore
export interface GenerateStaticParamsStore extends CommonWorkUnitStore { export interface BuildTimeGeneratorStore extends CommonWorkUnitStore {
readonly type: 'generate-static-params' readonly type: 'build-time-generator'
/** The public export name to use in diagnostics, regardless of bundling. */
readonly functionName: string
readonly rootParams: Params readonly rootParams: Params
} }
...@@ -445,7 +447,7 @@ export type WorkUnitStore = ...@@ -445,7 +447,7 @@ export type WorkUnitStore =
| RequestStore | RequestStore
| CacheStore | CacheStore
| PrerenderStore | PrerenderStore
| GenerateStaticParamsStore | BuildTimeGeneratorStore
export function willConsumerServerCache( export function willConsumerServerCache(
workUnitStore: WorkUnitStore | undefined workUnitStore: WorkUnitStore | undefined
...@@ -466,7 +468,7 @@ export function willConsumerServerCache( ...@@ -466,7 +468,7 @@ export function willConsumerServerCache(
case 'request': case 'request':
case 'prerender-runtime': case 'prerender-runtime':
case 'validation-client': case 'validation-client':
case 'generate-static-params': case 'build-time-generator':
return false return false
default: default:
return workUnitStore satisfies never return workUnitStore satisfies never
...@@ -506,7 +508,7 @@ export function getResumeDataCache( ...@@ -506,7 +508,7 @@ export function getResumeDataCache(
case 'private-cache': case 'private-cache':
case 'unstable-cache': case 'unstable-cache':
case 'prerender-legacy': case 'prerender-legacy':
case 'generate-static-params': case 'build-time-generator':
return null return null
default: default:
return workUnitStore satisfies never return workUnitStore satisfies never
...@@ -528,7 +530,7 @@ export function getHmrRefreshHash( ...@@ -528,7 +530,7 @@ export function getHmrRefreshHash(
case 'validation-client': case 'validation-client':
case 'prerender-legacy': case 'prerender-legacy':
case 'unstable-cache': case 'unstable-cache':
case 'generate-static-params': case 'build-time-generator':
break break
default: default:
workUnitStore satisfies never workUnitStore satisfies never
...@@ -551,7 +553,7 @@ export function isHmrRefresh(workUnitStore: WorkUnitStore): boolean { ...@@ -551,7 +553,7 @@ export function isHmrRefresh(workUnitStore: WorkUnitStore): boolean {
case 'prerender-runtime': case 'prerender-runtime':
case 'prerender-legacy': case 'prerender-legacy':
case 'unstable-cache': case 'unstable-cache':
case 'generate-static-params': case 'build-time-generator':
break break
default: default:
workUnitStore satisfies never workUnitStore satisfies never
...@@ -576,7 +578,7 @@ export function getServerComponentsHmrCache( ...@@ -576,7 +578,7 @@ export function getServerComponentsHmrCache(
case 'prerender-runtime': case 'prerender-runtime':
case 'prerender-legacy': case 'prerender-legacy':
case 'unstable-cache': case 'unstable-cache':
case 'generate-static-params': case 'build-time-generator':
break break
default: default:
workUnitStore satisfies never workUnitStore satisfies never
...@@ -605,7 +607,7 @@ export function getDraftModeProviderForCacheScope( ...@@ -605,7 +607,7 @@ export function getDraftModeProviderForCacheScope(
case 'prerender-client': case 'prerender-client':
case 'validation-client': case 'validation-client':
case 'prerender-legacy': case 'prerender-legacy':
case 'generate-static-params': case 'build-time-generator':
break break
default: default:
workUnitStore satisfies never workUnitStore satisfies never
...@@ -629,7 +631,7 @@ export function getStagedRenderingController( ...@@ -629,7 +631,7 @@ export function getStagedRenderingController(
case 'cache': case 'cache':
case 'private-cache': case 'private-cache':
case 'unstable-cache': case 'unstable-cache':
case 'generate-static-params': case 'build-time-generator':
return null return null
default: default:
return workUnitStore satisfies never return workUnitStore satisfies never
...@@ -656,7 +658,7 @@ export function getCacheSignal( ...@@ -656,7 +658,7 @@ export function getCacheSignal(
case 'cache': case 'cache':
case 'private-cache': case 'private-cache':
case 'unstable-cache': case 'unstable-cache':
case 'generate-static-params': case 'build-time-generator':
return null return null
default: default:
return workUnitStore satisfies never return workUnitStore satisfies never
...@@ -678,7 +680,7 @@ export function getVaryParamsAccumulator( ...@@ -678,7 +680,7 @@ export function getVaryParamsAccumulator(
case 'prerender-client': case 'prerender-client':
case 'validation-client': case 'validation-client':
case 'unstable-cache': case 'unstable-cache':
case 'generate-static-params': case 'build-time-generator':
return null return null
default: default:
workUnitStore satisfies never workUnitStore satisfies never
......
...@@ -296,7 +296,7 @@ function trackRuntimeDataAccessedImpl( ...@@ -296,7 +296,7 @@ function trackRuntimeDataAccessedImpl(
case 'cache': case 'cache':
case 'private-cache': case 'private-cache':
case 'unstable-cache': case 'unstable-cache':
case 'generate-static-params': case 'build-time-generator':
// Only the modern server prerender tracks this; see the field docs on // Only the modern server prerender tracks this; see the field docs on
// PrerenderStoreModernServer. // PrerenderStoreModernServer.
break break
...@@ -524,7 +524,7 @@ export function applyOwnerStack(error: Error): Error { ...@@ -524,7 +524,7 @@ export function applyOwnerStack(error: Error): Error {
case 'prerender-runtime': case 'prerender-runtime':
case 'prerender-client': case 'prerender-client':
case 'validation-client': case 'validation-client':
case 'generate-static-params': case 'build-time-generator':
case undefined: case undefined:
ownerStack = innerOwnerStack ownerStack = innerOwnerStack
break break
......
...@@ -72,7 +72,7 @@ function shouldProcessFetchConfigForWorkUnit( ...@@ -72,7 +72,7 @@ function shouldProcessFetchConfigForWorkUnit(
) )
case 'prerender-runtime': case 'prerender-runtime':
case 'validation-client': case 'validation-client':
case 'generate-static-params': case 'build-time-generator':
return false return false
default: default:
return workUnitStore satisfies never return workUnitStore satisfies never
...@@ -473,7 +473,7 @@ export function createPatchedFetcher( ...@@ -473,7 +473,7 @@ export function createPatchedFetcher(
break break
case 'request': case 'request':
case 'unstable-cache': case 'unstable-cache':
case 'generate-static-params': case 'build-time-generator':
break break
default: default:
workUnitStore satisfies never workUnitStore satisfies never
...@@ -512,7 +512,7 @@ export function createPatchedFetcher( ...@@ -512,7 +512,7 @@ export function createPatchedFetcher(
case 'request': case 'request':
case 'cache': case 'cache':
case 'private-cache': case 'private-cache':
case 'generate-static-params': case 'build-time-generator':
break break
default: default:
workUnitStore satisfies never workUnitStore satisfies never
...@@ -683,7 +683,7 @@ export function createPatchedFetcher( ...@@ -683,7 +683,7 @@ export function createPatchedFetcher(
case 'cache': case 'cache':
case 'private-cache': case 'private-cache':
case 'unstable-cache': case 'unstable-cache':
case 'generate-static-params': case 'build-time-generator':
break break
default: default:
workUnitStore satisfies never workUnitStore satisfies never
...@@ -815,7 +815,7 @@ export function createPatchedFetcher( ...@@ -815,7 +815,7 @@ export function createPatchedFetcher(
case 'cache': case 'cache':
case 'private-cache': case 'private-cache':
case 'unstable-cache': case 'unstable-cache':
case 'generate-static-params': case 'build-time-generator':
break break
default: default:
workUnitStore satisfies never workUnitStore satisfies never
...@@ -859,7 +859,7 @@ export function createPatchedFetcher( ...@@ -859,7 +859,7 @@ export function createPatchedFetcher(
case 'prerender-runtime': case 'prerender-runtime':
case 'prerender-legacy': case 'prerender-legacy':
case 'unstable-cache': case 'unstable-cache':
case 'generate-static-params': case 'build-time-generator':
break break
default: default:
workUnitStore satisfies never workUnitStore satisfies never
...@@ -1013,7 +1013,7 @@ export function createPatchedFetcher( ...@@ -1013,7 +1013,7 @@ export function createPatchedFetcher(
case 'cache': case 'cache':
case 'private-cache': case 'private-cache':
case 'unstable-cache': case 'unstable-cache':
case 'generate-static-params': case 'build-time-generator':
case undefined: case undefined:
return createCachedDynamicResponse( return createCachedDynamicResponse(
workStore, workStore,
...@@ -1096,7 +1096,7 @@ export function createPatchedFetcher( ...@@ -1096,7 +1096,7 @@ export function createPatchedFetcher(
case 'cache': case 'cache':
case 'private-cache': case 'private-cache':
case 'unstable-cache': case 'unstable-cache':
case 'generate-static-params': case 'build-time-generator':
break break
default: default:
workUnitStore satisfies never workUnitStore satisfies never
...@@ -1219,7 +1219,7 @@ export function createPatchedFetcher( ...@@ -1219,7 +1219,7 @@ export function createPatchedFetcher(
case 'cache': case 'cache':
case 'private-cache': case 'private-cache':
case 'unstable-cache': case 'unstable-cache':
case 'generate-static-params': case 'build-time-generator':
break break
default: default:
workUnitStore satisfies never workUnitStore satisfies never
...@@ -1266,7 +1266,7 @@ export function createPatchedFetcher( ...@@ -1266,7 +1266,7 @@ export function createPatchedFetcher(
case 'private-cache': case 'private-cache':
case 'unstable-cache': case 'unstable-cache':
case 'prerender-legacy': case 'prerender-legacy':
case 'generate-static-params': case 'build-time-generator':
break break
default: default:
workUnitStore satisfies never workUnitStore satisfies never
......
...@@ -261,7 +261,7 @@ function patchConsoleMethod(methodName: InterceptableConsoleMethod): void { ...@@ -261,7 +261,7 @@ function patchConsoleMethod(methodName: InterceptableConsoleMethod): void {
case 'unstable-cache': case 'unstable-cache':
case 'private-cache': case 'private-cache':
case 'request': case 'request':
case 'generate-static-params': case 'build-time-generator':
case undefined: case undefined:
if (consoleStore?.dim === true) { if (consoleStore?.dim === true) {
return applyWithDimming.call( return applyWithDimming.call(
......
...@@ -107,7 +107,7 @@ export function io(expression: string, type: SyncIOApiType) { ...@@ -107,7 +107,7 @@ export function io(expression: string, type: SyncIOApiType) {
case 'cache': case 'cache':
case 'private-cache': case 'private-cache':
case 'unstable-cache': case 'unstable-cache':
case 'generate-static-params': case 'build-time-generator':
break break
default: default:
workUnitStore satisfies never workUnitStore satisfies never
......
...@@ -619,7 +619,7 @@ function filteringUnhandledRejectionHandler( ...@@ -619,7 +619,7 @@ function filteringUnhandledRejectionHandler(
case 'cache': case 'cache':
case 'private-cache': case 'private-cache':
case 'unstable-cache': case 'unstable-cache':
case 'generate-static-params': case 'build-time-generator':
break break
default: default:
workUnitStore satisfies never workUnitStore satisfies never
......
...@@ -78,7 +78,7 @@ async function getCachedImageResponseArrayBuffer( ...@@ -78,7 +78,7 @@ async function getCachedImageResponseArrayBuffer(
case 'prerender-client': case 'prerender-client':
case 'validation-client': case 'validation-client':
case 'prerender-legacy': case 'prerender-legacy':
case 'generate-static-params': case 'build-time-generator':
return renderImageResponseArrayBuffer(args) return renderImageResponseArrayBuffer(args)
default: default:
return workUnitStore satisfies never return workUnitStore satisfies never
......
...@@ -135,9 +135,9 @@ export function unstable_prefetch(): Promise<void> { ...@@ -135,9 +135,9 @@ export function unstable_prefetch(): Promise<void> {
`Route ${workStore.route} used \`unstable_prefetch()\` inside a function cached with \`unstable_cache()\`. The \`unstable_prefetch()\` function is used to indicate the subsequent code must not run in the app shell, but \`unstable_cache()\` caches must be able to be produced before a prefetch, so this function is not allowed in this scope. See more info here: https://nextjs.org/docs/app/api-reference/functions/unstable_cache` `Route ${workStore.route} used \`unstable_prefetch()\` inside a function cached with \`unstable_cache()\`. The \`unstable_prefetch()\` function is used to indicate the subsequent code must not run in the app shell, but \`unstable_cache()\` caches must be able to be produced before a prefetch, so this function is not allowed in this scope. See more info here: https://nextjs.org/docs/app/api-reference/functions/unstable_cache`
) )
} }
case 'generate-static-params': { case 'build-time-generator': {
throw new Error( throw new Error(
`Route ${workStore.route} used \`unstable_prefetch()\` inside \`generateStaticParams\`. This is not supported because \`generateStaticParams\` runs at build time without a prefetch. Read more: https://nextjs.org/docs/messages/next-dynamic-api-wrong-context` `Route ${workStore.route} used \`unstable_prefetch()\` inside \`${workUnitStore.functionName}\`. This is not supported because \`${workUnitStore.functionName}\` runs at build time without a prefetch. Read more: https://nextjs.org/docs/messages/next-dynamic-api-wrong-context`
) )
} }
case 'prerender-client': case 'prerender-client':
...@@ -288,9 +288,9 @@ export function unstable_navigation(): Promise<void> { ...@@ -288,9 +288,9 @@ export function unstable_navigation(): Promise<void> {
`Route ${workStore.route} used \`unstable_navigation()\` inside a function cached with \`unstable_cache()\`. The \`unstable_navigation()\` function is used to indicate the subsequent code must only run during an actual navigation, but \`unstable_cache()\` caches must be able to be produced before a navigation, so this function is not allowed in this scope. See more info here: https://nextjs.org/docs/app/api-reference/functions/unstable_cache` `Route ${workStore.route} used \`unstable_navigation()\` inside a function cached with \`unstable_cache()\`. The \`unstable_navigation()\` function is used to indicate the subsequent code must only run during an actual navigation, but \`unstable_cache()\` caches must be able to be produced before a navigation, so this function is not allowed in this scope. See more info here: https://nextjs.org/docs/app/api-reference/functions/unstable_cache`
) )
} }
case 'generate-static-params': { case 'build-time-generator': {
throw new Error( throw new Error(
`Route ${workStore.route} used \`unstable_navigation()\` inside \`generateStaticParams\`. This is not supported because \`generateStaticParams\` runs at build time without a navigation. Read more: https://nextjs.org/docs/messages/next-dynamic-api-wrong-context` `Route ${workStore.route} used \`unstable_navigation()\` inside \`${workUnitStore.functionName}\`. This is not supported because \`${workUnitStore.functionName}\` runs at build time without a navigation. Read more: https://nextjs.org/docs/messages/next-dynamic-api-wrong-context`
) )
} }
case 'prerender-client': case 'prerender-client':
......
...@@ -72,9 +72,9 @@ export function connection(): Promise<void> { ...@@ -72,9 +72,9 @@ export function connection(): Promise<void> {
} }
case 'unstable-cache': case 'unstable-cache':
throw createConnectionInUnstableCacheError(workStore.route) throw createConnectionInUnstableCacheError(workStore.route)
case 'generate-static-params': case 'build-time-generator':
throw new Error( throw new Error(
`Route ${workStore.route} used \`connection()\` inside \`generateStaticParams\`. This is not supported because \`generateStaticParams\` runs at build time without an HTTP request. Read more: https://nextjs.org/docs/messages/next-dynamic-api-wrong-context` `Route ${workStore.route} used \`connection()\` inside \`${workUnitStore.functionName}\`. This is not supported because \`${workUnitStore.functionName}\` runs at build time without an HTTP request. Read more: https://nextjs.org/docs/messages/next-dynamic-api-wrong-context`
) )
case 'prerender': case 'prerender':
case 'prerender-client': case 'prerender-client':
......
...@@ -68,9 +68,9 @@ export function cookies(): Promise<ReadonlyRequestCookies> { ...@@ -68,9 +68,9 @@ export function cookies(): Promise<ReadonlyRequestCookies> {
throw error throw error
case 'unstable-cache': case 'unstable-cache':
throw createCookiesInUnstableCacheError(workStore.route) throw createCookiesInUnstableCacheError(workStore.route)
case 'generate-static-params': case 'build-time-generator':
throw new Error( throw new Error(
`Route ${workStore.route} used \`cookies()\` inside \`generateStaticParams\`. This is not supported because \`generateStaticParams\` runs at build time without an HTTP request. Read more: https://nextjs.org/docs/messages/next-dynamic-api-wrong-context` `Route ${workStore.route} used \`cookies()\` inside \`${workUnitStore.functionName}\`. This is not supported because \`${workUnitStore.functionName}\` runs at build time without an HTTP request. Read more: https://nextjs.org/docs/messages/next-dynamic-api-wrong-context`
) )
case 'prerender': case 'prerender':
return makeHangingCookies(workStore, workUnitStore) return makeHangingCookies(workStore, workUnitStore)
......
...@@ -82,9 +82,9 @@ export function draftMode(): Promise<DraftMode> { ...@@ -82,9 +82,9 @@ export function draftMode(): Promise<DraftMode> {
`${exportName} must not be used within a Client Component. Next.js should be preventing ${exportName} from being included in Client Components statically, but did not in this case.` `${exportName} must not be used within a Client Component. Next.js should be preventing ${exportName} from being included in Client Components statically, but did not in this case.`
) )
} }
case 'generate-static-params': case 'build-time-generator':
throw new Error( throw new Error(
`Route ${workStore.route} used \`${callingExpression}()\` inside \`generateStaticParams\`. This is not supported because \`generateStaticParams\` runs at build time without an HTTP request. Read more: https://nextjs.org/docs/messages/next-dynamic-api-wrong-context` `Route ${workStore.route} used \`${callingExpression}()\` inside \`${workUnitStore.functionName}\`. This is not supported because \`${workUnitStore.functionName}\` runs at build time without an HTTP request. Read more: https://nextjs.org/docs/messages/next-dynamic-api-wrong-context`
) )
default: default:
...@@ -260,9 +260,9 @@ function trackDynamicDraftMode(expression: string, constructorOpt: Function) { ...@@ -260,9 +260,9 @@ function trackDynamicDraftMode(expression: string, constructorOpt: Function) {
case 'request': case 'request':
trackDynamicDataInDynamicRender(workUnitStore) trackDynamicDataInDynamicRender(workUnitStore)
break break
case 'generate-static-params': case 'build-time-generator':
throw new Error( throw new Error(
`Route ${workStore.route} used \`${expression}\` inside \`generateStaticParams\`. This is not supported because \`generateStaticParams\` runs at build time without an HTTP request. Read more: https://nextjs.org/docs/messages/next-dynamic-api-wrong-context` `Route ${workStore.route} used \`${expression}\` inside \`${workUnitStore.functionName}\`. This is not supported because \`${workUnitStore.functionName}\` runs at build time without an HTTP request. Read more: https://nextjs.org/docs/messages/next-dynamic-api-wrong-context`
) )
default: default:
workUnitStore satisfies never workUnitStore satisfies never
......
...@@ -70,9 +70,9 @@ export function headers(): Promise<ReadonlyHeaders> { ...@@ -70,9 +70,9 @@ export function headers(): Promise<ReadonlyHeaders> {
} }
case 'unstable-cache': case 'unstable-cache':
throw createHeadersInUnstableCacheError(workStore.route) throw createHeadersInUnstableCacheError(workStore.route)
case 'generate-static-params': case 'build-time-generator':
throw new Error( throw new Error(
`Route ${workStore.route} used \`headers()\` inside \`generateStaticParams\`. This is not supported because \`generateStaticParams\` runs at build time without an HTTP request. Read more: https://nextjs.org/docs/messages/next-dynamic-api-wrong-context` `Route ${workStore.route} used \`headers()\` inside \`${workUnitStore.functionName}\`. This is not supported because \`${workUnitStore.functionName}\` runs at build time without an HTTP request. Read more: https://nextjs.org/docs/messages/next-dynamic-api-wrong-context`
) )
case 'prerender': case 'prerender':
case 'prerender-client': case 'prerender-client':
......
...@@ -74,7 +74,7 @@ export function io(): Promise<void> { ...@@ -74,7 +74,7 @@ export function io(): Promise<void> {
// simply return the value at cache-fill time. // simply return the value at cache-fill time.
// ... // ...
// intentional fallthrough // intentional fallthrough
case 'generate-static-params': case 'build-time-generator':
// generateStaticParams runs at build time. There is no prerender // generateStaticParams runs at build time. There is no prerender
// to stall so we resolve immediately. // to stall so we resolve immediately.
// ... // ...
......
...@@ -77,9 +77,9 @@ export function createParamsFromClient( ...@@ -77,9 +77,9 @@ export function createParamsFromClient(
throw new InvariantError( throw new InvariantError(
'createParamsFromClient should not be called in a runtime prerender.' 'createParamsFromClient should not be called in a runtime prerender.'
) )
case 'generate-static-params': case 'build-time-generator':
throw new InvariantError( throw new InvariantError(
'createParamsFromClient should not be called inside generateStaticParams.' `createParamsFromClient should not be called inside ${workUnitStore.functionName}.`
) )
case 'validation-client': { case 'validation-client': {
if (workUnitStore.validationSamples) { if (workUnitStore.validationSamples) {
...@@ -166,9 +166,9 @@ export function createServerParamsForRoute( ...@@ -166,9 +166,9 @@ export function createServerParamsForRoute(
throw new InvariantError( throw new InvariantError(
'createServerParamsForRoute should not be called in cache contexts.' 'createServerParamsForRoute should not be called in cache contexts.'
) )
case 'generate-static-params': case 'build-time-generator':
throw new InvariantError( throw new InvariantError(
'createServerParamsForRoute should not be called inside generateStaticParams.' `createServerParamsForRoute should not be called inside ${workUnitStore.functionName}.`
) )
case 'prerender-runtime': { case 'prerender-runtime': {
throw new InvariantError( throw new InvariantError(
...@@ -228,9 +228,9 @@ export function createServerParamsForServerSegment( ...@@ -228,9 +228,9 @@ export function createServerParamsForServerSegment(
throw new InvariantError( throw new InvariantError(
'createServerParamsForServerSegment should not be called in cache contexts.' 'createServerParamsForServerSegment should not be called in cache contexts.'
) )
case 'generate-static-params': case 'build-time-generator':
throw new InvariantError( throw new InvariantError(
'createServerParamsForServerSegment should not be called inside generateStaticParams.' `createServerParamsForServerSegment should not be called inside ${workUnitStore.functionName}.`
) )
case 'prerender-runtime': case 'prerender-runtime':
return createRuntimePrerenderParams( return createRuntimePrerenderParams(
...@@ -300,9 +300,9 @@ export function createPrerenderParamsForClientSegment( ...@@ -300,9 +300,9 @@ export function createPrerenderParamsForClientSegment(
throw new InvariantError( throw new InvariantError(
'createPrerenderParamsForClientSegment should not be called in cache contexts.' 'createPrerenderParamsForClientSegment should not be called in cache contexts.'
) )
case 'generate-static-params': case 'build-time-generator':
throw new InvariantError( throw new InvariantError(
'createPrerenderParamsForClientSegment should not be called inside generateStaticParams.' `createPrerenderParamsForClientSegment should not be called inside ${workUnitStore.functionName}.`
) )
case 'prerender-runtime': case 'prerender-runtime':
case 'prerender-legacy': case 'prerender-legacy':
......
...@@ -45,9 +45,9 @@ export function createServerPathnameForMetadata( ...@@ -45,9 +45,9 @@ export function createServerPathnameForMetadata(
throw new InvariantError( throw new InvariantError(
'createServerPathnameForMetadata should not be called in cache contexts.' 'createServerPathnameForMetadata should not be called in cache contexts.'
) )
case 'generate-static-params': case 'build-time-generator':
throw new InvariantError( throw new InvariantError(
'createServerPathnameForMetadata should not be called inside generateStaticParams.' `createServerPathnameForMetadata should not be called inside ${workUnitStore.functionName}.`
) )
case 'prerender-runtime': { case 'prerender-runtime': {
// TODO(app-shells): whether or not this is included in the shell // TODO(app-shells): whether or not this is included in the shell
......
...@@ -112,8 +112,13 @@ export function getRootParam(paramName: string): Promise<ParamValue> { ...@@ -112,8 +112,13 @@ export function getRootParam(paramName: string): Promise<ParamValue> {
case 'prerender-runtime': { case 'prerender-runtime': {
break break
} }
case 'generate-static-params': { case 'build-time-generator': {
if (!(paramName in workUnitStore.rootParams)) { if (!(paramName in workUnitStore.rootParams)) {
if (workUnitStore.functionName !== 'generateStaticParams') {
throw new Error(
`Route ${workStore.route} used ${apiName} inside \`${workUnitStore.functionName}\`, but the \`${paramName}\` parameter is not available in this build-time generator.`
)
}
throw new Error( throw new Error(
`Route ${workStore.route} used ${apiName} inside \`generateStaticParams\`, but the \`${paramName}\` parameter was not provided by a parent \`generateStaticParams\`. In \`generateStaticParams\`, root params are only available for segments nested below the segment that provides them.` `Route ${workStore.route} used ${apiName} inside \`generateStaticParams\`, but the \`${paramName}\` parameter was not provided by a parent \`generateStaticParams\`. In \`generateStaticParams\`, root params are only available for segments nested below the segment that provides them.`
) )
......
...@@ -70,9 +70,9 @@ export function createSearchParamsFromClient( ...@@ -70,9 +70,9 @@ export function createSearchParamsFromClient(
throw new InvariantError( throw new InvariantError(
'createSearchParamsFromClient should not be called in cache contexts.' 'createSearchParamsFromClient should not be called in cache contexts.'
) )
case 'generate-static-params': case 'build-time-generator':
throw new InvariantError( throw new InvariantError(
'createSearchParamsFromClient should not be called inside generateStaticParams.' `createSearchParamsFromClient should not be called inside ${workUnitStore.functionName}.`
) )
case 'validation-client': { case 'validation-client': {
if (workUnitStore.validationSamples) { if (workUnitStore.validationSamples) {
...@@ -133,9 +133,9 @@ export function createServerSearchParamsForServerPage( ...@@ -133,9 +133,9 @@ export function createServerSearchParamsForServerPage(
throw new InvariantError( throw new InvariantError(
'createServerSearchParamsForServerPage should not be called in cache contexts.' 'createServerSearchParamsForServerPage should not be called in cache contexts.'
) )
case 'generate-static-params': case 'build-time-generator':
throw new InvariantError( throw new InvariantError(
'createServerSearchParamsForServerPage should not be called inside generateStaticParams.' `createServerSearchParamsForServerPage should not be called inside ${workUnitStore.functionName}.`
) )
case 'prerender-runtime': case 'prerender-runtime':
return createRuntimePrerenderSearchParams( return createRuntimePrerenderSearchParams(
...@@ -195,9 +195,9 @@ export function createPrerenderSearchParamsForClientPage(): Promise<SearchParams ...@@ -195,9 +195,9 @@ export function createPrerenderSearchParamsForClientPage(): Promise<SearchParams
throw new InvariantError( throw new InvariantError(
'createPrerenderSearchParamsForClientPage should not be called in cache contexts.' 'createPrerenderSearchParamsForClientPage should not be called in cache contexts.'
) )
case 'generate-static-params': case 'build-time-generator':
throw new InvariantError( throw new InvariantError(
'createPrerenderSearchParamsForClientPage should not be called inside generateStaticParams.' `createPrerenderSearchParamsForClientPage should not be called inside ${workUnitStore.functionName}.`
) )
case 'prerender-legacy': case 'prerender-legacy':
case 'request': case 'request':
......
...@@ -1508,7 +1508,7 @@ function trackDynamic( ...@@ -1508,7 +1508,7 @@ function trackDynamic(
workUnitStore.usedDynamic = true workUnitStore.usedDynamic = true
} }
break break
case 'generate-static-params': case 'build-time-generator':
break break
default: default:
workUnitStore satisfies never workUnitStore satisfies never
......
...@@ -41,7 +41,7 @@ export function cacheLife(profile: CacheLifeProfiles | CacheLife): void { ...@@ -41,7 +41,7 @@ export function cacheLife(profile: CacheLifeProfiles | CacheLife): void {
case 'prerender-legacy': case 'prerender-legacy':
case 'request': case 'request':
case 'unstable-cache': case 'unstable-cache':
case 'generate-static-params': case 'build-time-generator':
case undefined: case undefined:
throw createCacheLifeOutsideUseCacheError( throw createCacheLifeOutsideUseCacheError(
workAsyncStorage.getStore()?.route workAsyncStorage.getStore()?.route
......
...@@ -20,7 +20,7 @@ export function cacheTag(...tags: string[]): void { ...@@ -20,7 +20,7 @@ export function cacheTag(...tags: string[]): void {
case 'prerender-legacy': case 'prerender-legacy':
case 'request': case 'request':
case 'unstable-cache': case 'unstable-cache':
case 'generate-static-params': case 'build-time-generator':
case undefined: case undefined:
throw createCacheTagOutsideUseCacheError( throw createCacheTagOutsideUseCacheError(
workAsyncStorage.getStore()?.route workAsyncStorage.getStore()?.route
......
...@@ -123,10 +123,11 @@ export function createDraftModeMutationInUnstableCacheError( ...@@ -123,10 +123,11 @@ export function createDraftModeMutationInUnstableCacheError(
export function createRevalidateDuringRenderError( export function createRevalidateDuringRenderError(
route: string, route: string,
expression: string expression: string,
generatorName?: string
): Error { ): Error {
return new Error( return new Error(
`Route "${route}": \`${expression}\` can't be called during render, inside a cached function, or inside \`generateStaticParams\`. Call it from a Server Action or Route Handler instead.\nLearn more: ${REVALIDATE_IN_USE_CACHE}` `Route "${route}": \`${expression}\` can't be called during render, inside a cached function, or inside \`${generatorName ?? 'generateStaticParams'}\`. Call it from a Server Action or Route Handler instead.\nLearn more: ${REVALIDATE_IN_USE_CACHE}`
) )
} }
...@@ -191,9 +192,10 @@ export function createUseCachePrivateInsideUnstableCacheError( ...@@ -191,9 +192,10 @@ export function createUseCachePrivateInsideUnstableCacheError(
} }
export function createUseCachePrivateOutsideRequestContextError( export function createUseCachePrivateOutsideRequestContextError(
route: string route: string,
functionName: string
): Error { ): Error {
return new Error( return new Error(
`Route "${route}": \`"use cache: private"\` needs an active request, so it can't be used during \`generateStaticParams\` or other build-time contexts. Move it to a request-time component or function.\nLearn more: ${USE_CACHE_PRIVATE_COMPOSITION}` `Route "${route}": \`"use cache: private"\` needs an active request, so it can't be used during \`${functionName}\` or other build-time contexts. Move it to a request-time component or function.\nLearn more: ${USE_CACHE_PRIVATE_COMPOSITION}`
) )
} }
...@@ -812,7 +812,7 @@ function createUseCacheStore( ...@@ -812,7 +812,7 @@ function createUseCacheStore(
case 'prerender': case 'prerender':
case 'prerender-legacy': case 'prerender-legacy':
case 'unstable-cache': case 'unstable-cache':
case 'generate-static-params': case 'build-time-generator':
break break
default: default:
outerWorkUnitStore satisfies never outerWorkUnitStore satisfies never
...@@ -874,7 +874,7 @@ function captureOuterOwnerStack( ...@@ -874,7 +874,7 @@ function captureOuterOwnerStack(
case 'prerender-runtime': case 'prerender-runtime':
case 'prerender-client': case 'prerender-client':
case 'validation-client': case 'validation-client':
case 'generate-static-params': case 'build-time-generator':
break break
default: default:
workUnitStore satisfies never workUnitStore satisfies never
...@@ -1034,7 +1034,7 @@ function propagateCacheEntryMetadata( ...@@ -1034,7 +1034,7 @@ function propagateCacheEntryMetadata(
) )
break break
case 'unstable-cache': case 'unstable-cache':
case 'generate-static-params': case 'build-time-generator':
break break
default: default:
cacheContext.outerWorkUnitStore satisfies never cacheContext.outerWorkUnitStore satisfies never
...@@ -1102,7 +1102,7 @@ function maybePropagateCacheEntryMetadata( ...@@ -1102,7 +1102,7 @@ function maybePropagateCacheEntryMetadata(
propagateCacheEntryMetadata(cacheContext, metadata) propagateCacheEntryMetadata(cacheContext, metadata)
break break
} }
case 'generate-static-params': case 'build-time-generator':
break break
default: { default: {
outerWorkUnitStore satisfies never outerWorkUnitStore satisfies never
...@@ -1347,7 +1347,7 @@ async function generateCacheEntryImpl( ...@@ -1347,7 +1347,7 @@ async function generateCacheEntryImpl(
case 'cache': case 'cache':
case 'private-cache': case 'private-cache':
case 'unstable-cache': case 'unstable-cache':
case 'generate-static-params': case 'build-time-generator':
break break
default: default:
outerWorkUnitStore satisfies never outerWorkUnitStore satisfies never
...@@ -1607,7 +1607,7 @@ async function generateCacheEntryImpl( ...@@ -1607,7 +1607,7 @@ async function generateCacheEntryImpl(
case 'cache': case 'cache':
case 'private-cache': case 'private-cache':
case 'unstable-cache': case 'unstable-cache':
case 'generate-static-params': case 'build-time-generator':
stream = renderToReadableStream( stream = renderToReadableStream(
resultPromise, resultPromise,
clientReferenceManifest.clientModules, clientReferenceManifest.clientModules,
...@@ -1797,7 +1797,7 @@ export async function cache( ...@@ -1797,7 +1797,7 @@ export async function cache(
case 'cache': case 'cache':
case 'private-cache': case 'private-cache':
case 'unstable-cache': case 'unstable-cache':
case 'generate-static-params': case 'build-time-generator':
break break
default: default:
workUnitStore satisfies never workUnitStore satisfies never
...@@ -1923,9 +1923,12 @@ export async function cache( ...@@ -1923,9 +1923,12 @@ export async function cache(
handlerKind: kind, handlerKind: kind,
} }
break break
case 'generate-static-params': case 'build-time-generator':
throw wrapAsInvalidDynamicUsageError( throw wrapAsInvalidDynamicUsageError(
createUseCachePrivateOutsideRequestContextError(workStore.route) createUseCachePrivateOutsideRequestContextError(
workStore.route,
workUnitStore.functionName
)
) )
default: default:
workUnitStore satisfies never workUnitStore satisfies never
...@@ -1974,7 +1977,7 @@ export async function cache( ...@@ -1974,7 +1977,7 @@ export async function cache(
// TODO: We should probably forbid nesting "use cache" inside // TODO: We should probably forbid nesting "use cache" inside
// unstable_cache. (fallthrough) // unstable_cache. (fallthrough)
case 'unstable-cache': case 'unstable-cache':
case 'generate-static-params': case 'build-time-generator':
cacheContext = { cacheContext = {
kind: 'public', kind: 'public',
outerWorkUnitStore: workUnitStore, outerWorkUnitStore: workUnitStore,
...@@ -2212,7 +2215,7 @@ export async function cache( ...@@ -2212,7 +2215,7 @@ export async function cache(
case 'cache': case 'cache':
case 'private-cache': case 'private-cache':
case 'unstable-cache': case 'unstable-cache':
case 'generate-static-params': case 'build-time-generator':
case undefined: case undefined:
encodedCacheKeyParts = await encodeCacheKeyParts() encodedCacheKeyParts = await encodeCacheKeyParts()
break break
...@@ -2349,7 +2352,7 @@ export async function cache( ...@@ -2349,7 +2352,7 @@ export async function cache(
case 'cache': case 'cache':
case 'private-cache': case 'private-cache':
case 'unstable-cache': case 'unstable-cache':
case 'generate-static-params': case 'build-time-generator':
break break
default: default:
workUnitStore satisfies never workUnitStore satisfies never
...@@ -2532,7 +2535,7 @@ export async function cache( ...@@ -2532,7 +2535,7 @@ export async function cache(
case 'cache': case 'cache':
case 'private-cache': case 'private-cache':
case 'unstable-cache': case 'unstable-cache':
case 'generate-static-params': case 'build-time-generator':
break break
default: default:
workUnitStore satisfies never workUnitStore satisfies never
...@@ -2677,7 +2680,7 @@ export async function cache( ...@@ -2677,7 +2680,7 @@ export async function cache(
case 'cache': case 'cache':
case 'private-cache': case 'private-cache':
case 'unstable-cache': case 'unstable-cache':
case 'generate-static-params': case 'build-time-generator':
break break
default: default:
workUnitStore satisfies never workUnitStore satisfies never
...@@ -2797,7 +2800,7 @@ export async function cache( ...@@ -2797,7 +2800,7 @@ export async function cache(
case 'cache': case 'cache':
case 'private-cache': case 'private-cache':
case 'unstable-cache': case 'unstable-cache':
case 'generate-static-params': case 'build-time-generator':
break break
default: default:
workUnitStore satisfies never workUnitStore satisfies never
...@@ -3246,7 +3249,7 @@ export async function cache( ...@@ -3246,7 +3249,7 @@ export async function cache(
case 'cache': case 'cache':
case 'private-cache': case 'private-cache':
case 'unstable-cache': case 'unstable-cache':
case 'generate-static-params': case 'build-time-generator':
break break
default: default:
workUnitStore satisfies never workUnitStore satisfies never
...@@ -3308,7 +3311,7 @@ export async function cache( ...@@ -3308,7 +3311,7 @@ export async function cache(
case 'cache': case 'cache':
case 'private-cache': case 'private-cache':
case 'unstable-cache': case 'unstable-cache':
case 'generate-static-params': case 'build-time-generator':
// A handler read in a prerender context is a cache-filling read. // A handler read in a prerender context is a cache-filling read.
// The stale exclusions for those are applied when the RDC is // The stale exclusions for those are applied when the RDC is
// read in the final prerender, so there's nothing to do here. // read in the final prerender, so there's nothing to do here.
...@@ -3561,7 +3564,7 @@ export async function cache( ...@@ -3561,7 +3564,7 @@ export async function cache(
case 'prerender-runtime': case 'prerender-runtime':
case 'prerender-legacy': case 'prerender-legacy':
case 'unstable-cache': case 'unstable-cache':
case 'generate-static-params': case 'build-time-generator':
break break
default: default:
workUnitStore satisfies never workUnitStore satisfies never
...@@ -3832,7 +3835,7 @@ function shouldForceRevalidate( ...@@ -3832,7 +3835,7 @@ function shouldForceRevalidate(
case 'validation-client': case 'validation-client':
case 'prerender-legacy': case 'prerender-legacy':
case 'unstable-cache': case 'unstable-cache':
case 'generate-static-params': case 'build-time-generator':
break break
default: default:
workUnitStore satisfies never workUnitStore satisfies never
...@@ -3880,7 +3883,7 @@ function shouldDiscardCacheEntry( ...@@ -3880,7 +3883,7 @@ function shouldDiscardCacheEntry(
case 'cache': case 'cache':
case 'private-cache': case 'private-cache':
case 'unstable-cache': case 'unstable-cache':
case 'generate-static-params': case 'build-time-generator':
break break
default: default:
workUnitStore satisfies never workUnitStore satisfies never
......
...@@ -145,6 +145,28 @@ function revalidate( ...@@ -145,6 +145,28 @@ function revalidate(
const workUnitStore = workUnitAsyncStorage.getStore() const workUnitStore = workUnitAsyncStorage.getStore()
if (workUnitStore) { if (workUnitStore) {
// Keep the generator's name before applying the general render-phase check.
switch (workUnitStore.type) {
case 'build-time-generator':
throw createRevalidateDuringRenderError(
store.route,
expression,
workUnitStore.functionName
)
case 'cache':
case 'private-cache':
case 'unstable-cache':
case 'prerender':
case 'prerender-runtime':
case 'prerender-client':
case 'validation-client':
case 'prerender-legacy':
case 'request':
break
default:
workUnitStore satisfies never
}
if (workUnitStore.phase === 'render') { if (workUnitStore.phase === 'render') {
throw createRevalidateDuringRenderError(store.route, expression) throw createRevalidateDuringRenderError(store.route, expression)
} }
...@@ -153,7 +175,6 @@ function revalidate( ...@@ -153,7 +175,6 @@ function revalidate(
case 'cache': case 'cache':
case 'private-cache': case 'private-cache':
case 'unstable-cache': case 'unstable-cache':
case 'generate-static-params':
throw createRevalidateDuringRenderError(store.route, expression) throw createRevalidateDuringRenderError(store.route, expression)
case 'prerender': case 'prerender':
case 'prerender-runtime': case 'prerender-runtime':
......
...@@ -216,7 +216,7 @@ export function unstable_cache<T extends Callback>( ...@@ -216,7 +216,7 @@ export function unstable_cache<T extends Callback>(
case 'prerender-client': case 'prerender-client':
case 'validation-client': case 'validation-client':
case 'request': case 'request':
case 'generate-static-params': case 'build-time-generator':
break break
default: default:
workUnitStore satisfies never workUnitStore satisfies never
...@@ -441,7 +441,7 @@ function getFetchUrlPrefix( ...@@ -441,7 +441,7 @@ function getFetchUrlPrefix(
case 'cache': case 'cache':
case 'private-cache': case 'private-cache':
case 'unstable-cache': case 'unstable-cache':
case 'generate-static-params': case 'build-time-generator':
return workStore.route return workStore.route
default: default:
return workUnitStore satisfies never return workUnitStore satisfies never
......
...@@ -43,7 +43,7 @@ export function unstable_noStore() { ...@@ -43,7 +43,7 @@ export function unstable_noStore() {
case 'cache': case 'cache':
case 'private-cache': case 'private-cache':
case 'unstable-cache': case 'unstable-cache':
case 'generate-static-params': case 'build-time-generator':
break break
default: default:
workUnitStore satisfies never workUnitStore satisfies never
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment