prisma-sql 1.13.0 → 1.15.0

package/dist/generator.js

@@ -54,7 +54,7 @@ var require_package = __commonJS({
   "package.json"(exports$1, module) {
     module.exports = {
       name: "prisma-sql",
-      version: "1.13.0",
+      version: "1.15.0",
       description: "Convert Prisma queries to optimized SQL with type safety. 2-7x faster than Prisma Client.",
       main: "dist/index.cjs",
       module: "dist/index.js",
@@ -116,7 +116,7 @@ var require_package = __commonJS({
       author: "multipliedtwice <multipliedtwice@gmail.com>",
       license: "MIT",
       dependencies: {
-        "@dee-wan/schema-parser": "1.2.0",
+        "@dee-wan/schema-parser": "1.3.0",
         "@prisma/generator-helper": "^7.2.0",
         "@prisma/internals": "^7.2.0"
       },
@@ -4183,14 +4183,6 @@ function safeAlias(input) {
   }
   return base;
 }
-function isPrismaMethod(v) {
-  return v === "findMany" || v === "findFirst" || v === "findUnique" || v === "aggregate" || v === "groupBy" || v === "count";
-}
-function getMethodFromProcessed(processed) {
-  const maybe = processed == null ? void 0 : processed.method;
-  if (isPrismaMethod(maybe)) return maybe;
-  return "findMany";
-}
 function buildSqlResult(args) {
   const {
     method,
@@ -4303,6 +4295,7 @@ function buildMainWhere(args) {
 }
 function buildAndNormalizeSql(args) {
   const {
+    method,
     processed,
     whereResult,
     tableName,
@@ -4311,7 +4304,6 @@ function buildAndNormalizeSql(args) {
     schemaModels,
     dialect
   } = args;
-  const method = getMethodFromProcessed(processed);
   const sqlResult = buildSqlResult({
     method,
     processed,
@@ -4333,7 +4325,7 @@ function finalizeDirective(args) {
   validateSqlPositions(normalizedSql, normalizedMappings, getGlobalDialect());
   const { staticParams, dynamicKeys } = buildParamsFromMappings(normalizedMappings);
   return {
-    header: directive.header,
+    method: directive.method,
     sql: normalizedSql,
     staticParams,
     dynamicKeys,
@@ -4353,7 +4345,9 @@ function generateSQL(directive) {
     modelDef,
     dialect
   });
+  const method = directive.method;
   const normalized = buildAndNormalizeSql({
+    method,
     processed: query.processed,
     whereResult,
     tableName,
@@ -4394,7 +4388,7 @@ function generateClient(options) {
       const modelQueries = queries.get(modelName);
       for (const directive of result.directives) {
         try {
-          const method = directive.header;
+          const method = directive.method;
           const sqlDirective = generateSQL2(directive);
           if (!modelQueries.has(method)) {
             modelQueries.set(method, /* @__PURE__ */ new Map());
@@ -4458,9 +4452,58 @@ const QUERIES: Record<string, Record<string, Record<string, {
 
 const DIALECT = ${JSON.stringify(dialect)}
 
+function isDynamicParam(key: string): boolean {
+  // Common dynamic parameters that should be replaced with markers
+  return key === 'skip' || key === 'take' || key === 'cursor'
+}
+
 function normalizeQuery(args: any): string {
   if (!args) return '{}'
-  return JSON.stringify(args, (key, value) => {
+  
+  // Clone and normalize the args
+  const normalized = JSON.parse(JSON.stringify(args))
+  
+  // Replace dynamic params with markers to match prebaked keys
+  function replaceDynamicParams(obj: any): any {
+    if (!obj || typeof obj !== 'object') return obj
+    
+    if (Array.isArray(obj)) {
+      return obj.map(replaceDynamicParams)
+    }
+    
+    const result: any = {}
+    for (const [key, value] of Object.entries(obj)) {
+      // Replace top-level dynamic params with markers
+      if (isDynamicParam(key)) {
+        result[key] = \`__DYNAMIC_\${key}__\`
+      } else {
+        result[key] = replaceDynamicParams(value)
+      }
+    }
+    return result
+  }
+  
+  const withMarkers = replaceDynamicParams(normalized)
+  
+  // Remove empty objects to match prebaked keys
+  function removeEmptyObjects(obj: any): any {
+    if (!obj || typeof obj !== 'object' || Array.isArray(obj)) return obj
+    
+    const result: any = {}
+    for (const [key, value] of Object.entries(obj)) {
+      // Skip empty objects (but keep empty arrays)
+      if (value && typeof value === 'object' && !Array.isArray(value) && Object.keys(value).length === 0) {
+        continue
+      }
+      result[key] = removeEmptyObjects(value)
+    }
+    return result
+  }
+  
+  const cleaned = removeEmptyObjects(withMarkers)
+  
+  // Sort keys recursively for deterministic matching
+  return JSON.stringify(cleaned, (key, value) => {
     if (value && typeof value === 'object' && !Array.isArray(value)) {
       const sorted: Record<string, unknown> = {}
       for (const k of Object.keys(value).sort()) {