prisma-generator-express 1.65.2 → 1.67.0

package/src/utils/copyFiles.ts

@@ -1,168 +1,199 @@
-import { GeneratorOptions } from '@prisma/generator-helper'
-import * as fs from 'fs'
-import * as path from 'path'
-import { Target } from '../constants'
-import { ImportStyle } from './resolveImportStyle'
-import { importExt } from './importExt'
-
-const SHARED_FILES = [
-  'parseQueryParams.ts',
-  'buildModelOpenApi.ts',
-  'operationDefinitions.ts',
-  'misc.ts',
-  'routeConfig.ts',
-  'docsRenderer.ts',
-  'operationRuntime.ts',
-  'errorMapper.ts',
-  'sse.ts',
-  'pagination.ts',
-  'materializedCount.ts',
-  'guardHelpers.ts',
-  'scalarTypes.ts',
-  'concurrency.ts',
-  'projectionDefaults.ts',
-  'guardVariantRouting.ts',
-  'guardVariantError.ts',
-]
-
-const EXPRESS_ONLY_FILES = [
-  'autoIncludePlanner.ts',
-  'autoIncludePlannerGuarded.ts',
-  'autoIncludeRuntime.ts',
-  'autoIncludeRuntimeGuarded.ts',
-  'materializedRouter.ts',
-]
-
-interface CopyFileOptions {
-  required?: boolean
-  importRewrites?: Array<{ from: string; to: string }>
-  destFilename?: string
-}
-
-function resolveTemplateDir(subpath: string): string {
-  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(
-    'Template directory "' + subpath + '" not found.\n  Searched:\n    ' +
-    fromSrc + '\n    ' + fromDist + '\n  __dirname: ' + __dirname,
-  )
-}
-
-function escapeRegex(str: string): string {
-  return str.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')
-}
-
-const RELATIVE_IMPORT_RE =
-  /(\b(?:import|export)\b[^'";]*?\bfrom\s+|\bimport\s+|\bimport\s*\(\s*)(['"])(\.{1,2}\/[^'"\n]+)\2/g
-
-const SKIP_EXTENSION_RE = /\.(m?[jt]sx?|json|css|svg|png|jpe?g|gif|webp|wasm)$/i
-
-function applyExtension(content: string, style: ImportStyle): string {
-  if (style === 'none') return content
-  const ext = importExt(style)
-  if (!ext) return content
-  return content.replace(RELATIVE_IMPORT_RE, (_match, prefix, quote, spec) => {
-    if (SKIP_EXTENSION_RE.test(spec)) return prefix + quote + spec + quote
-    return prefix + quote + spec + ext + quote
-  })
-}
-
-function copyFileSync(
-  srcDir: string,
-  destDir: string,
-  filename: string,
-  importStyle: ImportStyle,
-  options?: CopyFileOptions,
-): string | null {
-  const srcPath = path.join(srcDir, filename)
-  const destFilename = options?.destFilename || filename
-  const destPath = path.join(destDir, destFilename)
-
-  if (!fs.existsSync(srcPath)) {
-    if (options?.required) return 'Required file not found: ' + srcPath
-    return null
-  }
-
-  const destDirPath = path.dirname(destPath)
-  if (!fs.existsSync(destDirPath)) fs.mkdirSync(destDirPath, { recursive: true })
-
-  let content = fs.readFileSync(srcPath, 'utf-8')
-
-  if (options?.importRewrites) {
-    for (const rewrite of options.importRewrites) {
-      if (rewrite.from === rewrite.to) continue
-      content = content.replace(
-        new RegExp('from [\'"]' + escapeRegex(rewrite.from) + '[\'"]', 'g'),
-        "from '" + rewrite.to + "'",
-      )
-    }
-  }
-
-  const header =
-    '/**\n' +
-    ' * Auto-generated by prisma-generator-express\n' +
-    ' * DO NOT EDIT MANUALLY\n' +
-    ' */\n\n'
-
-  if (!content.startsWith('/**')) content = header + content
-
-  content = applyExtension(content, importStyle)
-
-  fs.writeFileSync(destPath, content)
-  return null
-}
-
-export async function copyFiles(
-  options: GeneratorOptions,
-  target: Target,
-  importStyle: ImportStyle,
-): Promise<void> {
-  const outputPath = options.generator.output?.value
-  if (!outputPath) return
-
-  const copyBase = resolveTemplateDir('copy')
-  const errors: string[] = []
-
-  console.log('  Copying utility files to: ' + outputPath + ' (target: ' + target + ')')
-
-  for (const file of SHARED_FILES) {
-    const err = copyFileSync(copyBase, outputPath, file, importStyle, { required: true })
-    if (err) errors.push(err)
-  }
-
-  if (target === 'express') {
-    for (const file of EXPRESS_ONLY_FILES) {
-      const err = copyFileSync(copyBase, outputPath, file, importStyle, { required: true })
-      if (err) errors.push(err)
-    }
-  }
-
-  const targetConfigFile = 'routeConfig.' + target + '.ts'
-  const err = copyFileSync(copyBase, outputPath, targetConfigFile, importStyle, {
-    required: true,
-    destFilename: 'routeConfig.target.ts',
-  })
-  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 clientErr = copyFileSync(clientSrcDir, clientDir, 'encodeQueryParams.ts', importStyle, {
-    required: true,
-    importRewrites: [{ from: '../copy/misc', to: '../misc' }],
-  })
-  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')
-}
+import { GeneratorOptions } from '@prisma/generator-helper'
+import * as fs from 'fs'
+import * as path from 'path'
+import { Target } from '../constants'
+import { ImportStyle } from './resolveImportStyle'
+import { importExt } from './importExt'
+
+const SHARED_FILES = [
+  'parseQueryParams.ts',
+  'buildModelOpenApi.ts',
+  'operationDefinitions.ts',
+  'misc.ts',
+  'routeConfig.ts',
+  'docsRenderer.ts',
+  'operationRuntime.ts',
+  'errorMapper.ts',
+  'sse.ts',
+  'pagination.ts',
+  'materializedCount.ts',
+  'guardHelpers.ts',
+  'scalarTypes.ts',
+  'concurrency.ts',
+  'projectionDefaults.ts',
+  'guardVariantRouting.ts',
+  'guardVariantError.ts',
+]
+
+const EXPRESS_ONLY_FILES = [
+  'autoIncludePlanner.ts',
+  'autoIncludePlannerGuarded.ts',
+  'autoIncludeRuntime.ts',
+  'autoIncludeRuntimeGuarded.ts',
+  'materializedRouter.ts',
+  'ndjson.ts',
+]
+
+interface CopyFileOptions {
+  required?: boolean
+  importRewrites?: Array<{ from: string; to: string }>
+  destFilename?: string
+}
+
+function resolveTemplateDir(subpath: string): string {
+  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(
+    'Template directory "' +
+      subpath +
+      '" not found.\n  Searched:\n    ' +
+      fromSrc +
+      '\n    ' +
+      fromDist +
+      '\n  __dirname: ' +
+      __dirname,
+  )
+}
+
+function escapeRegex(str: string): string {
+  return str.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')
+}
+
+const RELATIVE_IMPORT_RE =
+  /(\b(?:import|export)\b[^'";]*?\bfrom\s+|\bimport\s+|\bimport\s*\(\s*)(['"])(\.{1,2}\/[^'"\n]+)\2/g
+
+const SKIP_EXTENSION_RE = /\.(m?[jt]sx?|json|css|svg|png|jpe?g|gif|webp|wasm)$/i
+
+function applyExtension(content: string, style: ImportStyle): string {
+  if (style === 'none') return content
+  const ext = importExt(style)
+  if (!ext) return content
+  return content.replace(RELATIVE_IMPORT_RE, (_match, prefix, quote, spec) => {
+    if (SKIP_EXTENSION_RE.test(spec)) return prefix + quote + spec + quote
+    return prefix + quote + spec + ext + quote
+  })
+}
+
+function copyFileSync(
+  srcDir: string,
+  destDir: string,
+  filename: string,
+  importStyle: ImportStyle,
+  options?: CopyFileOptions,
+): string | null {
+  const srcPath = path.join(srcDir, filename)
+  const destFilename = options?.destFilename || filename
+  const destPath = path.join(destDir, destFilename)
+
+  if (!fs.existsSync(srcPath)) {
+    if (options?.required) return 'Required file not found: ' + srcPath
+    return null
+  }
+
+  const destDirPath = path.dirname(destPath)
+  if (!fs.existsSync(destDirPath))
+    fs.mkdirSync(destDirPath, { recursive: true })
+
+  let content = fs.readFileSync(srcPath, 'utf-8')
+
+  if (options?.importRewrites) {
+    for (const rewrite of options.importRewrites) {
+      if (rewrite.from === rewrite.to) continue
+      content = content.replace(
+        new RegExp('from [\'"]' + escapeRegex(rewrite.from) + '[\'"]', 'g'),
+        "from '" + rewrite.to + "'",
+      )
+    }
+  }
+
+  const header =
+    '/**\n' +
+    ' * Auto-generated by prisma-generator-express\n' +
+    ' * DO NOT EDIT MANUALLY\n' +
+    ' */\n\n'
+
+  if (!content.startsWith('/**')) content = header + content
+
+  content = applyExtension(content, importStyle)
+
+  fs.writeFileSync(destPath, content)
+  return null
+}
+
+export async function copyFiles(
+  options: GeneratorOptions,
+  target: Target,
+  importStyle: ImportStyle,
+): Promise<void> {
+  const outputPath = options.generator.output?.value
+  if (!outputPath) return
+
+  const copyBase = resolveTemplateDir('copy')
+  const errors: string[] = []
+
+  console.log(
+    '  Copying utility files to: ' + outputPath + ' (target: ' + target + ')',
+  )
+
+  for (const file of SHARED_FILES) {
+    const err = copyFileSync(copyBase, outputPath, file, importStyle, {
+      required: true,
+    })
+    if (err) errors.push(err)
+  }
+
+  if (target === 'express') {
+    for (const file of EXPRESS_ONLY_FILES) {
+      const err = copyFileSync(copyBase, outputPath, file, importStyle, {
+        required: true,
+      })
+      if (err) errors.push(err)
+    }
+  }
+
+  const targetConfigFile = 'routeConfig.' + target + '.ts'
+  const err = copyFileSync(
+    copyBase,
+    outputPath,
+    targetConfigFile,
+    importStyle,
+    {
+      required: true,
+      destFilename: 'routeConfig.target.ts',
+    },
+  )
+  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 clientErr = copyFileSync(
+    clientSrcDir,
+    clientDir,
+    'encodeQueryParams.ts',
+    importStyle,
+    {
+      required: true,
+      importRewrites: [{ from: '../copy/misc', to: '../misc' }],
+    },
+  )
+  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')
+}

package/src/utils/importExt.ts

@@ -1,7 +1,7 @@
-import { ImportStyle } from './resolveImportStyle'
+import type { ImportStyle } from './resolveImportStyle'
 
 export function importExt(style: ImportStyle): string {
   if (style === 'js') return '.js'
   if (style === 'ts') return '.ts'
   return ''
-}
+}

package/src/utils/pathCasing.ts

@@ -0,0 +1,42 @@
+export type PathCase = 'lower' | 'kebab' | 'raw'
+
+export function parsePathCase(raw: unknown): PathCase {
+  const value = String(raw ?? 'lower').toLowerCase()
+  if (value === 'lower' || value === 'kebab' || value === 'raw') return value
+  throw new Error(
+    `Invalid pathCase "${String(raw)}". Expected "lower", "kebab", or "raw".`,
+  )
+}
+
+export function toKebabCase(name: string): string {
+  let out = ''
+  for (let i = 0; i < name.length; i++) {
+    const ch = name[i]
+    const prev = i > 0 ? name[i - 1] : undefined
+    const next = name[i + 1]
+    const isUpper = ch >= 'A' && ch <= 'Z'
+    const prevIsLower = prev !== undefined && prev >= 'a' && prev <= 'z'
+    const prevIsDigit = prev !== undefined && prev >= '0' && prev <= '9'
+    const nextIsLower = next !== undefined && next >= 'a' && next <= 'z'
+    if (
+      isUpper &&
+      i > 0 &&
+      (prevIsLower ||
+        prevIsDigit ||
+        (prev !== undefined && prev >= 'A' && prev <= 'Z' && nextIsLower))
+    ) {
+      out += '-'
+    }
+    out += ch.toLowerCase()
+  }
+  return out
+}
+
+export function modelPathSegment(
+  modelName: string,
+  pathCase: PathCase,
+): string {
+  if (pathCase === 'raw') return modelName
+  if (pathCase === 'kebab') return toKebabCase(modelName)
+  return modelName.toLowerCase()
+}

package/src/utils/resolveImportStyle.ts

@@ -39,7 +39,8 @@ function stripJsonComments(input: string): string {
     }
     if (c === '/' && next === '*') {
       i += 2
-      while (i < input.length && !(input[i] === '*' && input[i + 1] === '/')) i++
+      while (i < input.length && !(input[i] === '*' && input[i + 1] === '/'))
+        i++
       i += 2
       continue
     }
@@ -75,7 +76,10 @@ function findUpwards(startDir: string, filename: string): string | null {
   return result
 }
 
-function resolveExtendsTarget(extendsValue: string, fromFile: string): string | null {
+function resolveExtendsTarget(
+  extendsValue: string,
+  fromFile: string,
+): string | null {
   const fromDir = path.dirname(fromFile)
   if (extendsValue.startsWith('.') || path.isAbsolute(extendsValue)) {
     const direct = path.resolve(fromDir, extendsValue)
@@ -90,7 +94,9 @@ function resolveExtendsTarget(extendsValue: string, fromFile: string): string |
     return require.resolve(extendsValue, { paths: [fromDir] })
   } catch {
     try {
-      return require.resolve(extendsValue + '/tsconfig.json', { paths: [fromDir] })
+      return require.resolve(extendsValue + '/tsconfig.json', {
+        paths: [fromDir],
+      })
     } catch {
       return null
     }
@@ -102,7 +108,10 @@ type TsConfigRaw = {
   compilerOptions?: Record<string, unknown>
 }
 
-function readTsConfig(filePath: string, seen: Set<string> = new Set()): Record<string, unknown> {
+function readTsConfig(
+  filePath: string,
+  seen: Set<string> = new Set(),
+): Record<string, unknown> {
   const abs = path.resolve(filePath)
   if (seen.has(abs)) return {}
   seen.add(abs)
@@ -143,21 +152,25 @@ function readPackageType(startDir: string): string | null {
 
 export function resolveImportStyle(options: GeneratorOptions): ImportStyle {
   const config = (options.generator.config || {}) as Record<string, string>
-  const raw = typeof config.importStyle === 'string'
-    ? config.importStyle.toLowerCase()
-    : 'auto'
+  const raw =
+    typeof config.importStyle === 'string'
+      ? config.importStyle.toLowerCase()
+      : 'auto'
 
   if (!VALID_OVERRIDES.has(raw)) {
     console.warn(
-      '[prisma-generator-express] Invalid importStyle "' + config.importStyle +
-      '". Expected one of: auto, none, js, ts. Falling back to auto.',
+      '[prisma-generator-express] Invalid importStyle "' +
+        config.importStyle +
+        '". Expected one of: auto, none, js, ts. Falling back to auto.',
     )
   } else if (raw !== 'auto') {
     return raw as ImportStyle
   }
 
   const outputPath = options.generator.output?.value
-  const schemaDir = options.schemaPath ? path.dirname(options.schemaPath) : process.cwd()
+  const schemaDir = options.schemaPath
+    ? path.dirname(options.schemaPath)
+    : process.cwd()
   const startDir = outputPath ? path.dirname(outputPath) : schemaDir
 
   const tsconfigPath =
@@ -171,12 +184,21 @@ export function resolveImportStyle(options: GeneratorOptions): ImportStyle {
   if (compilerOptions.allowImportingTsExtensions === true) return 'ts'
 
   const moduleVal = String(compilerOptions.module ?? '').toLowerCase()
-  const moduleResolution = String(compilerOptions.moduleResolution ?? '').toLowerCase()
-
-  if (NODE_MODULE_KEYWORDS.has(moduleVal) || NODE_MODULE_KEYWORDS.has(moduleResolution)) {
+  const moduleResolution = String(
+    compilerOptions.moduleResolution ?? '',
+  ).toLowerCase()
+
+  if (
+    NODE_MODULE_KEYWORDS.has(moduleVal) ||
+    NODE_MODULE_KEYWORDS.has(moduleResolution)
+  ) {
     return 'js'
   }
-  if (moduleResolution === 'bundler' || moduleResolution === 'classic' || moduleResolution === 'node') {
+  if (
+    moduleResolution === 'bundler' ||
+    moduleResolution === 'classic' ||
+    moduleResolution === 'node'
+  ) {
     return 'none'
   }
 
@@ -184,4 +206,4 @@ export function resolveImportStyle(options: GeneratorOptions): ImportStyle {
   if (pkgType === 'module') return 'js'
 
   return 'none'
-}
+}

package/src/utils/strings.ts

@@ -1,2 +1,2 @@
-export const capitalize = (str: string) =>
-  str.charAt(0).toUpperCase() + str.slice(1)
+export const capitalize = (str: string) =>
+  str.charAt(0).toUpperCase() + str.slice(1)

package/src/utils/writeFileSafely.ts

@@ -41,7 +41,11 @@ export async function writeFileSafely({
       break
     default:
       if (!model) throw new Error('Model required for operation: ' + operation)
-      filePath = path.join(outputPath, model.name, `${model.name}${operation}.ts`)
+      filePath = path.join(
+        outputPath,
+        model.name,
+        `${model.name}${operation}.ts`,
+      )
   }
 
   const dirPath = path.dirname(filePath)
@@ -54,4 +58,4 @@ export async function writeFileSafely({
   })
 
   fs.writeFileSync(filePath, formattedContent)
-}
+}