prisma-generator-express 1.28.0 → 1.30.0

package/src/index.ts

@@ -4,17 +4,31 @@ import {
   DMMF,
 } from '@prisma/generator-helper'
 import { generateUnifiedHandler } from './generators/generateUnifiedHandler.js'
+import { generateFastifyHandler } from './generators/generateFastifyHandler.js'
 import { generateRouterFunction } from './generators/generateRouter.js'
+import { generateFastifyRouterFunction } from './generators/generateRouterFastify.js'
 import { generateScalarUIHandler } from './generators/generateUnifiedScalarUI.js'
 import { generateUnifiedDocs } from './generators/generateUnifiedDocs.js'
 import { generateQueryBuilderHelper } from './generators/generateQueryBuilderHelper.js'
+import {
+  generateOperationRuntime,
+  generateModelCore,
+} from './generators/generateOperationCore.js'
 import {
   generateImportPrismaStatement,
   getRelativeClientPath,
 } from './generators/generateImportPrismaStatement.js'
 import { writeFileSafely } from './utils/writeFileSafely.js'
 import { copyFiles } from './utils/copyFiles.js'
-import { GENERATOR_NAME } from './constants.js'
+import { GENERATOR_NAME, Target } from './constants.js'
+
+function getTarget(options: GeneratorOptions): Target {
+  const raw = String(
+    (options.generator.config as Record<string, unknown>).target ?? 'express',
+  ).toLowerCase()
+  if (raw === 'express' || raw === 'fastify') return raw
+  throw new Error(`Invalid target "${raw}". Expected "express" or "fastify".`)
+}
 
 generatorHandler({
   onManifest() {
@@ -26,14 +40,29 @@ generatorHandler({
   },
 
   async onGenerate(options: GeneratorOptions) {
-    const prismaImportStatement = generateImportPrismaStatement(options)
+    const target = getTarget(options)
 
-    console.log('\n═══ Prisma Generator Express ═══')
+    console.log(`\n═══ Prisma Generator (${target.toUpperCase()}) ═══`)
+    console.log(`  Target: ${target}`)
 
-    await copyFiles(options)
+    await copyFiles(options, target)
+
+    await writeFileSafely({
+      content: generateOperationRuntime(),
+      options,
+      operation: 'operationRuntime',
+    })
 
     const modelNames: string[] = []
 
+    const generateHandler =
+      target === 'fastify' ? generateFastifyHandler : generateUnifiedHandler
+
+    const generateRouter =
+      target === 'fastify'
+        ? generateFastifyRouterFunction
+        : generateRouterFunction
+
     for (const model of options.dmmf.datamodel.models) {
       if (
         model.documentation &&
@@ -48,9 +77,15 @@ generatorHandler({
       const relativeClientPath = getRelativeClientPath(options, model.name)
 
       await writeFileSafely({
-        content: generateUnifiedHandler({
+        content: generateModelCore({ model: model as DMMF.Model }),
+        options,
+        model: model as DMMF.Model,
+        operation: 'Core',
+      })
+
+      await writeFileSafely({
+        content: generateHandler({
           model: model as DMMF.Model,
-          prismaImportStatement,
         }),
         options,
         model: model as DMMF.Model,
@@ -58,7 +93,7 @@ generatorHandler({
       })
 
       await writeFileSafely({
-        content: generateRouterFunction({
+        content: generateRouter({
           model: model as DMMF.Model,
           enums: options.dmmf.datamodel.enums as DMMF.DatamodelEnum[],
           relativeClientPath,
@@ -72,6 +107,7 @@ generatorHandler({
         content: generateScalarUIHandler({
           model: model as DMMF.Model,
           enums: options.dmmf.datamodel.enums as DMMF.DatamodelEnum[],
+          target,
         }),
         options,
         model: model as DMMF.Model,
@@ -80,7 +116,7 @@ generatorHandler({
     }
 
     await writeFileSafely({
-      content: generateUnifiedDocs(modelNames),
+      content: generateUnifiedDocs(modelNames, target),
       options,
       operation: 'combinedDocs',
     })
@@ -92,7 +128,7 @@ generatorHandler({
     })
 
     console.log('\n═══ Generation Complete ═══')
-    console.log(`✓ ${modelNames.length} models`)
+    console.log(`✓ ${modelNames.length} models (${target})`)
     console.log(`✓ OpenAPI documentation generated`)
     console.log(`✓ Query builder helper generated`)
     console.log('')

package/src/utils/copyFiles.ts

@@ -1,54 +1,46 @@
 import { GeneratorOptions } from '@prisma/generator-helper'
 import * as fs from 'fs'
 import * as path from 'path'
+import { Target } from '../constants.js'
+
+const SHARED_FILES = [
+  'parseQueryParams.ts',
+  'buildModelOpenApi.ts',
+  'operationDefinitions.ts',
+  'misc.ts',
+]
+
+const TARGET_FILES: Record<Target, string[]> = {
+  express: ['routeConfig.ts'],
+  fastify: ['routeConfig.ts'],
+}
 
-export async function copyFiles(options: GeneratorOptions): Promise<void> {
-  const outputPath = options.generator.output?.value
-  if (!outputPath) return
-
-  const srcDir = path.join(__dirname, '..', '..', 'src', 'copy')
-
-  const baseFiles = [
-    'routeConfig.ts',
-    'parseQueryParams.ts',
-    'buildModelOpenApi.ts',
-    'operationDefinitions.ts',
-    'misc.ts',
-  ]
-
-  let allCopied = true
+function resolveTemplateDir(subpath: string): string {
+  const fromSibling = path.join(__dirname, '..', subpath)
+  if (fs.existsSync(fromSibling)) return fromSibling
 
-  console.log(`Copying utility files to: ${outputPath}`)
+  const fromSrc = path.join(__dirname, '..', '..', 'src', subpath)
+  if (fs.existsSync(fromSrc)) return fromSrc
 
-  for (const file of baseFiles) {
-    const ok = await copyFile(srcDir, outputPath, file, { required: true })
-    if (!ok) allCopied = false
-  }
-
-  const clientDir = path.join(outputPath, 'client')
-  if (!fs.existsSync(clientDir)) {
-    fs.mkdirSync(clientDir, { recursive: true })
-  }
-
-  const clientSrcDir = path.join(__dirname, '..', '..', 'src', 'client')
-  const clientOk = await copyFile(
-    clientSrcDir,
-    clientDir,
-    'encodeQueryParams.ts',
-    {
-      required: true,
-      importRewrites: [{ from: '../copy/misc.js', to: '../misc.js' }],
-    },
+  throw new Error(
+    `[prisma-generator-express] Template directory "${subpath}" not found.\n` +
+    `  Searched:\n` +
+    `    ${fromSibling}\n` +
+    `    ${fromSrc}\n` +
+    `  Ensure template files are included in the published package.`,
   )
-  if (!clientOk) allCopied = false
+}
 
-  if (allCopied) {
-    console.log(`✓ Utility files copied successfully`)
-  } else {
+function getTargetSourceDir(copyBase: string, target: Target): string {
+  if (target === 'express') return copyBase
+  const targetDir = path.join(copyBase, target)
+  if (!fs.existsSync(targetDir)) {
     throw new Error(
-      'One or more required utility files could not be copied. Generation aborted.',
+      `[prisma-generator-express] Target template directory not found: ${targetDir}\n` +
+      `  Expected directory for target "${target}" at: ${targetDir}`,
     )
   }
+  return targetDir
 }
 
 interface CopyFileOptions {
@@ -56,6 +48,10 @@ interface CopyFileOptions {
   importRewrites?: Array<{ from: string; to: string }>
 }
 
+function escapeRegex(str: string): string {
+  return str.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')
+}
+
 async function copyFile(
   srcDir: string,
   destDir: string,
@@ -67,10 +63,10 @@ async function copyFile(
 
   if (!fs.existsSync(srcPath)) {
     if (options?.required) {
-      console.error(`✗ Required source file not found: ${srcPath}`)
+      console.error(`[prisma-generator-express] ✗ Required source file not found: ${srcPath}`)
       return false
     }
-    console.warn(`⚠️  Source file not found: ${srcPath}`)
+    console.warn(`[prisma-generator-express] ⚠️  Source file not found: ${srcPath}`)
     return true
   }
 
@@ -106,6 +102,54 @@ async function copyFile(
   return true
 }
 
-function escapeRegex(str: string): string {
-  return str.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')
+export async function copyFiles(
+  options: GeneratorOptions,
+  target: Target,
+): Promise<void> {
+  const outputPath = options.generator.output?.value
+  if (!outputPath) return
+
+  const copyBase = resolveTemplateDir('copy')
+
+  let allCopied = true
+
+  console.log(`  Copying utility files to: ${outputPath} (target: ${target})`)
+
+  for (const file of SHARED_FILES) {
+    const ok = await copyFile(copyBase, outputPath, file, { required: true })
+    if (!ok) allCopied = false
+  }
+
+  const targetSrcDir = getTargetSourceDir(copyBase, target)
+  for (const file of TARGET_FILES[target]) {
+    const ok = await copyFile(targetSrcDir, outputPath, file, {
+      required: true,
+    })
+    if (!ok) allCopied = false
+  }
+
+  const clientDir = path.join(outputPath, 'client')
+  if (!fs.existsSync(clientDir)) {
+    fs.mkdirSync(clientDir, { recursive: true })
+  }
+
+  const clientSrcDir = resolveTemplateDir('client')
+  const clientOk = await copyFile(
+    clientSrcDir,
+    clientDir,
+    'encodeQueryParams.ts',
+    {
+      required: true,
+      importRewrites: [{ from: '../copy/misc.js', to: '../misc.js' }],
+    },
+  )
+  if (!clientOk) allCopied = false
+
+  if (allCopied) {
+    console.log(`  ✓ Utility files copied successfully`)
+  } else {
+    throw new Error(
+      '[prisma-generator-express] One or more required utility files could not be copied. Generation aborted.',
+    )
+  }
 }

package/src/utils/writeFileSafely.ts

@@ -41,6 +41,10 @@ export async function writeFileSafely({
       filePath = path.join(outputPath, 'queryBuilder.ts')
       break
 
+    case 'operationRuntime':
+      filePath = path.join(outputPath, 'operationRuntime.ts')
+      break
+
     default:
       if (!model) {
         throw new Error(`Model required for operation: ${operation}`)