prisma-generator-express 1.23.0 → 1.25.0

package/dist/utils/writeFileSafely.js

@@ -54,12 +54,6 @@ async function writeFileSafely({ content, options, model, operation, }) {
     }
     let filePath;
     switch (operation) {
-        case 'cacheConfig':
-            filePath = path.join(outputPath, 'cacheConfig.ts');
-            break;
-        case 'types/inputs':
-            filePath = path.join(outputPath, 'types', 'inputs.ts');
-            break;
         case 'combinedDocs':
             filePath = path.join(outputPath, 'combinedDocs.ts');
             break;

package/dist/utils/writeFileSafely.js.map

@@ -1 +1 @@
-{"version":3,"file":"writeFileSafely.js","sourceRoot":"","sources":["../../src/utils/writeFileSafely.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAqBA,0CA6DC;AAhFD,uCAAwB;AACxB,2CAA4B;AAC5B,wDAA+B;AAS/B,IAAI,gBAAqD,CAAA;AAEzD,KAAK,UAAU,kBAAkB;IAC/B,IAAI,gBAAgB,KAAK,SAAS;QAAE,OAAO,gBAAgB,CAAA;IAC3D,gBAAgB,GAAG,MAAM,kBAAQ,CAAC,aAAa,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAA;IAC9D,OAAO,gBAAgB,CAAA;AACzB,CAAC;AAEM,KAAK,UAAU,eAAe,CAAC,EACpC,OAAO,EACP,OAAO,EACP,KAAK,EACL,SAAS,GACQ;IACjB,MAAM,UAAU,GAAG,OAAO,CAAC,SAAS,CAAC,MAAM,EAAE,KAAK,CAAA;IAClD,IAAI,CAAC,UAAU,EAAE,CAAC;QAChB,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAA;IAC5C,CAAC;IAED,IAAI,QAAgB,CAAA;IAEpB,QAAQ,SAAS,EAAE,CAAC;QAClB,KAAK,aAAa;YAChB,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,gBAAgB,CAAC,CAAA;YAClD,MAAK;QAEP,KAAK,cAAc;YACjB,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,OAAO,EAAE,WAAW,CAAC,CAAA;YACtD,MAAK;QAEP,KAAK,cAAc;YACjB,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,iBAAiB,CAAC,CAAA;YACnD,MAAK;QAEP,KAAK,cAAc;YACjB,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,iBAAiB,CAAC,CAAA;YACnD,MAAK;QAEP;YACE,IAAI,CAAC,KAAK,EAAE,CAAC;gBACX,MAAM,IAAI,KAAK,CAAC,iCAAiC,SAAS,EAAE,CAAC,CAAA;YAC/D,CAAC;YACD,QAAQ,GAAG,IAAI,CAAC,IAAI,CAClB,UAAU,EACV,KAAK,CAAC,IAAI,EACV,GAAG,KAAK,CAAC,IAAI,GAAG,SAAS,KAAK,CAC/B,CAAA;IACL,CAAC;IAED,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAA;IACtC,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,CAAC;QAC5B,EAAE,CAAC,SAAS,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAA;IAC5C,CAAC;IAED,IAAI,gBAAwB,CAAA;IAC5B,IAAI,CAAC;QACH,MAAM,eAAe,GAAG,MAAM,kBAAkB,EAAE,CAAA;QAClD,gBAAgB,GAAG,MAAM,kBAAQ,CAAC,MAAM,CAAC,OAAO,EAAE;YAChD,GAAG,eAAe;YAClB,MAAM,EAAE,YAAY;SACrB,CAAC,CAAA;IACJ,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,CAAC,IAAI,CACV,sCAAsC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,uBAAuB,CACrF,CAAA;QACD,gBAAgB,GAAG,OAAO,CAAA;IAC5B,CAAC;IAED,EAAE,CAAC,aAAa,CAAC,QAAQ,EAAE,gBAAgB,CAAC,CAAA;AAC9C,CAAC"}
+{"version":3,"file":"writeFileSafely.js","sourceRoot":"","sources":["../../src/utils/writeFileSafely.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAqBA,0CAqDC;AAxED,uCAAwB;AACxB,2CAA4B;AAC5B,wDAA+B;AAS/B,IAAI,gBAAqD,CAAA;AAEzD,KAAK,UAAU,kBAAkB;IAC/B,IAAI,gBAAgB,KAAK,SAAS;QAAE,OAAO,gBAAgB,CAAA;IAC3D,gBAAgB,GAAG,MAAM,kBAAQ,CAAC,aAAa,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAA;IAC9D,OAAO,gBAAgB,CAAA;AACzB,CAAC;AAEM,KAAK,UAAU,eAAe,CAAC,EACpC,OAAO,EACP,OAAO,EACP,KAAK,EACL,SAAS,GACQ;IACjB,MAAM,UAAU,GAAG,OAAO,CAAC,SAAS,CAAC,MAAM,EAAE,KAAK,CAAA;IAClD,IAAI,CAAC,UAAU,EAAE,CAAC;QAChB,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAA;IAC5C,CAAC;IAED,IAAI,QAAgB,CAAA;IAEpB,QAAQ,SAAS,EAAE,CAAC;QAClB,KAAK,cAAc;YACjB,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,iBAAiB,CAAC,CAAA;YACnD,MAAK;QAEP,KAAK,cAAc;YACjB,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,iBAAiB,CAAC,CAAA;YACnD,MAAK;QAEP;YACE,IAAI,CAAC,KAAK,EAAE,CAAC;gBACX,MAAM,IAAI,KAAK,CAAC,iCAAiC,SAAS,EAAE,CAAC,CAAA;YAC/D,CAAC;YACD,QAAQ,GAAG,IAAI,CAAC,IAAI,CAClB,UAAU,EACV,KAAK,CAAC,IAAI,EACV,GAAG,KAAK,CAAC,IAAI,GAAG,SAAS,KAAK,CAC/B,CAAA;IACL,CAAC;IAED,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAA;IACtC,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,CAAC;QAC5B,EAAE,CAAC,SAAS,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAA;IAC5C,CAAC;IAED,IAAI,gBAAwB,CAAA;IAC5B,IAAI,CAAC;QACH,MAAM,eAAe,GAAG,MAAM,kBAAkB,EAAE,CAAA;QAClD,gBAAgB,GAAG,MAAM,kBAAQ,CAAC,MAAM,CAAC,OAAO,EAAE;YAChD,GAAG,eAAe;YAClB,MAAM,EAAE,YAAY;SACrB,CAAC,CAAA;IACJ,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,CAAC,IAAI,CACV,sCAAsC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,uBAAuB,CACrF,CAAA;QACD,gBAAgB,GAAG,OAAO,CAAA;IAC5B,CAAC;IAED,EAAE,CAAC,aAAa,CAAC,QAAQ,EAAE,gBAAgB,CAAC,CAAA;AAC9C,CAAC"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "prisma-generator-express",
   "description": "Prisma generator for Hono CRUD API with OpenAPI documentation",
-  "version": "1.23.0",
+  "version": "1.25.0",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "license": "MIT",

package/src/bin.ts

@@ -1,2 +1,2 @@
 #!/usr/bin/env node
-import '.'
+import './index.js'

package/src/client/encodeQueryParams.ts

@@ -53,4 +53,4 @@ export const encodeQueryParams = (params: Record<string, unknown>): string => {
   }
 
   return entries.join('&')
-}
+}

package/src/copy/buildModelOpenApi.ts

@@ -123,6 +123,45 @@ function queryParam(
   return param
 }
 
+function scalarUpdateOperations(
+  baseSchema: SchemaObject | RefObject,
+  fieldType: string,
+  fieldKind: string,
+): SchemaObject {
+  const ops: Record<string, SchemaObject | RefObject> = { set: baseSchema }
+
+  if (fieldKind === 'scalar' && NUMERIC_SCALAR_TYPES.has(fieldType)) {
+    ops.increment = baseSchema
+    ops.decrement = baseSchema
+    ops.multiply = baseSchema
+    ops.divide = baseSchema
+  }
+
+  return {
+    oneOf: [
+      baseSchema,
+      { type: 'object', properties: ops },
+    ],
+  }
+}
+
+function listScalarUpdateOperations(
+  itemSchema: SchemaObject | RefObject,
+): SchemaObject {
+  return {
+    type: 'object',
+    properties: {
+      set: { type: 'array', items: itemSchema },
+      push: {
+        oneOf: [
+          itemSchema as SchemaObject,
+          { type: 'array', items: itemSchema },
+        ],
+      },
+    },
+  }
+}
+
 export function buildModelOpenApi(
   modelName: string,
   modelFields: ModelField[],
@@ -214,7 +253,24 @@ function generateOperationSchemas(
     }
   })
 
-  const requiredScalars = fields
+  const relationFkFields = new Set(
+    fields
+      .filter((f) => f.kind === 'object' && f.relationFromFields?.length)
+      .flatMap((f) => f.relationFromFields!),
+  )
+
+  const requiredCreateScalars = fields
+    .filter(
+      (f) =>
+        (f.kind === 'scalar' || f.kind === 'enum') &&
+        f.isRequired &&
+        !f.hasDefaultValue &&
+        !f.isUpdatedAt &&
+        !relationFkFields.has(f.name),
+    )
+    .map((f) => f.name)
+
+  const requiredCreateManyScalars = fields
     .filter(
       (f) =>
         (f.kind === 'scalar' || f.kind === 'enum') &&
@@ -226,34 +282,34 @@ function generateOperationSchemas(
 
   const createInputSchema: SchemaObject = {
     type: 'object',
-    properties: fieldsToWriteProperties(fields),
+    properties: fieldsToWriteProperties(fields, 'create'),
   }
-  if (requiredScalars.length > 0) {
-    createInputSchema.required = [...requiredScalars]
+  if (requiredCreateScalars.length > 0) {
+    createInputSchema.required = [...requiredCreateScalars]
   }
 
   spec.components.schemas[`${modelName}CreateInput`] = createInputSchema
 
   spec.components.schemas[`${modelName}UpdateInput`] = {
     type: 'object',
-    properties: fieldsToWriteProperties(fields),
+    properties: fieldsToWriteProperties(fields, 'update'),
   }
 
   const createManyInputSchema: SchemaObject = {
     type: 'object',
-    properties: fieldsToBulkWriteProperties(fields),
+    properties: fieldsToBulkWriteProperties(fields, 'create'),
     description:
       'Scalar-only input for bulk create. Nested relation writes are not supported in createMany operations.',
   }
-  if (requiredScalars.length > 0) {
-    createManyInputSchema.required = [...requiredScalars]
+  if (requiredCreateManyScalars.length > 0) {
+    createManyInputSchema.required = [...requiredCreateManyScalars]
   }
 
   spec.components.schemas[`${modelName}CreateManyInput`] = createManyInputSchema
 
   spec.components.schemas[`${modelName}UpdateManyMutationInput`] = {
     type: 'object',
-    properties: fieldsToBulkWriteProperties(fields),
+    properties: fieldsToBulkWriteProperties(fields, 'update'),
     description:
       'Scalar-only input for bulk update. Nested relation writes are not supported in updateMany operations.',
   }
@@ -1085,21 +1141,23 @@ function fieldsToProperties(
 
 function fieldsToWriteProperties(
   fields: ModelField[],
+  mode: 'create' | 'update',
 ): Record<string, SchemaObject | RefObject> {
   const props: Record<string, SchemaObject | RefObject> = {}
   for (const field of fields) {
-    props[field.name] = mapFieldToWriteSchema(field)
+    props[field.name] = mapFieldToWriteSchema(field, mode)
   }
   return props
 }
 
 function fieldsToBulkWriteProperties(
   fields: ModelField[],
+  mode: 'create' | 'update',
 ): Record<string, SchemaObject | RefObject> {
   const props: Record<string, SchemaObject | RefObject> = {}
   for (const field of fields) {
     if (field.kind === 'object') continue
-    props[field.name] = mapFieldToWriteSchema(field)
+    props[field.name] = mapFieldToWriteSchema(field, mode)
   }
   return props
 }
@@ -1164,7 +1222,10 @@ function mapFieldToSchema(field: ModelField): SchemaObject | RefObject {
   return schema
 }
 
-function mapFieldToWriteSchema(field: ModelField): SchemaObject | RefObject {
+function mapFieldToWriteSchema(
+  field: ModelField,
+  mode: 'create' | 'update',
+): SchemaObject | RefObject {
   if (field.kind === 'object') {
     if (field.isList) {
       return {
@@ -1382,21 +1443,31 @@ function mapFieldToWriteSchema(field: ModelField): SchemaObject | RefObject {
     }
   }
 
-  let schema: SchemaObject | RefObject
+  let baseSchema: SchemaObject | RefObject
 
   switch (field.kind) {
     case 'scalar':
-      schema = mapScalarType(field.type)
+      baseSchema = mapScalarType(field.type)
       break
     case 'enum':
-      schema = { $ref: `#/components/schemas/${field.type}` }
+      baseSchema = { $ref: `#/components/schemas/${field.type}` }
       break
     default:
-      schema = { type: 'string' }
+      baseSchema = { type: 'string' }
   }
 
+  let schema: SchemaObject | RefObject
+
   if (field.isList) {
-    schema = { type: 'array', items: schema }
+    if (mode === 'update') {
+      schema = listScalarUpdateOperations(baseSchema)
+    } else {
+      schema = { type: 'array', items: baseSchema }
+    }
+  } else if (mode === 'update') {
+    schema = scalarUpdateOperations(baseSchema, field.type, field.kind)
+  } else {
+    schema = baseSchema
   }
 
   if (!field.isRequired && !field.isList) {
@@ -1410,7 +1481,7 @@ function mapFieldToWriteSchema(field: ModelField): SchemaObject | RefObject {
         description: field.documentation,
       }
     } else if (!('$ref' in schema)) {
-      schema.description = field.documentation
+      (schema as SchemaObject).description = field.documentation
     }
   }
 
@@ -1566,4 +1637,4 @@ function toYaml(obj: any, indent = 0): string {
   }
 
   return yaml
-}
+}

package/src/copy/parseQueryParams.ts

@@ -1,4 +1,4 @@
-import { isObject, isSafeKey, sanitizeKeys } from './misc'
+import { isObject, isSafeKey, sanitizeKeys } from './misc.js'
 
 type QueryParams =
   | string
@@ -48,7 +48,7 @@ export const parseQueryParams = (params: QueryParams): unknown => {
       if (typeof raw === 'string') {
         parsedParams[key] = parseQueryValue(raw, key)
       } else {
-        parsedParams[key] = raw
+        parsedParams[key] = sanitizeKeys(raw)
       }
     }
     return parsedParams

package/src/generators/generateImportPrismaStatement.ts

@@ -75,4 +75,4 @@ export function getRelativeClientPath(
   const routerDirPath = path.join(outputValue, modelName)
 
   return getRelativeImportPath(routerDirPath, clientGenerator.output.value)
-}
+}

package/src/generators/generateRouter.ts

@@ -57,10 +57,10 @@ import {
   ${modelName}Aggregate,
   ${modelName}Count,
   ${modelName}GroupBy
-} from './${modelName}Handlers'
-import type { RouteConfig } from '../routeConfig'
-import { parseQueryParams } from '../parseQueryParams'
-import { buildModelOpenApi } from '../buildModelOpenApi'
+} from './${modelName}Handlers.js'
+import type { RouteConfig } from '../routeConfig.js'
+import { parseQueryParams } from '../parseQueryParams.js'
+import { buildModelOpenApi } from '../buildModelOpenApi.js'
 
 const _env = typeof process !== 'undefined' && process.env ? process.env : {} as Record<string, string | undefined>
 
@@ -140,7 +140,7 @@ export function ${routerFunctionName}(config: RouteConfig = {}) {
   if (qbEnabled) {
     const qbConfig = getQueryBuilderConfig(config)
     if (qbConfig) {
-      import('../queryBuilder').then(mod => mod.startQueryBuilder(qbConfig)).catch(() => {})
+      import('../queryBuilder.js').then(mod => mod.startQueryBuilder(qbConfig)).catch((err) => { if (_env.NODE_ENV !== 'production') console.warn('[query-builder]', err) })
     }
   }
 

package/src/generators/generateUnifiedDocs.ts

@@ -3,14 +3,18 @@ export function generateUnifiedDocs(models: string[]): string {
     .map((model) => `import { ${model}Docs } from './${model}/${model}Docs'`)
     .join('\n')
 
+  const handlersEntries = models
+    .map((model) => `  ${model}: ${model}Docs`)
+    .join(',\n')
+
   return `${imports}
-import { Request, Response, RequestHandler } from 'express'
+import { Request, Response } from 'express'
 import type { RouteConfig } from './routeConfig'
 
 const _env = typeof process !== 'undefined' && process.env ? process.env : {} as Record<string, string | undefined>
 
 const docsHandlers: Record<string, (config: any) => (req: Request, res: Response) => any> = {
-${models.map((model) => `  ${model}: ${model}Docs`).join(',\n')}
+${handlersEntries}
 }
 
 type DocsUI = 'docs' | 'scalar' | 'json' | 'yaml' | 'playground'
@@ -77,66 +81,72 @@ export function generateCombinedDocs(config: CombinedDocsConfig) {
     const basePath = removeTrailingSlash(config.basePath || '/docs')
     const generatedAt = new Date().toISOString()
 
-    const html = \`<!DOCTYPE html>
-<html lang="en">
-<head>
-  <meta charset="utf-8" />
-  <meta name="viewport" content="width=device-width, initial-scale=1" />
-  <title>\${escapeHtml(title)}</title>
-  <script src="https://cdn.tailwindcss.com"></script>
-</head>
-<body class="m-0 bg-white text-gray-900 font-serif leading-normal">
-  <div class="max-w-[980px] mx-auto px-7 pt-10 pb-16">
-    <div class="border-b-2 border-gray-900 pb-3.5 mb-[18px]">
-      <div class="text-[28px] font-bold tracking-wide">\${escapeHtml(title)}</div>
-      \${description ? '<div class="mt-1.5 text-gray-500 text-sm">' + escapeHtml(description) + '</div>' : ''}
-      <div class="mt-3 flex gap-x-5 text-[13px] text-gray-500">
-        \${version ? '<div>Version: ' + escapeHtml(version) + '</div>' : ''}
-        <div>Generated: \${escapeHtml(generatedAt)}</div>
-      </div>
-    </div>
-
-    <div class="mt-[22px]">
-      <h2 class="m-0 mb-2.5 text-lg border-t border-gray-300 pt-3.5">Models</h2>
-      <table class="w-full border-collapse text-[13px]">
-        <thead>
-          <tr>
-            <th class="text-left py-2 px-2 border-b border-gray-300 align-top font-bold">Model</th>
-            <th class="text-left py-2 px-2 border-b border-gray-300 align-top font-bold">Documentation</th>
-            <th class="text-left py-2 px-2 border-b border-gray-300 align-top font-bold">Views</th>
-          </tr>
-        </thead>
-        <tbody>
-          \${registeredModels.map((m) => {
-            const lower = m.toLowerCase()
-            const docsUrl = \\\`\\\${basePath}/\\\${lower}\\\`
-            const scalarUrl = \\\`\\\${basePath}/\\\${lower}?ui=scalar\\\`
-            const jsonUrl = \\\`\\\${basePath}/\\\${lower}?ui=json\\\`
-            const yamlUrl = \\\`\\\${basePath}/\\\${lower}?ui=yaml\\\`
-            const playgroundUrl = \\\`\\\${basePath}/\\\${lower}?ui=playground\\\`
-            const modelCfg = config.modelConfigs[m]
-            const modelPlayground = isPlaygroundAvailable(modelCfg)
-            const playgroundLink = modelPlayground
-              ? \\\`, <a href="\\\${playgroundUrl}" class="text-inherit underline">playground</a>\\\`
-              : ''
-            return \\\`
-              <tr>
-                <td class="text-left py-2 px-2 border-b border-gray-300 align-top">\\\${escapeHtml(m)}</td>
-                <td class="text-left py-2 px-2 border-b border-gray-300 align-top"><a href="\\\${docsUrl}" class="text-inherit underline">\\\${escapeHtml(docsUrl)}</a></td>
-                <td class="text-left py-2 px-2 border-b border-gray-300 align-top">
-                  <a href="\\\${scalarUrl}" class="text-inherit underline">scalar</a>,
-                  <a href="\\\${jsonUrl}" class="text-inherit underline">json</a>,
-                  <a href="\\\${yamlUrl}" class="text-inherit underline">yaml</a>\\\${playgroundLink}
-                </td>
-              </tr>
-            \\\`
-          }).join('')}
-        </tbody>
-      </table>
-    </div>
-  </div>
-</body>
-</html>\`
+    const modelRows = registeredModels.map((m) => {
+      const lower = m.toLowerCase()
+      const docsUrl = basePath + '/' + lower
+      const scalarUrl = docsUrl + '?ui=scalar'
+      const jsonUrl = docsUrl + '?ui=json'
+      const yamlUrl = docsUrl + '?ui=yaml'
+      const playgroundUrl = docsUrl + '?ui=playground'
+      const modelCfg = config.modelConfigs[m]
+      const modelPlayground = isPlaygroundAvailable(modelCfg)
+      const playgroundLink = modelPlayground
+        ? ', <a href="' + playgroundUrl + '" class="text-inherit underline">playground</a>'
+        : ''
+      return '<tr>' +
+        '<td class="text-left py-2 px-2 border-b border-gray-300 align-top">' + escapeHtml(m) + '</td>' +
+        '<td class="text-left py-2 px-2 border-b border-gray-300 align-top"><a href="' + docsUrl + '" class="text-inherit underline">' + escapeHtml(docsUrl) + '</a></td>' +
+        '<td class="text-left py-2 px-2 border-b border-gray-300 align-top">' +
+          '<a href="' + scalarUrl + '" class="text-inherit underline">scalar</a>, ' +
+          '<a href="' + jsonUrl + '" class="text-inherit underline">json</a>, ' +
+          '<a href="' + yamlUrl + '" class="text-inherit underline">yaml</a>' +
+          playgroundLink +
+        '</td>' +
+      '</tr>'
+    }).join('')
+
+    const descriptionHtml = description
+      ? '<div class="mt-1.5 text-gray-500 text-sm">' + escapeHtml(description) + '</div>'
+      : ''
+    const versionHtml = version
+      ? '<div>Version: ' + escapeHtml(version) + '</div>'
+      : ''
+
+    const html =
+      '<!DOCTYPE html>' +
+      '<html lang="en">' +
+      '<head>' +
+        '<meta charset="utf-8" />' +
+        '<meta name="viewport" content="width=device-width, initial-scale=1" />' +
+        '<title>' + escapeHtml(title) + '</title>' +
+        '<script src="https://cdn.tailwindcss.com"></' + 'script>' +
+      '</head>' +
+      '<body class="m-0 bg-white text-gray-900 font-serif leading-normal">' +
+        '<div class="max-w-[980px] mx-auto px-7 pt-10 pb-16">' +
+          '<div class="border-b-2 border-gray-900 pb-3.5 mb-[18px]">' +
+            '<div class="text-[28px] font-bold tracking-wide">' + escapeHtml(title) + '</div>' +
+            descriptionHtml +
+            '<div class="mt-3 flex gap-x-5 text-[13px] text-gray-500">' +
+              versionHtml +
+              '<div>Generated: ' + escapeHtml(generatedAt) + '</div>' +
+            '</div>' +
+          '</div>' +
+          '<div class="mt-[22px]">' +
+            '<h2 class="m-0 mb-2.5 text-lg border-t border-gray-300 pt-3.5">Models</h2>' +
+            '<table class="w-full border-collapse text-[13px]">' +
+              '<thead>' +
+                '<tr>' +
+                  '<th class="text-left py-2 px-2 border-b border-gray-300 align-top font-bold">Model</th>' +
+                  '<th class="text-left py-2 px-2 border-b border-gray-300 align-top font-bold">Documentation</th>' +
+                  '<th class="text-left py-2 px-2 border-b border-gray-300 align-top font-bold">Views</th>' +
+                '</tr>' +
+              '</thead>' +
+              '<tbody>' + modelRows + '</tbody>' +
+            '</table>' +
+          '</div>' +
+        '</div>' +
+      '</body>' +
+      '</html>'
 
     res.type('html').send(html)
   }
@@ -159,9 +169,9 @@ export function registerModelDocs(
   registeredModels.forEach((model) => {
     const handler = docsHandlers[model]
     const cfg = configs[model] || {}
-    const path = \\\`\\\${normalizedBase}/\\\${model.toLowerCase()}\\\`
-    console.log(\\\`  Registered docs: \\\${path}\\\`)
-    app.get(path, handler(cfg))
+    const docPath = normalizedBase + '/' + model.toLowerCase()
+    console.log('  Registered docs: ' + docPath)
+    app.get(docPath, handler(cfg))
   })
 }
 `

package/src/generators/generateUnifiedHandler.ts

@@ -13,7 +13,7 @@ export function generateUnifiedHandler(options: UnifiedHandlerOptions): string {
     prismaImportStatement.match(/from ['"](.+?)['"]/)?.[1] || ''
 
   return `
-import { Prisma, PrismaClient } from '${importPath}'
+import { PrismaClient } from '${importPath}'
 import { Request, Response, NextFunction } from 'express'
 import { sanitizeKeys } from '../misc'
 
@@ -152,6 +152,7 @@ function handleError(error: unknown, next: NextFunction): void {
       return
     }
     if (typeof code === 'string' && code.startsWith('P')) {
+      console.warn('[prisma-generator-express] Unmapped Prisma error code:', code, (error as any).message || '')
       next(new HttpError(500, 'Database operation failed'))
       return
     }
@@ -348,10 +349,14 @@ function generateWriteHandlers(
     method: string
     requiredFields?: string[]
   }[] = [
-    { name: 'Create', method: 'create' },
-    { name: 'CreateMany', method: 'createMany' },
-    { name: 'CreateManyAndReturn', method: 'createManyAndReturn' },
-    { name: 'Update', method: 'update' },
+    { name: 'Create', method: 'create', requiredFields: ['data'] },
+    { name: 'CreateMany', method: 'createMany', requiredFields: ['data'] },
+    {
+      name: 'CreateManyAndReturn',
+      method: 'createManyAndReturn',
+      requiredFields: ['data'],
+    },
+    { name: 'Update', method: 'update', requiredFields: ['where', 'data'] },
     {
       name: 'UpdateMany',
       method: 'updateMany',
@@ -362,9 +367,13 @@ function generateWriteHandlers(
       method: 'updateManyAndReturn',
       requiredFields: ['where', 'data'],
     },
-    { name: 'Delete', method: 'delete' },
+    { name: 'Delete', method: 'delete', requiredFields: ['where'] },
     { name: 'DeleteMany', method: 'deleteMany', requiredFields: ['where'] },
-    { name: 'Upsert', method: 'upsert' },
+    {
+      name: 'Upsert',
+      method: 'upsert',
+      requiredFields: ['where', 'create', 'update'],
+    },
   ]
 
   return (
@@ -414,6 +423,14 @@ async function countForPagination(
   const countShape = shape ? buildCountShape(shape) : undefined
 
   if (hasDistinct) {
+    if (shape) {
+      const countArgs: Record<string, any> = {}
+      if (query.where) countArgs.where = query.where
+      return countShape
+        ? await delegate.guard(countShape, caller).count(countArgs)
+        : await delegate.count(countArgs)
+    }
+
     const selectField = distinctFields[0]
     const distinctArgs: Record<string, any> = {
       where: query.where,
@@ -422,17 +439,13 @@ async function countForPagination(
       take: DISTINCT_COUNT_LIMIT + 1,
     }
 
-    const results = shape
-      ? await delegate.guard(shape, caller).findMany(distinctArgs)
-      : await delegate.findMany(distinctArgs)
+    const results = await delegate.findMany(distinctArgs)
 
     if (results.length > DISTINCT_COUNT_LIMIT) {
       console.warn('[prisma-generator-express] Distinct count exceeds ' + DISTINCT_COUNT_LIMIT + ', falling back to approximate total')
       const countArgs: Record<string, any> = {}
       if (query.where) countArgs.where = query.where
-      return countShape
-        ? await delegate.guard(countShape, caller).count(countArgs)
-        : await delegate.count(countArgs)
+      return await delegate.count(countArgs)
     }
 
     return results.length

package/src/generators/generateUnifiedScalarUI.ts

@@ -86,10 +86,10 @@ export function generateScalarUIHandler(options: {
       fields: idx.fields,
     }))
 
-  return `import type { Context } from 'hono'
-import { buildModelOpenApi } from '../buildModelOpenApi'
-import type { RouteConfig } from '../routeConfig'
-import { OPERATION_DEFS, isOperationEnabled } from '../operationDefinitions'
+  return `import { Request, Response } from 'express'
+import { buildModelOpenApi } from '../buildModelOpenApi.js'
+import type { RouteConfig } from '../routeConfig.js'
+import { OPERATION_DEFS, isOperationEnabled } from '../operationDefinitions.js'
 
 const _env = typeof process !== 'undefined' && process.env ? process.env : {} as Record<string, string | undefined>
 
@@ -1359,19 +1359,19 @@ function renderDocs(modelName: string, config: DocsConfig) {
 }
 
 export function ${modelName}Docs(config: DocsConfig = {}) {
-  return (c: Context) => {
+  return (req: Request, res: Response) => {
     const disabled = isOpenApiDisabled(config.disableOpenApi)
-    if (disabled) return c.text('OpenAPI documentation is disabled in production', 404)
+    if (disabled) return res.status(404).send('OpenAPI documentation is disabled in production')
 
-    const rawUi = c.req.query('ui') || config.docsUi || 'docs'
+    const rawUi = (req.query['ui'] as string | undefined) || config.docsUi || 'docs'
     const validUis: DocsUI[] = ['docs', 'scalar', 'json', 'yaml', 'playground']
     const ui: DocsUI = validUis.includes(rawUi as DocsUI) ? (rawUi as DocsUI) : 'docs'
 
     if (ui === 'playground') {
       if (!isPlaygroundAvailable(config)) {
-        return c.text('Query builder is disabled', 404)
+        return res.status(404).send('Query builder is disabled')
       }
-      return c.html(renderPlayground('${modelName}', config))
+      return res.type('html').send(renderPlayground('${modelName}', config))
     }
 
     if (ui === 'yaml') {
@@ -1382,7 +1382,7 @@ export function ${modelName}Docs(config: DocsConfig = {}) {
         config,
         { format: 'yaml' }
       )
-      return c.text(yaml as string, 200, { 'Content-Type': 'application/yaml' })
+      return res.type('application/yaml').send(yaml as string)
     }
 
     const spec = buildModelOpenApi(
@@ -1393,16 +1393,16 @@ export function ${modelName}Docs(config: DocsConfig = {}) {
       { format: 'json' }
     )
 
-    if (ui === 'json') return c.json(spec)
+    if (ui === 'json') return res.json(spec)
 
     const pageTitle = config.docsTitle || \`${modelName} API\`
 
     if (ui === 'scalar') {
-      return c.html(renderScalar('${modelName}', spec, pageTitle, config.scalarCdnUrl))
+      return res.type('html').send(renderScalar('${modelName}', spec, pageTitle, config.scalarCdnUrl))
     }
 
     const html = renderDocs('${modelName}', config)
-    return c.html(html)
+    return res.type('html').send(html)
   }
 }
 `

package/src/index.ts

@@ -3,18 +3,18 @@ import {
   GeneratorOptions,
   DMMF,
 } from '@prisma/generator-helper'
-import { generateUnifiedHandler } from './generators/generateUnifiedHandler'
-import { generateRouterFunction } from './generators/generateRouter'
-import { generateScalarUIHandler } from './generators/generateUnifiedScalarUI'
-import { generateUnifiedDocs } from './generators/generateUnifiedDocs'
-import { generateQueryBuilderHelper } from './generators/generateQueryBuilderHelper'
+import { generateUnifiedHandler } from './generators/generateUnifiedHandler.js'
+import { generateRouterFunction } from './generators/generateRouter.js'
+import { generateScalarUIHandler } from './generators/generateUnifiedScalarUI.js'
+import { generateUnifiedDocs } from './generators/generateUnifiedDocs.js'
+import { generateQueryBuilderHelper } from './generators/generateQueryBuilderHelper.js'
 import {
   generateImportPrismaStatement,
   getRelativeClientPath,
-} from './generators/generateImportPrismaStatement'
-import { writeFileSafely } from './utils/writeFileSafely'
-import { copyFiles } from './utils/copyFiles'
-import { GENERATOR_NAME } from './constants'
+} from './generators/generateImportPrismaStatement.js'
+import { writeFileSafely } from './utils/writeFileSafely.js'
+import { copyFiles } from './utils/copyFiles.js'
+import { GENERATOR_NAME } from './constants.js'
 
 generatorHandler({
   onManifest() {