prisma-sql 1.75.11 → 1.76.0

package/dist/generator.cjs

@@ -70,7 +70,7 @@ var require_package = __commonJS({
   "package.json"(exports$1, module) {
     module.exports = {
       name: "prisma-sql",
-      version: "1.75.11",
+      version: "1.76.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",
@@ -146,7 +146,6 @@ var require_package = __commonJS({
         "@faker-js/faker": "^10.2.0",
         "@prisma/adapter-better-sqlite3": "^7.4.0",
         "@prisma/adapter-pg": "^7.4.0",
-        "@prisma/client": "7.4.0",
         "@semantic-release/changelog": "^6.0.3",
         "@semantic-release/git": "^10.0.1",
         "@types/better-sqlite3": "^7.6.13",
@@ -155,11 +154,12 @@ var require_package = __commonJS({
         "better-sqlite3": "^12.6.2",
         "drizzle-kit": "^0.31.8",
         "drizzle-orm": "^0.45.1",
-        prisma: "7.4.0",
         tsup: "^8.5.1",
         tsx: "^4.21.0",
         typescript: "^5.9.3",
-        vitest: "^4.0.18"
+        vitest: "^4.0.18",
+        "@prisma/client": "7.4.0",
+        prisma: "7.4.0"
       },
       engines: {
         node: ">=16.0.0"
@@ -2361,11 +2361,14 @@ var SINGLE_PARENT_MAX_FLAT_JOIN_DEPTH = 1;
 function getFanOut(modelName, relName) {
   return DEFAULT_FAN;
 }
+var DYNAMIC_TAKE_ESTIMATE = 10;
 function readTake(relArgs) {
   if (!isPlainObject(relArgs)) return Infinity;
   const obj = relArgs;
   if ("take" in obj && typeof obj.take === "number" && obj.take > 0)
     return obj.take;
+  if ("take" in obj && obj.take != null && schemaParser.isDynamicParameter(obj.take))
+    return DYNAMIC_TAKE_ESTIMATE;
   return Infinity;
 }
 function hasWhereClause(relArgs) {
@@ -2379,7 +2382,7 @@ function isListField(field) {
 function hasPaginationArgs(value) {
   if (!isPlainObject(value)) return false;
   const obj = value;
-  return "take" in obj && obj.take != null || "skip" in obj && typeof obj.skip === "number" && obj.skip > 0;
+  return "take" in obj && obj.take != null || "skip" in obj && obj.skip != null && (typeof obj.skip === "number" && obj.skip > 0 || schemaParser.isDynamicParameter(obj.skip));
 }
 function buildCostTree(includeSpec, model, schemas, depth = 0) {
   if (depth > LIMITS.MAX_INCLUDE_DEPTH) return [];
@@ -2501,7 +2504,16 @@ function hasChildPaginationAnywhere(includeSpec, model, schemas, depth = 0) {
   return false;
 }
 function pickIncludeStrategy(params) {
-  const { includeSpec, model, schemas, method, takeValue, canFlatJoin, debug } = params;
+  const {
+    includeSpec,
+    model,
+    schemas,
+    method,
+    takeValue,
+    canFlatJoin,
+    hasChildPagination,
+    debug
+  } = params;
   if (Object.keys(includeSpec).length === 0) return "where-in";
   if (canFlatJoin && hasOnlyToOneRelations(includeSpec, model)) {
     if (debug)
@@ -2521,6 +2533,35 @@ function pickIncludeStrategy(params) {
   }
   const costTree = buildCostTree(includeSpec, model, schemas);
   const treeDepth = maxDepthFromTree(costTree);
+  if (hasChildPagination && treeDepth >= 2) {
+    if (debug)
+      console.log(
+        `  [strategy] ${model.name}: childPagination + depth=${treeDepth} \u2265 2 \u2192 fallback`
+      );
+    return "fallback";
+  }
+  if (hasChildPagination && treeDepth === 1) {
+    if (anyChildHasWhere(costTree)) {
+      if (debug)
+        console.log(
+          `  [strategy] ${model.name}: childPagination + depth=1 + childWhere \u2192 where-in`
+        );
+      return "where-in";
+    }
+    const hasSelectNarrowing = isPlainObject(params.args) && isPlainObject(params.args.select);
+    if (hasSelectNarrowing) {
+      if (debug)
+        console.log(
+          `  [strategy] ${model.name}: childPagination + depth=1 + selectNarrowing \u2192 fallback`
+        );
+      return "fallback";
+    }
+    if (debug)
+      console.log(
+        `  [strategy] ${model.name}: childPagination + depth=1 \u2192 where-in`
+      );
+    return "where-in";
+  }
   if (treeDepth === 1 && anyChildHasWhere(costTree)) {
     if (debug)
       console.log(`  [strategy] ${model.name}: depth-1 + childWhere \u2192 where-in`);
@@ -4865,14 +4906,17 @@ function constructFinalSql(spec) {
   if (dialect === "postgres" && hasIncludes) {
     const canFlatJoin = canUseFlatJoinForAll(includeSpec, model, schemas);
     canUseLateralJoin(includeSpec, model, schemas);
-    hasChildPaginationAnywhere(includeSpec, model, schemas);
+    const hasChildPag = hasChildPaginationAnywhere(includeSpec, model, schemas);
     const strategy = pickIncludeStrategy({
       includeSpec,
       model,
       schemas,
       method,
+      args,
       takeValue,
-      canFlatJoin});
+      canFlatJoin,
+      hasChildPagination: hasChildPag
+    });
     if (strategy === "flat-join") {
       const flatResult = buildFlatJoinSql(spec);
       if (flatResult.sql) {
@@ -7856,6 +7900,8 @@ function generateExtension(runtimeImportPath) {
       postgresClient: postgres,
     })
 
+    const originalTransaction = prisma.$transaction.bind(prisma)
+
     interface ModelContext {
       name?: string
       $name?: string
@@ -8260,9 +8306,15 @@ function generateExtension(runtimeImportPath) {
     }
 
     async function transaction(
-      queries: TransactionQuery[] | any[],
+      queriesOrFn: TransactionQuery[] | any[] | ((...args: any[]) => Promise<any>),
       options?: TransactionOptions,
     ): Promise<unknown[]> {
+      if (typeof queriesOrFn === 'function') {
+        return originalTransaction(queriesOrFn, options)
+      }
+
+      const queries = queriesOrFn
+
       if (!queries || queries.length === 0) {
         return []
       }