@prisma/client-engine-runtime 6.7.0-dev.17 → 6.7.0-dev.19

package/dist/QueryPlan.d.ts

@@ -36,6 +36,8 @@ export type Fragment = {
     type: 'parameter';
 } | {
     type: 'parameterTuple';
+} | {
+    type: 'parameterTupleList';
 };
 export interface PlaceholderFormat {
     prefix: string;

package/dist/index.d.mts

@@ -17,6 +17,8 @@ export declare type Fragment = {
     type: 'parameter';
 } | {
     type: 'parameterTuple';
+} | {
+    type: 'parameterTupleList';
 };
 
 export declare function isPrismaValueGenerator(value: unknown): value is PrismaValueGenerator;

package/dist/index.d.ts

@@ -17,6 +17,8 @@ export declare type Fragment = {
     type: 'parameter';
 } | {
     type: 'parameterTuple';
+} | {
+    type: 'parameterTupleList';
 };
 
 export declare function isPrismaValueGenerator(value: unknown): value is PrismaValueGenerator;

package/dist/index.js

@@ -224,6 +224,7 @@ var GeneratorRegistry = class {
     this.register("cuid", new CuidGenerator());
     this.register("ulid", new UlidGenerator());
     this.register("nanoid", new NanoIdGenerator());
+    this.register("product", new ProductGenerator());
   }
   /**
    * Returns a snapshot of the generator registry. It's 'frozen' in time at the moment of this
@@ -286,6 +287,22 @@ var NanoIdGenerator = class {
     }
   }
 };
+var ProductGenerator = class {
+  generate(lhs, rhs) {
+    if (lhs === void 0 || rhs === void 0) {
+      throw new Error("Invalid Product generator arguments");
+    }
+    if (Array.isArray(lhs) && Array.isArray(rhs)) {
+      return lhs.flatMap((l) => rhs.map((r) => [l, r]));
+    } else if (Array.isArray(lhs)) {
+      return lhs.map((l) => [l, rhs]);
+    } else if (Array.isArray(rhs)) {
+      return rhs.map((r) => [lhs, r]);
+    } else {
+      return [[lhs, rhs]];
+    }
+  }
+};
 
 // src/QueryPlan.ts
 function isPrismaValuePlaceholder(value) {
@@ -300,36 +317,44 @@ function renderQuery(dbQuery, scope, generators) {
   const queryType = dbQuery.type;
   switch (queryType) {
     case "rawSql":
-      return renderRawSql(dbQuery.sql, substituteParams(dbQuery.params, scope, generators));
+      return renderRawSql(dbQuery.sql, evaluateParams(dbQuery.params, scope, generators));
     case "templateSql":
       return renderTemplateSql(
         dbQuery.fragments,
         dbQuery.placeholderFormat,
-        substituteParams(dbQuery.params, scope, generators)
+        evaluateParams(dbQuery.params, scope, generators)
       );
     default:
       assertNever(queryType, `Invalid query type`);
   }
 }
-function substituteParams(params, scope, generators) {
-  return params.map((param) => {
-    if (isPrismaValueGenerator(param)) {
-      const { name, args } = param.prisma__value;
+function evaluateParams(params, scope, generators) {
+  return params.map((param) => evaluateParam(param, scope, generators));
+}
+function evaluateParam(param, scope, generators) {
+  let value = param;
+  while (doesRequireEvaluation(value)) {
+    if (isPrismaValuePlaceholder(value)) {
+      const found = scope[value.prisma__value.name];
+      if (found === void 0) {
+        throw new Error(`Missing value for query variable ${value.prisma__value.name}`);
+      }
+      value = found;
+    } else if (isPrismaValueGenerator(value)) {
+      const { name, args } = value.prisma__value;
       const generator = generators[name];
       if (!generator) {
         throw new Error(`Encountered an unknown generator '${name}'`);
       }
-      return generator.generate(...args);
-    }
-    if (!isPrismaValuePlaceholder(param)) {
-      return param;
-    }
-    const value = scope[param.prisma__value.name];
-    if (value === void 0) {
-      throw new Error(`Missing value for query variable ${param.prisma__value.name}`);
+      value = generator.generate(...args.map((arg) => evaluateParam(arg, scope, generators)));
+    } else {
+      assertNever(value, `Unexpected unevaluated value type: ${value}`);
     }
-    return value;
-  });
+  }
+  if (Array.isArray(value)) {
+    value = value.map((el) => evaluateParam(el, scope, generators));
+  }
+  return value;
 }
 function renderTemplateSql(fragments, placeholderFormat, params) {
   let paramIndex = 0;
@@ -358,6 +383,29 @@ function renderTemplateSql(fragments, placeholderFormat, params) {
         }).join(",");
         return `(${placeholders})`;
       }
+      case "parameterTupleList": {
+        if (paramIndex >= params.length) {
+          throw new Error(`Malformed query template. Fragments attempt to read over ${params.length} parameters.`);
+        }
+        const paramValue = params[paramIndex++];
+        if (!Array.isArray(paramValue)) {
+          throw new Error(`Malformed query template. Tuple list expected.`);
+        }
+        if (paramValue.length === 0) {
+          throw new Error(`Malformed query template. Tuple list cannot be empty.`);
+        }
+        const tupleList = paramValue.map((tuple) => {
+          if (!Array.isArray(tuple)) {
+            throw new Error(`Malformed query template. Tuple expected.`);
+          }
+          const elements = tuple.map((value) => {
+            flattenedParams.push(value);
+            return formatPlaceholder(placeholderFormat, placeholderNumber++);
+          }).join(",");
+          return `(${elements})`;
+        }).join(",");
+        return tupleList;
+      }
       default:
         assertNever(fragmentType, "Invalid fragment type");
     }
@@ -416,6 +464,9 @@ function placeholderTypeToArgType(type) {
   }
   return mappedType;
 }
+function doesRequireEvaluation(param) {
+  return isPrismaValuePlaceholder(param) || isPrismaValueGenerator(param);
+}
 
 // src/interpreter/serialize.ts
 function serialize(resultSet) {
@@ -633,6 +684,8 @@ function attachChildrenToParent(parentRecord, children) {
 function filterChildRecords(records, parentRecord, joinExpr) {
   if (Array.isArray(records)) {
     return records.filter((record) => childRecordMatchesParent(asRecord(record), parentRecord, joinExpr));
+  } else if (records === null) {
+    return null;
   } else {
     const record = asRecord(records);
     return childRecordMatchesParent(record, parentRecord, joinExpr) ? record : null;

package/dist/index.mjs

@@ -182,6 +182,7 @@ var GeneratorRegistry = class {
     this.register("cuid", new CuidGenerator());
     this.register("ulid", new UlidGenerator());
     this.register("nanoid", new NanoIdGenerator());
+    this.register("product", new ProductGenerator());
   }
   /**
    * Returns a snapshot of the generator registry. It's 'frozen' in time at the moment of this
@@ -244,6 +245,22 @@ var NanoIdGenerator = class {
     }
   }
 };
+var ProductGenerator = class {
+  generate(lhs, rhs) {
+    if (lhs === void 0 || rhs === void 0) {
+      throw new Error("Invalid Product generator arguments");
+    }
+    if (Array.isArray(lhs) && Array.isArray(rhs)) {
+      return lhs.flatMap((l) => rhs.map((r) => [l, r]));
+    } else if (Array.isArray(lhs)) {
+      return lhs.map((l) => [l, rhs]);
+    } else if (Array.isArray(rhs)) {
+      return rhs.map((r) => [lhs, r]);
+    } else {
+      return [[lhs, rhs]];
+    }
+  }
+};
 
 // src/QueryPlan.ts
 function isPrismaValuePlaceholder(value) {
@@ -258,36 +275,44 @@ function renderQuery(dbQuery, scope, generators) {
   const queryType = dbQuery.type;
   switch (queryType) {
     case "rawSql":
-      return renderRawSql(dbQuery.sql, substituteParams(dbQuery.params, scope, generators));
+      return renderRawSql(dbQuery.sql, evaluateParams(dbQuery.params, scope, generators));
     case "templateSql":
       return renderTemplateSql(
         dbQuery.fragments,
         dbQuery.placeholderFormat,
-        substituteParams(dbQuery.params, scope, generators)
+        evaluateParams(dbQuery.params, scope, generators)
       );
     default:
       assertNever(queryType, `Invalid query type`);
   }
 }
-function substituteParams(params, scope, generators) {
-  return params.map((param) => {
-    if (isPrismaValueGenerator(param)) {
-      const { name, args } = param.prisma__value;
+function evaluateParams(params, scope, generators) {
+  return params.map((param) => evaluateParam(param, scope, generators));
+}
+function evaluateParam(param, scope, generators) {
+  let value = param;
+  while (doesRequireEvaluation(value)) {
+    if (isPrismaValuePlaceholder(value)) {
+      const found = scope[value.prisma__value.name];
+      if (found === void 0) {
+        throw new Error(`Missing value for query variable ${value.prisma__value.name}`);
+      }
+      value = found;
+    } else if (isPrismaValueGenerator(value)) {
+      const { name, args } = value.prisma__value;
       const generator = generators[name];
       if (!generator) {
         throw new Error(`Encountered an unknown generator '${name}'`);
       }
-      return generator.generate(...args);
-    }
-    if (!isPrismaValuePlaceholder(param)) {
-      return param;
-    }
-    const value = scope[param.prisma__value.name];
-    if (value === void 0) {
-      throw new Error(`Missing value for query variable ${param.prisma__value.name}`);
+      value = generator.generate(...args.map((arg) => evaluateParam(arg, scope, generators)));
+    } else {
+      assertNever(value, `Unexpected unevaluated value type: ${value}`);
     }
-    return value;
-  });
+  }
+  if (Array.isArray(value)) {
+    value = value.map((el) => evaluateParam(el, scope, generators));
+  }
+  return value;
 }
 function renderTemplateSql(fragments, placeholderFormat, params) {
   let paramIndex = 0;
@@ -316,6 +341,29 @@ function renderTemplateSql(fragments, placeholderFormat, params) {
         }).join(",");
         return `(${placeholders})`;
       }
+      case "parameterTupleList": {
+        if (paramIndex >= params.length) {
+          throw new Error(`Malformed query template. Fragments attempt to read over ${params.length} parameters.`);
+        }
+        const paramValue = params[paramIndex++];
+        if (!Array.isArray(paramValue)) {
+          throw new Error(`Malformed query template. Tuple list expected.`);
+        }
+        if (paramValue.length === 0) {
+          throw new Error(`Malformed query template. Tuple list cannot be empty.`);
+        }
+        const tupleList = paramValue.map((tuple) => {
+          if (!Array.isArray(tuple)) {
+            throw new Error(`Malformed query template. Tuple expected.`);
+          }
+          const elements = tuple.map((value) => {
+            flattenedParams.push(value);
+            return formatPlaceholder(placeholderFormat, placeholderNumber++);
+          }).join(",");
+          return `(${elements})`;
+        }).join(",");
+        return tupleList;
+      }
       default:
         assertNever(fragmentType, "Invalid fragment type");
     }
@@ -374,6 +422,9 @@ function placeholderTypeToArgType(type) {
   }
   return mappedType;
 }
+function doesRequireEvaluation(param) {
+  return isPrismaValuePlaceholder(param) || isPrismaValueGenerator(param);
+}
 
 // src/interpreter/serialize.ts
 function serialize(resultSet) {
@@ -591,6 +642,8 @@ function attachChildrenToParent(parentRecord, children) {
 function filterChildRecords(records, parentRecord, joinExpr) {
   if (Array.isArray(records)) {
     return records.filter((record) => childRecordMatchesParent(asRecord(record), parentRecord, joinExpr));
+  } else if (records === null) {
+    return null;
   } else {
     const record = asRecord(records);
     return childRecordMatchesParent(record, parentRecord, joinExpr) ? record : null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@prisma/client-engine-runtime",
-  "version": "6.7.0-dev.17",
+  "version": "6.7.0-dev.19",
   "description": "This package is intended for Prisma's internal use",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -30,8 +30,8 @@
     "nanoid": "5.1.5",
     "ulid": "3.0.0",
     "uuid": "11.1.0",
-    "@prisma/debug": "6.7.0-dev.17",
-    "@prisma/driver-adapter-utils": "6.7.0-dev.17"
+    "@prisma/debug": "6.7.0-dev.19",
+    "@prisma/driver-adapter-utils": "6.7.0-dev.19"
   },
   "devDependencies": {
     "@types/jest": "29.5.14",