@prisma/client-engine-runtime 6.18.0-dev.2 → 6.18.0-dev.4

package/dist/index.d.mts

@@ -446,6 +446,12 @@ export declare class TransactionManager {
         onQuery?: (event: QueryEvent) => void;
         provider?: SchemaProvider;
     });
+    /**
+     * Starts an internal transaction. The difference to `startTransaction` is that it does not
+     * use the default transaction options from the `TransactionManager`, which in practice means
+     * that it does not apply the default timeouts.
+     */
+    startInternalTransaction(options?: TransactionOptions): Promise<TransactionInfo>;
     startTransaction(options?: TransactionOptions): Promise<TransactionInfo>;
     commitTransaction(transactionId: string): Promise<void>;
     rollbackTransaction(transactionId: string): Promise<void>;

package/dist/index.d.ts

@@ -446,6 +446,12 @@ export declare class TransactionManager {
         onQuery?: (event: QueryEvent) => void;
         provider?: SchemaProvider;
     });
+    /**
+     * Starts an internal transaction. The difference to `startTransaction` is that it does not
+     * use the default transaction options from the `TransactionManager`, which in practice means
+     * that it does not apply the default timeouts.
+     */
+    startInternalTransaction(options?: TransactionOptions): Promise<TransactionInfo>;
     startTransaction(options?: TransactionOptions): Promise<TransactionInfo>;
     commitTransaction(transactionId: string): Promise<void>;
     rollbackTransaction(transactionId: string): Promise<void>;

package/dist/index.js

@@ -1606,7 +1606,7 @@ var QueryInterpreter = class _QueryInterpreter {
           return this.interpretNode(node.args, queryable, scope, generators);
         }
         const transactionManager = this.#transactionManager.manager;
-        const transactionInfo = await transactionManager.startTransaction();
+        const transactionInfo = await transactionManager.startInternalTransaction();
         const transaction = await transactionManager.getTransaction(transactionInfo, "query");
         try {
           const value = await this.interpretNode(node.args, transaction, scope, generators);
@@ -1934,24 +1934,39 @@ var TransactionManager = class {
     this.#onQuery = onQuery;
     this.#provider = provider;
   }
+  /**
+   * Starts an internal transaction. The difference to `startTransaction` is that it does not
+   * use the default transaction options from the `TransactionManager`, which in practice means
+   * that it does not apply the default timeouts.
+   */
+  async startInternalTransaction(options) {
+    const validatedOptions = options !== void 0 ? this.#validateOptions(options) : {};
+    return await this.tracingHelper.runInChildSpan(
+      "start_transaction",
+      () => this.#startTransactionImpl(validatedOptions)
+    );
+  }
   async startTransaction(options) {
-    return await this.tracingHelper.runInChildSpan("start_transaction", () => this.#startTransactionImpl(options));
+    const validatedOptions = options !== void 0 ? this.#validateOptions(options) : this.transactionOptions;
+    return await this.tracingHelper.runInChildSpan(
+      "start_transaction",
+      () => this.#startTransactionImpl(validatedOptions)
+    );
   }
   async #startTransactionImpl(options) {
-    const validatedOptions = options !== void 0 ? this.#validateOptions(options) : this.transactionOptions;
     const transaction = {
       id: await randomUUID(),
       status: "waiting",
       timer: void 0,
-      timeout: validatedOptions.timeout,
+      timeout: options.timeout,
       startedAt: Date.now(),
       transaction: void 0
     };
     this.transactions.set(transaction.id, transaction);
     let hasTimedOut = false;
-    const startTimer = setTimeout(() => hasTimedOut = true, validatedOptions.maxWait);
-    startTimer.unref?.();
-    transaction.transaction = await this.driverAdapter.startTransaction(validatedOptions.isolationLevel).catch(rethrowAsUserFacing);
+    const startTimer = createTimeoutIfDefined(() => hasTimedOut = true, options.maxWait);
+    startTimer?.unref?.();
+    transaction.transaction = await this.driverAdapter.startTransaction(options.isolationLevel).catch(rethrowAsUserFacing);
     clearTimeout(startTimer);
     switch (transaction.status) {
       case "waiting":
@@ -1960,7 +1975,7 @@ var TransactionManager = class {
           throw new TransactionStartTimeoutError();
         }
         transaction.status = "running";
-        transaction.timer = this.#startTransactionTimeout(transaction.id, validatedOptions.timeout);
+        transaction.timer = this.#startTransactionTimeout(transaction.id, options.timeout);
         return { id: transaction.id };
       case "timed_out":
       case "running":
@@ -2030,7 +2045,7 @@ var TransactionManager = class {
   }
   #startTransactionTimeout(transactionId, timeout) {
     const timeoutStartedAt = Date.now();
-    const timer = setTimeout(async () => {
+    const timer = createTimeoutIfDefined(async () => {
       debug("Transaction timed out.", { transactionId, timeoutStartedAt, timeout });
       const tx = this.transactions.get(transactionId);
       if (tx && ["running", "waiting"].includes(tx.status)) {
@@ -2039,7 +2054,7 @@ var TransactionManager = class {
         debug("Transaction already committed or rolled back when timeout happened.", transactionId);
       }
     }, timeout);
-    timer.unref?.();
+    timer?.unref?.();
     return timer;
   }
   async #closeTransaction(tx, status) {
@@ -2109,6 +2124,9 @@ var TransactionManager = class {
     });
   }
 };
+function createTimeoutIfDefined(cb, ms) {
+  return ms !== void 0 ? setTimeout(cb, ms) : void 0;
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   DataMapperError,

package/dist/index.mjs

@@ -1556,7 +1556,7 @@ var QueryInterpreter = class _QueryInterpreter {
           return this.interpretNode(node.args, queryable, scope, generators);
         }
         const transactionManager = this.#transactionManager.manager;
-        const transactionInfo = await transactionManager.startTransaction();
+        const transactionInfo = await transactionManager.startInternalTransaction();
         const transaction = await transactionManager.getTransaction(transactionInfo, "query");
         try {
           const value = await this.interpretNode(node.args, transaction, scope, generators);
@@ -1884,24 +1884,39 @@ var TransactionManager = class {
     this.#onQuery = onQuery;
     this.#provider = provider;
   }
+  /**
+   * Starts an internal transaction. The difference to `startTransaction` is that it does not
+   * use the default transaction options from the `TransactionManager`, which in practice means
+   * that it does not apply the default timeouts.
+   */
+  async startInternalTransaction(options) {
+    const validatedOptions = options !== void 0 ? this.#validateOptions(options) : {};
+    return await this.tracingHelper.runInChildSpan(
+      "start_transaction",
+      () => this.#startTransactionImpl(validatedOptions)
+    );
+  }
   async startTransaction(options) {
-    return await this.tracingHelper.runInChildSpan("start_transaction", () => this.#startTransactionImpl(options));
+    const validatedOptions = options !== void 0 ? this.#validateOptions(options) : this.transactionOptions;
+    return await this.tracingHelper.runInChildSpan(
+      "start_transaction",
+      () => this.#startTransactionImpl(validatedOptions)
+    );
   }
   async #startTransactionImpl(options) {
-    const validatedOptions = options !== void 0 ? this.#validateOptions(options) : this.transactionOptions;
     const transaction = {
       id: await randomUUID(),
       status: "waiting",
       timer: void 0,
-      timeout: validatedOptions.timeout,
+      timeout: options.timeout,
       startedAt: Date.now(),
       transaction: void 0
     };
     this.transactions.set(transaction.id, transaction);
     let hasTimedOut = false;
-    const startTimer = setTimeout(() => hasTimedOut = true, validatedOptions.maxWait);
-    startTimer.unref?.();
-    transaction.transaction = await this.driverAdapter.startTransaction(validatedOptions.isolationLevel).catch(rethrowAsUserFacing);
+    const startTimer = createTimeoutIfDefined(() => hasTimedOut = true, options.maxWait);
+    startTimer?.unref?.();
+    transaction.transaction = await this.driverAdapter.startTransaction(options.isolationLevel).catch(rethrowAsUserFacing);
     clearTimeout(startTimer);
     switch (transaction.status) {
       case "waiting":
@@ -1910,7 +1925,7 @@ var TransactionManager = class {
           throw new TransactionStartTimeoutError();
         }
         transaction.status = "running";
-        transaction.timer = this.#startTransactionTimeout(transaction.id, validatedOptions.timeout);
+        transaction.timer = this.#startTransactionTimeout(transaction.id, options.timeout);
         return { id: transaction.id };
       case "timed_out":
       case "running":
@@ -1980,7 +1995,7 @@ var TransactionManager = class {
   }
   #startTransactionTimeout(transactionId, timeout) {
     const timeoutStartedAt = Date.now();
-    const timer = setTimeout(async () => {
+    const timer = createTimeoutIfDefined(async () => {
       debug("Transaction timed out.", { transactionId, timeoutStartedAt, timeout });
       const tx = this.transactions.get(transactionId);
       if (tx && ["running", "waiting"].includes(tx.status)) {
@@ -1989,7 +2004,7 @@ var TransactionManager = class {
         debug("Transaction already committed or rolled back when timeout happened.", transactionId);
       }
     }, timeout);
-    timer.unref?.();
+    timer?.unref?.();
     return timer;
   }
   async #closeTransaction(tx, status) {
@@ -2059,6 +2074,9 @@ var TransactionManager = class {
     });
   }
 };
+function createTimeoutIfDefined(cb, ms) {
+  return ms !== void 0 ? setTimeout(cb, ms) : void 0;
+}
 export {
   DataMapperError,
   QueryInterpreter,

package/dist/transaction-manager/transaction-manager.d.ts

@@ -17,6 +17,12 @@ export declare class TransactionManager {
         onQuery?: (event: QueryEvent) => void;
         provider?: SchemaProvider;
     });
+    /**
+     * Starts an internal transaction. The difference to `startTransaction` is that it does not
+     * use the default transaction options from the `TransactionManager`, which in practice means
+     * that it does not apply the default timeouts.
+     */
+    startInternalTransaction(options?: Options): Promise<TransactionInfo>;
     startTransaction(options?: Options): Promise<TransactionInfo>;
     commitTransaction(transactionId: string): Promise<void>;
     rollbackTransaction(transactionId: string): Promise<void>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@prisma/client-engine-runtime",
-  "version": "6.18.0-dev.2",
+  "version": "6.18.0-dev.4",
   "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.18.0-dev.2",
-    "@prisma/driver-adapter-utils": "6.18.0-dev.2"
+    "@prisma/debug": "6.18.0-dev.4",
+    "@prisma/driver-adapter-utils": "6.18.0-dev.4"
   },
   "devDependencies": {
     "@types/jest": "29.5.14",