prisma-generator-express 1.30.0 → 1.32.0

package/dist/generators/generateRouter.js

@@ -45,7 +45,7 @@ import {
   ${modelName}Count,
   ${modelName}GroupBy
 } from './${modelName}Handlers.js'
-import type { RouteConfig } from '../routeConfig.js'
+import type { RouteConfig } from '../routeConfig.target.js'
 import { parseQueryParams } from '../parseQueryParams.js'
 import { buildModelOpenApi } from '../buildModelOpenApi.js'
 import { transformResult } from '../operationRuntime.js'

package/dist/generators/generateRouterFastify.js

@@ -44,7 +44,7 @@ import {
   ${modelName}Count,
   ${modelName}GroupBy,
 } from './${modelName}Handlers.js'
-import type { RouteConfig, FastifyHookHandler } from '../routeConfig.js'
+import type { RouteConfig, FastifyHookHandler } from '../routeConfig.target.js'
 import { parseQueryParams } from '../parseQueryParams.js'
 import { buildModelOpenApi } from '../buildModelOpenApi.js'
 import { mapError, transformResult } from '../operationRuntime.js'

package/dist/generators/generateUnifiedDocs.js

@@ -11,7 +11,7 @@ function generateUnifiedDocs(models, target = 'express') {
     const frameworkImport = target === 'fastify'
         ? `import type { FastifyInstance, FastifyRequest, FastifyReply } from 'fastify'`
         : `import { Request, Response } from 'express'`;
-    const routeConfigImport = `import type { RouteConfig } from './routeConfig.js'`;
+    const routeConfigImport = `import type { RouteConfig } from './routeConfig.target.js'`;
     const handlerType = target === 'fastify'
         ? `(config: any) => (request: FastifyRequest, reply: FastifyReply) => Promise<void>`
         : `(config: any) => (req: Request, res: Response) => any`;

package/dist/generators/generateUnifiedDocs.js.map

@@ -1 +1 @@
-{"version":3,"file":"generateUnifiedDocs.js","sourceRoot":"","sources":["../../src/generators/generateUnifiedDocs.ts"],"names":[],"mappings":";;AAEA,kDAkLC;AAlLD,SAAgB,mBAAmB,CACjC,MAAgB,EAChB,SAAiB,SAAS;IAE1B,MAAM,OAAO,GAAG,MAAM;SACnB,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,YAAY,KAAK,kBAAkB,KAAK,IAAI,KAAK,UAAU,CAAC;SAC3E,IAAI,CAAC,IAAI,CAAC,CAAA;IAEb,MAAM,eAAe,GAAG,MAAM;SAC3B,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,KAAK,KAAK,KAAK,MAAM,CAAC;SAC1C,IAAI,CAAC,KAAK,CAAC,CAAA;IAEd,MAAM,eAAe,GACnB,MAAM,KAAK,SAAS;QAClB,CAAC,CAAC,8EAA8E;QAChF,CAAC,CAAC,6CAA6C,CAAA;IAEnD,MAAM,iBAAiB,GAAG,qDAAqD,CAAA;IAE/E,MAAM,WAAW,GACf,MAAM,KAAK,SAAS;QAClB,CAAC,CAAC,kFAAkF;QACpF,CAAC,CAAC,uDAAuD,CAAA;IAE7D,MAAM,kBAAkB,GACtB,MAAM,KAAK,SAAS;QAClB,CAAC,CAAC,2BAA2B,EAAE;QAC/B,CAAC,CAAC,2BAA2B,EAAE,CAAA;IAEnC,MAAM,YAAY,GAChB,MAAM,KAAK,SAAS;QAClB,CAAC,CAAC,2BAA2B,EAAE;QAC/B,CAAC,CAAC,2BAA2B,EAAE,CAAA;IAEnC,OAAO,GAAG,OAAO;EACjB,eAAe;EACf,iBAAiB;;;;qCAIkB,WAAW;EAC9C,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAqIf,kBAAkB;;EAElB,YAAY;CACb,CAAA;AACD,CAAC;AAED,SAAS,2BAA2B;IAClC,OAAO;;;;;;;;;;;EAWP,CAAA;AACF,CAAC;AAED,SAAS,2BAA2B;IAClC,OAAO;;;;;;;;;;;EAWP,CAAA;AACF,CAAC;AAED,SAAS,2BAA2B;IAClC,OAAO;;;;;;;;;;;;;;;;;;;;;EAqBP,CAAA;AACF,CAAC;AAED,SAAS,2BAA2B;IAClC,OAAO;;;;;;;;;;;;;;;;;;;;;EAqBP,CAAA;AACF,CAAC"}
+{"version":3,"file":"generateUnifiedDocs.js","sourceRoot":"","sources":["../../src/generators/generateUnifiedDocs.ts"],"names":[],"mappings":";;AAEA,kDAkLC;AAlLD,SAAgB,mBAAmB,CACjC,MAAgB,EAChB,SAAiB,SAAS;IAE1B,MAAM,OAAO,GAAG,MAAM;SACnB,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,YAAY,KAAK,kBAAkB,KAAK,IAAI,KAAK,UAAU,CAAC;SAC3E,IAAI,CAAC,IAAI,CAAC,CAAA;IAEb,MAAM,eAAe,GAAG,MAAM;SAC3B,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,KAAK,KAAK,KAAK,MAAM,CAAC;SAC1C,IAAI,CAAC,KAAK,CAAC,CAAA;IAEd,MAAM,eAAe,GACnB,MAAM,KAAK,SAAS;QAClB,CAAC,CAAC,8EAA8E;QAChF,CAAC,CAAC,6CAA6C,CAAA;IAEnD,MAAM,iBAAiB,GAAG,4DAA4D,CAAA;IAEtF,MAAM,WAAW,GACf,MAAM,KAAK,SAAS;QAClB,CAAC,CAAC,kFAAkF;QACpF,CAAC,CAAC,uDAAuD,CAAA;IAE7D,MAAM,kBAAkB,GACtB,MAAM,KAAK,SAAS;QAClB,CAAC,CAAC,2BAA2B,EAAE;QAC/B,CAAC,CAAC,2BAA2B,EAAE,CAAA;IAEnC,MAAM,YAAY,GAChB,MAAM,KAAK,SAAS;QAClB,CAAC,CAAC,2BAA2B,EAAE;QAC/B,CAAC,CAAC,2BAA2B,EAAE,CAAA;IAEnC,OAAO,GAAG,OAAO;EACjB,eAAe;EACf,iBAAiB;;;;qCAIkB,WAAW;EAC9C,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAqIf,kBAAkB;;EAElB,YAAY;CACb,CAAA;AACD,CAAC;AAED,SAAS,2BAA2B;IAClC,OAAO;;;;;;;;;;;EAWP,CAAA;AACF,CAAC;AAED,SAAS,2BAA2B;IAClC,OAAO;;;;;;;;;;;EAWP,CAAA;AACF,CAAC;AAED,SAAS,2BAA2B;IAClC,OAAO;;;;;;;;;;;;;;;;;;;;;EAqBP,CAAA;AACF,CAAC;AAED,SAAS,2BAA2B;IAClC,OAAO;;;;;;;;;;;;;;;;;;;;;EAqBP,CAAA;AACF,CAAC"}

package/dist/utils/copyFiles.js

@@ -41,47 +41,35 @@ const SHARED_FILES = [
     'buildModelOpenApi.ts',
     'operationDefinitions.ts',
     'misc.ts',
+    'routeConfig.ts',
+    'docsRenderer.ts',
 ];
-const TARGET_FILES = {
-    express: ['routeConfig.ts'],
-    fastify: ['routeConfig.ts'],
-};
 function resolveTemplateDir(subpath) {
-    const fromSibling = path.join(__dirname, '..', subpath);
-    if (fs.existsSync(fromSibling))
-        return fromSibling;
     const fromSrc = path.join(__dirname, '..', '..', 'src', subpath);
     if (fs.existsSync(fromSrc))
         return fromSrc;
-    throw new Error(`[prisma-generator-express] Template directory "${subpath}" not found.\n` +
+    const fromDist = path.join(__dirname, '..', subpath);
+    if (fs.existsSync(fromDist))
+        return fromDist;
+    throw new Error(`Template directory "${subpath}" not found.\n` +
         `  Searched:\n` +
-        `    ${fromSibling}\n` +
         `    ${fromSrc}\n` +
+        `    ${fromDist}\n` +
+        `  __dirname: ${__dirname}\n` +
         `  Ensure template files are included in the published package.`);
 }
-function getTargetSourceDir(copyBase, target) {
-    if (target === 'express')
-        return copyBase;
-    const targetDir = path.join(copyBase, target);
-    if (!fs.existsSync(targetDir)) {
-        throw new Error(`[prisma-generator-express] Target template directory not found: ${targetDir}\n` +
-            `  Expected directory for target "${target}" at: ${targetDir}`);
-    }
-    return targetDir;
-}
 function escapeRegex(str) {
     return str.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
 }
-async function copyFile(srcDir, destDir, filename, options) {
+function copyFileSync(srcDir, destDir, filename, options) {
     const srcPath = path.join(srcDir, filename);
-    const destPath = path.join(destDir, filename);
+    const destFilename = options?.destFilename || filename;
+    const destPath = path.join(destDir, destFilename);
     if (!fs.existsSync(srcPath)) {
         if (options?.required) {
-            console.error(`[prisma-generator-express] ✗ Required source file not found: ${srcPath}`);
-            return false;
+            return `Required file not found: ${srcPath}`;
         }
-        console.warn(`[prisma-generator-express] ⚠️  Source file not found: ${srcPath}`);
-        return true;
+        return null;
     }
     const destDirPath = path.dirname(destPath);
     if (!fs.existsSync(destDirPath)) {
@@ -103,45 +91,45 @@ async function copyFile(srcDir, destDir, filename, options) {
         content = header + content;
     }
     fs.writeFileSync(destPath, content);
-    console.log(`  ✓ Copied: ${filename}`);
-    return true;
+    return null;
 }
 async function copyFiles(options, target) {
     const outputPath = options.generator.output?.value;
     if (!outputPath)
         return;
     const copyBase = resolveTemplateDir('copy');
-    let allCopied = true;
+    const errors = [];
     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 err = copyFileSync(copyBase, outputPath, file, { required: true });
+        if (err)
+            errors.push(err);
     }
+    const targetConfigFile = `routeConfig.${target}.ts`;
+    const err = copyFileSync(copyBase, outputPath, targetConfigFile, {
+        required: true,
+        destFilename: 'routeConfig.target.ts',
+        importRewrites: [{ from: './routeConfig', to: './routeConfig' }],
+    });
+    if (err)
+        errors.push(err);
     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', {
+    const clientErr = copyFileSync(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.');
+    if (clientErr)
+        errors.push(clientErr);
+    if (errors.length > 0) {
+        throw new Error(`Failed to copy ${errors.length} required file(s):\n` +
+            errors.map((e) => `  - ${e}`).join('\n') +
+            `\n  copyBase: ${copyBase}` +
+            `\n  __dirname: ${__dirname}`);
     }
+    console.log(`  ✓ Utility files copied successfully`);
 }
 //# sourceMappingURL=copyFiles.js.map

package/dist/utils/copyFiles.js.map

@@ -1 +1 @@
-{"version":3,"file":"copyFiles.js","sourceRoot":"","sources":["../../src/utils/copyFiles.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"copyFiles.js","sourceRoot":"","sources":["../../src/utils/copyFiles.ts"],"names":[],"mappings":"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"}

package/package.json

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

package/src/copy/routeConfig.express.ts

@@ -0,0 +1,14 @@
+import { Request, RequestHandler } from 'express'
+import {
+  BaseOperationConfig,
+  BaseRouteConfig,
+  QueryBuilderConfig,
+  OpenApiServerConfig,
+  OpenApiSecuritySchemeConfig,
+} from './routeConfig'
+
+export type { QueryBuilderConfig, OpenApiServerConfig, OpenApiSecuritySchemeConfig }
+
+export type OperationConfig = BaseOperationConfig<RequestHandler>
+
+export type RouteConfig = BaseRouteConfig<RequestHandler, Request>

package/src/copy/routeConfig.fastify.ts

@@ -0,0 +1,19 @@
+import type { FastifyRequest, FastifyReply } from 'fastify'
+import {
+  BaseOperationConfig,
+  BaseRouteConfig,
+  QueryBuilderConfig,
+  OpenApiServerConfig,
+  OpenApiSecuritySchemeConfig,
+} from './routeConfig'
+
+export type { QueryBuilderConfig, OpenApiServerConfig, OpenApiSecuritySchemeConfig }
+
+export type FastifyHookHandler = (
+  request: FastifyRequest,
+  reply: FastifyReply,
+) => Promise<void> | void
+
+export type OperationConfig = BaseOperationConfig<FastifyHookHandler>
+
+export type RouteConfig = BaseRouteConfig<FastifyHookHandler, FastifyRequest>

package/src/copy/routeConfig.ts

@@ -1,16 +1,3 @@
-import type { FastifyRequest, FastifyReply } from 'fastify'
-
-export type FastifyHookHandler = (
-  request: FastifyRequest,
-  reply: FastifyReply,
-) => Promise<void> | void
-
-export interface OperationConfig {
-  before?: FastifyHookHandler[]
-  after?: FastifyHookHandler[]
-  shape?: Record<string, any>
-}
-
 export interface QueryBuilderConfig {
   enabled?: boolean
   port?: number
@@ -33,7 +20,13 @@ export interface OpenApiSecuritySchemeConfig {
   description?: string
 }
 
-export interface RouteConfig {
+export interface BaseOperationConfig<HookHandler> {
+  before?: HookHandler[]
+  after?: HookHandler[]
+  shape?: Record<string, any>
+}
+
+export interface BaseRouteConfig<HookHandler, RequestType> {
   enableAll?: boolean
   addModelPrefix?: boolean
   customUrlPrefix?: string
@@ -49,7 +42,7 @@ export interface RouteConfig {
   openApiSecurity?: Record<string, string[]>[]
 
   guard?: {
-    resolveVariant?: (request: FastifyRequest) => string | undefined
+    resolveVariant?: (request: RequestType) => string | undefined
     variantHeader?: string
   }
 
@@ -61,22 +54,26 @@ export interface RouteConfig {
     distinctCountLimit?: number
   }
 
-  findUnique?: OperationConfig
-  findUniqueOrThrow?: OperationConfig
-  findFirst?: OperationConfig
-  findFirstOrThrow?: OperationConfig
-  findMany?: OperationConfig
-  findManyPaginated?: OperationConfig
-  create?: OperationConfig
-  createMany?: OperationConfig
-  createManyAndReturn?: OperationConfig
-  update?: OperationConfig
-  updateMany?: OperationConfig
-  updateManyAndReturn?: OperationConfig
-  upsert?: OperationConfig
-  delete?: OperationConfig
-  deleteMany?: OperationConfig
-  aggregate?: OperationConfig
-  count?: OperationConfig
-  groupBy?: OperationConfig
-}
+  findUnique?: BaseOperationConfig<HookHandler>
+  findUniqueOrThrow?: BaseOperationConfig<HookHandler>
+  findFirst?: BaseOperationConfig<HookHandler>
+  findFirstOrThrow?: BaseOperationConfig<HookHandler>
+  findMany?: BaseOperationConfig<HookHandler>
+  findManyPaginated?: BaseOperationConfig<HookHandler>
+  create?: BaseOperationConfig<HookHandler>
+  createMany?: BaseOperationConfig<HookHandler>
+  createManyAndReturn?: BaseOperationConfig<HookHandler>
+  update?: BaseOperationConfig<HookHandler>
+  updateMany?: BaseOperationConfig<HookHandler>
+  updateManyAndReturn?: BaseOperationConfig<HookHandler>
+  upsert?: BaseOperationConfig<HookHandler>
+  delete?: BaseOperationConfig<HookHandler>
+  deleteMany?: BaseOperationConfig<HookHandler>
+  aggregate?: BaseOperationConfig<HookHandler>
+  count?: BaseOperationConfig<HookHandler>
+  groupBy?: BaseOperationConfig<HookHandler>
+}
+
+export type OperationConfig = BaseOperationConfig<any>
+
+export type RouteConfig = BaseRouteConfig<any, any>

package/src/generators/generateRouter.ts

@@ -58,7 +58,7 @@ import {
   ${modelName}Count,
   ${modelName}GroupBy
 } from './${modelName}Handlers.js'
-import type { RouteConfig } from '../routeConfig.js'
+import type { RouteConfig } from '../routeConfig.target.js'
 import { parseQueryParams } from '../parseQueryParams.js'
 import { buildModelOpenApi } from '../buildModelOpenApi.js'
 import { transformResult } from '../operationRuntime.js'

package/src/generators/generateRouterFastify.ts

@@ -55,7 +55,7 @@ import {
   ${modelName}Count,
   ${modelName}GroupBy,
 } from './${modelName}Handlers.js'
-import type { RouteConfig, FastifyHookHandler } from '../routeConfig.js'
+import type { RouteConfig, FastifyHookHandler } from '../routeConfig.target.js'
 import { parseQueryParams } from '../parseQueryParams.js'
 import { buildModelOpenApi } from '../buildModelOpenApi.js'
 import { mapError, transformResult } from '../operationRuntime.js'

package/src/generators/generateUnifiedDocs.ts

@@ -17,7 +17,7 @@ export function generateUnifiedDocs(
       ? `import type { FastifyInstance, FastifyRequest, FastifyReply } from 'fastify'`
       : `import { Request, Response } from 'express'`
 
-  const routeConfigImport = `import type { RouteConfig } from './routeConfig.js'`
+  const routeConfigImport = `import type { RouteConfig } from './routeConfig.target.js'`
 
   const handlerType =
     target === 'fastify'

package/src/utils/copyFiles.ts

@@ -8,66 +8,52 @@ const SHARED_FILES = [
   'buildModelOpenApi.ts',
   'operationDefinitions.ts',
   'misc.ts',
+  'routeConfig.ts',
+  'docsRenderer.ts',
 ]
 
-const TARGET_FILES: Record<Target, string[]> = {
-  express: ['routeConfig.ts'],
-  fastify: ['routeConfig.ts'],
+interface CopyFileOptions {
+  required?: boolean
+  importRewrites?: Array<{ from: string; to: string }>
+  destFilename?: string
 }
 
 function resolveTemplateDir(subpath: string): string {
-  const fromSibling = path.join(__dirname, '..', subpath)
-  if (fs.existsSync(fromSibling)) return fromSibling
-
   const fromSrc = path.join(__dirname, '..', '..', 'src', subpath)
   if (fs.existsSync(fromSrc)) return fromSrc
 
+  const fromDist = path.join(__dirname, '..', subpath)
+  if (fs.existsSync(fromDist)) return fromDist
+
   throw new Error(
-    `[prisma-generator-express] Template directory "${subpath}" not found.\n` +
+    `Template directory "${subpath}" not found.\n` +
     `  Searched:\n` +
-    `    ${fromSibling}\n` +
     `    ${fromSrc}\n` +
+    `    ${fromDist}\n` +
+    `  __dirname: ${__dirname}\n` +
     `  Ensure template files are included in the published package.`,
   )
 }
 
-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(
-      `[prisma-generator-express] Target template directory not found: ${targetDir}\n` +
-      `  Expected directory for target "${target}" at: ${targetDir}`,
-    )
-  }
-  return targetDir
-}
-
-interface CopyFileOptions {
-  required?: boolean
-  importRewrites?: Array<{ from: string; to: string }>
-}
-
 function escapeRegex(str: string): string {
   return str.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')
 }
 
-async function copyFile(
+function copyFileSync(
   srcDir: string,
   destDir: string,
   filename: string,
   options?: CopyFileOptions,
-): Promise<boolean> {
+): string | null {
   const srcPath = path.join(srcDir, filename)
-  const destPath = path.join(destDir, filename)
+  const destFilename = options?.destFilename || filename
+  const destPath = path.join(destDir, destFilename)
 
   if (!fs.existsSync(srcPath)) {
     if (options?.required) {
-      console.error(`[prisma-generator-express] ✗ Required source file not found: ${srcPath}`)
-      return false
+      return `Required file not found: ${srcPath}`
     }
-    console.warn(`[prisma-generator-express] ⚠️  Source file not found: ${srcPath}`)
-    return true
+    return null
   }
 
   const destDirPath = path.dirname(destPath)
@@ -98,8 +84,7 @@ async function copyFile(
   }
 
   fs.writeFileSync(destPath, content)
-  console.log(`  ✓ Copied: ${filename}`)
-  return true
+  return null
 }
 
 export async function copyFiles(
@@ -110,23 +95,22 @@ export async function copyFiles(
   if (!outputPath) return
 
   const copyBase = resolveTemplateDir('copy')
-
-  let allCopied = true
+  const errors: string[] = []
 
   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 err = copyFileSync(copyBase, outputPath, file, { required: true })
+    if (err) errors.push(err)
   }
 
-  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 targetConfigFile = `routeConfig.${target}.ts`
+  const err = copyFileSync(copyBase, outputPath, targetConfigFile, {
+    required: true,
+    destFilename: 'routeConfig.target.ts',
+    importRewrites: [{ from: './routeConfig', to: './routeConfig' }],
+  })
+  if (err) errors.push(err)
 
   const clientDir = path.join(outputPath, 'client')
   if (!fs.existsSync(clientDir)) {
@@ -134,7 +118,7 @@ export async function copyFiles(
   }
 
   const clientSrcDir = resolveTemplateDir('client')
-  const clientOk = await copyFile(
+  const clientErr = copyFileSync(
     clientSrcDir,
     clientDir,
     'encodeQueryParams.ts',
@@ -143,13 +127,16 @@ export async function copyFiles(
       importRewrites: [{ from: '../copy/misc.js', to: '../misc.js' }],
     },
   )
-  if (!clientOk) allCopied = false
+  if (clientErr) errors.push(clientErr)
 
-  if (allCopied) {
-    console.log(`  ✓ Utility files copied successfully`)
-  } else {
+  if (errors.length > 0) {
     throw new Error(
-      '[prisma-generator-express] One or more required utility files could not be copied. Generation aborted.',
+      `Failed to copy ${errors.length} required file(s):\n` +
+      errors.map((e) => `  - ${e}`).join('\n') +
+      `\n  copyBase: ${copyBase}` +
+      `\n  __dirname: ${__dirname}`,
     )
   }
+
+  console.log(`  ✓ Utility files copied successfully`)
 }