prisma-generator-express 1.62.1 → 1.62.3

package/src/generators/generateRouterFastify.ts

@@ -10,37 +10,79 @@ function pathExpr(suffix: string): string {
   return `\`\${basePath}${suffix}\``
 }
 
-function emitReadOp(meta: (typeof OPERATION_METADATA)[number], modelName: string): string {
+function opKindFor(opName: string): string {
+  switch (opName) {
+    case 'findUnique':
+    case 'findUniqueOrThrow':
+      return 'readUnique'
+    case 'findMany':
+    case 'findFirst':
+    case 'findFirstOrThrow':
+    case 'findManyPaginated':
+    case 'count':
+    case 'aggregate':
+    case 'groupBy':
+      return 'read'
+    case 'create':
+      return 'create'
+    case 'createMany':
+    case 'createManyAndReturn':
+      return 'createMany'
+    case 'update':
+      return 'update'
+    case 'updateMany':
+    case 'updateManyAndReturn':
+      return 'updateMany'
+    case 'upsert':
+      return 'upsert'
+    case 'delete':
+      return 'delete'
+    case 'deleteMany':
+      return 'deleteMany'
+    default:
+      return 'noop'
+  }
+}
+
+function emitReadOp(
+  meta: (typeof OPERATION_METADATA)[number],
+  modelName: string,
+): string {
   const c = meta.name.charAt(0).toUpperCase() + meta.name.slice(1)
   const handlerName = `${modelName}${c}`
   const pathValue = pathExpr(meta.pathSuffix)
+  const opKind = opKindFor(meta.name)
 
   const postReadLine = meta.supportsPostRead
     ? meta.name === 'findMany'
       ? `      if (postReadsEnabled) {
         const postPath = basePath ? \`\${basePath}/read\` : '/read'
-        instance.post(postPath, handleRead(opConfig, ${handlerName}, parseBodyAsQueryHook))
+        instance.post(postPath, handleRead(opConfig, ${handlerName}, parseBodyAsQueryHook, '${opKind}'))
       }`
-      : `      if (postReadsEnabled) instance.post(path, handleRead(opConfig, ${handlerName}, parseBodyAsQueryHook))`
+      : `      if (postReadsEnabled) instance.post(path, handleRead(opConfig, ${handlerName}, parseBodyAsQueryHook, '${opKind}'))`
     : ''
 
   return `    if (isEnabled(config.${meta.configKey})) {
       const opConfig: OperationConfigLike = (config.${meta.configKey} as OperationConfigLike | undefined) ?? defaultOpConfig
       const path = ${pathValue}
-      instance.get(path, handleRead(opConfig, ${handlerName}, parseQueryHook))
+      instance.get(path, handleRead(opConfig, ${handlerName}, parseQueryHook, '${opKind}'))
 ${postReadLine}
     }`
 }
 
-function emitWriteOp(meta: (typeof OPERATION_METADATA)[number], modelName: string): string {
+function emitWriteOp(
+  meta: (typeof OPERATION_METADATA)[number],
+  modelName: string,
+): string {
   const c = meta.name.charAt(0).toUpperCase() + meta.name.slice(1)
   const handlerName = `${modelName}${c}`
   const pathValue = pathExpr(meta.pathSuffix)
+  const opKind = opKindFor(meta.name)
 
   return `    if (isEnabled(config.${meta.configKey})) {
       const opConfig: OperationConfigLike = (config.${meta.configKey} as OperationConfigLike | undefined) ?? defaultOpConfig
       const path = ${pathValue}
-      instance.${meta.method}(path, handleWrite(opConfig, ${handlerName}))
+      instance.${meta.method}(path, handleWrite(opConfig, ${handlerName}, '${opKind}'))
     }`
 }
 
@@ -89,13 +131,15 @@ import type {
   PaginationConfig,
 } from '../routeConfig.target${ext}'
 import { parseQueryParams } from '../parseQueryParams${ext}'
-import { sanitizeKeys, normalizePrefix, getEnv } from '../misc${ext}'
+import { sanitizeKeys, normalizePrefix, getEnv, isPlainObject } from '../misc${ext}'
 import { buildModelOpenApi } from '../buildModelOpenApi${ext}'
 import { validateCountSourceWhere } from '../routeConfig${ext}'
 import type { OperationContext } from '../operationRuntime${ext}'
 import { transformResult } from '../operationRuntime${ext}'
 import { HttpError, mapError } from '../errorMapper${ext}'
 import { mergePaginationConfig } from '../pagination${ext}'
+import { applyDroppedGuard } from '../projectionDefaults${ext}'
+import type { OpKind } from '../projectionDefaults${ext}'
 import { MODEL_FIELDS, MODEL_ENUMS } from './${modelName}Metadata${ext}'
 
 ${generateRouteConfigType(modelName, 'FastifyHookHandler', guardShapesImport, importStyle, 'fastify')}
@@ -156,26 +200,58 @@ function parseBodyAsQueryHook(request: FastifyRequest): void {
   (request as FastifyExtended).parsedQuery = sanitizeKeys(body as Record<string, unknown>)
 }
 
+function buildResolveContext(
+  config: ${modelName}RouteConfig,
+  request: FastifyRequest,
+): (() => unknown | Promise<unknown>) | undefined {
+  if (typeof config.resolveContext !== 'function') return undefined
+  return () => (config.resolveContext as (r: FastifyRequest) => unknown | Promise<unknown>)(request)
+}
+
 function makeShapeHook(
   config: ${modelName}RouteConfig,
   opConfig: OperationConfigLike,
-): (request: FastifyRequest) => void {
-  return (request: FastifyRequest) => {
+  opKind: OpKind,
+): (request: FastifyRequest) => Promise<void> {
+  return async (request: FastifyRequest) => {
     const fx = request as FastifyExtended
     const merged = mergePaginationConfig(config.pagination, opConfig.pagination)
-    if (merged) {
-      fx.routeConfig = { pagination: merged }
-    }
+    if (merged) fx.routeConfig = { pagination: merged }
+
     const headerName = (config.guard?.variantHeader || 'x-api-variant').toLowerCase()
     const headerValue = request.headers[headerName]
     const caller = config.guard?.resolveVariant?.(request)
       ?? (Array.isArray(headerValue) ? headerValue[0] : headerValue)
       ?? undefined
-    if (caller) {
-      fx.guardCaller = caller
-    }
-    if (opConfig.shape && !DROP_GUARD) {
-      fx.guardShape = opConfig.shape
+    if (caller) fx.guardCaller = caller
+
+    if (opConfig.shape) {
+      if (!DROP_GUARD) {
+        fx.guardShape = opConfig.shape
+      } else {
+        await applyDroppedGuard(
+          opConfig.shape,
+          caller,
+          buildResolveContext(config, request),
+          opKind,
+          {
+            readQuery: fx.parsedQuery,
+            writeBody: isPlainObject(request.body)
+              ? (request.body as Record<string, unknown>)
+              : undefined,
+          },
+          () => {
+            if (!fx.parsedQuery) fx.parsedQuery = {}
+            return fx.parsedQuery
+          },
+          () => {
+            if (!isPlainObject(request.body)) {
+              ;(request as unknown as { body: unknown }).body = {}
+            }
+            return request.body as Record<string, unknown>
+          },
+        )
+      }
     }
   }
 }
@@ -302,10 +378,11 @@ export async function ${routerFunctionName}<TCtx = unknown, TPrisma = any>(
       opConfig: OperationConfigLike,
       handlerFn: (req: FastifyRequest, reply: FastifyReply) => Promise<void>,
       parseFn: (req: FastifyRequest) => void,
+      opKind: OpKind,
     ) => async (request: FastifyRequest, reply: FastifyReply) => {
       try {
         parseFn(request)
-        makeShapeHook(config, opConfig)(request)
+        await makeShapeHook(config, opConfig, opKind)(request)
         const { before = [], after = [] } = opConfig
         if (await runHooks(before, request, reply)) return
         await handlerFn(request, reply)
@@ -319,9 +396,10 @@ export async function ${routerFunctionName}<TCtx = unknown, TPrisma = any>(
     const handleWrite = (
       opConfig: OperationConfigLike,
       handlerFn: (req: FastifyRequest, reply: FastifyReply) => Promise<void>,
+      opKind: OpKind,
     ) => async (request: FastifyRequest, reply: FastifyReply) => {
       try {
-        makeShapeHook(config, opConfig)(request)
+        await makeShapeHook(config, opConfig, opKind)(request)
         const { before = [], after = [] } = opConfig
         if (await runHooks(before, request, reply)) return
         await handlerFn(request, reply)
@@ -350,7 +428,7 @@ ${writeOpBlocks}
           if (!Array.isArray(request.body)) {
             throw new HttpError(400, 'updateEach body must be an array of { where, data } items')
           }
-          makeShapeHook(config, opConfig)(request)
+          await makeShapeHook(config, opConfig, 'noop')(request)
           const { before = [], after = [] } = opConfig
           if (await runHooks(before, request, reply)) return
           await ${modelName}UpdateEach(request, reply)

package/src/generators/generateRouterHono.ts

@@ -10,24 +10,59 @@ function pathExpr(suffix: string): string {
   return `\`\${basePath}${suffix}\``
 }
 
+function opKindFor(opName: string): string {
+  switch (opName) {
+    case 'findUnique':
+    case 'findUniqueOrThrow':
+      return 'readUnique'
+    case 'findMany':
+    case 'findFirst':
+    case 'findFirstOrThrow':
+    case 'findManyPaginated':
+    case 'count':
+    case 'aggregate':
+    case 'groupBy':
+      return 'read'
+    case 'create':
+      return 'create'
+    case 'createMany':
+    case 'createManyAndReturn':
+      return 'createMany'
+    case 'update':
+      return 'update'
+    case 'updateMany':
+    case 'updateManyAndReturn':
+      return 'updateMany'
+    case 'upsert':
+      return 'upsert'
+    case 'delete':
+      return 'delete'
+    case 'deleteMany':
+      return 'deleteMany'
+    default:
+      return 'noop'
+  }
+}
+
 function emitReadOp(meta: (typeof OPERATION_METADATA)[number], modelName: string): string {
   const c = meta.name.charAt(0).toUpperCase() + meta.name.slice(1)
   const handlerName = `${modelName}${c}`
   const pathValue = pathExpr(meta.pathSuffix)
+  const opKind = opKindFor(meta.name)
 
   const postReadLine = meta.supportsPostRead
     ? meta.name === 'findMany'
       ? `    if (postReadsEnabled) {
       const postPath = basePath ? \`\${basePath}/read\` : '/read'
-      app.post(postPath, handleRead(opConfig, ${handlerName}, parseBodyAsQueryMiddleware))
+      app.post(postPath, handleRead(opConfig, ${handlerName}, parseBodyAsQueryMiddleware, '${opKind}'))
     }`
-      : `    if (postReadsEnabled) app.post(path, handleRead(opConfig, ${handlerName}, parseBodyAsQueryMiddleware))`
+      : `    if (postReadsEnabled) app.post(path, handleRead(opConfig, ${handlerName}, parseBodyAsQueryMiddleware, '${opKind}'))`
     : ''
 
   return `  if (isEnabled(config.${meta.configKey})) {
     const opConfig = opFor('${meta.configKey}')
     const path = ${pathValue}
-    app.get(path, handleRead(opConfig, ${handlerName}, parseQueryMiddleware))
+    app.get(path, handleRead(opConfig, ${handlerName}, parseQueryMiddleware, '${opKind}'))
 ${postReadLine}
   }`
 }
@@ -36,11 +71,12 @@ function emitWriteOp(meta: (typeof OPERATION_METADATA)[number], modelName: strin
   const c = meta.name.charAt(0).toUpperCase() + meta.name.slice(1)
   const handlerName = `${modelName}${c}`
   const pathValue = pathExpr(meta.pathSuffix)
+  const opKind = opKindFor(meta.name)
 
   return `  if (isEnabled(config.${meta.configKey})) {
     const opConfig = opFor('${meta.configKey}')
     const path = ${pathValue}
-    app.${meta.method}(path, handleWrite(opConfig, ${handlerName}))
+    app.${meta.method}(path, handleWrite(opConfig, ${handlerName}, '${opKind}'))
   }`
 }
 
@@ -92,12 +128,14 @@ import type {
   PaginationConfig,
 } from '../routeConfig.target${ext}'
 import { parseQueryParams } from '../parseQueryParams${ext}'
-import { normalizePrefix, getEnv, sanitizeKeys } from '../misc${ext}'
+import { normalizePrefix, getEnv, sanitizeKeys, isPlainObject } from '../misc${ext}'
 import { buildModelOpenApi } from '../buildModelOpenApi${ext}'
 import { validateCountSourceWhere } from '../routeConfig${ext}'
 import { transformResult } from '../operationRuntime${ext}'
 import { mapError } from '../errorMapper${ext}'
 import { mergePaginationConfig } from '../pagination${ext}'
+import { applyDroppedGuard } from '../projectionDefaults${ext}'
+import type { OpKind } from '../projectionDefaults${ext}'
 import { MODEL_FIELDS, MODEL_ENUMS } from './${modelName}Metadata${ext}'
 
 ${generateRouteConfigType(modelName, 'HonoBeforeHook', guardShapesImport, importStyle, 'hono')}
@@ -176,18 +214,54 @@ async function parseUpdateEachBodyMiddleware(c: HandlerContext): Promise<void> {
 function makeShapeMiddleware<TCtx, TPrisma, TEnv extends HonoEnvBase>(
   config: ${modelName}RouteConfig<TCtx, TPrisma, TEnv>,
   opConfig: OperationConfigLike<TEnv>,
+  opKind: OpKind,
 ) {
-  return (c: Context<GeneratedHonoEnv<TEnv>>): void => {
+  return async (c: Context<GeneratedHonoEnv<TEnv>>): Promise<void> => {
     const merged = mergePaginationConfig(config.pagination, opConfig.pagination)
-    if (merged) {
-      c.set('routeConfig', { pagination: merged })
-    }
+    if (merged) c.set('routeConfig', { pagination: merged })
+
     const headerName = config.guard?.variantHeader || 'x-api-variant'
     const headerValue = c.req.header(headerName)
     const caller = config.guard?.resolveVariant?.(c) ?? headerValue ?? undefined
     if (caller) c.set('guardCaller', caller)
-    if (opConfig.shape && !DROP_GUARD) {
-      c.set('guardShape', opConfig.shape)
+
+    if (opConfig.shape) {
+      if (!DROP_GUARD) {
+        c.set('guardShape', opConfig.shape)
+      } else {
+        const resolveCtx = typeof config.resolveContext === 'function'
+          ? () => (config.resolveContext as (ctx: Context<GeneratedHonoEnv<TEnv>>) => unknown | Promise<unknown>)(c)
+          : undefined
+
+        await applyDroppedGuard(
+          opConfig.shape,
+          caller,
+          resolveCtx,
+          opKind,
+          {
+            readQuery: c.get('parsedQuery'),
+            writeBody: isPlainObject(c.get('body'))
+              ? (c.get('body') as Record<string, unknown>)
+              : undefined,
+          },
+          () => {
+            let target = c.get('parsedQuery')
+            if (!target) {
+              target = {}
+              c.set('parsedQuery', target)
+            }
+            return target
+          },
+          () => {
+            let target = c.get('body')
+            if (!isPlainObject(target)) {
+              target = {}
+              c.set('body', target)
+            }
+            return target as Record<string, unknown>
+          },
+        )
+      }
     }
   }
 }
@@ -306,10 +380,11 @@ export function ${routerFunctionName}<TCtx = unknown, TPrisma = any, TEnv extend
     opConfig: OperationConfigLike<TEnv>,
     handlerFn: (c: HandlerContext) => Promise<void>,
     parseFn: (c: HandlerContext) => Promise<void>,
+    opKind: OpKind,
   ) => async (c: Context<GeneratedHonoEnv<TEnv>>): Promise<Response> => {
     try {
       await parseFn(c as unknown as HandlerContext)
-      makeShapeMiddleware<TCtx, TPrisma, TEnv>(config, opConfig)(c)
+      await makeShapeMiddleware<TCtx, TPrisma, TEnv>(config, opConfig, opKind)(c)
       const { before = [], after = [] } = opConfig
       const beforeResp = await runBeforeHooks<TEnv>(before, c)
       if (beforeResp) return beforeResp
@@ -325,10 +400,11 @@ export function ${routerFunctionName}<TCtx = unknown, TPrisma = any, TEnv extend
   const handleWrite = (
     opConfig: OperationConfigLike<TEnv>,
     handlerFn: (c: HandlerContext) => Promise<void>,
+    opKind: OpKind,
   ) => async (c: Context<GeneratedHonoEnv<TEnv>>): Promise<Response> => {
     try {
       await parseWriteBodyMiddleware(c as unknown as HandlerContext)
-      makeShapeMiddleware<TCtx, TPrisma, TEnv>(config, opConfig)(c)
+      await makeShapeMiddleware<TCtx, TPrisma, TEnv>(config, opConfig, opKind)(c)
       const { before = [], after = [] } = opConfig
       const beforeResp = await runBeforeHooks<TEnv>(before, c)
       if (beforeResp) return beforeResp
@@ -362,7 +438,7 @@ ${writeOpBlocks}
     app.post(path, async (c: Context<GeneratedHonoEnv<TEnv>>): Promise<Response> => {
       try {
         await parseUpdateEachBodyMiddleware(c as unknown as HandlerContext)
-        makeShapeMiddleware<TCtx, TPrisma, TEnv>(config, opConfig)(c)
+        await makeShapeMiddleware<TCtx, TPrisma, TEnv>(config, opConfig, 'noop')(c)
         const { before = [], after = [] } = opConfig
         const beforeResp = await runBeforeHooks<TEnv>(before, c)
         if (beforeResp) return beforeResp

package/src/utils/copyFiles.ts

@@ -20,6 +20,7 @@ const SHARED_FILES = [
   'guardHelpers.ts',
   'scalarTypes.ts',
   'concurrency.ts',
+  'projectionDefaults.ts',
 ]
 
 const EXPRESS_ONLY_FILES = [