prisma-generator-express 1.59.0 → 1.60.0

package/dist/utils/writeFileSafely.js.map

@@ -1 +1 @@
-{"version":3,"file":"writeFileSafely.js","sourceRoot":"","sources":["../../src/utils/writeFileSafely.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAqBA,0CAyCC;AA5DD,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;QAAE,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAA;IAE3D,IAAI,QAAgB,CAAA;IACpB,QAAQ,SAAS,EAAE,CAAC;QAClB,KAAK,cAAc;YACjB,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,iBAAiB,CAAC,CAAA;YACnD,MAAK;QACP,KAAK,cAAc;YACjB,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,iBAAiB,CAAC,CAAA;YACnD,MAAK;QACP,KAAK,qBAAqB;YACxB,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,mBAAmB,CAAC,CAAA;YACrD,MAAK;QACP;YACE,IAAI,CAAC,KAAK;gBAAE,MAAM,IAAI,KAAK,CAAC,gCAAgC,GAAG,SAAS,CAAC,CAAA;YACzE,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,KAAK,CAAC,IAAI,EAAE,GAAG,KAAK,CAAC,IAAI,GAAG,SAAS,KAAK,CAAC,CAAA;IAChF,CAAC;IAED,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAA;IACtC,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC;QAAE,EAAE,CAAC,SAAS,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAA;IAEvE,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,MAAM,CAAC;QACP,OAAO,CAAC,IAAI,CAAC,qCAAqC,GAAG,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,GAAG,uBAAuB,CAAC,CAAA;QACvG,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,0CAmCC;AAtDD,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;QAAE,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAA;IAE3D,IAAI,QAAgB,CAAA;IACpB,QAAQ,SAAS,EAAE,CAAC;QAClB,KAAK,cAAc;YACjB,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,iBAAiB,CAAC,CAAA;YACnD,MAAK;QACP,KAAK,cAAc;YACjB,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,iBAAiB,CAAC,CAAA;YACnD,MAAK;QACP,KAAK,qBAAqB;YACxB,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,mBAAmB,CAAC,CAAA;YACrD,MAAK;QACP;YACE,IAAI,CAAC,KAAK;gBAAE,MAAM,IAAI,KAAK,CAAC,gCAAgC,GAAG,SAAS,CAAC,CAAA;YACzE,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,KAAK,CAAC,IAAI,EAAE,GAAG,KAAK,CAAC,IAAI,GAAG,SAAS,KAAK,CAAC,CAAA;IAChF,CAAC;IAED,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAA;IACtC,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC;QAAE,EAAE,CAAC,SAAS,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAA;IAEvE,MAAM,eAAe,GAAG,MAAM,kBAAkB,EAAE,CAAA;IAClD,MAAM,gBAAgB,GAAG,MAAM,kBAAQ,CAAC,MAAM,CAAC,OAAO,EAAE;QACtD,GAAG,eAAe;QAClB,MAAM,EAAE,YAAY;KACrB,CAAC,CAAA;IAEF,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 Express, Fastify, and Hono CRUD APIs with OpenAPI documentation",
-  "version": "1.59.0",
+  "version": "1.60.0",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "license": "MIT",
@@ -19,7 +19,8 @@
   },
   "dependencies": {
     "@prisma/generator-helper": "7.5.0",
-    "prettier": "3.6.2"
+    "prettier": "3.6.2",
+    "yaml": "^2.9.0"
   },
   "peerDependencies": {
     "@prisma/client": ">=6.0.0",
@@ -31,6 +32,15 @@
     "prisma-sql": ">=1.0.0"
   },
   "peerDependenciesMeta": {
+    "express": {
+      "optional": true
+    },
+    "fastify": {
+      "optional": true
+    },
+    "hono": {
+      "optional": true
+    },
     "prisma-guard": {
       "optional": true
     },

package/src/client/encodeQueryParams.ts

@@ -1,48 +1,35 @@
 import { isObject } from '../copy/misc'
 
-function replacer(_key: string, value: unknown): unknown {
+const bigintReplacer = (_key: string, value: unknown): unknown =>
+  typeof value === 'bigint' ? value.toString() : value
+
+const encodeEntry = (key: string, value: unknown): string | null => {
+  if (value === undefined) return null
+
+  const encodedKey = encodeURIComponent(key)
+
+  if (value === null) return encodedKey + '=null'
+
   if (typeof value === 'bigint') {
-    return value.toString()
+    return encodedKey + '=' + encodeURIComponent(value.toString())
+  }
+
+  if (typeof value === 'string') {
+    return encodedKey + '=' + encodeURIComponent(JSON.stringify(value))
   }
-  return value
+
+  if (Array.isArray(value) || isObject(value)) {
+    return encodedKey + '=' + encodeURIComponent(JSON.stringify(value, bigintReplacer))
+  }
+
+  return encodedKey + '=' + encodeURIComponent(String(value))
 }
 
 export const encodeQueryParams = (params: Record<string, unknown>): string => {
   const entries: string[] = []
-
   for (const [key, value] of Object.entries(params)) {
-    if (value === undefined) continue
-
-    if (value === null) {
-      entries.push(`${encodeURIComponent(key)}=null`)
-      continue
-    }
-
-    if (typeof value === 'bigint') {
-      entries.push(
-        `${encodeURIComponent(key)}=${encodeURIComponent(value.toString())}`,
-      )
-      continue
-    }
-
-    if (typeof value === 'string') {
-      entries.push(
-        `${encodeURIComponent(key)}=${encodeURIComponent(JSON.stringify(value))}`,
-      )
-      continue
-    }
-
-    if (Array.isArray(value) || isObject(value)) {
-      entries.push(
-        `${encodeURIComponent(key)}=${encodeURIComponent(JSON.stringify(value, replacer))}`,
-      )
-      continue
-    }
-
-    entries.push(
-      `${encodeURIComponent(key)}=${encodeURIComponent(String(value))}`,
-    )
+    const entry = encodeEntry(key, value)
+    if (entry !== null) entries.push(entry)
   }
-
   return entries.join('&')
 }

package/src/copy/autoIncludePlanner.ts

@@ -64,15 +64,15 @@ function hasWhereLikeRelationReference(
   args: Record<string, unknown>,
   model: ModelRelationMap,
 ): boolean {
-  const checkObject = (obj: unknown): boolean => {
+  const hasRelationKeysInObj = (obj: unknown): boolean => {
     if (!isPlainObject(obj)) return false
     for (const key of Object.keys(obj)) {
       if (model.relations[key]) return true
       if (key === 'AND' || key === 'OR' || key === 'NOT') {
         const sub = obj[key]
         if (Array.isArray(sub)) {
-          for (const item of sub) if (checkObject(item)) return true
-        } else if (checkObject(sub)) {
+          for (const item of sub) if (hasRelationKeysInObj(item)) return true
+        } else if (hasRelationKeysInObj(sub)) {
           return true
         }
       }
@@ -80,24 +80,22 @@ function hasWhereLikeRelationReference(
     return false
   }
 
-  if (checkObject(args.where)) return true
-
-  if (args.orderBy) {
-    const obs = Array.isArray(args.orderBy) ? args.orderBy : [args.orderBy]
-    for (const ob of obs) {
+  const anyOrderByHasRelation = (v: unknown): boolean => {
+    const list = Array.isArray(v) ? v : [v]
+    for (const ob of list) {
       if (!isPlainObject(ob)) continue
-      for (const key of Object.keys(ob)) {
-        if (model.relations[key]) return true
-      }
+      for (const key of Object.keys(ob)) if (model.relations[key]) return true
     }
+    return false
   }
 
+  if (hasRelationKeysInObj(args.where)) return true
+  if (args.orderBy && anyOrderByHasRelation(args.orderBy)) return true
   if (isPlainObject(args.cursor)) {
     for (const key of Object.keys(args.cursor)) {
       if (model.relations[key]) return true
     }
   }
-
   return false
 }
 
@@ -246,11 +244,7 @@ function walk(
 
     const relationPath = parentPath ? parentPath + '.' + branch.name : branch.name
 
-    const stageArgs: Record<string, unknown> = {}
-    for (const [k, v] of Object.entries(relationArgs)) {
-      if (k === 'select' || k === 'include' || k === 'omit') continue
-      stageArgs[k] = v
-    }
+    const { select: _s, include: _i, omit: _o, ...stageArgs } = relationArgs
 
     const stageIndex = ctx.stages.length
 
@@ -314,12 +308,9 @@ export function planAutoInclude(input: AutoIncludePlannerInput): AutoIncludePlan
     rootArgs.select = result.projectionAfterStrip
     delete rootArgs.include
   } else if (rootModel && isPlainObject(input.args.include)) {
-    const stripped: Record<string, unknown> = {}
-    for (const [k, v] of Object.entries(input.args.include)) {
-      if (!rootModel.relations[k]) {
-        stripped[k] = v
-      }
-    }
+    const stripped = Object.fromEntries(
+      Object.entries(input.args.include).filter(([k]) => !rootModel.relations[k]),
+    )
     if (Object.keys(stripped).length > 0) {
       rootArgs.include = stripped
     } else {