prisma-generator-express 1.66.0 → 1.68.0

package/src/copy/pagination.ts

@@ -1,7 +1,13 @@
 import { HttpError, LOG_PREFIX } from './errorMapper'
-import { assertGuard, buildCountShape, type PrismaDelegateLike } from './guardHelpers'
-import { countFromMaterializedView } from './materializedCount'
+import {
+  assertGuard,
+  buildCountShape,
+  type PrismaDelegateLike,
+} from './guardHelpers'
 import { isPlainObject } from './misc'
+// legacy self-contained behavior restored: the materialized-view module is
+// small and statically owned by pagination (phase 9 budget re-measured)
+import { countFromMaterializedView } from './materializedCount'
 import type { PaginationConfig, PaginationCountSource } from './routeConfig'
 
 export const DISTINCT_COUNT_LIMIT = 100000
@@ -13,11 +19,16 @@ export function applyPaginationLimits(
 ): Record<string, unknown> {
   if (!config) return query
   const result: Record<string, unknown> = { ...query }
-  if (!hasGuardShape && result.take === undefined && config.defaultLimit !== undefined) {
+  if (
+    !hasGuardShape &&
+    result.take === undefined &&
+    config.defaultLimit !== undefined
+  ) {
     result.take = config.defaultLimit
   }
   if (config.maxLimit !== undefined && result.take !== undefined) {
-    const takeNum = typeof result.take === 'number' ? result.take : Number(result.take)
+    const takeNum =
+      typeof result.take === 'number' ? result.take : Number(result.take)
     if (!Number.isFinite(takeNum)) {
       throw new HttpError(400, 'Invalid take: must be a finite number')
     }
@@ -65,7 +76,10 @@ export function mergePaginationConfig(
     ...(base ?? {}),
     ...(override ?? {}),
   }
-  const mergedCountSource = mergeCountSource(base?.countSource, override?.countSource)
+  const mergedCountSource = mergeCountSource(
+    base?.countSource,
+    override?.countSource,
+  )
   if (mergedCountSource) {
     merged.countSource = mergedCountSource
   } else {
@@ -76,7 +90,8 @@ export function mergePaginationConfig(
 
 export function normalizeDistinct(value: unknown): string[] {
   if (typeof value === 'string') return [value]
-  if (Array.isArray(value)) return value.filter((v): v is string => typeof v === 'string')
+  if (Array.isArray(value))
+    return value.filter((v): v is string => typeof v === 'string')
   return []
 }
 
@@ -106,7 +121,13 @@ export async function countForPagination(
     whereIsEmpty &&
     distinctIsEmpty
   ) {
-    return countFromMaterializedView(rawClient ?? delegate, countSource)
+    return countFromMaterializedView(
+      rawClient ?? delegate,
+      countSource as Extract<
+        PaginationCountSource,
+        { type: 'materializedView' }
+      >,
+    )
   }
 
   const hasDistinct = normalizedDistinct.length > 0
@@ -118,10 +139,9 @@ export async function countForPagination(
     if (query.where) countArgs.where = query.where
     if (countShape) {
       assertGuard(delegate)
-      return (await delegate.guard(
-        countShape as Record<string, unknown>,
-        caller,
-      ).count(countArgs)) as number
+      return (await delegate
+        .guard(countShape as Record<string, unknown>, caller)
+        .count(countArgs)) as number
     }
     return (await delegate.count(countArgs)) as number
   }
@@ -140,7 +160,9 @@ export async function countForPagination(
     if (results.length > effectiveLimit) {
       console.warn(
         LOG_PREFIX,
-        'Distinct count exceeds ' + effectiveLimit + ', falling back to approximate total',
+        'Distinct count exceeds ' +
+          effectiveLimit +
+          ', falling back to approximate total',
       )
       return runCount()
     }
@@ -148,4 +170,4 @@ export async function countForPagination(
   }
 
   return runCount()
-}
+}

package/src/copy/parseQueryParams.ts

@@ -1,48 +1,47 @@
-import { isObject, isSafeKey, sanitizeKeys } from './misc'
-
-type QueryParams =
-  | string
-  | Record<string, unknown>
-  | string[]
-  | Record<string, unknown>[]
-  | undefined
-
-const NUMERIC_KEYS = new Set(['take', 'skip'])
-const INTEGER_RE = /^-?\d+$/
-
-const parseQueryValue = (value: string, key?: string): unknown => {
-  if (value.startsWith('{') || value.startsWith('[') || value.startsWith('"')) {
-    try {
-      const parsed = JSON.parse(value)
-      return sanitizeKeys(parsed)
-    } catch {
-    }
-  }
-  if (value === 'true') return true
-  if (value === 'false') return false
-  if (value === 'null') return null
-  if (key && NUMERIC_KEYS.has(key) && INTEGER_RE.test(value)) {
-    return parseInt(value, 10)
-  }
-  return value
-}
-
-export const parseQueryParams = (params: QueryParams): unknown => {
-  if (typeof params === 'string') return parseQueryValue(params)
-  if (Array.isArray(params)) {
-    return params.map((item) =>
-      typeof item === 'string' ? parseQueryValue(item) : sanitizeKeys(item),
-    )
-  }
-  if (isObject(params)) {
-    const parsedParams: Record<string, unknown> = {}
-    for (const key of Object.keys(params)) {
-      if (!isSafeKey(key)) continue
-      const raw = params[key]
-      parsedParams[key] =
-        typeof raw === 'string' ? parseQueryValue(raw, key) : sanitizeKeys(raw)
-    }
-    return parsedParams
-  }
-  return params
-}
+import { isObject, isSafeKey, sanitizeKeys } from './misc'
+
+type QueryParams =
+  | string
+  | Record<string, unknown>
+  | string[]
+  | Record<string, unknown>[]
+  | undefined
+
+const NUMERIC_KEYS = new Set(['take', 'skip'])
+const INTEGER_RE = /^-?\d+$/
+
+const parseQueryValue = (value: string, key?: string): unknown => {
+  if (value.startsWith('{') || value.startsWith('[') || value.startsWith('"')) {
+    try {
+      const parsed = JSON.parse(value)
+      return sanitizeKeys(parsed)
+    } catch {}
+  }
+  if (value === 'true') return true
+  if (value === 'false') return false
+  if (value === 'null') return null
+  if (key && NUMERIC_KEYS.has(key) && INTEGER_RE.test(value)) {
+    return parseInt(value, 10)
+  }
+  return value
+}
+
+export const parseQueryParams = (params: QueryParams): unknown => {
+  if (typeof params === 'string') return parseQueryValue(params)
+  if (Array.isArray(params)) {
+    return params.map((item) =>
+      typeof item === 'string' ? parseQueryValue(item) : sanitizeKeys(item),
+    )
+  }
+  if (isObject(params)) {
+    const parsedParams: Record<string, unknown> = {}
+    for (const key of Object.keys(params)) {
+      if (!isSafeKey(key)) continue
+      const raw = params[key]
+      parsedParams[key] =
+        typeof raw === 'string' ? parseQueryValue(raw, key) : sanitizeKeys(raw)
+    }
+    return parsedParams
+  }
+  return params
+}

package/src/copy/projectionDefaults.ts

@@ -64,8 +64,7 @@ function emptyForced(): WhereForced {
 
 function hasForced(f: WhereForced): boolean {
   return (
-    Object.keys(f.conditions).length > 0 ||
-    Object.keys(f.relations).length > 0
+    Object.keys(f.conditions).length > 0 || Object.keys(f.relations).length > 0
   )
 }
 
@@ -423,7 +422,10 @@ export async function applyDroppedGuard(
     : emptyForced()
 
   const forcedData =
-    opKind === 'create' || opKind === 'createMany' || opKind === 'update' || opKind === 'updateMany'
+    opKind === 'create' ||
+    opKind === 'createMany' ||
+    opKind === 'update' ||
+    opKind === 'updateMany'
       ? isPlainObject(resolved.data)
         ? extractForcedFromDataConfig(resolved.data)
         : {}
@@ -474,4 +476,4 @@ export async function applyDroppedGuard(
   if (Object.keys(forcedUpdate).length > 0) {
     target.update = mergeForcedData(target.update, forcedUpdate)
   }
-}
+}

package/src/copy/routeConfig.express.ts

@@ -4,6 +4,7 @@ import type {
   BaseRouteConfig,
   ProgressiveStage,
   ProgressiveVariantConfig,
+  PrismaClientLike,
   QueryBuilderConfig,
   OpenApiServerConfig,
   OpenApiSecuritySchemeConfig,
@@ -21,6 +22,7 @@ export type {
   FindManyPaginatedMode,
   PaginationConfig,
   PaginationCountSource,
+  PrismaClientLike,
 }
 
 export type {
@@ -40,13 +42,13 @@ export type OperationConfig<TShape = Record<string, unknown>> =
 export type ReadOperationConfig<
   TShape = Record<string, unknown>,
   TCtx = unknown,
-  TPrisma = any,
+  TPrisma extends PrismaClientLike = PrismaClientLike,
 > = BaseOperationConfig<RequestHandler, TShape> & {
   progressive?: Record<string, ProgressiveVariantConfig>
   progressiveStages?: Record<string, ProgressiveStage<TCtx, TPrisma>>
 }
 
-type ReadOperationOverrides<TShape, TCtx, TPrisma> = {
+type ReadOperationOverrides<TShape, TCtx, TPrisma extends PrismaClientLike> = {
   findFirst?: ReadOperationConfig<TShape, TCtx, TPrisma> | false
   findFirstOrThrow?: ReadOperationConfig<TShape, TCtx, TPrisma> | false
   findUnique?: ReadOperationConfig<TShape, TCtx, TPrisma> | false
@@ -61,6 +63,16 @@ type ReadOperationOverrides<TShape, TCtx, TPrisma> = {
 export type RouteConfig<
   TShape = Record<string, unknown>,
   TCtx = unknown,
-  TPrisma = any,
+  TPrisma extends PrismaClientLike = PrismaClientLike,
 > = BaseRouteConfig<RequestHandler, Request, TShape, TCtx> &
-  ReadOperationOverrides<TShape, TCtx, TPrisma>
+  ReadOperationOverrides<TShape, TCtx, TPrisma> & {
+    /**
+     * Honour `PGE_DROP_GUARD=true` in the environment as a guard bypass
+     * (deprecated alias: `E2E=true`). **Default `false` for this target.**
+     *
+     * Only the explicit `true` enables it; false or omitted means the
+     * environment cannot drop guards. The generation-time `dropGuard` literal
+     * is independent of this control and unchanged.
+     */
+    allowE2EGuardBypass?: boolean
+  }

package/src/copy/routeConfig.fastify.ts

@@ -9,6 +9,7 @@ import type {
   FindManyPaginatedMode,
   PaginationConfig,
   PaginationCountSource,
+  PrismaClientLike,
 } from './routeConfig'
 
 export type {
@@ -19,6 +20,7 @@ export type {
   FindManyPaginatedMode,
   PaginationConfig,
   PaginationCountSource,
+  PrismaClientLike,
 }
 
 export type FastifyHookHandler = (
@@ -29,5 +31,17 @@ export type FastifyHookHandler = (
 export type OperationConfig<TShape = Record<string, unknown>> =
   BaseOperationConfig<FastifyHookHandler, TShape>
 
-export type RouteConfig<TShape = Record<string, unknown>, TCtx = unknown> =
-  BaseRouteConfig<FastifyHookHandler, FastifyRequest, TShape, TCtx>
+export type RouteConfig<
+  TShape = Record<string, unknown>,
+  TCtx = unknown,
+> = BaseRouteConfig<FastifyHookHandler, FastifyRequest, TShape, TCtx> & {
+  /**
+   * Honour `PGE_DROP_GUARD=true` in the environment as a guard bypass
+   * (deprecated alias: `E2E=true`). **Default `false` for this target.**
+   *
+   * Only the explicit `true` enables it; false or omitted means the
+   * environment cannot drop guards. The generation-time `dropGuard` literal
+   * is independent of this control and unchanged.
+   */
+  allowE2EGuardBypass?: boolean
+}

package/src/copy/routeConfig.hono.ts

@@ -1,5 +1,6 @@
+import type { RuntimeOperationOverride } from './operationRuntime'
+import type { HttpError } from './errorMapper'
 import type { Context } from 'hono'
-import type { GuardVariantResolution } from './guardVariantRouting'
 import type {
   BaseOperationConfig,
   BaseRouteConfig,
@@ -10,6 +11,7 @@ import type {
   FindManyPaginatedMode,
   PaginationConfig,
   PaginationCountSource,
+  PrismaClientLike,
 } from './routeConfig'
 
 export type {
@@ -20,6 +22,7 @@ export type {
   FindManyPaginatedMode,
   PaginationConfig,
   PaginationCountSource,
+  PrismaClientLike,
 }
 
 export type HonoEnvBase = {
@@ -27,7 +30,22 @@ export type HonoEnvBase = {
   Bindings?: Record<string, unknown>
 }
 
+/**
+ * A stored, already-classified stage failure. `settleStage` rethrows the
+ * `HttpError` unchanged; where that happens is the adapter's ordering choice.
+ */
+export type StoredStageFailure = { ok: false; failure: HttpError }
+
 export type HonoInternalVariables = {
+  operationOverride?: RuntimeOperationOverride
+  /**
+   * Memoized application-context resolver (new key).
+   *
+   * @deprecated keep-populated alias of the pre-1.x key below; existing typed
+   * hooks read `resolveOperationContext`, so the router writes BOTH.
+   */
+  resolveOperationContext?: () => unknown | Promise<unknown>
+  getContext?: () => Promise<unknown>
   prisma?: unknown
   postgres?: unknown
   sqlite?: unknown
@@ -37,12 +55,28 @@ export type HonoInternalVariables = {
   guardShape?: Record<string, unknown>
   guardCaller?: string
   guardVariantKey?: string
-  guardVariantFailure?: Extract<GuardVariantResolution, { ok: false }>
   /**
-   * Set when `validateResolvedShapes` refuses what a shape function returned.
+   * Stored, already-classified variant failure (new internal key).
+   */
+  guardVariantStageFailure?: StoredStageFailure
+  /**
+   * Raw variant resolution — the pre-1.x public shape. Still populated so
+   * existing typed hooks reading `.code` keep compiling and running.
    *
-   * It was written by the router and never declared here, so the emitted router
-   * failed to typecheck at exactly the line that implements the control.
+   * @deprecated read `guardVariantStageFailure` for the classified failure.
+   */
+  guardVariantFailure?: Extract<
+    import('./guardVariantRouting').GuardVariantResolution,
+    { ok: false }
+  >
+  /**
+   * Stored, already-classified shape failure (new internal key).
+   */
+  guardShapeStageFailure?: StoredStageFailure
+  /**
+   * Pre-1.x string form of the shape-resolution problem. Still populated.
+   *
+   * @deprecated read `guardShapeStageFailure` for the classified failure.
    */
   guardShapeFailure?: string
   resultData?: unknown
@@ -51,7 +85,7 @@ export type HonoInternalVariables = {
 
 export type GeneratedHonoEnv<TEnv extends HonoEnvBase = HonoEnvBase> = {
   Variables: HonoInternalVariables & TEnv['Variables']
-  Bindings: TEnv['Bindings']
+  Bindings: NonNullable<TEnv['Bindings']>
 }
 
 export type HonoBeforeHook<TEnv extends HonoEnvBase = HonoEnvBase> = (
@@ -63,16 +97,13 @@ export type HonoAfterHook<TEnv extends HonoEnvBase = HonoEnvBase> = (
 ) => Promise<Response | void> | Response | void
 
 /** @deprecated use HonoBeforeHook or HonoAfterHook */
-export type HonoHookHandler<TEnv extends HonoEnvBase = HonoEnvBase> = HonoBeforeHook<TEnv>
+export type HonoHookHandler<TEnv extends HonoEnvBase = HonoEnvBase> =
+  HonoBeforeHook<TEnv>
 
 export type OperationConfig<
   TShape = Record<string, unknown>,
   TEnv extends HonoEnvBase = HonoEnvBase,
-> = BaseOperationConfig<
-  HonoBeforeHook<TEnv>,
-  TShape,
-  HonoAfterHook<TEnv>
->
+> = BaseOperationConfig<HonoBeforeHook<TEnv>, TShape, HonoAfterHook<TEnv>>
 
 export type UpdateEachConfig<TEnv extends HonoEnvBase = HonoEnvBase> = {
   before?: HonoBeforeHook<TEnv>[]
@@ -180,7 +211,8 @@ export type RouteConfig<
   guardResolutionOrder?: 'after-hooks' | 'before-hooks'
 
   /**
-   * Honour `E2E=true` in the environment as a guard bypass. **Default `true`.**
+   * Honour `PGE_DROP_GUARD=true` in the environment as a guard bypass
+   * (deprecated alias: `E2E=true`). **Default `true`.**
    *
    * Upstream behaviour, and a real hazard on an edge runtime where that variable
    * is an ordinary config var — set on staging, copied forward, flagged as
@@ -218,4 +250,4 @@ export type RouteConfig<
   count?: OperationConfig<TShape, TEnv> | false
   groupBy?: OperationConfig<TShape, TEnv> | false
   updateEach?: UpdateEachConfig<TEnv>
-}
+}