@prisma/query-plan-executor 7.1.0-integration-fix-fix-missing-cockroach-wasm.2 → 7.2.0-dev.1

package/dist/index.d.ts

@@ -34,8 +34,14 @@ declare class App {
     shutdown(): Promise<void>;
     /**
      * Executes a query plan and returns the result.
+     *
+     * @param queryPlan - The query plan to execute
+     * @param placeholderValues - Placeholder values for the query
+     * @param comments - Pre-computed SQL commenter tags from the client
+     * @param resourceLimits - Resource limits for the query
+     * @param transactionId - Transaction ID if running within a transaction
      */
-    query(queryPlan: QueryPlanNode, placeholderValues: Record<string, unknown>, resourceLimits: ResourceLimits, transactionId: string | null): Promise<unknown>;
+    query(queryPlan: QueryPlanNode, placeholderValues: Record<string, unknown>, comments: Record<string, string> | undefined, resourceLimits: ResourceLimits, transactionId: string | null): Promise<unknown>;
     /**
      * Starts a new transaction.
      */
@@ -648,6 +654,7 @@ operation: string;
 plan: Record<string, unknown>;
 params: Record<string, unknown>;
 model?: string | undefined;
+comments?: Record<string, string> | undefined;
 };
 };
 output: {
@@ -683,6 +690,7 @@ operation: string;
 plan: Record<string, unknown>;
 params: Record<string, unknown>;
 model?: string | undefined;
+comments?: Record<string, string> | undefined;
 };
 } & {
 param: {

package/dist/index.js

@@ -40576,7 +40576,7 @@ var require_dist2 = __commonJS({
   "../../node_modules/.pnpm/@tootallnate+once@2.0.0/node_modules/@tootallnate/once/dist/index.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
-    function once(emitter, name6, { signal } = {}) {
+    function once2(emitter, name6, { signal } = {}) {
       return new Promise((resolve, reject) => {
         function cleanup() {
           signal === null || signal === void 0 ? void 0 : signal.removeEventListener("abort", cleanup);
@@ -40596,7 +40596,7 @@ var require_dist2 = __commonJS({
         emitter.on("error", onError);
       });
     }
-    exports2.default = once;
+    exports2.default = once2;
   }
 });
 
@@ -55946,7 +55946,7 @@ var require_lodash7 = __commonJS({
         return result;
       };
     }
-    function once(func) {
+    function once2(func) {
       return before(2, func);
     }
     function isObject3(value) {
@@ -55992,7 +55992,7 @@ var require_lodash7 = __commonJS({
       var isBinary2 = reIsBinary.test(value);
       return isBinary2 || reIsOctal.test(value) ? freeParseInt(value.slice(2), isBinary2 ? 2 : 8) : reIsBadHex.test(value) ? NAN : +value;
     }
-    module2.exports = once;
+    module2.exports = once2;
   }
 });
 
@@ -56010,7 +56010,7 @@ var require_sign2 = __commonJS({
     var isNumber = require_lodash4();
     var isPlainObject2 = require_lodash5();
     var isString = require_lodash6();
-    var once = require_lodash7();
+    var once2 = require_lodash7();
     var { KeyObject, createSecretKey, createPrivateKey: createPrivateKey3 } = require("crypto");
     var SUPPORTED_ALGS = ["RS256", "RS384", "RS512", "ES256", "ES384", "ES512", "HS256", "HS384", "HS512", "none"];
     if (PS_SUPPORTED) {
@@ -56199,7 +56199,7 @@ var require_sign2 = __commonJS({
       });
       const encoding = options.encoding || "utf8";
       if (typeof callback === "function") {
-        callback = callback && once(callback);
+        callback = callback && once2(callback);
         jws.createSign({
           header,
           privateKey: secretOrPrivateKey,
@@ -66461,7 +66461,7 @@ var require_end_of_stream = __commonJS({
     var process3 = require_process();
     var { AbortError: AbortError3, codes } = require_errors3();
     var { ERR_INVALID_ARG_TYPE, ERR_STREAM_PREMATURE_CLOSE } = codes;
-    var { kEmptyObject, once } = require_util();
+    var { kEmptyObject, once: once2 } = require_util();
     var { validateAbortSignal, validateFunction, validateObject, validateBoolean } = require_validators();
     var { Promise: Promise2, PromisePrototypeThen } = require_primordials();
     var {
@@ -66497,7 +66497,7 @@ var require_end_of_stream = __commonJS({
       }
       validateFunction(callback, "callback");
       validateAbortSignal(options.signal, "options.signal");
-      callback = once(callback);
+      callback = once2(callback);
       if (isReadableStream2(stream) || isWritableStream(stream)) {
         return eosWeb(stream, options, callback);
       }
@@ -66634,7 +66634,7 @@ var require_end_of_stream = __commonJS({
           process3.nextTick(abort);
         } else {
           const originalCallback = callback;
-          callback = once((...args) => {
+          callback = once2((...args) => {
             options.signal.removeEventListener("abort", abort);
             originalCallback.apply(stream, args);
           });
@@ -66660,7 +66660,7 @@ var require_end_of_stream = __commonJS({
           process3.nextTick(abort);
         } else {
           const originalCallback = callback;
-          callback = once((...args) => {
+          callback = once2((...args) => {
             options.signal.removeEventListener("abort", abort);
             originalCallback.apply(stream, args);
           });
@@ -69478,7 +69478,7 @@ var require_pipeline = __commonJS({
     var process3 = require_process();
     var { ArrayIsArray, Promise: Promise2, SymbolAsyncIterator } = require_primordials();
     var eos = require_end_of_stream();
-    var { once } = require_util();
+    var { once: once2 } = require_util();
     var destroyImpl = require_destroy();
     var Duplex = require_duplex();
     var {
@@ -69629,7 +69629,7 @@ var require_pipeline = __commonJS({
       }
     }
     function pipeline(...streams) {
-      return pipelineImpl(streams, once(popCallback(streams)));
+      return pipelineImpl(streams, once2(popCallback(streams)));
     }
     function pipelineImpl(streams, callback, opts) {
       if (streams.length === 1 && ArrayIsArray(streams[0])) {
@@ -97752,7 +97752,7 @@ __export(index_exports, {
 module.exports = __toCommonJS(index_exports);
 
 // package.json
-var version = "7.1.0-integration-fix-fix-missing-cockroach-wasm.2";
+var version = "7.2.0-dev.1";
 
 // ../../node_modules/.pnpm/temporal-polyfill@0.3.0/node_modules/temporal-polyfill/chunks/internal.js
 function clampProp(e2, n2, t2, o2, r2) {
@@ -106556,6 +106556,41 @@ function normalizeDateTime(dt2) {
   }
   return dtWithTz;
 }
+function formatSqlComment(tags) {
+  const entries = Object.entries(tags);
+  if (entries.length === 0) {
+    return "";
+  }
+  entries.sort(([a2], [b2]) => a2.localeCompare(b2));
+  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, context2) {
+  const merged = {};
+  for (const plugin of plugins) {
+    const tags = plugin(context2);
+    for (const [key, value] of Object.entries(tags)) {
+      if (value !== void 0) {
+        merged[key] = value;
+      }
+    }
+  }
+  return merged;
+}
+function buildSqlComment(plugins, context2) {
+  const tags = applySqlCommenters(plugins, context2);
+  return formatSqlComment(tags);
+}
+function appendSqlComment(sql4, comment) {
+  if (!comment) {
+    return sql4;
+  }
+  return `${sql4} ${comment}`;
+}
 function providerToOtelSystem(provider) {
   switch (provider) {
     case "postgresql":
@@ -107279,7 +107314,8 @@ var QueryInterpreter = class _QueryInterpreter {
   #serializer;
   #rawSerializer;
   #provider;
-  #connectioInfo;
+  #connectionInfo;
+  #sqlCommenter;
   constructor({
     transactionManager,
     placeholderValues,
@@ -107288,7 +107324,8 @@ var QueryInterpreter = class _QueryInterpreter {
     serializer,
     rawSerializer,
     provider,
-    connectionInfo
+    connectionInfo,
+    sqlCommenter
   }) {
     this.#transactionManager = transactionManager;
     this.#placeholderValues = placeholderValues;
@@ -107297,7 +107334,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({
@@ -107308,7 +107346,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) {
@@ -107372,10 +107411,11 @@ var QueryInterpreter = class _QueryInterpreter {
         const queries = renderQuery(node.args, scope, generators, this.#maxChunkSize());
         let sum2 = 0;
         for (const query2 of queries) {
+          const commentedQuery = this.#applyComments(query2);
           sum2 += await this.#withQuerySpanAndEvent(
-            query2,
+            commentedQuery,
             queryable,
-            () => queryable.executeRaw(query2).catch(
+            () => queryable.executeRaw(commentedQuery).catch(
               (err) => node.args.type === "rawSql" ? rethrowAsUserFacingRawError(err) : rethrowAsUserFacing(err)
             )
           );
@@ -107386,10 +107426,11 @@ var QueryInterpreter = class _QueryInterpreter {
         const queries = renderQuery(node.args, scope, generators, this.#maxChunkSize());
         let results;
         for (const query2 of queries) {
+          const commentedQuery = this.#applyComments(query2);
           const result = await this.#withQuerySpanAndEvent(
-            query2,
+            commentedQuery,
             queryable,
-            () => queryable.queryRaw(query2).catch(
+            () => queryable.queryRaw(commentedQuery).catch(
               (err) => node.args.type === "rawSql" ? rethrowAsUserFacingRawError(err) : rethrowAsUserFacing(err)
             )
           );
@@ -107511,8 +107552,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();
   }
@@ -107547,6 +107588,22 @@ var QueryInterpreter = class _QueryInterpreter {
       onQuery: this.#onQuery
     });
   }
+  #applyComments(query2) {
+    if (!this.#sqlCommenter || this.#sqlCommenter.plugins.length === 0) {
+      return query2;
+    }
+    const comment = buildSqlComment(this.#sqlCommenter.plugins, {
+      query: this.#sqlCommenter.queryInfo,
+      sql: query2.sql
+    });
+    if (!comment) {
+      return query2;
+    }
+    return {
+      ...query2,
+      sql: appendSqlComment(query2.sql, comment)
+    };
+  }
 };
 function isEmpty(value) {
   if (Array.isArray(value)) {
@@ -107654,6 +107711,11 @@ async function randomUUID2() {
   const crypto7 = await getCrypto();
   return crypto7.randomUUID();
 }
+async function once(target, event) {
+  return new Promise((resolve) => {
+    target.addEventListener(event, resolve, { once: true });
+  });
+}
 var TransactionManagerError = class extends UserFacingError {
   name = "TransactionManagerError";
   constructor(message, meta) {
@@ -107766,15 +107828,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((e2) => debug3("error in discarded transaction:", e2));
           await this.#closeTransaction(transaction, "timed_out");
           throw new TransactionStartTimeoutError();
         }
@@ -111790,15 +111856,28 @@ var App = class _App {
   }
   /**
    * Executes a query plan and returns the result.
+   *
+   * @param queryPlan - The query plan to execute
+   * @param placeholderValues - Placeholder values for the query
+   * @param comments - Pre-computed SQL commenter tags from the client
+   * @param resourceLimits - Resource limits for the query
+   * @param transactionId - Transaction ID if running within a transaction
    */
-  async query(queryPlan, placeholderValues, resourceLimits, transactionId) {
+  async query(queryPlan, placeholderValues, comments, resourceLimits, transactionId) {
     return await this.#tracingHandler.runInChildSpan("query", async () => {
       const queryable = transactionId !== null ? await this.#transactionManager.getTransaction({ id: transactionId }, "query") : this.#db;
+      const sqlCommenter = comments && Object.keys(comments).length > 0 ? {
+        plugins: [() => comments],
+        // For pre-computed comments, we use a placeholder queryInfo since the actual
+        // query info was already used on the client side to compute the comments
+        queryInfo: { type: "single", action: "queryRaw", query: {} }
+      } : void 0;
       const queryInterpreter = QueryInterpreter.forSql({
         placeholderValues,
         tracingHelper: this.#tracingHandler,
         transactionManager: transactionId === null ? { enabled: true, manager: this.#transactionManager } : { enabled: false },
-        onQuery: logQuery
+        onQuery: logQuery,
+        sqlCommenter
       });
       const result = await Promise.race([
         queryInterpreter.run(queryPlan, queryable),
@@ -124031,7 +124110,8 @@ var QueryRequestBody = external_exports.object({
   model: external_exports.string().min(1).optional(),
   operation: external_exports.string().min(1),
   plan: external_exports.record(external_exports.string(), external_exports.unknown()),
-  params: external_exports.record(external_exports.string(), external_exports.unknown())
+  params: external_exports.record(external_exports.string(), external_exports.unknown()),
+  comments: external_exports.record(external_exports.string(), external_exports.string()).optional()
 });
 var TransactionStartRequestBody = external_exports.object({
   timeout: external_exports.number().optional(),
@@ -124075,7 +124155,13 @@ function createHonoServer(app, options) {
     return c2.json(app.getConnectionInfo());
   }).post("/query", zValidator("json", QueryRequestBody), async (c2) => {
     const request3 = c2.req.valid("json");
-    const data = await app.query(request3.plan, request3.params, c2.get("resourceLimits"), null);
+    const data = await app.query(
+      request3.plan,
+      request3.params,
+      request3.comments,
+      c2.get("resourceLimits"),
+      null
+    );
     return c2.json({ data });
   }).post("/transaction/start", zValidator("json", TransactionStartRequestBody), async (c2) => {
     const result = await app.startTransaction(c2.req.valid("json"), c2.get("resourceLimits"));
@@ -124086,6 +124172,7 @@ function createHonoServer(app, options) {
     const data = await app.query(
       request3.plan,
       request3.params,
+      request3.comments,
       c2.get("resourceLimits"),
       c2.req.param("txId")
     );

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@prisma/query-plan-executor",
-  "version": "7.1.0-integration-fix-fix-missing-cockroach-wasm.2",
+  "version": "7.2.0-dev.1",
   "description": "This package is intended for Prisma's internal use",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -20,11 +20,11 @@
     "temporal-polyfill": "0.3.0",
     "vitest": "3.2.4",
     "zod": "4.1.3",
-    "@prisma/adapter-pg": "7.1.0-integration-fix-fix-missing-cockroach-wasm.2",
-    "@prisma/adapter-mariadb": "7.1.0-integration-fix-fix-missing-cockroach-wasm.2",
-    "@prisma/adapter-mssql": "7.1.0-integration-fix-fix-missing-cockroach-wasm.2",
-    "@prisma/client-engine-runtime": "7.1.0-integration-fix-fix-missing-cockroach-wasm.2",
-    "@prisma/driver-adapter-utils": "7.1.0-integration-fix-fix-missing-cockroach-wasm.2"
+    "@prisma/adapter-pg": "7.2.0-dev.1",
+    "@prisma/adapter-mariadb": "7.2.0-dev.1",
+    "@prisma/adapter-mssql": "7.2.0-dev.1",
+    "@prisma/driver-adapter-utils": "7.2.0-dev.1",
+    "@prisma/client-engine-runtime": "7.2.0-dev.1"
   },
   "files": [
     "dist"