@prisma/client-engine-runtime 6.6.0-dev.67 → 6.6.0-dev.69

package/dist/QueryPlan.d.ts

@@ -12,9 +12,27 @@ export type QueryPlanBinding = {
     expr: QueryPlanNode;
 };
 export type QueryPlanDbQuery = {
-    query: string;
+    type: 'rawSql';
+    sql: string;
     params: PrismaValue[];
+} | {
+    type: 'templateSql';
+    fragments: Fragment[];
+    placeholderFormat: PlaceholderFormat;
+    params: PrismaValue[];
+};
+export type Fragment = {
+    type: 'stringChunk';
+    value: string;
+} | {
+    type: 'parameter';
+} | {
+    type: 'parameterTuple';
 };
+export interface PlaceholderFormat {
+    prefix: string;
+    hasNumbering: boolean;
+}
 export type JoinExpression = {
     child: QueryPlanNode;
     on: [left: string, right: string][];

package/dist/index.d.mts

@@ -3,6 +3,15 @@ import { SqlDriverAdapter } from '@prisma/driver-adapter-utils';
 import { SqlQueryable } from '@prisma/driver-adapter-utils';
 import { Transaction } from '@prisma/driver-adapter-utils';
 
+export declare type Fragment = {
+    type: 'stringChunk';
+    value: string;
+} | {
+    type: 'parameter';
+} | {
+    type: 'parameterTuple';
+};
+
 export declare function isPrismaValuePlaceholder(value: unknown): value is PrismaValuePlaceholder;
 
 export declare type JoinExpression = {
@@ -11,6 +20,11 @@ export declare type JoinExpression = {
     parentField: string;
 };
 
+export declare interface PlaceholderFormat {
+    prefix: string;
+    hasNumbering: boolean;
+}
+
 export declare type PrismaValue = string | boolean | number | PrismaValue[] | null | Record<string, unknown> | PrismaValuePlaceholder;
 
 export declare type PrismaValuePlaceholder = {
@@ -47,7 +61,13 @@ export declare type QueryPlanBinding = {
 };
 
 export declare type QueryPlanDbQuery = {
-    query: string;
+    type: 'rawSql';
+    sql: string;
+    params: PrismaValue[];
+} | {
+    type: 'templateSql';
+    fragments: Fragment[];
+    placeholderFormat: PlaceholderFormat;
     params: PrismaValue[];
 };
 

package/dist/index.d.ts

@@ -3,6 +3,15 @@ import { SqlDriverAdapter } from '@prisma/driver-adapter-utils';
 import { SqlQueryable } from '@prisma/driver-adapter-utils';
 import { Transaction } from '@prisma/driver-adapter-utils';
 
+export declare type Fragment = {
+    type: 'stringChunk';
+    value: string;
+} | {
+    type: 'parameter';
+} | {
+    type: 'parameterTuple';
+};
+
 export declare function isPrismaValuePlaceholder(value: unknown): value is PrismaValuePlaceholder;
 
 export declare type JoinExpression = {
@@ -11,6 +20,11 @@ export declare type JoinExpression = {
     parentField: string;
 };
 
+export declare interface PlaceholderFormat {
+    prefix: string;
+    hasNumbering: boolean;
+}
+
 export declare type PrismaValue = string | boolean | number | PrismaValue[] | null | Record<string, unknown> | PrismaValuePlaceholder;
 
 export declare type PrismaValuePlaceholder = {
@@ -47,7 +61,13 @@ export declare type QueryPlanBinding = {
 };
 
 export declare type QueryPlanDbQuery = {
-    query: string;
+    type: 'rawSql';
+    sql: string;
+    params: PrismaValue[];
+} | {
+    type: 'templateSql';
+    fragments: Fragment[];
+    placeholderFormat: PlaceholderFormat;
     params: PrismaValue[];
 };
 

package/dist/index.js

@@ -42,107 +42,25 @@ function isPrismaValuePlaceholder(value) {
   return typeof value === "object" && value !== null && value["prisma__type"] === "param";
 }
 
-// src/interpreter/renderQueryTemplate.ts
-var BEGIN_REPEAT = "/* prisma-comma-repeatable-start */";
-var END_REPEAT = "/* prisma-comma-repeatable-end */";
-function renderQueryTemplate({
-  query,
-  params
-}) {
-  if (!query.includes(BEGIN_REPEAT)) {
-    return { query, params };
-  }
-  const flattenedParams = [];
-  let lastParamId = 1;
-  let result = "";
-  let templatePos = 0;
-  let state = 0 /* Normal */;
-  let stateBeforeQuote = 0 /* Normal */;
-  while (templatePos < query.length) {
-    const nextChar = query[templatePos];
-    if (state === 1 /* Quoted */ && nextChar !== '"') {
-      result += nextChar;
-      templatePos++;
-      continue;
-    }
-    if (nextChar === '"') {
-      if (state === 1 /* Quoted */) {
-        state = stateBeforeQuote;
-      } else {
-        stateBeforeQuote = state;
-        state = 1 /* Quoted */;
-      }
-      result += nextChar;
-      templatePos++;
-      continue;
-    }
-    if (query.slice(templatePos, templatePos + BEGIN_REPEAT.length) === BEGIN_REPEAT) {
-      if (state === 2 /* Repeating */) {
-        throw new Error("Nested repetition is not allowed");
-      }
-      state = 2 /* Repeating */;
-      templatePos += BEGIN_REPEAT.length;
-      result += "(";
-      continue;
-    }
-    if (query.slice(templatePos, templatePos + END_REPEAT.length) === END_REPEAT) {
-      if (state === 0 /* Normal */) {
-        throw new Error("Unmatched repetition end");
-      }
-      state = 0 /* Normal */;
-      templatePos += END_REPEAT.length;
-      result += ")";
-      continue;
-    }
-    if (nextChar === "$") {
-      const paramMatch = query.slice(templatePos + 1).match(/^\d+/);
-      if (!paramMatch) {
-        result += "$";
-        templatePos++;
-        continue;
-      }
-      templatePos += paramMatch[0].length + 1;
-      const originalParamIdx = parseInt(paramMatch[0]);
-      const paramValue = params[originalParamIdx - 1];
-      switch (state) {
-        case 0 /* Normal */: {
-          flattenedParams.push(paramValue);
-          result += `$${lastParamId++}`;
-          break;
-        }
-        case 2 /* Repeating */: {
-          const paramArray = Array.isArray(paramValue) ? paramValue : [paramValue];
-          if (paramArray.length === 0) {
-            result += "NULL";
-            break;
-          }
-          paramArray.forEach((value, idx) => {
-            flattenedParams.push(value);
-            result += `$${lastParamId++}`;
-            if (idx !== paramArray.length - 1) {
-              result += ", ";
-            }
-          });
-          break;
-        }
-        default: {
-          throw new Error(`Unexpected state: ${state}`);
-        }
-      }
-      continue;
-    }
-    result += nextChar;
-    templatePos++;
-  }
-  return {
-    query: result,
-    params: flattenedParams
-  };
+// src/utils.ts
+function assertNever(_, message) {
+  throw new Error(message);
 }
 
 // src/interpreter/renderQuery.ts
-function renderQuery({ query, params }, scope) {
-  const substitutedParams = params.map((param) => {
+function renderQuery(dbQuery, scope) {
+  const queryType = dbQuery.type;
+  switch (queryType) {
+    case "rawSql":
+      return renderRawSql(dbQuery.sql, substituteParams(dbQuery.params, scope));
+    case "templateSql":
+      return renderTemplateSql(dbQuery.fragments, dbQuery.placeholderFormat, substituteParams(dbQuery.params, scope));
+    default:
+      assertNever(queryType, `Invalid query type`);
+  }
+}
+function substituteParams(params, scope) {
+  return params.map((param) => {
     if (!isPrismaValuePlaceholder(param)) {
       return param;
     }
@@ -152,11 +70,48 @@ function renderQuery({ query, params }, scope) {
     }
     return value;
   });
-  const { query: renderedQuery, params: expandedParams } = renderQueryTemplate({ query, params: substitutedParams });
-  const argTypes = expandedParams.map((param) => toArgType(param));
+}
+function renderTemplateSql(fragments, placeholderFormat, params) {
+  let paramIndex = 0;
+  let placeholderNumber = 1;
+  const flattenedParams = [];
+  const sql = fragments.map((fragment) => {
+    const fragmentType = fragment.type;
+    switch (fragmentType) {
+      case "parameter":
+        if (paramIndex >= params.length) {
+          throw new Error(`Malformed query template. Fragments attempt to read over ${params.length} parameters.`);
+        }
+        flattenedParams.push(params[paramIndex++]);
+        return formatPlaceholder(placeholderFormat, placeholderNumber++);
+      case "stringChunk":
+        return fragment.value;
+      case "parameterTuple": {
+        if (paramIndex >= params.length) {
+          throw new Error(`Malformed query template. Fragments attempt to read over ${params.length} parameters.`);
+        }
+        const paramValue = params[paramIndex++];
+        const paramArray = Array.isArray(paramValue) ? paramValue : [paramValue];
+        const placeholders = paramArray.length == 0 ? "NULL" : paramArray.map((value) => {
+          flattenedParams.push(value);
+          return formatPlaceholder(placeholderFormat, placeholderNumber++);
+        }).join(",");
+        return `(${placeholders})`;
+      }
+      default:
+        assertNever(fragmentType, "Invalid fragment type");
+    }
+  }).join("");
+  return renderRawSql(sql, flattenedParams);
+}
+function formatPlaceholder(placeholderFormat, placeholderNumber) {
+  return placeholderFormat.hasNumbering ? `${placeholderFormat.prefix}${placeholderNumber}` : placeholderFormat.prefix;
+}
+function renderRawSql(sql, params) {
+  const argTypes = params.map((param) => toArgType(param));
   return {
-    sql: renderedQuery,
-    args: expandedParams,
+    sql,
+    args: params,
     argTypes
   };
 }
@@ -413,11 +368,6 @@ async function randomUUID() {
   return crypto.randomUUID();
 }
 
-// src/utils.ts
-function assertNever(_, message) {
-  throw new Error(message);
-}
-
 // src/transactionManager/TransactionManagerErrors.ts
 var TransactionManagerError = class extends Error {
   constructor(message, meta) {

package/dist/index.mjs

@@ -3,107 +3,25 @@ function isPrismaValuePlaceholder(value) {
   return typeof value === "object" && value !== null && value["prisma__type"] === "param";
 }
 
-// src/interpreter/renderQueryTemplate.ts
-var BEGIN_REPEAT = "/* prisma-comma-repeatable-start */";
-var END_REPEAT = "/* prisma-comma-repeatable-end */";
-function renderQueryTemplate({
-  query,
-  params
-}) {
-  if (!query.includes(BEGIN_REPEAT)) {
-    return { query, params };
-  }
-  const flattenedParams = [];
-  let lastParamId = 1;
-  let result = "";
-  let templatePos = 0;
-  let state = 0 /* Normal */;
-  let stateBeforeQuote = 0 /* Normal */;
-  while (templatePos < query.length) {
-    const nextChar = query[templatePos];
-    if (state === 1 /* Quoted */ && nextChar !== '"') {
-      result += nextChar;
-      templatePos++;
-      continue;
-    }
-    if (nextChar === '"') {
-      if (state === 1 /* Quoted */) {
-        state = stateBeforeQuote;
-      } else {
-        stateBeforeQuote = state;
-        state = 1 /* Quoted */;
-      }
-      result += nextChar;
-      templatePos++;
-      continue;
-    }
-    if (query.slice(templatePos, templatePos + BEGIN_REPEAT.length) === BEGIN_REPEAT) {
-      if (state === 2 /* Repeating */) {
-        throw new Error("Nested repetition is not allowed");
-      }
-      state = 2 /* Repeating */;
-      templatePos += BEGIN_REPEAT.length;
-      result += "(";
-      continue;
-    }
-    if (query.slice(templatePos, templatePos + END_REPEAT.length) === END_REPEAT) {
-      if (state === 0 /* Normal */) {
-        throw new Error("Unmatched repetition end");
-      }
-      state = 0 /* Normal */;
-      templatePos += END_REPEAT.length;
-      result += ")";
-      continue;
-    }
-    if (nextChar === "$") {
-      const paramMatch = query.slice(templatePos + 1).match(/^\d+/);
-      if (!paramMatch) {
-        result += "$";
-        templatePos++;
-        continue;
-      }
-      templatePos += paramMatch[0].length + 1;
-      const originalParamIdx = parseInt(paramMatch[0]);
-      const paramValue = params[originalParamIdx - 1];
-      switch (state) {
-        case 0 /* Normal */: {
-          flattenedParams.push(paramValue);
-          result += `$${lastParamId++}`;
-          break;
-        }
-        case 2 /* Repeating */: {
-          const paramArray = Array.isArray(paramValue) ? paramValue : [paramValue];
-          if (paramArray.length === 0) {
-            result += "NULL";
-            break;
-          }
-          paramArray.forEach((value, idx) => {
-            flattenedParams.push(value);
-            result += `$${lastParamId++}`;
-            if (idx !== paramArray.length - 1) {
-              result += ", ";
-            }
-          });
-          break;
-        }
-        default: {
-          throw new Error(`Unexpected state: ${state}`);
-        }
-      }
-      continue;
-    }
-    result += nextChar;
-    templatePos++;
-  }
-  return {
-    query: result,
-    params: flattenedParams
-  };
+// src/utils.ts
+function assertNever(_, message) {
+  throw new Error(message);
 }
 
 // src/interpreter/renderQuery.ts
-function renderQuery({ query, params }, scope) {
-  const substitutedParams = params.map((param) => {
+function renderQuery(dbQuery, scope) {
+  const queryType = dbQuery.type;
+  switch (queryType) {
+    case "rawSql":
+      return renderRawSql(dbQuery.sql, substituteParams(dbQuery.params, scope));
+    case "templateSql":
+      return renderTemplateSql(dbQuery.fragments, dbQuery.placeholderFormat, substituteParams(dbQuery.params, scope));
+    default:
+      assertNever(queryType, `Invalid query type`);
+  }
+}
+function substituteParams(params, scope) {
+  return params.map((param) => {
     if (!isPrismaValuePlaceholder(param)) {
       return param;
     }
@@ -113,11 +31,48 @@ function renderQuery({ query, params }, scope) {
     }
     return value;
   });
-  const { query: renderedQuery, params: expandedParams } = renderQueryTemplate({ query, params: substitutedParams });
-  const argTypes = expandedParams.map((param) => toArgType(param));
+}
+function renderTemplateSql(fragments, placeholderFormat, params) {
+  let paramIndex = 0;
+  let placeholderNumber = 1;
+  const flattenedParams = [];
+  const sql = fragments.map((fragment) => {
+    const fragmentType = fragment.type;
+    switch (fragmentType) {
+      case "parameter":
+        if (paramIndex >= params.length) {
+          throw new Error(`Malformed query template. Fragments attempt to read over ${params.length} parameters.`);
+        }
+        flattenedParams.push(params[paramIndex++]);
+        return formatPlaceholder(placeholderFormat, placeholderNumber++);
+      case "stringChunk":
+        return fragment.value;
+      case "parameterTuple": {
+        if (paramIndex >= params.length) {
+          throw new Error(`Malformed query template. Fragments attempt to read over ${params.length} parameters.`);
+        }
+        const paramValue = params[paramIndex++];
+        const paramArray = Array.isArray(paramValue) ? paramValue : [paramValue];
+        const placeholders = paramArray.length == 0 ? "NULL" : paramArray.map((value) => {
+          flattenedParams.push(value);
+          return formatPlaceholder(placeholderFormat, placeholderNumber++);
+        }).join(",");
+        return `(${placeholders})`;
+      }
+      default:
+        assertNever(fragmentType, "Invalid fragment type");
+    }
+  }).join("");
+  return renderRawSql(sql, flattenedParams);
+}
+function formatPlaceholder(placeholderFormat, placeholderNumber) {
+  return placeholderFormat.hasNumbering ? `${placeholderFormat.prefix}${placeholderNumber}` : placeholderFormat.prefix;
+}
+function renderRawSql(sql, params) {
+  const argTypes = params.map((param) => toArgType(param));
   return {
-    sql: renderedQuery,
-    args: expandedParams,
+    sql,
+    args: params,
     argTypes
   };
 }
@@ -374,11 +329,6 @@ async function randomUUID() {
   return crypto.randomUUID();
 }
 
-// src/utils.ts
-function assertNever(_, message) {
-  throw new Error(message);
-}
-
 // src/transactionManager/TransactionManagerErrors.ts
 var TransactionManagerError = class extends Error {
   constructor(message, meta) {

package/dist/interpreter/renderQuery.d.ts

@@ -1,4 +1,4 @@
 import { SqlQuery } from '@prisma/driver-adapter-utils';
-import { QueryPlanDbQuery } from '../QueryPlan';
+import type { QueryPlanDbQuery } from '../QueryPlan';
 import { ScopeBindings } from './scope';
-export declare function renderQuery({ query, params }: QueryPlanDbQuery, scope: ScopeBindings): SqlQuery;
+export declare function renderQuery(dbQuery: QueryPlanDbQuery, scope: ScopeBindings): SqlQuery;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@prisma/client-engine-runtime",
-  "version": "6.6.0-dev.67",
+  "version": "6.6.0-dev.69",
   "description": "This package is intended for Prisma's internal use",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -24,8 +24,8 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@prisma/debug": "6.6.0-dev.67",
-    "@prisma/driver-adapter-utils": "6.6.0-dev.67"
+    "@prisma/debug": "6.6.0-dev.69",
+    "@prisma/driver-adapter-utils": "6.6.0-dev.69"
   },
   "devDependencies": {
     "@types/jest": "29.5.14",

package/dist/interpreter/renderQueryTemplate.d.ts

@@ -1,10 +0,0 @@
-import { Value } from './scope';
-/**
- * A `QueryPlanDbQuery` in which all placeholders have been substituted with
- * their values from the environment.
- */
-export type QueryWithSubstitutedPlaceholders = {
-    query: string;
-    params: Value[];
-};
-export declare function renderQueryTemplate({ query, params, }: QueryWithSubstitutedPlaceholders): QueryWithSubstitutedPlaceholders;