prisma-generator-express 1.28.0 → 1.29.0

package/src/generators/generateQueryBuilderHelper.ts

@@ -12,6 +12,7 @@ import { createRequire } from 'module'
 import type { ChildProcess } from 'child_process'
 
 let _process: ChildProcess | null = null
+let _starting: Promise<void> | null = null
 let _stopping = false
 let _cleanupRegistered = false
 
@@ -43,90 +44,105 @@ function findCliPath(): string | null {
 }
 
 export function startQueryBuilder(options: QueryBuilderOptions = {}): void {
-  if (_process) return
+  if (_process || _starting) return
 
-  const env = typeof process !== 'undefined' && process.env ? process.env : {} as Record<string, string | undefined>
-
-  if (env.NODE_ENV === 'production') return
-
-  const cliPath = findCliPath()
-  if (!cliPath) {
-    console.warn('[query-builder] prisma-query-builder-ui not found. Install: npm install prisma-query-builder-ui')
-    return
-  }
+  _starting = doStart(options)
+  _starting.finally(() => { _starting = null })
+}
 
-  const port = options.port || 5173
-  const host = options.host || 'localhost'
-  const schemaPath = options.schemaPath || ${schemaPath}
-  const databaseUrl = options.databaseUrl || env.DATABASE_URL || ''
+function doStart(options: QueryBuilderOptions): Promise<void> {
+  return new Promise<void>((resolvePromise) => {
+    const env = typeof process !== 'undefined' && process.env ? process.env : {} as Record<string, string | undefined>
 
-  if (!existsSync(schemaPath)) {
-    console.error('[query-builder] Schema file not found: ' + schemaPath)
-    return
-  }
+    if (env.NODE_ENV === 'production') {
+      resolvePromise()
+      return
+    }
 
-  let schemaContent: string
-  try {
-    schemaContent = readFileSync(schemaPath, 'utf-8')
-  } catch (err) {
-    console.error('[query-builder] Failed to read schema:', err)
-    return
-  }
+    const cliPath = findCliPath()
+    if (!cliPath) {
+      console.warn('[query-builder] prisma-query-builder-ui not found. Install: npm install prisma-query-builder-ui')
+      resolvePromise()
+      return
+    }
 
-  const schemaCwd = dirname(resolve(schemaPath))
-
-  _process = spawn(process.execPath, [cliPath], {
-    stdio: 'inherit',
-    env: {
-      ...env,
-      PORT: String(port),
-      HOST: host,
-      PRISMA_QUERY_BUILDER_MODE: 'embedded',
-      DISABLE_PERSISTENCE: 'true',
-      PRISMA_QUERY_BUILDER_SCHEMA_CONTENT: schemaContent,
-      PRISMA_QUERY_BUILDER_CWD: schemaCwd,
-      DATABASE_URL: databaseUrl,
-    },
-  })
+    const port = options.port || 5173
+    const host = options.host || 'localhost'
+    const schemaPath = options.schemaPath || ${schemaPath}
+    const databaseUrl = options.databaseUrl || env.DATABASE_URL || ''
 
-  _process.on('error', (err) => {
-    console.error('[query-builder] Failed to start:', err.message)
-    _process = null
-  })
+    if (!existsSync(schemaPath)) {
+      console.error('[query-builder] Schema file not found: ' + schemaPath)
+      resolvePromise()
+      return
+    }
 
-  _process.on('exit', (code) => {
-    const wasStopping = _stopping
-    _stopping = false
-    _process = null
-    if (!wasStopping && code !== 0) {
-      console.warn('[query-builder] Process exited with code ' + code)
+    let schemaContent: string
+    try {
+      schemaContent = readFileSync(schemaPath, 'utf-8')
+    } catch (err) {
+      console.error('[query-builder] Failed to read schema:', err)
+      resolvePromise()
+      return
     }
-  })
 
-  if (!_cleanupRegistered) {
-    _cleanupRegistered = true
+    const schemaCwd = dirname(resolve(schemaPath))
+
+    _process = spawn(process.execPath, [cliPath], {
+      stdio: 'inherit',
+      env: {
+        ...env,
+        PORT: String(port),
+        HOST: host,
+        PRISMA_QUERY_BUILDER_MODE: 'embedded',
+        DISABLE_PERSISTENCE: 'true',
+        PRISMA_QUERY_BUILDER_SCHEMA_CONTENT: schemaContent,
+        PRISMA_QUERY_BUILDER_CWD: schemaCwd,
+        DATABASE_URL: databaseUrl,
+      },
+    })
 
-    process.on('exit', () => {
-      stopQueryBuilder()
+    _process.on('error', (err) => {
+      console.error('[query-builder] Failed to start:', err.message)
+      _process = null
+      resolvePromise()
     })
 
-    const handleSigint = () => {
-      stopQueryBuilder()
-      process.removeListener('SIGINT', handleSigint)
-      process.kill(process.pid, 'SIGINT')
-    }
+    _process.on('exit', (code) => {
+      const wasStopping = _stopping
+      _stopping = false
+      _process = null
+      if (!wasStopping && code !== 0) {
+        console.warn('[query-builder] Process exited with code ' + code)
+      }
+    })
 
-    const handleSigterm = () => {
-      stopQueryBuilder()
-      process.removeListener('SIGTERM', handleSigterm)
-      process.kill(process.pid, 'SIGTERM')
-    }
+    if (!_cleanupRegistered) {
+      _cleanupRegistered = true
 
-    process.on('SIGINT', handleSigint)
-    process.on('SIGTERM', handleSigterm)
-  }
+      process.on('exit', () => {
+        stopQueryBuilder()
+      })
 
-  console.log('[query-builder] Starting on http://' + host + ':' + port)
+      const handleSigint = () => {
+        stopQueryBuilder()
+        process.removeListener('SIGINT', handleSigint)
+        process.kill(process.pid, 'SIGINT')
+      }
+
+      const handleSigterm = () => {
+        stopQueryBuilder()
+        process.removeListener('SIGTERM', handleSigterm)
+        process.kill(process.pid, 'SIGTERM')
+      }
+
+      process.on('SIGINT', handleSigint)
+      process.on('SIGTERM', handleSigterm)
+    }
+
+    console.log('[query-builder] Starting on http://' + host + ':' + port)
+    resolvePromise()
+  })
 }
 
 export function stopQueryBuilder(): void {
@@ -135,4 +151,4 @@ export function stopQueryBuilder(): void {
   _process.kill()
 }
 `
-}
+}

package/src/generators/generateRouter.ts

@@ -61,6 +61,7 @@ import {
 import type { RouteConfig } from '../routeConfig.js'
 import { parseQueryParams } from '../parseQueryParams.js'
 import { buildModelOpenApi } from '../buildModelOpenApi.js'
+import { transformResult } from '../operationRuntime.js'
 
 const _env = typeof process !== 'undefined' && process.env ? process.env : {} as Record<string, string | undefined>
 
@@ -82,31 +83,6 @@ function normalizePrefix(p: string): string {
   return result
 }
 
-function transformResult(value: unknown): unknown {
-  if (value === null || value === undefined) return value
-  if (typeof value === 'bigint') return value.toString()
-  if (typeof Buffer !== 'undefined' && Buffer.isBuffer(value)) {
-    return value.toString('base64')
-  }
-  if (value instanceof Uint8Array) {
-    let binary = ''
-    for (let i = 0; i < value.length; i++) binary += String.fromCharCode(value[i])
-    return btoa(binary)
-  }
-  if (value instanceof Date) return value
-  if (Array.isArray(value)) return value.map(transformResult)
-  if (typeof value === 'object') {
-    const proto = Object.getPrototypeOf(value)
-    if (proto !== Object.prototype && proto !== null) return value
-    const out: Record<string, unknown> = {}
-    for (const [k, v] of Object.entries(value as Record<string, unknown>)) {
-      out[k] = transformResult(v)
-    }
-    return out
-  }
-  return value
-}
-
 function isQueryBuilderEnabled(config: RouteConfig): boolean {
   if (config.queryBuilder === false) return false
   if (typeof config.queryBuilder === 'object' && config.queryBuilder.enabled === false) return false