@prisma/client-engine-runtime 6.9.0-dev.21 → 6.9.0-dev.22

package/dist/index.d.mts

@@ -1,7 +1,7 @@
-import type { Context } from '@opentelemetry/api';
+import { Context } from '@opentelemetry/api';
 import type { IsolationLevel } from '@prisma/driver-adapter-utils';
-import type { Span } from '@opentelemetry/api';
-import type { SpanOptions } from '@opentelemetry/api';
+import { Span } from '@opentelemetry/api';
+import { SpanOptions } from '@opentelemetry/api';
 import { SqlDriverAdapter } from '@prisma/driver-adapter-utils';
 import { SqlQueryable } from '@prisma/driver-adapter-utils';
 import { SqlResultSet } from '@prisma/driver-adapter-utils';
@@ -292,6 +292,12 @@ export declare type ResultNode = {
     resultType: PrismaValueType;
 };
 
+/**
+ * `JSON.stringify` wrapper with custom replacer function that handles nested
+ * BigInt and Uint8Array values.
+ */
+export declare function safeJsonStringify(obj: unknown): string;
+
 declare type SpanCallback<R> = (span?: Span, context?: Context) => R;
 
 export declare interface TracingHelper {
@@ -309,10 +315,11 @@ export declare class TransactionManager {
     private readonly driverAdapter;
     private readonly transactionOptions;
     private readonly tracingHelper;
-    constructor({ driverAdapter, transactionOptions, tracingHelper, }: {
+    constructor({ driverAdapter, transactionOptions, tracingHelper, onQuery, }: {
         driverAdapter: SqlDriverAdapter;
         transactionOptions: TransactionOptions;
         tracingHelper: TracingHelper;
+        onQuery?: (event: QueryEvent) => void;
     });
     startTransaction(options?: TransactionOptions): Promise<TransactionInfo>;
     commitTransaction(transactionId: string): Promise<void>;

package/dist/index.d.ts

@@ -1,7 +1,7 @@
-import type { Context } from '@opentelemetry/api';
+import { Context } from '@opentelemetry/api';
 import type { IsolationLevel } from '@prisma/driver-adapter-utils';
-import type { Span } from '@opentelemetry/api';
-import type { SpanOptions } from '@opentelemetry/api';
+import { Span } from '@opentelemetry/api';
+import { SpanOptions } from '@opentelemetry/api';
 import { SqlDriverAdapter } from '@prisma/driver-adapter-utils';
 import { SqlQueryable } from '@prisma/driver-adapter-utils';
 import { SqlResultSet } from '@prisma/driver-adapter-utils';
@@ -292,6 +292,12 @@ export declare type ResultNode = {
     resultType: PrismaValueType;
 };
 
+/**
+ * `JSON.stringify` wrapper with custom replacer function that handles nested
+ * BigInt and Uint8Array values.
+ */
+export declare function safeJsonStringify(obj: unknown): string;
+
 declare type SpanCallback<R> = (span?: Span, context?: Context) => R;
 
 export declare interface TracingHelper {
@@ -309,10 +315,11 @@ export declare class TransactionManager {
     private readonly driverAdapter;
     private readonly transactionOptions;
     private readonly tracingHelper;
-    constructor({ driverAdapter, transactionOptions, tracingHelper, }: {
+    constructor({ driverAdapter, transactionOptions, tracingHelper, onQuery, }: {
         driverAdapter: SqlDriverAdapter;
         transactionOptions: TransactionOptions;
         tracingHelper: TracingHelper;
+        onQuery?: (event: QueryEvent) => void;
     });
     startTransaction(options?: TransactionOptions): Promise<TransactionInfo>;
     commitTransaction(transactionId: string): Promise<void>;

package/dist/index.js

@@ -41,7 +41,8 @@ __export(index_exports, {
   isPrismaValueBytes: () => isPrismaValueBytes,
   isPrismaValueGenerator: () => isPrismaValueGenerator,
   isPrismaValuePlaceholder: () => isPrismaValuePlaceholder,
-  noopTracingHelper: () => noopTracingHelper
+  noopTracingHelper: () => noopTracingHelper,
+  safeJsonStringify: () => safeJsonStringify
 });
 module.exports = __toCommonJS(index_exports);
 
@@ -75,6 +76,16 @@ function doKeysMatch(lhs, rhs) {
     return isDeepStrictEqual(lhs[key], rhs[key]);
   });
 }
+function safeJsonStringify(obj) {
+  return JSON.stringify(obj, (_key, val) => {
+    if (typeof val === "bigint") {
+      return val.toString();
+    } else if (val instanceof Uint8Array) {
+      return Buffer.from(val).toString("base64");
+    }
+    return val;
+  });
+}
 
 // src/interpreter/DataMapper.ts
 var DataMapperError = class extends Error {
@@ -184,10 +195,8 @@ function mapValue(value, resultType) {
   }
 }
 
-// src/interpreter/QueryInterpreter.ts
-var import_api = require("@opentelemetry/api");
-
 // src/tracing.ts
+var import_api = require("@opentelemetry/api");
 var noopTracingHelper = {
   runInChildSpan(_, callback) {
     return callback();
@@ -205,6 +214,37 @@ function providerToOtelSystem(provider) {
       assertNever(provider, `Unknown provider: ${provider}`);
   }
 }
+async function withQuerySpanAndEvent({
+  query,
+  queryable,
+  tracingHelper,
+  onQuery,
+  execute
+}) {
+  return await tracingHelper.runInChildSpan(
+    {
+      name: "db_query",
+      kind: import_api.SpanKind.CLIENT,
+      attributes: {
+        "db.query.text": query.sql,
+        "db.system.name": providerToOtelSystem(queryable.provider)
+      }
+    },
+    async () => {
+      const timestamp = /* @__PURE__ */ new Date();
+      const startInstant = performance.now();
+      const result = await execute();
+      const endInstant = performance.now();
+      onQuery?.({
+        timestamp,
+        duration: endInstant - startInstant,
+        query: query.sql,
+        params: query.args
+      });
+      return result;
+    }
+  );
+}
 
 // src/UserFacingError.ts
 var import_driver_adapter_utils = require("@prisma/driver-adapter-utils");
@@ -844,13 +884,13 @@ var QueryInterpreter = class _QueryInterpreter {
       }
       case "execute": {
         const query = renderQuery(node.args, scope, generators);
-        return this.#withQueryEvent(query, queryable, async () => {
+        return this.#withQuerySpanAndEvent(query, queryable, async () => {
           return await queryable.executeRaw(query);
         });
       }
       case "query": {
         const query = renderQuery(node.args, scope, generators);
-        return this.#withQueryEvent(query, queryable, async () => {
+        return this.#withQuerySpanAndEvent(query, queryable, async () => {
           if (node.args.type === "rawSql") {
             return this.#rawSerializer(await queryable.queryRaw(query));
           } else {
@@ -980,30 +1020,14 @@ var QueryInterpreter = class _QueryInterpreter {
         assertNever(node, `Unexpected node type: ${node.type}`);
     }
   }
-  #withQueryEvent(query, queryable, execute) {
-    return this.#tracingHelper.runInChildSpan(
-      {
-        name: "db_query",
-        kind: import_api.SpanKind.CLIENT,
-        attributes: {
-          "db.query.text": query.sql,
-          "db.system.name": providerToOtelSystem(queryable.provider)
-        }
-      },
-      async () => {
-        const timestamp = /* @__PURE__ */ new Date();
-        const startInstant = performance.now();
-        const result = await execute();
-        const endInstant = performance.now();
-        this.#onQuery?.({
-          timestamp,
-          duration: endInstant - startInstant,
-          query: query.sql,
-          params: query.args
-        });
-        return result;
-      }
-    );
+  #withQuerySpanAndEvent(query, queryable, execute) {
+    return withQuerySpanAndEvent({
+      query,
+      queryable,
+      execute,
+      tracingHelper: this.#tracingHelper,
+      onQuery: this.#onQuery
+    });
   }
 };
 function isEmpty(value) {
@@ -1146,6 +1170,16 @@ var MAX_CLOSED_TRANSACTIONS = 100;
 var debug = (0, import_debug.Debug)("prisma:client:transactionManager");
 var COMMIT_QUERY = () => ({ sql: "COMMIT", args: [], argTypes: [] });
 var ROLLBACK_QUERY = () => ({ sql: "ROLLBACK", args: [], argTypes: [] });
+var PHANTOM_COMMIT_QUERY = () => ({
+  sql: '-- Implicit "COMMIT" query via underlying driver',
+  args: [],
+  argTypes: []
+});
+var PHANTOM_ROLLBACK_QUERY = () => ({
+  sql: '-- Implicit "ROLLBACK" query via underlying driver',
+  args: [],
+  argTypes: []
+});
 var TransactionManager = class {
   // The map of active transactions.
   transactions = /* @__PURE__ */ new Map();
@@ -1155,14 +1189,17 @@ var TransactionManager = class {
   driverAdapter;
   transactionOptions;
   tracingHelper;
+  #onQuery;
   constructor({
     driverAdapter,
     transactionOptions,
-    tracingHelper
+    tracingHelper,
+    onQuery
   }) {
     this.driverAdapter = driverAdapter;
     this.transactionOptions = transactionOptions;
     this.tracingHelper = tracingHelper;
+    this.#onQuery = onQuery;
   }
   async startTransaction(options) {
     return await this.tracingHelper.runInChildSpan("start_transaction", () => this.#startTransactionImpl(options));
@@ -1266,14 +1303,20 @@ var TransactionManager = class {
     debug("Closing transaction.", { transactionId: tx.id, status });
     tx.status = status;
     if (tx.transaction && status === "committed") {
-      await tx.transaction.commit();
-      if (!tx.transaction.options.usePhantomQuery) {
-        await tx.transaction.executeRaw(COMMIT_QUERY());
+      if (tx.transaction.options.usePhantomQuery) {
+        await this.#withQuerySpanAndEvent(PHANTOM_COMMIT_QUERY(), tx.transaction, () => tx.transaction.commit());
+      } else {
+        await tx.transaction.commit();
+        const query = COMMIT_QUERY();
+        await this.#withQuerySpanAndEvent(query, tx.transaction, () => tx.transaction.executeRaw(query));
       }
     } else if (tx.transaction) {
-      await tx.transaction.rollback();
-      if (!tx.transaction.options.usePhantomQuery) {
-        await tx.transaction.executeRaw(ROLLBACK_QUERY());
+      if (tx.transaction.options.usePhantomQuery) {
+        await this.#withQuerySpanAndEvent(PHANTOM_ROLLBACK_QUERY(), tx.transaction, () => tx.transaction.rollback());
+      } else {
+        await tx.transaction.rollback();
+        const query = ROLLBACK_QUERY();
+        await this.#withQuerySpanAndEvent(query, tx.transaction, () => tx.transaction.executeRaw(query));
       }
     }
     clearTimeout(tx.timer);
@@ -1294,6 +1337,15 @@ var TransactionManager = class {
       maxWait: options.maxWait
     };
   }
+  #withQuerySpanAndEvent(query, queryable, execute) {
+    return withQuerySpanAndEvent({
+      query,
+      queryable,
+      execute,
+      tracingHelper: this.tracingHelper,
+      onQuery: this.#onQuery
+    });
+  }
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
@@ -1308,5 +1360,6 @@ var TransactionManager = class {
   isPrismaValueBytes,
   isPrismaValueGenerator,
   isPrismaValuePlaceholder,
-  noopTracingHelper
+  noopTracingHelper,
+  safeJsonStringify
 });

package/dist/index.mjs

@@ -28,6 +28,16 @@ function doKeysMatch(lhs, rhs) {
     return isDeepStrictEqual(lhs[key], rhs[key]);
   });
 }
+function safeJsonStringify(obj) {
+  return JSON.stringify(obj, (_key, val) => {
+    if (typeof val === "bigint") {
+      return val.toString();
+    } else if (val instanceof Uint8Array) {
+      return Buffer.from(val).toString("base64");
+    }
+    return val;
+  });
+}
 
 // src/interpreter/DataMapper.ts
 var DataMapperError = class extends Error {
@@ -137,10 +147,8 @@ function mapValue(value, resultType) {
   }
 }
 
-// src/interpreter/QueryInterpreter.ts
-import { SpanKind } from "@opentelemetry/api";
-
 // src/tracing.ts
+import { SpanKind } from "@opentelemetry/api";
 var noopTracingHelper = {
   runInChildSpan(_, callback) {
     return callback();
@@ -158,6 +166,37 @@ function providerToOtelSystem(provider) {
       assertNever(provider, `Unknown provider: ${provider}`);
   }
 }
+async function withQuerySpanAndEvent({
+  query,
+  queryable,
+  tracingHelper,
+  onQuery,
+  execute
+}) {
+  return await tracingHelper.runInChildSpan(
+    {
+      name: "db_query",
+      kind: SpanKind.CLIENT,
+      attributes: {
+        "db.query.text": query.sql,
+        "db.system.name": providerToOtelSystem(queryable.provider)
+      }
+    },
+    async () => {
+      const timestamp = /* @__PURE__ */ new Date();
+      const startInstant = performance.now();
+      const result = await execute();
+      const endInstant = performance.now();
+      onQuery?.({
+        timestamp,
+        duration: endInstant - startInstant,
+        query: query.sql,
+        params: query.args
+      });
+      return result;
+    }
+  );
+}
 
 // src/UserFacingError.ts
 import { isDriverAdapterError } from "@prisma/driver-adapter-utils";
@@ -797,13 +836,13 @@ var QueryInterpreter = class _QueryInterpreter {
       }
       case "execute": {
         const query = renderQuery(node.args, scope, generators);
-        return this.#withQueryEvent(query, queryable, async () => {
+        return this.#withQuerySpanAndEvent(query, queryable, async () => {
           return await queryable.executeRaw(query);
         });
       }
       case "query": {
         const query = renderQuery(node.args, scope, generators);
-        return this.#withQueryEvent(query, queryable, async () => {
+        return this.#withQuerySpanAndEvent(query, queryable, async () => {
           if (node.args.type === "rawSql") {
             return this.#rawSerializer(await queryable.queryRaw(query));
           } else {
@@ -933,30 +972,14 @@ var QueryInterpreter = class _QueryInterpreter {
         assertNever(node, `Unexpected node type: ${node.type}`);
     }
   }
-  #withQueryEvent(query, queryable, execute) {
-    return this.#tracingHelper.runInChildSpan(
-      {
-        name: "db_query",
-        kind: SpanKind.CLIENT,
-        attributes: {
-          "db.query.text": query.sql,
-          "db.system.name": providerToOtelSystem(queryable.provider)
-        }
-      },
-      async () => {
-        const timestamp = /* @__PURE__ */ new Date();
-        const startInstant = performance.now();
-        const result = await execute();
-        const endInstant = performance.now();
-        this.#onQuery?.({
-          timestamp,
-          duration: endInstant - startInstant,
-          query: query.sql,
-          params: query.args
-        });
-        return result;
-      }
-    );
+  #withQuerySpanAndEvent(query, queryable, execute) {
+    return withQuerySpanAndEvent({
+      query,
+      queryable,
+      execute,
+      tracingHelper: this.#tracingHelper,
+      onQuery: this.#onQuery
+    });
   }
 };
 function isEmpty(value) {
@@ -1099,6 +1122,16 @@ var MAX_CLOSED_TRANSACTIONS = 100;
 var debug = Debug("prisma:client:transactionManager");
 var COMMIT_QUERY = () => ({ sql: "COMMIT", args: [], argTypes: [] });
 var ROLLBACK_QUERY = () => ({ sql: "ROLLBACK", args: [], argTypes: [] });
+var PHANTOM_COMMIT_QUERY = () => ({
+  sql: '-- Implicit "COMMIT" query via underlying driver',
+  args: [],
+  argTypes: []
+});
+var PHANTOM_ROLLBACK_QUERY = () => ({
+  sql: '-- Implicit "ROLLBACK" query via underlying driver',
+  args: [],
+  argTypes: []
+});
 var TransactionManager = class {
   // The map of active transactions.
   transactions = /* @__PURE__ */ new Map();
@@ -1108,14 +1141,17 @@ var TransactionManager = class {
   driverAdapter;
   transactionOptions;
   tracingHelper;
+  #onQuery;
   constructor({
     driverAdapter,
     transactionOptions,
-    tracingHelper
+    tracingHelper,
+    onQuery
   }) {
     this.driverAdapter = driverAdapter;
     this.transactionOptions = transactionOptions;
     this.tracingHelper = tracingHelper;
+    this.#onQuery = onQuery;
   }
   async startTransaction(options) {
     return await this.tracingHelper.runInChildSpan("start_transaction", () => this.#startTransactionImpl(options));
@@ -1219,14 +1255,20 @@ var TransactionManager = class {
     debug("Closing transaction.", { transactionId: tx.id, status });
     tx.status = status;
     if (tx.transaction && status === "committed") {
-      await tx.transaction.commit();
-      if (!tx.transaction.options.usePhantomQuery) {
-        await tx.transaction.executeRaw(COMMIT_QUERY());
+      if (tx.transaction.options.usePhantomQuery) {
+        await this.#withQuerySpanAndEvent(PHANTOM_COMMIT_QUERY(), tx.transaction, () => tx.transaction.commit());
+      } else {
+        await tx.transaction.commit();
+        const query = COMMIT_QUERY();
+        await this.#withQuerySpanAndEvent(query, tx.transaction, () => tx.transaction.executeRaw(query));
       }
     } else if (tx.transaction) {
-      await tx.transaction.rollback();
-      if (!tx.transaction.options.usePhantomQuery) {
-        await tx.transaction.executeRaw(ROLLBACK_QUERY());
+      if (tx.transaction.options.usePhantomQuery) {
+        await this.#withQuerySpanAndEvent(PHANTOM_ROLLBACK_QUERY(), tx.transaction, () => tx.transaction.rollback());
+      } else {
+        await tx.transaction.rollback();
+        const query = ROLLBACK_QUERY();
+        await this.#withQuerySpanAndEvent(query, tx.transaction, () => tx.transaction.executeRaw(query));
       }
     }
     clearTimeout(tx.timer);
@@ -1247,6 +1289,15 @@ var TransactionManager = class {
       maxWait: options.maxWait
     };
   }
+  #withQuerySpanAndEvent(query, queryable, execute) {
+    return withQuerySpanAndEvent({
+      query,
+      queryable,
+      execute,
+      tracingHelper: this.tracingHelper,
+      onQuery: this.#onQuery
+    });
+  }
 };
 export {
   DataMapperError,
@@ -1260,5 +1311,6 @@ export {
   isPrismaValueBytes,
   isPrismaValueGenerator,
   isPrismaValuePlaceholder,
-  noopTracingHelper
+  noopTracingHelper,
+  safeJsonStringify
 };

package/dist/tracing.d.ts

@@ -1,5 +1,6 @@
-import type { Context, Span, SpanOptions } from '@opentelemetry/api';
-import type { Provider } from '@prisma/driver-adapter-utils';
+import { type Context, type Span, type SpanOptions } from '@opentelemetry/api';
+import type { Provider, SqlQuery, SqlQueryable } from '@prisma/driver-adapter-utils';
+import { QueryEvent } from './events';
 export type SpanCallback<R> = (span?: Span, context?: Context) => R;
 export type ExtendedSpanOptions = SpanOptions & {
     name: string;
@@ -9,3 +10,10 @@ export interface TracingHelper {
 }
 export declare const noopTracingHelper: TracingHelper;
 export declare function providerToOtelSystem(provider: Provider): string;
+export declare function withQuerySpanAndEvent<T>({ query, queryable, tracingHelper, onQuery, execute, }: {
+    query: SqlQuery;
+    queryable: SqlQueryable;
+    tracingHelper: TracingHelper;
+    onQuery?: (event: QueryEvent) => void;
+    execute: () => Promise<T>;
+}): Promise<T>;

package/dist/transactionManager/TransactionManager.d.ts

@@ -1,4 +1,5 @@
 import { SqlDriverAdapter, Transaction } from '@prisma/driver-adapter-utils';
+import { QueryEvent } from '../events';
 import { TracingHelper } from '../tracing';
 import { Options, TransactionInfo } from './Transaction';
 export declare class TransactionManager {
@@ -8,10 +9,11 @@ export declare class TransactionManager {
     private readonly driverAdapter;
     private readonly transactionOptions;
     private readonly tracingHelper;
-    constructor({ driverAdapter, transactionOptions, tracingHelper, }: {
+    constructor({ driverAdapter, transactionOptions, tracingHelper, onQuery, }: {
         driverAdapter: SqlDriverAdapter;
         transactionOptions: Options;
         tracingHelper: TracingHelper;
+        onQuery?: (event: QueryEvent) => void;
     });
     startTransaction(options?: Options): Promise<TransactionInfo>;
     commitTransaction(transactionId: string): Promise<void>;

package/dist/utils.d.ts

@@ -9,3 +9,8 @@ export declare function isDeepStrictEqual(a: unknown, b: unknown): boolean;
  * converts arguments to the types used by driver adapters if necessary.
  */
 export declare function doKeysMatch(lhs: {}, rhs: {}): boolean;
+/**
+ * `JSON.stringify` wrapper with custom replacer function that handles nested
+ * BigInt and Uint8Array values.
+ */
+export declare function safeJsonStringify(obj: unknown): string;

package/package.json

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