@prisma/client-engine-runtime 7.3.0-integration-prisma6-fix-cloudflare-engine.2 → 7.3.0-integration-engines-7-3-0-10-fix-fix-mapped-enum-issue-0b7e6564db7dc3dac7f9312aa84e9ed81d805521.1

package/dist/index.d.mts

@@ -2,15 +2,27 @@ import { ArgType } from '@prisma/driver-adapter-utils';
 import { Arity } from '@prisma/driver-adapter-utils';
 import { ConnectionInfo } from '@prisma/driver-adapter-utils';
 import { Context } from '@opentelemetry/api';
-import { Decimal } from 'decimal.js';
+import { Decimal } from '@prisma/client-runtime-utils';
 import type { IsolationLevel } from '@prisma/driver-adapter-utils';
 import { Span } from '@opentelemetry/api';
 import { SpanOptions } from '@opentelemetry/api';
+import type { SqlCommenterContext } from '@prisma/sqlcommenter';
+import type { SqlCommenterPlugin } from '@prisma/sqlcommenter';
+import type { SqlCommenterQueryInfo } from '@prisma/sqlcommenter';
 import { SqlDriverAdapter } from '@prisma/driver-adapter-utils';
 import { SqlQueryable } from '@prisma/driver-adapter-utils';
 import { SqlResultSet } from '@prisma/driver-adapter-utils';
 import { Transaction } from '@prisma/driver-adapter-utils';
 
+/**
+ * Applies SQL commenter plugins and returns the merged key-value pairs.
+ * Keys with undefined values are filtered out.
+ *
+ * Each plugin receives a deep clone of the context to prevent mutations
+ * that could affect other plugins.
+ */
+export declare function applySqlCommenters(plugins: SqlCommenterPlugin[], context: SqlCommenterContext): Record<string, string>;
+
 export declare type BatchResponse = MultiBatchResponse | CompactedBatchResponse;
 
 export declare type BigIntTaggedValue = {
@@ -38,8 +50,11 @@ export declare type CompactedBatchResponse = {
  */
 export declare function convertCompactedRows(rows: {}[], compiledBatch: CompactedBatchResponse): unknown[];
 
-export declare class DataMapperError extends Error {
+export declare class DataMapperError extends UserFacingError {
     name: string;
+    constructor(message: string, options?: {
+        cause?: unknown;
+    });
 }
 
 export declare type DataRule = {
@@ -234,7 +249,7 @@ export declare type QueryEvent = {
 
 export declare class QueryInterpreter {
     #private;
-    constructor({ transactionManager, placeholderValues, onQuery, tracingHelper, serializer, rawSerializer, provider, connectionInfo, }: QueryInterpreterOptions);
+    constructor({ transactionManager, placeholderValues, onQuery, tracingHelper, serializer, rawSerializer, provider, connectionInfo, sqlCommenter, }: QueryInterpreterOptions);
     static forSql(options: {
         transactionManager: QueryInterpreterTransactionManager;
         placeholderValues: Record<string, unknown>;
@@ -242,6 +257,7 @@ export declare class QueryInterpreter {
         tracingHelper: TracingHelper;
         provider?: SchemaProvider;
         connectionInfo?: ConnectionInfo;
+        sqlCommenter?: QueryInterpreterSqlCommenter;
     }): QueryInterpreter;
     run(queryPlan: QueryPlanNode, queryable: SqlQueryable): Promise<unknown>;
     private interpretNode;
@@ -256,6 +272,12 @@ export declare type QueryInterpreterOptions = {
     rawSerializer?: (results: SqlResultSet) => Value;
     provider?: SchemaProvider;
     connectionInfo?: ConnectionInfo;
+    sqlCommenter?: QueryInterpreterSqlCommenter;
+};
+
+export declare type QueryInterpreterSqlCommenter = {
+    plugins: SqlCommenterPlugin[];
+    queryInfo: SqlCommenterQueryInfo;
 };
 
 export declare type QueryInterpreterTransactionManager = {

package/dist/index.d.ts

@@ -2,15 +2,27 @@ import { ArgType } from '@prisma/driver-adapter-utils';
 import { Arity } from '@prisma/driver-adapter-utils';
 import { ConnectionInfo } from '@prisma/driver-adapter-utils';
 import { Context } from '@opentelemetry/api';
-import { Decimal } from 'decimal.js';
+import { Decimal } from '@prisma/client-runtime-utils';
 import type { IsolationLevel } from '@prisma/driver-adapter-utils';
 import { Span } from '@opentelemetry/api';
 import { SpanOptions } from '@opentelemetry/api';
+import type { SqlCommenterContext } from '@prisma/sqlcommenter';
+import type { SqlCommenterPlugin } from '@prisma/sqlcommenter';
+import type { SqlCommenterQueryInfo } from '@prisma/sqlcommenter';
 import { SqlDriverAdapter } from '@prisma/driver-adapter-utils';
 import { SqlQueryable } from '@prisma/driver-adapter-utils';
 import { SqlResultSet } from '@prisma/driver-adapter-utils';
 import { Transaction } from '@prisma/driver-adapter-utils';
 
+/**
+ * Applies SQL commenter plugins and returns the merged key-value pairs.
+ * Keys with undefined values are filtered out.
+ *
+ * Each plugin receives a deep clone of the context to prevent mutations
+ * that could affect other plugins.
+ */
+export declare function applySqlCommenters(plugins: SqlCommenterPlugin[], context: SqlCommenterContext): Record<string, string>;
+
 export declare type BatchResponse = MultiBatchResponse | CompactedBatchResponse;
 
 export declare type BigIntTaggedValue = {
@@ -38,8 +50,11 @@ export declare type CompactedBatchResponse = {
  */
 export declare function convertCompactedRows(rows: {}[], compiledBatch: CompactedBatchResponse): unknown[];
 
-export declare class DataMapperError extends Error {
+export declare class DataMapperError extends UserFacingError {
     name: string;
+    constructor(message: string, options?: {
+        cause?: unknown;
+    });
 }
 
 export declare type DataRule = {
@@ -234,7 +249,7 @@ export declare type QueryEvent = {
 
 export declare class QueryInterpreter {
     #private;
-    constructor({ transactionManager, placeholderValues, onQuery, tracingHelper, serializer, rawSerializer, provider, connectionInfo, }: QueryInterpreterOptions);
+    constructor({ transactionManager, placeholderValues, onQuery, tracingHelper, serializer, rawSerializer, provider, connectionInfo, sqlCommenter, }: QueryInterpreterOptions);
     static forSql(options: {
         transactionManager: QueryInterpreterTransactionManager;
         placeholderValues: Record<string, unknown>;
@@ -242,6 +257,7 @@ export declare class QueryInterpreter {
         tracingHelper: TracingHelper;
         provider?: SchemaProvider;
         connectionInfo?: ConnectionInfo;
+        sqlCommenter?: QueryInterpreterSqlCommenter;
     }): QueryInterpreter;
     run(queryPlan: QueryPlanNode, queryable: SqlQueryable): Promise<unknown>;
     private interpretNode;
@@ -256,6 +272,12 @@ export declare type QueryInterpreterOptions = {
     rawSerializer?: (results: SqlResultSet) => Value;
     provider?: SchemaProvider;
     connectionInfo?: ConnectionInfo;
+    sqlCommenter?: QueryInterpreterSqlCommenter;
+};
+
+export declare type QueryInterpreterSqlCommenter = {
+    plugins: SqlCommenterPlugin[];
+    queryInfo: SqlCommenterQueryInfo;
 };
 
 export declare type QueryInterpreterTransactionManager = {

package/dist/index.js

@@ -35,6 +35,7 @@ __export(index_exports, {
   TransactionManager: () => TransactionManager,
   TransactionManagerError: () => TransactionManagerError,
   UserFacingError: () => UserFacingError,
+  applySqlCommenters: () => applySqlCommenters,
   convertCompactedRows: () => convertCompactedRows,
   deserializeJsonResponse: () => deserializeJsonResponse,
   doKeysMatch: () => doKeysMatch,
@@ -49,10 +50,10 @@ __export(index_exports, {
 module.exports = __toCommonJS(index_exports);
 
 // src/json-protocol.ts
-var import_decimal2 = require("decimal.js");
+var import_client_runtime_utils2 = require("@prisma/client-runtime-utils");
 
 // src/utils.ts
-var import_decimal = __toESM(require("decimal.js"));
+var import_client_runtime_utils = require("@prisma/client-runtime-utils");
 function assertNever(_, message) {
   throw new Error(message);
 }
@@ -67,7 +68,7 @@ function doKeysMatch(lhs, rhs) {
     if (typeof lhs[key] === typeof rhs[key] && typeof lhs[key] !== "object") {
       return lhs[key] === rhs[key];
     }
-    if (import_decimal.default.isDecimal(lhs[key]) || import_decimal.default.isDecimal(rhs[key])) {
+    if (import_client_runtime_utils.Decimal.isDecimal(lhs[key]) || import_client_runtime_utils.Decimal.isDecimal(rhs[key])) {
       const lhsDecimal = asDecimal(lhs[key]);
       const rhsDecimal = asDecimal(rhs[key]);
       return lhsDecimal && rhsDecimal && lhsDecimal.equals(rhsDecimal);
@@ -86,10 +87,10 @@ function doKeysMatch(lhs, rhs) {
   });
 }
 function asDecimal(value) {
-  if (import_decimal.default.isDecimal(value)) {
+  if (import_client_runtime_utils.Decimal.isDecimal(value)) {
     return value;
   } else if (typeof value === "number" || typeof value === "string") {
-    return new import_decimal.default(value);
+    return new import_client_runtime_utils.Decimal(value);
   } else {
     return;
   }
@@ -178,7 +179,7 @@ function normalizeTaggedValue({ $type, value }) {
     case "DateTime":
       return { $type, value: new Date(value).toISOString() };
     case "Decimal":
-      return { $type, value: String(new import_decimal2.Decimal(value)) };
+      return { $type, value: String(new import_client_runtime_utils2.Decimal(value)) };
     case "Json":
       return { $type, value: JSON.stringify(JSON.parse(value)) };
     default:
@@ -221,7 +222,7 @@ function deserializeTaggedValue({ $type, value }) {
     case "DateTime":
       return new Date(value);
     case "Decimal":
-      return new import_decimal2.Decimal(value);
+      return new import_client_runtime_utils2.Decimal(value);
     case "Json":
       return JSON.parse(value);
     default:
@@ -299,6 +300,8 @@ function getErrorCode(err) {
       return "P2002";
     case "ForeignKeyConstraintViolation":
       return "P2003";
+    case "InvalidInputValue":
+      return "P2007";
     case "UnsupportedNativeDataType":
       return "P2010";
     case "NullConstraintViolation":
@@ -395,6 +398,8 @@ function renderErrorMessage(err) {
       return `Error in external connector (id ${err.cause.id})`;
     case "TooManyConnections":
       return `Too many database connections opened: ${err.cause.cause}`;
+    case "InvalidInputValue":
+      return `Invalid input value: ${err.cause.message}`;
     case "sqlite":
     case "postgres":
     case "mysql":
@@ -443,9 +448,12 @@ function convertCompactedRows(rows, compiledBatch) {
 }
 
 // src/interpreter/data-mapper.ts
-var import_decimal3 = __toESM(require("decimal.js"));
-var DataMapperError = class extends Error {
+var import_client_runtime_utils3 = require("@prisma/client-runtime-utils");
+var DataMapperError = class extends UserFacingError {
   name = "DataMapperError";
+  constructor(message, options) {
+    super(message, "P2023", options);
+  }
 };
 function applyDataMap(data, structure, enums) {
   switch (structure.type) {
@@ -596,7 +604,7 @@ function mapValue(value, columnName, scalarType, enums) {
           throw new DataMapperError(`Expected a boolean in column '${columnName}', got ${typeof value}: ${value}`);
         }
       }
-      if (Array.isArray(value)) {
+      if (Array.isArray(value) || value instanceof Uint8Array) {
         for (const byte of value) {
           if (byte !== 0) return true;
         }
@@ -605,7 +613,7 @@ function mapValue(value, columnName, scalarType, enums) {
       throw new DataMapperError(`Expected a boolean in column '${columnName}', got ${typeof value}: ${value}`);
     }
     case "decimal":
-      if (typeof value !== "number" && typeof value !== "string" && !import_decimal3.default.isDecimal(value)) {
+      if (typeof value !== "number" && typeof value !== "string" && !import_client_runtime_utils3.Decimal.isDecimal(value)) {
         throw new DataMapperError(`Expected a decimal in column '${columnName}', got ${typeof value}: ${value}`);
       }
       return { $type: "Decimal", value };
@@ -691,6 +699,44 @@ function normalizeDateTime(dt) {
   return dtWithTz;
 }
 
+// src/sql-commenter.ts
+var import_klona = require("klona");
+function formatSqlComment(tags) {
+  const entries = Object.entries(tags);
+  if (entries.length === 0) {
+    return "";
+  }
+  entries.sort(([a], [b]) => a.localeCompare(b));
+  const parts = entries.map(([key, value]) => {
+    const encodedKey = encodeURIComponent(key);
+    const encodedValue = encodeURIComponent(value).replace(/'/g, "\\'");
+    return `${encodedKey}='${encodedValue}'`;
+  });
+  return `/*${parts.join(",")}*/`;
+}
+function applySqlCommenters(plugins, context) {
+  const merged = {};
+  for (const plugin of plugins) {
+    const tags = plugin((0, import_klona.klona)(context));
+    for (const [key, value] of Object.entries(tags)) {
+      if (value !== void 0) {
+        merged[key] = value;
+      }
+    }
+  }
+  return merged;
+}
+function buildSqlComment(plugins, context) {
+  const tags = applySqlCommenters(plugins, context);
+  return formatSqlComment(tags);
+}
+function appendSqlComment(sql, comment) {
+  if (!comment) {
+    return sql;
+  }
+  return `${sql} ${comment}`;
+}
+
 // src/tracing.ts
 var import_api = require("@opentelemetry/api");
 var noopTracingHelper = {
@@ -1256,17 +1302,6 @@ function serializeRawValue(value, type) {
         throw new Error(`Cannot serialize value of type ${typeof value} as JsonArray`);
       }
       return value.map((v) => serializeRawValue(v, import_driver_adapter_utils2.ColumnTypeEnum.Json));
-    case import_driver_adapter_utils2.ColumnTypeEnum.Bytes:
-      if (Array.isArray(value)) {
-        return new Uint8Array(value);
-      } else {
-        throw new Error(`Cannot serialize value of type ${typeof value} as Bytes`);
-      }
-    case import_driver_adapter_utils2.ColumnTypeEnum.BytesArray:
-      if (!Array.isArray(value)) {
-        throw new Error(`Cannot serialize value of type ${typeof value} as BytesArray`);
-      }
-      return value.map((v) => serializeRawValue(v, import_driver_adapter_utils2.ColumnTypeEnum.Bytes));
     case import_driver_adapter_utils2.ColumnTypeEnum.Boolean:
       switch (typeof value) {
         case "boolean":
@@ -1441,7 +1476,8 @@ var QueryInterpreter = class _QueryInterpreter {
   #serializer;
   #rawSerializer;
   #provider;
-  #connectioInfo;
+  #connectionInfo;
+  #sqlCommenter;
   constructor({
     transactionManager,
     placeholderValues,
@@ -1450,7 +1486,8 @@ var QueryInterpreter = class _QueryInterpreter {
     serializer,
     rawSerializer,
     provider,
-    connectionInfo
+    connectionInfo,
+    sqlCommenter
   }) {
     this.#transactionManager = transactionManager;
     this.#placeholderValues = placeholderValues;
@@ -1459,7 +1496,8 @@ var QueryInterpreter = class _QueryInterpreter {
     this.#serializer = serializer;
     this.#rawSerializer = rawSerializer ?? serializer;
     this.#provider = provider;
-    this.#connectioInfo = connectionInfo;
+    this.#connectionInfo = connectionInfo;
+    this.#sqlCommenter = sqlCommenter;
   }
   static forSql(options) {
     return new _QueryInterpreter({
@@ -1470,7 +1508,8 @@ var QueryInterpreter = class _QueryInterpreter {
       serializer: serializeSql,
       rawSerializer: serializeRawSql,
       provider: options.provider,
-      connectionInfo: options.connectionInfo
+      connectionInfo: options.connectionInfo,
+      sqlCommenter: options.sqlCommenter
     });
   }
   async run(queryPlan, queryable) {
@@ -1534,10 +1573,11 @@ var QueryInterpreter = class _QueryInterpreter {
         const queries = renderQuery(node.args, scope, generators, this.#maxChunkSize());
         let sum = 0;
         for (const query of queries) {
+          const commentedQuery = this.#applyComments(query);
           sum += await this.#withQuerySpanAndEvent(
-            query,
+            commentedQuery,
             queryable,
-            () => queryable.executeRaw(query).catch(
+            () => queryable.executeRaw(commentedQuery).catch(
               (err) => node.args.type === "rawSql" ? rethrowAsUserFacingRawError(err) : rethrowAsUserFacing(err)
             )
           );
@@ -1548,10 +1588,11 @@ var QueryInterpreter = class _QueryInterpreter {
         const queries = renderQuery(node.args, scope, generators, this.#maxChunkSize());
         let results;
         for (const query of queries) {
+          const commentedQuery = this.#applyComments(query);
           const result = await this.#withQuerySpanAndEvent(
-            query,
+            commentedQuery,
             queryable,
-            () => queryable.queryRaw(query).catch(
+            () => queryable.queryRaw(commentedQuery).catch(
               (err) => node.args.type === "rawSql" ? rethrowAsUserFacingRawError(err) : rethrowAsUserFacing(err)
             )
           );
@@ -1673,8 +1714,8 @@ var QueryInterpreter = class _QueryInterpreter {
     }
   }
   #maxChunkSize() {
-    if (this.#connectioInfo?.maxBindValues !== void 0) {
-      return this.#connectioInfo.maxBindValues;
+    if (this.#connectionInfo?.maxBindValues !== void 0) {
+      return this.#connectionInfo.maxBindValues;
     }
     return this.#providerMaxChunkSize();
   }
@@ -1709,6 +1750,22 @@ var QueryInterpreter = class _QueryInterpreter {
       onQuery: this.#onQuery
     });
   }
+  #applyComments(query) {
+    if (!this.#sqlCommenter || this.#sqlCommenter.plugins.length === 0) {
+      return query;
+    }
+    const comment = buildSqlComment(this.#sqlCommenter.plugins, {
+      query: this.#sqlCommenter.queryInfo,
+      sql: query.sql
+    });
+    if (!comment) {
+      return query;
+    }
+    return {
+      ...query,
+      sql: appendSqlComment(query.sql, comment)
+    };
+  }
 };
 function isEmpty(value) {
   if (Array.isArray(value)) {
@@ -1811,7 +1868,7 @@ function evalFieldOperation(op, value, scope, generators) {
 }
 
 // src/raw-json-protocol.ts
-var import_decimal4 = __toESM(require("decimal.js"));
+var import_client_runtime_utils4 = require("@prisma/client-runtime-utils");
 function normalizeRawJsonProtocolResponse(response) {
   for (let i = 0; i < response.rows.length; i++) {
     const row = response.rows[i];
@@ -1829,7 +1886,7 @@ function normalizeValue(type, value) {
     case "bigint":
       return String(BigInt(value));
     case "decimal":
-      return String(new import_decimal4.default(value));
+      return String(new import_client_runtime_utils4.Decimal(value));
     case "bigint-array":
       return value.map((v) => normalizeValue("bigint", v));
     case "decimal-array":
@@ -1851,6 +1908,13 @@ async function randomUUID() {
   return crypto.randomUUID();
 }
 
+// src/web-platform.ts
+async function once(target, event) {
+  return new Promise((resolve) => {
+    target.addEventListener(event, resolve, { once: true });
+  });
+}
+
 // src/transaction-manager/transaction-manager-error.ts
 var TransactionManagerError = class extends UserFacingError {
   name = "TransactionManagerError";
@@ -1966,15 +2030,19 @@ var TransactionManager = class {
       startedAt: Date.now(),
       transaction: void 0
     };
-    this.transactions.set(transaction.id, transaction);
-    let hasTimedOut = false;
-    const startTimer = createTimeoutIfDefined(() => hasTimedOut = true, options.maxWait);
+    const abortController = new AbortController();
+    const startTimer = createTimeoutIfDefined(() => abortController.abort(), options.maxWait);
     startTimer?.unref?.();
-    transaction.transaction = await this.driverAdapter.startTransaction(options.isolationLevel).catch(rethrowAsUserFacing);
-    clearTimeout(startTimer);
+    const startTransactionPromise = this.driverAdapter.startTransaction(options.isolationLevel).catch(rethrowAsUserFacing);
+    transaction.transaction = await Promise.race([
+      startTransactionPromise.finally(() => clearTimeout(startTimer)),
+      once(abortController.signal, "abort").then(() => void 0)
+    ]);
+    this.transactions.set(transaction.id, transaction);
     switch (transaction.status) {
       case "waiting":
-        if (hasTimedOut) {
+        if (abortController.signal.aborted) {
+          void startTransactionPromise.then((tx) => tx.rollback()).catch((e) => debug("error in discarded transaction:", e));
           await this.#closeTransaction(transaction, "timed_out");
           throw new TransactionStartTimeoutError();
         }
@@ -2070,8 +2138,13 @@ var TransactionManager = class {
             await this.#withQuerySpanAndEvent(PHANTOM_COMMIT_QUERY(), tx.transaction, () => tx.transaction.commit());
           } else {
             const query = COMMIT_QUERY();
-            await this.#withQuerySpanAndEvent(query, tx.transaction, () => tx.transaction.executeRaw(query));
-            await tx.transaction.commit();
+            await this.#withQuerySpanAndEvent(query, tx.transaction, () => tx.transaction.executeRaw(query)).then(
+              () => tx.transaction.commit(),
+              (err) => {
+                const fail = () => Promise.reject(err);
+                return tx.transaction.rollback().then(fail, fail);
+              }
+            );
           }
         } else if (tx.transaction) {
           if (tx.transaction.options.usePhantomQuery) {
@@ -2082,8 +2155,11 @@ var TransactionManager = class {
             );
           } else {
             const query = ROLLBACK_QUERY();
-            await this.#withQuerySpanAndEvent(query, tx.transaction, () => tx.transaction.executeRaw(query));
-            await tx.transaction.rollback();
+            try {
+              await this.#withQuerySpanAndEvent(query, tx.transaction, () => tx.transaction.executeRaw(query));
+            } finally {
+              await tx.transaction.rollback();
+            }
           }
         }
       } finally {
@@ -2138,6 +2214,7 @@ function createTimeoutIfDefined(cb, ms) {
   TransactionManager,
   TransactionManagerError,
   UserFacingError,
+  applySqlCommenters,
   convertCompactedRows,
   deserializeJsonResponse,
   doKeysMatch,

package/dist/index.mjs

@@ -1,8 +1,8 @@
 // src/json-protocol.ts
-import { Decimal as Decimal2 } from "decimal.js";
+import { Decimal as Decimal2 } from "@prisma/client-runtime-utils";
 
 // src/utils.ts
-import Decimal from "decimal.js";
+import { Decimal } from "@prisma/client-runtime-utils";
 function assertNever(_, message) {
   throw new Error(message);
 }
@@ -249,6 +249,8 @@ function getErrorCode(err) {
       return "P2002";
     case "ForeignKeyConstraintViolation":
       return "P2003";
+    case "InvalidInputValue":
+      return "P2007";
     case "UnsupportedNativeDataType":
       return "P2010";
     case "NullConstraintViolation":
@@ -345,6 +347,8 @@ function renderErrorMessage(err) {
       return `Error in external connector (id ${err.cause.id})`;
     case "TooManyConnections":
       return `Too many database connections opened: ${err.cause.cause}`;
+    case "InvalidInputValue":
+      return `Invalid input value: ${err.cause.message}`;
     case "sqlite":
     case "postgres":
     case "mysql":
@@ -393,9 +397,12 @@ function convertCompactedRows(rows, compiledBatch) {
 }
 
 // src/interpreter/data-mapper.ts
-import Decimal3 from "decimal.js";
-var DataMapperError = class extends Error {
+import { Decimal as Decimal3 } from "@prisma/client-runtime-utils";
+var DataMapperError = class extends UserFacingError {
   name = "DataMapperError";
+  constructor(message, options) {
+    super(message, "P2023", options);
+  }
 };
 function applyDataMap(data, structure, enums) {
   switch (structure.type) {
@@ -546,7 +553,7 @@ function mapValue(value, columnName, scalarType, enums) {
           throw new DataMapperError(`Expected a boolean in column '${columnName}', got ${typeof value}: ${value}`);
         }
       }
-      if (Array.isArray(value)) {
+      if (Array.isArray(value) || value instanceof Uint8Array) {
         for (const byte of value) {
           if (byte !== 0) return true;
         }
@@ -641,6 +648,44 @@ function normalizeDateTime(dt) {
   return dtWithTz;
 }
 
+// src/sql-commenter.ts
+import { klona } from "klona";
+function formatSqlComment(tags) {
+  const entries = Object.entries(tags);
+  if (entries.length === 0) {
+    return "";
+  }
+  entries.sort(([a], [b]) => a.localeCompare(b));
+  const parts = entries.map(([key, value]) => {
+    const encodedKey = encodeURIComponent(key);
+    const encodedValue = encodeURIComponent(value).replace(/'/g, "\\'");
+    return `${encodedKey}='${encodedValue}'`;
+  });
+  return `/*${parts.join(",")}*/`;
+}
+function applySqlCommenters(plugins, context) {
+  const merged = {};
+  for (const plugin of plugins) {
+    const tags = plugin(klona(context));
+    for (const [key, value] of Object.entries(tags)) {
+      if (value !== void 0) {
+        merged[key] = value;
+      }
+    }
+  }
+  return merged;
+}
+function buildSqlComment(plugins, context) {
+  const tags = applySqlCommenters(plugins, context);
+  return formatSqlComment(tags);
+}
+function appendSqlComment(sql, comment) {
+  if (!comment) {
+    return sql;
+  }
+  return `${sql} ${comment}`;
+}
+
 // src/tracing.ts
 import { SpanKind } from "@opentelemetry/api";
 var noopTracingHelper = {
@@ -1206,17 +1251,6 @@ function serializeRawValue(value, type) {
         throw new Error(`Cannot serialize value of type ${typeof value} as JsonArray`);
       }
       return value.map((v) => serializeRawValue(v, ColumnTypeEnum.Json));
-    case ColumnTypeEnum.Bytes:
-      if (Array.isArray(value)) {
-        return new Uint8Array(value);
-      } else {
-        throw new Error(`Cannot serialize value of type ${typeof value} as Bytes`);
-      }
-    case ColumnTypeEnum.BytesArray:
-      if (!Array.isArray(value)) {
-        throw new Error(`Cannot serialize value of type ${typeof value} as BytesArray`);
-      }
-      return value.map((v) => serializeRawValue(v, ColumnTypeEnum.Bytes));
     case ColumnTypeEnum.Boolean:
       switch (typeof value) {
         case "boolean":
@@ -1391,7 +1425,8 @@ var QueryInterpreter = class _QueryInterpreter {
   #serializer;
   #rawSerializer;
   #provider;
-  #connectioInfo;
+  #connectionInfo;
+  #sqlCommenter;
   constructor({
     transactionManager,
     placeholderValues,
@@ -1400,7 +1435,8 @@ var QueryInterpreter = class _QueryInterpreter {
     serializer,
     rawSerializer,
     provider,
-    connectionInfo
+    connectionInfo,
+    sqlCommenter
   }) {
     this.#transactionManager = transactionManager;
     this.#placeholderValues = placeholderValues;
@@ -1409,7 +1445,8 @@ var QueryInterpreter = class _QueryInterpreter {
     this.#serializer = serializer;
     this.#rawSerializer = rawSerializer ?? serializer;
     this.#provider = provider;
-    this.#connectioInfo = connectionInfo;
+    this.#connectionInfo = connectionInfo;
+    this.#sqlCommenter = sqlCommenter;
   }
   static forSql(options) {
     return new _QueryInterpreter({
@@ -1420,7 +1457,8 @@ var QueryInterpreter = class _QueryInterpreter {
       serializer: serializeSql,
       rawSerializer: serializeRawSql,
       provider: options.provider,
-      connectionInfo: options.connectionInfo
+      connectionInfo: options.connectionInfo,
+      sqlCommenter: options.sqlCommenter
     });
   }
   async run(queryPlan, queryable) {
@@ -1484,10 +1522,11 @@ var QueryInterpreter = class _QueryInterpreter {
         const queries = renderQuery(node.args, scope, generators, this.#maxChunkSize());
         let sum = 0;
         for (const query of queries) {
+          const commentedQuery = this.#applyComments(query);
           sum += await this.#withQuerySpanAndEvent(
-            query,
+            commentedQuery,
             queryable,
-            () => queryable.executeRaw(query).catch(
+            () => queryable.executeRaw(commentedQuery).catch(
               (err) => node.args.type === "rawSql" ? rethrowAsUserFacingRawError(err) : rethrowAsUserFacing(err)
             )
           );
@@ -1498,10 +1537,11 @@ var QueryInterpreter = class _QueryInterpreter {
         const queries = renderQuery(node.args, scope, generators, this.#maxChunkSize());
         let results;
         for (const query of queries) {
+          const commentedQuery = this.#applyComments(query);
           const result = await this.#withQuerySpanAndEvent(
-            query,
+            commentedQuery,
             queryable,
-            () => queryable.queryRaw(query).catch(
+            () => queryable.queryRaw(commentedQuery).catch(
               (err) => node.args.type === "rawSql" ? rethrowAsUserFacingRawError(err) : rethrowAsUserFacing(err)
             )
           );
@@ -1623,8 +1663,8 @@ var QueryInterpreter = class _QueryInterpreter {
     }
   }
   #maxChunkSize() {
-    if (this.#connectioInfo?.maxBindValues !== void 0) {
-      return this.#connectioInfo.maxBindValues;
+    if (this.#connectionInfo?.maxBindValues !== void 0) {
+      return this.#connectionInfo.maxBindValues;
     }
     return this.#providerMaxChunkSize();
   }
@@ -1659,6 +1699,22 @@ var QueryInterpreter = class _QueryInterpreter {
       onQuery: this.#onQuery
     });
   }
+  #applyComments(query) {
+    if (!this.#sqlCommenter || this.#sqlCommenter.plugins.length === 0) {
+      return query;
+    }
+    const comment = buildSqlComment(this.#sqlCommenter.plugins, {
+      query: this.#sqlCommenter.queryInfo,
+      sql: query.sql
+    });
+    if (!comment) {
+      return query;
+    }
+    return {
+      ...query,
+      sql: appendSqlComment(query.sql, comment)
+    };
+  }
 };
 function isEmpty(value) {
   if (Array.isArray(value)) {
@@ -1761,7 +1817,7 @@ function evalFieldOperation(op, value, scope, generators) {
 }
 
 // src/raw-json-protocol.ts
-import Decimal4 from "decimal.js";
+import { Decimal as Decimal4 } from "@prisma/client-runtime-utils";
 function normalizeRawJsonProtocolResponse(response) {
   for (let i = 0; i < response.rows.length; i++) {
     const row = response.rows[i];
@@ -1801,6 +1857,13 @@ async function randomUUID() {
   return crypto.randomUUID();
 }
 
+// src/web-platform.ts
+async function once(target, event) {
+  return new Promise((resolve) => {
+    target.addEventListener(event, resolve, { once: true });
+  });
+}
+
 // src/transaction-manager/transaction-manager-error.ts
 var TransactionManagerError = class extends UserFacingError {
   name = "TransactionManagerError";
@@ -1916,15 +1979,19 @@ var TransactionManager = class {
       startedAt: Date.now(),
       transaction: void 0
     };
-    this.transactions.set(transaction.id, transaction);
-    let hasTimedOut = false;
-    const startTimer = createTimeoutIfDefined(() => hasTimedOut = true, options.maxWait);
+    const abortController = new AbortController();
+    const startTimer = createTimeoutIfDefined(() => abortController.abort(), options.maxWait);
     startTimer?.unref?.();
-    transaction.transaction = await this.driverAdapter.startTransaction(options.isolationLevel).catch(rethrowAsUserFacing);
-    clearTimeout(startTimer);
+    const startTransactionPromise = this.driverAdapter.startTransaction(options.isolationLevel).catch(rethrowAsUserFacing);
+    transaction.transaction = await Promise.race([
+      startTransactionPromise.finally(() => clearTimeout(startTimer)),
+      once(abortController.signal, "abort").then(() => void 0)
+    ]);
+    this.transactions.set(transaction.id, transaction);
     switch (transaction.status) {
       case "waiting":
-        if (hasTimedOut) {
+        if (abortController.signal.aborted) {
+          void startTransactionPromise.then((tx) => tx.rollback()).catch((e) => debug("error in discarded transaction:", e));
           await this.#closeTransaction(transaction, "timed_out");
           throw new TransactionStartTimeoutError();
         }
@@ -2020,8 +2087,13 @@ var TransactionManager = class {
             await this.#withQuerySpanAndEvent(PHANTOM_COMMIT_QUERY(), tx.transaction, () => tx.transaction.commit());
           } else {
             const query = COMMIT_QUERY();
-            await this.#withQuerySpanAndEvent(query, tx.transaction, () => tx.transaction.executeRaw(query));
-            await tx.transaction.commit();
+            await this.#withQuerySpanAndEvent(query, tx.transaction, () => tx.transaction.executeRaw(query)).then(
+              () => tx.transaction.commit(),
+              (err) => {
+                const fail = () => Promise.reject(err);
+                return tx.transaction.rollback().then(fail, fail);
+              }
+            );
           }
         } else if (tx.transaction) {
           if (tx.transaction.options.usePhantomQuery) {
@@ -2032,8 +2104,11 @@ var TransactionManager = class {
             );
           } else {
             const query = ROLLBACK_QUERY();
-            await this.#withQuerySpanAndEvent(query, tx.transaction, () => tx.transaction.executeRaw(query));
-            await tx.transaction.rollback();
+            try {
+              await this.#withQuerySpanAndEvent(query, tx.transaction, () => tx.transaction.executeRaw(query));
+            } finally {
+              await tx.transaction.rollback();
+            }
           }
         }
       } finally {
@@ -2087,6 +2162,7 @@ export {
   TransactionManager,
   TransactionManagerError,
   UserFacingError,
+  applySqlCommenters,
   convertCompactedRows,
   deserializeJsonResponse,
   doKeysMatch,

package/dist/interpreter/data-mapper.d.ts

@@ -1,6 +1,10 @@
 import { ResultNode } from '../query-plan';
+import { UserFacingError } from '../user-facing-error';
 import { Value } from './scope';
-export declare class DataMapperError extends Error {
+export declare class DataMapperError extends UserFacingError {
     name: string;
+    constructor(message: string, options?: {
+        cause?: unknown;
+    });
 }
 export declare function applyDataMap(data: Value, structure: ResultNode, enums: Record<string, Record<string, string>>): Value;

package/dist/interpreter/query-interpreter.d.ts

@@ -1,4 +1,5 @@
 import { ConnectionInfo, SqlQueryable, SqlResultSet } from '@prisma/driver-adapter-utils';
+import type { SqlCommenterPlugin, SqlCommenterQueryInfo } from '@prisma/sqlcommenter';
 import { QueryEvent } from '../events';
 import { QueryPlanNode } from '../query-plan';
 import { type SchemaProvider } from '../schema';
@@ -20,10 +21,15 @@ export type QueryInterpreterOptions = {
     rawSerializer?: (results: SqlResultSet) => Value;
     provider?: SchemaProvider;
     connectionInfo?: ConnectionInfo;
+    sqlCommenter?: QueryInterpreterSqlCommenter;
+};
+export type QueryInterpreterSqlCommenter = {
+    plugins: SqlCommenterPlugin[];
+    queryInfo: SqlCommenterQueryInfo;
 };
 export declare class QueryInterpreter {
     #private;
-    constructor({ transactionManager, placeholderValues, onQuery, tracingHelper, serializer, rawSerializer, provider, connectionInfo, }: QueryInterpreterOptions);
+    constructor({ transactionManager, placeholderValues, onQuery, tracingHelper, serializer, rawSerializer, provider, connectionInfo, sqlCommenter, }: QueryInterpreterOptions);
     static forSql(options: {
         transactionManager: QueryInterpreterTransactionManager;
         placeholderValues: Record<string, unknown>;
@@ -31,6 +37,7 @@ export declare class QueryInterpreter {
         tracingHelper: TracingHelper;
         provider?: SchemaProvider;
         connectionInfo?: ConnectionInfo;
+        sqlCommenter?: QueryInterpreterSqlCommenter;
     }): QueryInterpreter;
     run(queryPlan: QueryPlanNode, queryable: SqlQueryable): Promise<unknown>;
     private interpretNode;

package/dist/json-protocol.d.ts

@@ -1,4 +1,4 @@
-import { Decimal } from 'decimal.js';
+import { Decimal } from '@prisma/client-runtime-utils';
 export type DateTaggedValue = {
     $type: 'DateTime';
     value: string;

package/dist/sql-commenter.d.ts

@@ -0,0 +1,31 @@
+import type { SqlCommenterContext, SqlCommenterPlugin } from '@prisma/sqlcommenter';
+/**
+ * Formats key-value pairs into a sqlcommenter-compatible comment string.
+ *
+ * Algorithm per https://google.github.io/sqlcommenter/spec/:
+ * 1. If the map is empty, return empty string
+ * 2. Sort keys lexicographically
+ * 3. URL-encode keys
+ * 4. URL-encode values
+ * 5. Replace ' with \' in values (after URL encoding)
+ * 6. Wrap values in single quotes
+ * 7. Join key='value' pairs with commas
+ * 8. Wrap in a SQL comment
+ */
+export declare function formatSqlComment(tags: Record<string, string>): string;
+/**
+ * Applies SQL commenter plugins and returns the merged key-value pairs.
+ * Keys with undefined values are filtered out.
+ *
+ * Each plugin receives a deep clone of the context to prevent mutations
+ * that could affect other plugins.
+ */
+export declare function applySqlCommenters(plugins: SqlCommenterPlugin[], context: SqlCommenterContext): Record<string, string>;
+/**
+ * Applies SQL commenter plugins and returns the formatted comment.
+ */
+export declare function buildSqlComment(plugins: SqlCommenterPlugin[], context: SqlCommenterContext): string;
+/**
+ * Appends a sqlcommenter comment to a SQL query.
+ */
+export declare function appendSqlComment(sql: string, comment: string): string;

package/dist/sql-commenter.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/web-platform.d.ts

@@ -0,0 +1,9 @@
+/**
+ * Equivalent to `once` from `node:events` for DOM {@link EventTarget}.
+ *
+ * It is useful, e.g., to wait for an `abort` event on {@link AbortSignal}.
+ * While in Node.js `AbortSignal` does implement `EventEmitter` interface
+ * and is compatible with the `once` utility in `node:events`, it is not
+ * necessarily the case in other JS runtimes.
+ */
+export declare function once(target: EventTarget, event: string): Promise<Event>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@prisma/client-engine-runtime",
-  "version": "7.3.0-integration-prisma6-fix-cloudflare-engine.2",
+  "version": "7.3.0-integration-engines-7-3-0-10-fix-fix-mapped-enum-issue-0b7e6564db7dc3dac7f9312aa84e9ed81d805521.1",
   "description": "This package is intended for Prisma's internal use",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -27,16 +27,21 @@
     "@bugsnag/cuid": "3.2.1",
     "@opentelemetry/api": "1.9.0",
     "@paralleldrive/cuid2": "2.2.2",
-    "decimal.js": "10.5.0",
+    "klona": "2.0.6",
     "nanoid": "5.1.5",
     "ulid": "3.0.0",
     "uuid": "11.1.0",
-    "@prisma/debug": "7.3.0-integration-prisma6-fix-cloudflare-engine.2",
-    "@prisma/driver-adapter-utils": "7.3.0-integration-prisma6-fix-cloudflare-engine.2"
+    "@prisma/client-runtime-utils": "7.3.0-integration-engines-7-3-0-10-fix-fix-mapped-enum-issue-0b7e6564db7dc3dac7f9312aa84e9ed81d805521.1",
+    "@prisma/debug": "7.3.0-integration-engines-7-3-0-10-fix-fix-mapped-enum-issue-0b7e6564db7dc3dac7f9312aa84e9ed81d805521.1",
+    "@prisma/sqlcommenter": "7.3.0-integration-engines-7-3-0-10-fix-fix-mapped-enum-issue-0b7e6564db7dc3dac7f9312aa84e9ed81d805521.1",
+    "@prisma/driver-adapter-utils": "7.3.0-integration-engines-7-3-0-10-fix-fix-mapped-enum-issue-0b7e6564db7dc3dac7f9312aa84e9ed81d805521.1"
   },
   "devDependencies": {
+    "@codspeed/benchmark.js-plugin": "4.0.0",
+    "@types/benchmark": "2.1.5",
     "@types/jest": "29.5.14",
-    "@types/node": "18.19.76",
+    "@types/node": "~20.19.24",
+    "benchmark": "2.1.4",
     "jest": "29.7.0",
     "jest-junit": "16.0.0"
   },