prisma-generator-express 1.42.0 → 1.44.0

package/src/copy/routeConfig.ts

@@ -36,26 +36,37 @@ export type ProgressiveStageResult<T = unknown> =
   | ProgressivePatch[]
   | ProgressiveStopResult<T>
 
-export type ProgressiveStageContext<TContext = unknown, TPrisma = any> = {
+export type ProgressiveStageContext<TContext = unknown, TPrisma = unknown> = {
   ctx: TContext
-  req: any
-  res: any
+  req: unknown
+  res: unknown
   prisma: TPrisma
   variant: string
   accumulated: Record<string, unknown>
   signal: AbortSignal
 }
 
-export type ProgressiveStage<TContext = unknown, TPrisma = any, T = unknown> = (
+export type ProgressiveStage<TContext = unknown, TPrisma = unknown, T = unknown> = (
   context: ProgressiveStageContext<TContext, TPrisma>,
 ) => Promise<ProgressiveStageResult<T>>
 
-export type ProgressiveVariantConfig = {
+export type ManualProgressiveVariantConfig = {
   enabled?: boolean
+  mode?: 'manual'
   stages: string[]
 }
 
-export interface BaseOperationConfig<HookHandler, TShape = Record<string, any>> {
+export type AutoIncludeProgressiveVariantConfig = {
+  enabled?: boolean
+  mode: 'autoInclude'
+  fallback?: 'singleResult' | 'error'
+}
+
+export type ProgressiveVariantConfig =
+  | ManualProgressiveVariantConfig
+  | AutoIncludeProgressiveVariantConfig
+
+export interface BaseOperationConfig<HookHandler, TShape = Record<string, unknown>> {
   before?: HookHandler[]
   after?: HookHandler[]
   shape?: TShape
@@ -64,7 +75,7 @@ export interface BaseOperationConfig<HookHandler, TShape = Record<string, any>>
 export interface BaseRouteConfig<
   HookHandler,
   RequestType,
-  TShape = Record<string, any>,
+  TShape = Record<string, unknown>,
   TCtx = unknown,
 > {
   enableAll?: boolean
@@ -111,5 +122,5 @@ export interface BaseRouteConfig<
   groupBy?: BaseOperationConfig<HookHandler, TShape>
 }
 
-export type OperationConfig = BaseOperationConfig<any>
-export type RouteConfig = BaseRouteConfig<any, any>
+export type OperationConfig = BaseOperationConfig<unknown>
+export type RouteConfig = BaseRouteConfig<unknown, unknown>

package/src/generators/generateFastifyHandler.ts

@@ -1,5 +1,7 @@
 import { DMMF } from '@prisma/generator-helper'
 import { toCamelCase } from '../utils/strings'
+import { ImportStyle } from '../utils/resolveImportStyle'
+import { importExt } from '../utils/importExt'
 
 const CORE_NAME_MAP: Record<string, string> = {
   delete: 'deleteUnique',
@@ -41,7 +43,9 @@ const CREATED_OPS = new Set([
 
 export function generateFastifyHandler(options: {
   model: DMMF.Model
+  importStyle: ImportStyle
 }): string {
+  const ext = importExt(options.importStyle)
   const modelName = options.model.name
   const prefix = toCamelCase(modelName)
 
@@ -54,7 +58,7 @@ export async function ${exportName}(
   _reply: FastifyReply,
 ): Promise<void> {
   const data = await core.${coreFnName(op)}(buildContext(request))
-  ;(request as any).resultData = data
+  ;(request as FastifyExtended).resultData = data
 }`
   }).join('\n')
 
@@ -68,17 +72,30 @@ export async function ${exportName}(
   _reply: FastifyReply,
 ): Promise<void> {
   const data = await core.${coreFnName(op)}(buildContext(request))
-  ;(request as any).resultData = data
-  ;(request as any).resultStatus = ${statusCode}
+  const ext = request as FastifyExtended
+  ext.resultData = data
+  ext.resultStatus = ${statusCode}
 }`
   }).join('\n')
 
   return `import type { FastifyRequest, FastifyReply } from 'fastify'
-import * as core from './${modelName}Core'
-import type { OperationContext } from '../operationRuntime'
+import * as core from './${modelName}Core${ext}'
+import type { OperationContext } from '../operationRuntime${ext}'
+
+type FastifyExtended = FastifyRequest & {
+  prisma?: unknown
+  postgres?: unknown
+  sqlite?: unknown
+  parsedQuery?: Record<string, unknown>
+  routeConfig?: { pagination?: OperationContext['paginationConfig'] }
+  guardShape?: Record<string, unknown>
+  guardCaller?: string
+  resultData?: unknown
+  resultStatus?: number
+}
 
 function buildContext(request: FastifyRequest): OperationContext {
-  const req = request as any
+  const req = request as FastifyExtended
   return {
     prisma: req.prisma,
     postgres: req.postgres,

package/src/generators/generateHonoHandler.ts

@@ -1,5 +1,7 @@
 import { DMMF } from '@prisma/generator-helper'
 import { toCamelCase } from '../utils/strings'
+import { ImportStyle } from '../utils/resolveImportStyle'
+import { importExt } from '../utils/importExt'
 
 const CORE_NAME_MAP: Record<string, string> = {
   delete: 'deleteUnique',
@@ -41,7 +43,9 @@ const CREATED_OPS = new Set([
 
 export function generateHonoHandler(options: {
   model: DMMF.Model
+  importStyle: ImportStyle
 }): string {
+  const ext = importExt(options.importStyle)
   const modelName = options.model.name
   const prefix = toCamelCase(modelName)
 
@@ -68,16 +72,16 @@ export async function ${exportName}(c: Context<HonoEnv>): Promise<void> {
   }).join('\n')
 
   return `import type { Context } from 'hono'
-import * as core from './${modelName}Core'
-import type { OperationContext } from '../operationRuntime'
+import * as core from './${modelName}Core${ext}'
+import type { OperationContext } from '../operationRuntime${ext}'
 
 type HonoVariables = {
-  prisma: any
-  postgres?: any
-  sqlite?: any
+  prisma: unknown
+  postgres?: unknown
+  sqlite?: unknown
   parsedQuery?: Record<string, unknown>
   body?: unknown
-  routeConfig?: any
+  routeConfig?: { pagination?: OperationContext['paginationConfig'] }
   guardShape?: Record<string, unknown>
   guardCaller?: string
   resultData?: unknown