@prisma/client-engine-runtime 6.11.0-dev.4 → 6.11.0-dev.40

package/dist/QueryPlan.d.ts

@@ -59,7 +59,7 @@ export type ResultNode = {
 } | {
     type: 'Object';
     fields: Record<string, ResultNode>;
-    flattened: boolean;
+    serializedName: string | null;
 } | {
     type: 'Value';
     dbName: string;

package/dist/index.d.mts

@@ -336,7 +336,7 @@ export declare type ResultNode = {
 } | {
     type: 'Object';
     fields: Record<string, ResultNode>;
-    flattened: boolean;
+    serializedName: string | null;
 } | {
     type: 'Value';
     dbName: string;

package/dist/index.d.ts

@@ -336,7 +336,7 @@ export declare type ResultNode = {
 } | {
     type: 'Object';
     fields: Record<string, ResultNode>;
-    flattened: boolean;
+    serializedName: string | null;
 } | {
     type: 'Value';
     dbName: string;

package/dist/index.js

@@ -140,12 +140,12 @@ function mapObject(data, fields, enums) {
         throw new DataMapperError(`Unexpected 'AffectedRows' node in data mapping for field '${name}'`);
       }
       case "Object": {
-        if (!node.flattened && !Object.hasOwn(data, name)) {
+        if (node.serializedName !== null && !Object.hasOwn(data, node.serializedName)) {
           throw new DataMapperError(
             `Missing data field (Object): '${name}'; node: ${JSON.stringify(node)}; data: ${JSON.stringify(data)}`
           );
         }
-        const target = node.flattened ? data : data[name];
+        const target = node.serializedName !== null ? data[node.serializedName] : data;
         result[name] = mapArrayOrObject(target, node.fields, enums);
         break;
       }
@@ -230,6 +230,12 @@ function mapValue(value, columnName, resultType, enums) {
           throw new DataMapperError(`Expected a boolean in column '${columnName}', got ${typeof value}: ${value}`);
         }
       }
+      if (value instanceof Uint8Array) {
+        for (const byte of value) {
+          if (byte !== 0) return true;
+        }
+        return false;
+      }
       throw new DataMapperError(`Expected a boolean in column '${columnName}', got ${typeof value}: ${value}`);
     }
     case "Decimal":
@@ -267,6 +273,9 @@ function mapValue(value, columnName, resultType, enums) {
       if (Array.isArray(value)) {
         return { $type: "Bytes", value: Buffer.from(value).toString("base64") };
       }
+      if (value instanceof Uint8Array) {
+        return { $type: "Bytes", value: Buffer.from(value).toString("base64") };
+      }
       throw new DataMapperError(`Expected a byte array in column '${columnName}', got ${typeof value}: ${value}`);
     }
     case "Enum": {
@@ -468,7 +477,7 @@ function renderErrorMessage(err) {
     case "NullConstraintViolation":
       return `Null constraint violation on the ${renderConstraint(err.cause.constraint)}`;
     case "ValueOutOfRange":
-      return `Value out of range for the type. ${err.cause.cause}`;
+      return `Value out of range for the type: ${err.cause.cause}`;
     case "TableDoesNotExist": {
       const table = err.cause.table ?? "(not available)";
       return `The table \`${table}\` does not exist in the current database.`;
@@ -764,8 +773,16 @@ function doesRequireEvaluation(param) {
 // src/interpreter/serializeSql.ts
 var import_driver_adapter_utils2 = require("@prisma/driver-adapter-utils");
 function serializeSql(resultSet) {
+  const mappers = resultSet.columnTypes.map((type) => {
+    switch (type) {
+      case import_driver_adapter_utils2.ColumnTypeEnum.Bytes:
+        return (value) => Array.isArray(value) ? new Uint8Array(value) : value;
+      default:
+        return (value) => value;
+    }
+  });
   return resultSet.rows.map(
-    (row) => row.reduce((acc, value, index) => {
+    (row) => row.map((value, index) => mappers[index](value)).reduce((acc, value, index) => {
       const splitByDot = resultSet.columnNames[index].split(".");
       let nested = acc;
       for (let i = 0; i < splitByDot.length; i++) {
@@ -787,6 +804,8 @@ function serializeRawSql(resultSet) {
   const types = resultSet.columnTypes.map((type) => serializeColumnType(type));
   const mappers = types.map((type) => {
     switch (type) {
+      case "bytes":
+        return (value) => Array.isArray(value) ? new Uint8Array(value) : value;
       case "int":
         return (value) => value === null ? null : typeof value === "number" ? value : parseInt(`${value}`, 10);
       case "bigint":
@@ -1424,17 +1443,16 @@ var TransactionManager = class {
       transaction: void 0
     };
     this.transactions.set(transaction.id, transaction);
-    transaction.timer = this.startTransactionTimeout(transaction.id, validatedOptions.maxWait);
-    const startedTransaction = await this.driverAdapter.startTransaction(validatedOptions.isolationLevel);
+    const startTimer = setTimeout(() => transaction.status = "timed_out", validatedOptions.maxWait);
+    transaction.transaction = await this.driverAdapter.startTransaction(validatedOptions.isolationLevel);
+    clearTimeout(startTimer);
     switch (transaction.status) {
       case "waiting":
-        transaction.transaction = startedTransaction;
-        clearTimeout(transaction.timer);
-        transaction.timer = void 0;
         transaction.status = "running";
         transaction.timer = this.startTransactionTimeout(transaction.id, validatedOptions.timeout);
         return { id: transaction.id };
       case "timed_out":
+        await this.closeTransaction(transaction, "timed_out");
         throw new TransactionStartTimeoutError();
       case "running":
       case "committed":
@@ -1511,30 +1529,33 @@ var TransactionManager = class {
   async closeTransaction(tx, status) {
     debug("Closing transaction.", { transactionId: tx.id, status });
     tx.status = status;
-    if (tx.transaction && status === "committed") {
-      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));
+    try {
+      if (tx.transaction && status === "committed") {
+        if (tx.transaction.options.usePhantomQuery) {
+          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();
+        }
+      } else if (tx.transaction) {
+        if (tx.transaction.options.usePhantomQuery) {
+          await this.#withQuerySpanAndEvent(PHANTOM_ROLLBACK_QUERY(), tx.transaction, () => tx.transaction.rollback());
+        } else {
+          const query = ROLLBACK_QUERY();
+          await this.#withQuerySpanAndEvent(query, tx.transaction, () => tx.transaction.executeRaw(query));
+          await tx.transaction.rollback();
+        }
       }
-    } else if (tx.transaction) {
-      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));
+    } finally {
+      clearTimeout(tx.timer);
+      tx.timer = void 0;
+      this.transactions.delete(tx.id);
+      this.closedTransactions.push(tx);
+      if (this.closedTransactions.length > MAX_CLOSED_TRANSACTIONS) {
+        this.closedTransactions.shift();
       }
     }
-    clearTimeout(tx.timer);
-    tx.timer = void 0;
-    this.transactions.delete(tx.id);
-    this.closedTransactions.push(tx);
-    if (this.closedTransactions.length > MAX_CLOSED_TRANSACTIONS) {
-      this.closedTransactions.shift();
-    }
   }
   validateOptions(options) {
     if (!options.timeout) throw new TransactionManagerError("timeout is required");

package/dist/index.mjs

@@ -92,12 +92,12 @@ function mapObject(data, fields, enums) {
         throw new DataMapperError(`Unexpected 'AffectedRows' node in data mapping for field '${name}'`);
       }
       case "Object": {
-        if (!node.flattened && !Object.hasOwn(data, name)) {
+        if (node.serializedName !== null && !Object.hasOwn(data, node.serializedName)) {
           throw new DataMapperError(
             `Missing data field (Object): '${name}'; node: ${JSON.stringify(node)}; data: ${JSON.stringify(data)}`
           );
         }
-        const target = node.flattened ? data : data[name];
+        const target = node.serializedName !== null ? data[node.serializedName] : data;
         result[name] = mapArrayOrObject(target, node.fields, enums);
         break;
       }
@@ -182,6 +182,12 @@ function mapValue(value, columnName, resultType, enums) {
           throw new DataMapperError(`Expected a boolean in column '${columnName}', got ${typeof value}: ${value}`);
         }
       }
+      if (value instanceof Uint8Array) {
+        for (const byte of value) {
+          if (byte !== 0) return true;
+        }
+        return false;
+      }
       throw new DataMapperError(`Expected a boolean in column '${columnName}', got ${typeof value}: ${value}`);
     }
     case "Decimal":
@@ -219,6 +225,9 @@ function mapValue(value, columnName, resultType, enums) {
       if (Array.isArray(value)) {
         return { $type: "Bytes", value: Buffer.from(value).toString("base64") };
       }
+      if (value instanceof Uint8Array) {
+        return { $type: "Bytes", value: Buffer.from(value).toString("base64") };
+      }
       throw new DataMapperError(`Expected a byte array in column '${columnName}', got ${typeof value}: ${value}`);
     }
     case "Enum": {
@@ -420,7 +429,7 @@ function renderErrorMessage(err) {
     case "NullConstraintViolation":
       return `Null constraint violation on the ${renderConstraint(err.cause.constraint)}`;
     case "ValueOutOfRange":
-      return `Value out of range for the type. ${err.cause.cause}`;
+      return `Value out of range for the type: ${err.cause.cause}`;
     case "TableDoesNotExist": {
       const table = err.cause.table ?? "(not available)";
       return `The table \`${table}\` does not exist in the current database.`;
@@ -716,8 +725,16 @@ function doesRequireEvaluation(param) {
 // src/interpreter/serializeSql.ts
 import { ColumnTypeEnum } from "@prisma/driver-adapter-utils";
 function serializeSql(resultSet) {
+  const mappers = resultSet.columnTypes.map((type) => {
+    switch (type) {
+      case ColumnTypeEnum.Bytes:
+        return (value) => Array.isArray(value) ? new Uint8Array(value) : value;
+      default:
+        return (value) => value;
+    }
+  });
   return resultSet.rows.map(
-    (row) => row.reduce((acc, value, index) => {
+    (row) => row.map((value, index) => mappers[index](value)).reduce((acc, value, index) => {
       const splitByDot = resultSet.columnNames[index].split(".");
       let nested = acc;
       for (let i = 0; i < splitByDot.length; i++) {
@@ -739,6 +756,8 @@ function serializeRawSql(resultSet) {
   const types = resultSet.columnTypes.map((type) => serializeColumnType(type));
   const mappers = types.map((type) => {
     switch (type) {
+      case "bytes":
+        return (value) => Array.isArray(value) ? new Uint8Array(value) : value;
       case "int":
         return (value) => value === null ? null : typeof value === "number" ? value : parseInt(`${value}`, 10);
       case "bigint":
@@ -1376,17 +1395,16 @@ var TransactionManager = class {
       transaction: void 0
     };
     this.transactions.set(transaction.id, transaction);
-    transaction.timer = this.startTransactionTimeout(transaction.id, validatedOptions.maxWait);
-    const startedTransaction = await this.driverAdapter.startTransaction(validatedOptions.isolationLevel);
+    const startTimer = setTimeout(() => transaction.status = "timed_out", validatedOptions.maxWait);
+    transaction.transaction = await this.driverAdapter.startTransaction(validatedOptions.isolationLevel);
+    clearTimeout(startTimer);
     switch (transaction.status) {
       case "waiting":
-        transaction.transaction = startedTransaction;
-        clearTimeout(transaction.timer);
-        transaction.timer = void 0;
         transaction.status = "running";
         transaction.timer = this.startTransactionTimeout(transaction.id, validatedOptions.timeout);
         return { id: transaction.id };
       case "timed_out":
+        await this.closeTransaction(transaction, "timed_out");
         throw new TransactionStartTimeoutError();
       case "running":
       case "committed":
@@ -1463,30 +1481,33 @@ var TransactionManager = class {
   async closeTransaction(tx, status) {
     debug("Closing transaction.", { transactionId: tx.id, status });
     tx.status = status;
-    if (tx.transaction && status === "committed") {
-      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));
+    try {
+      if (tx.transaction && status === "committed") {
+        if (tx.transaction.options.usePhantomQuery) {
+          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();
+        }
+      } else if (tx.transaction) {
+        if (tx.transaction.options.usePhantomQuery) {
+          await this.#withQuerySpanAndEvent(PHANTOM_ROLLBACK_QUERY(), tx.transaction, () => tx.transaction.rollback());
+        } else {
+          const query = ROLLBACK_QUERY();
+          await this.#withQuerySpanAndEvent(query, tx.transaction, () => tx.transaction.executeRaw(query));
+          await tx.transaction.rollback();
+        }
       }
-    } else if (tx.transaction) {
-      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));
+    } finally {
+      clearTimeout(tx.timer);
+      tx.timer = void 0;
+      this.transactions.delete(tx.id);
+      this.closedTransactions.push(tx);
+      if (this.closedTransactions.length > MAX_CLOSED_TRANSACTIONS) {
+        this.closedTransactions.shift();
       }
     }
-    clearTimeout(tx.timer);
-    tx.timer = void 0;
-    this.transactions.delete(tx.id);
-    this.closedTransactions.push(tx);
-    if (this.closedTransactions.length > MAX_CLOSED_TRANSACTIONS) {
-      this.closedTransactions.shift();
-    }
   }
   validateOptions(options) {
     if (!options.timeout) throw new TransactionManagerError("timeout is required");

package/package.json

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