@prisma/client-engine-runtime 6.14.0-dev.17 → 6.14.0-dev.18

package/dist/QueryPlan.d.ts

@@ -46,6 +46,8 @@ export type PrismaValueType = {
 } | {
     type: 'Array';
     inner: PrismaValueType;
+} | {
+    type: 'Json';
 } | {
     type: 'Object';
 } | {

package/dist/UserFacingError.d.ts

@@ -14,3 +14,4 @@ export declare class UserFacingError extends Error {
     };
 }
 export declare function rethrowAsUserFacing(error: any): never;
+export declare function rethrowAsUserFacingRawError(error: any): never;

package/dist/index.d.mts

@@ -140,6 +140,8 @@ export declare const noopTracingHelper: TracingHelper;
 
 export declare function normalizeJsonProtocolValues(result: unknown): unknown;
 
+export declare function normalizeRawJsonProtocolResponse(response: RawResponse): RawResponse;
+
 export declare type Pagination = {
     cursor: Record<string, PrismaValue> | null;
     take: number | null;
@@ -201,6 +203,8 @@ export declare type PrismaValueType = {
 } | {
     type: 'Array';
     inner: PrismaValueType;
+} | {
+    type: 'Json';
 } | {
     type: 'Object';
 } | {
@@ -380,6 +384,12 @@ export declare type QueryPlanNode = {
     };
 };
 
+export declare type RawResponse = {
+    columns: string[];
+    types: string[];
+    rows: unknown[][];
+};
+
 export declare type ResultNode = {
     type: 'AffectedRows';
 } | {

package/dist/index.d.ts

@@ -140,6 +140,8 @@ export declare const noopTracingHelper: TracingHelper;
 
 export declare function normalizeJsonProtocolValues(result: unknown): unknown;
 
+export declare function normalizeRawJsonProtocolResponse(response: RawResponse): RawResponse;
+
 export declare type Pagination = {
     cursor: Record<string, PrismaValue> | null;
     take: number | null;
@@ -201,6 +203,8 @@ export declare type PrismaValueType = {
 } | {
     type: 'Array';
     inner: PrismaValueType;
+} | {
+    type: 'Json';
 } | {
     type: 'Object';
 } | {
@@ -380,6 +384,12 @@ export declare type QueryPlanNode = {
     };
 };
 
+export declare type RawResponse = {
+    columns: string[];
+    types: string[];
+    rows: unknown[][];
+};
+
 export declare type ResultNode = {
     type: 'AffectedRows';
 } | {

package/dist/index.js

@@ -43,6 +43,7 @@ __export(index_exports, {
   isPrismaValuePlaceholder: () => isPrismaValuePlaceholder,
   noopTracingHelper: () => noopTracingHelper,
   normalizeJsonProtocolValues: () => normalizeJsonProtocolValues,
+  normalizeRawJsonProtocolResponse: () => normalizeRawJsonProtocolResponse,
   safeJsonStringify: () => safeJsonStringify
 });
 module.exports = __toCommonJS(index_exports);
@@ -318,8 +319,10 @@ function mapValue(value, columnName, resultType, enums) {
       return values.map((v, i) => mapValue(v, `${columnName}[${i}]`, resultType.inner, enums));
     }
     case "Object": {
-      const jsonValue = typeof value === "string" ? value : safeJsonStringify(value);
-      return { $type: "Json", value: jsonValue };
+      return { $type: "Json", value: safeJsonStringify(value) };
+    }
+    case "Json": {
+      return { $type: "Json", value: `${value}` };
     }
     case "Bytes": {
       if (typeof value === "string" && value.startsWith("\\x")) {
@@ -340,7 +343,7 @@ function mapValue(value, columnName, resultType, enums) {
       }
       const enumValue = enumDef[`${value}`];
       if (enumValue === void 0) {
-        throw new DataMapperError(`Unknown enum value '${value}' for enum '${resultType.inner}'`);
+        throw new DataMapperError(`Value '${value}' not found in enum '${resultType.inner}'`);
       }
       return enumValue;
     }
@@ -450,6 +453,16 @@ function rethrowAsUserFacing(error) {
   }
   throw new UserFacingError(message, code, { driverAdapterError: error });
 }
+function rethrowAsUserFacingRawError(error) {
+  if (!(0, import_driver_adapter_utils.isDriverAdapterError)(error)) {
+    throw error;
+  }
+  throw new UserFacingError(
+    `Raw query failed. Code: ${error.cause.originalCode ?? "N/A"}. Message: ${error.cause.originalMessage ?? renderErrorMessage(error)}`,
+    "P2010",
+    { driverAdapterError: error }
+  );
+}
 function getErrorCode(err) {
   switch (err.cause.kind) {
     case "AuthenticationFailed":
@@ -991,29 +1004,90 @@ function serializeSql(resultSet) {
   );
 }
 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":
-        return (value) => value === null ? null : typeof value === "bigint" ? value : BigInt(`${value}`);
-      case "json":
-        return (value) => typeof value === "string" ? JSON.parse(value) : value;
-      case "bool":
-        return (value) => typeof value === "string" ? value === "true" || value === "1" : typeof value === "number" ? value === 1 : value;
-      default:
-        return (value) => value;
-    }
-  });
   return {
     columns: resultSet.columnNames,
     types: resultSet.columnTypes.map((type) => serializeColumnType(type)),
-    rows: resultSet.rows.map((row) => row.map((value, index) => mappers[index](value)))
+    rows: resultSet.rows.map(
+      (row) => row.map((value, index) => serializeRawValue(value, resultSet.columnTypes[index]))
+    )
   };
 }
+function serializeRawValue(value, type) {
+  if (value === null) {
+    return null;
+  }
+  switch (type) {
+    case import_driver_adapter_utils2.ColumnTypeEnum.Int32:
+      switch (typeof value) {
+        case "number":
+          return Math.trunc(value);
+        case "string":
+          return Math.trunc(Number(value));
+        default:
+          throw new Error(`Cannot serialize value of type ${typeof value} as Int32`);
+      }
+    case import_driver_adapter_utils2.ColumnTypeEnum.Int32Array:
+      if (!Array.isArray(value)) {
+        throw new Error(`Cannot serialize value of type ${typeof value} as Int32Array`);
+      }
+      return value.map((v) => serializeRawValue(v, import_driver_adapter_utils2.ColumnTypeEnum.Int32));
+    case import_driver_adapter_utils2.ColumnTypeEnum.Int64:
+      switch (typeof value) {
+        case "number":
+          return BigInt(Math.trunc(value));
+        case "string":
+          return value;
+        default:
+          throw new Error(`Cannot serialize value of type ${typeof value} as Int64`);
+      }
+    case import_driver_adapter_utils2.ColumnTypeEnum.Int64Array:
+      if (!Array.isArray(value)) {
+        throw new Error(`Cannot serialize value of type ${typeof value} as Int64Array`);
+      }
+      return value.map((v) => serializeRawValue(v, import_driver_adapter_utils2.ColumnTypeEnum.Int64));
+    case import_driver_adapter_utils2.ColumnTypeEnum.Json:
+      switch (typeof value) {
+        case "string":
+          return JSON.parse(value);
+        default:
+          throw new Error(`Cannot serialize value of type ${typeof value} as Json`);
+      }
+    case import_driver_adapter_utils2.ColumnTypeEnum.JsonArray:
+      if (!Array.isArray(value)) {
+        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":
+          return value;
+        case "string":
+          return value === "true" || value === "1";
+        case "number":
+          return value === 1;
+        default:
+          throw new Error(`Cannot serialize value of type ${typeof value} as Boolean`);
+      }
+    case import_driver_adapter_utils2.ColumnTypeEnum.BooleanArray:
+      if (!Array.isArray(value)) {
+        throw new Error(`Cannot serialize value of type ${typeof value} as BooleanArray`);
+      }
+      return value.map((v) => serializeRawValue(v, import_driver_adapter_utils2.ColumnTypeEnum.Boolean));
+    default:
+      return value;
+  }
+}
 function serializeColumnType(columnType) {
   switch (columnType) {
     case import_driver_adapter_utils2.ColumnTypeEnum.Int32:
@@ -1261,7 +1335,13 @@ var QueryInterpreter = class _QueryInterpreter {
         const queries = renderQuery(node.args, scope, generators, this.#maxChunkSize());
         let sum = 0;
         for (const query of queries) {
-          sum += await this.#withQuerySpanAndEvent(query, queryable, () => queryable.executeRaw(query));
+          sum += await this.#withQuerySpanAndEvent(
+            query,
+            queryable,
+            () => queryable.executeRaw(query).catch(
+              (err) => node.args.type === "rawSql" ? rethrowAsUserFacingRawError(err) : rethrowAsUserFacing(err)
+            )
+          );
         }
         return { value: sum };
       }
@@ -1269,7 +1349,13 @@ var QueryInterpreter = class _QueryInterpreter {
         const queries = renderQuery(node.args, scope, generators, this.#maxChunkSize());
         let results;
         for (const query of queries) {
-          const result = await this.#withQuerySpanAndEvent(query, queryable, () => queryable.queryRaw(query));
+          const result = await this.#withQuerySpanAndEvent(
+            query,
+            queryable,
+            () => queryable.queryRaw(query).catch(
+              (err) => node.args.type === "rawSql" ? rethrowAsUserFacingRawError(err) : rethrowAsUserFacing(err)
+            )
+          );
           if (results === void 0) {
             results = result;
           } else {
@@ -1614,6 +1700,35 @@ function mapObjectValues(object, mapper) {
   return result;
 }
 
+// src/raw-json-protocol.ts
+var import_decimal4 = __toESM(require("decimal.js"));
+function normalizeRawJsonProtocolResponse(response) {
+  for (let i = 0; i < response.rows.length; i++) {
+    const row = response.rows[i];
+    for (let j = 0; j < row.length; j++) {
+      row[j] = normalizeValue(response.types[j], row[j]);
+    }
+  }
+  return response;
+}
+function normalizeValue(type, value) {
+  if (value === null) {
+    return value;
+  }
+  switch (type) {
+    case "bigint":
+      return String(BigInt(value));
+    case "decimal":
+      return String(new import_decimal4.default(value));
+    case "bigint-array":
+      return value.map((v) => normalizeValue("bigint", v));
+    case "decimal-array":
+      return value.map((v) => normalizeValue("decimal", v));
+    default:
+      return value;
+  }
+}
+
 // src/transactionManager/TransactionManager.ts
 var import_debug = require("@prisma/debug");
 
@@ -1890,5 +2005,6 @@ var TransactionManager = class {
   isPrismaValuePlaceholder,
   noopTracingHelper,
   normalizeJsonProtocolValues,
+  normalizeRawJsonProtocolResponse,
   safeJsonStringify
 });

package/dist/index.mjs

@@ -269,8 +269,10 @@ function mapValue(value, columnName, resultType, enums) {
       return values.map((v, i) => mapValue(v, `${columnName}[${i}]`, resultType.inner, enums));
     }
     case "Object": {
-      const jsonValue = typeof value === "string" ? value : safeJsonStringify(value);
-      return { $type: "Json", value: jsonValue };
+      return { $type: "Json", value: safeJsonStringify(value) };
+    }
+    case "Json": {
+      return { $type: "Json", value: `${value}` };
     }
     case "Bytes": {
       if (typeof value === "string" && value.startsWith("\\x")) {
@@ -291,7 +293,7 @@ function mapValue(value, columnName, resultType, enums) {
       }
       const enumValue = enumDef[`${value}`];
       if (enumValue === void 0) {
-        throw new DataMapperError(`Unknown enum value '${value}' for enum '${resultType.inner}'`);
+        throw new DataMapperError(`Value '${value}' not found in enum '${resultType.inner}'`);
       }
       return enumValue;
     }
@@ -401,6 +403,16 @@ function rethrowAsUserFacing(error) {
   }
   throw new UserFacingError(message, code, { driverAdapterError: error });
 }
+function rethrowAsUserFacingRawError(error) {
+  if (!isDriverAdapterError(error)) {
+    throw error;
+  }
+  throw new UserFacingError(
+    `Raw query failed. Code: ${error.cause.originalCode ?? "N/A"}. Message: ${error.cause.originalMessage ?? renderErrorMessage(error)}`,
+    "P2010",
+    { driverAdapterError: error }
+  );
+}
 function getErrorCode(err) {
   switch (err.cause.kind) {
     case "AuthenticationFailed":
@@ -942,29 +954,90 @@ function serializeSql(resultSet) {
   );
 }
 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":
-        return (value) => value === null ? null : typeof value === "bigint" ? value : BigInt(`${value}`);
-      case "json":
-        return (value) => typeof value === "string" ? JSON.parse(value) : value;
-      case "bool":
-        return (value) => typeof value === "string" ? value === "true" || value === "1" : typeof value === "number" ? value === 1 : value;
-      default:
-        return (value) => value;
-    }
-  });
   return {
     columns: resultSet.columnNames,
     types: resultSet.columnTypes.map((type) => serializeColumnType(type)),
-    rows: resultSet.rows.map((row) => row.map((value, index) => mappers[index](value)))
+    rows: resultSet.rows.map(
+      (row) => row.map((value, index) => serializeRawValue(value, resultSet.columnTypes[index]))
+    )
   };
 }
+function serializeRawValue(value, type) {
+  if (value === null) {
+    return null;
+  }
+  switch (type) {
+    case ColumnTypeEnum.Int32:
+      switch (typeof value) {
+        case "number":
+          return Math.trunc(value);
+        case "string":
+          return Math.trunc(Number(value));
+        default:
+          throw new Error(`Cannot serialize value of type ${typeof value} as Int32`);
+      }
+    case ColumnTypeEnum.Int32Array:
+      if (!Array.isArray(value)) {
+        throw new Error(`Cannot serialize value of type ${typeof value} as Int32Array`);
+      }
+      return value.map((v) => serializeRawValue(v, ColumnTypeEnum.Int32));
+    case ColumnTypeEnum.Int64:
+      switch (typeof value) {
+        case "number":
+          return BigInt(Math.trunc(value));
+        case "string":
+          return value;
+        default:
+          throw new Error(`Cannot serialize value of type ${typeof value} as Int64`);
+      }
+    case ColumnTypeEnum.Int64Array:
+      if (!Array.isArray(value)) {
+        throw new Error(`Cannot serialize value of type ${typeof value} as Int64Array`);
+      }
+      return value.map((v) => serializeRawValue(v, ColumnTypeEnum.Int64));
+    case ColumnTypeEnum.Json:
+      switch (typeof value) {
+        case "string":
+          return JSON.parse(value);
+        default:
+          throw new Error(`Cannot serialize value of type ${typeof value} as Json`);
+      }
+    case ColumnTypeEnum.JsonArray:
+      if (!Array.isArray(value)) {
+        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":
+          return value;
+        case "string":
+          return value === "true" || value === "1";
+        case "number":
+          return value === 1;
+        default:
+          throw new Error(`Cannot serialize value of type ${typeof value} as Boolean`);
+      }
+    case ColumnTypeEnum.BooleanArray:
+      if (!Array.isArray(value)) {
+        throw new Error(`Cannot serialize value of type ${typeof value} as BooleanArray`);
+      }
+      return value.map((v) => serializeRawValue(v, ColumnTypeEnum.Boolean));
+    default:
+      return value;
+  }
+}
 function serializeColumnType(columnType) {
   switch (columnType) {
     case ColumnTypeEnum.Int32:
@@ -1212,7 +1285,13 @@ var QueryInterpreter = class _QueryInterpreter {
         const queries = renderQuery(node.args, scope, generators, this.#maxChunkSize());
         let sum = 0;
         for (const query of queries) {
-          sum += await this.#withQuerySpanAndEvent(query, queryable, () => queryable.executeRaw(query));
+          sum += await this.#withQuerySpanAndEvent(
+            query,
+            queryable,
+            () => queryable.executeRaw(query).catch(
+              (err) => node.args.type === "rawSql" ? rethrowAsUserFacingRawError(err) : rethrowAsUserFacing(err)
+            )
+          );
         }
         return { value: sum };
       }
@@ -1220,7 +1299,13 @@ var QueryInterpreter = class _QueryInterpreter {
         const queries = renderQuery(node.args, scope, generators, this.#maxChunkSize());
         let results;
         for (const query of queries) {
-          const result = await this.#withQuerySpanAndEvent(query, queryable, () => queryable.queryRaw(query));
+          const result = await this.#withQuerySpanAndEvent(
+            query,
+            queryable,
+            () => queryable.queryRaw(query).catch(
+              (err) => node.args.type === "rawSql" ? rethrowAsUserFacingRawError(err) : rethrowAsUserFacing(err)
+            )
+          );
           if (results === void 0) {
             results = result;
           } else {
@@ -1565,6 +1650,35 @@ function mapObjectValues(object, mapper) {
   return result;
 }
 
+// src/raw-json-protocol.ts
+import Decimal4 from "decimal.js";
+function normalizeRawJsonProtocolResponse(response) {
+  for (let i = 0; i < response.rows.length; i++) {
+    const row = response.rows[i];
+    for (let j = 0; j < row.length; j++) {
+      row[j] = normalizeValue(response.types[j], row[j]);
+    }
+  }
+  return response;
+}
+function normalizeValue(type, value) {
+  if (value === null) {
+    return value;
+  }
+  switch (type) {
+    case "bigint":
+      return String(BigInt(value));
+    case "decimal":
+      return String(new Decimal4(value));
+    case "bigint-array":
+      return value.map((v) => normalizeValue("bigint", v));
+    case "decimal-array":
+      return value.map((v) => normalizeValue("decimal", v));
+    default:
+      return value;
+  }
+}
+
 // src/transactionManager/TransactionManager.ts
 import { Debug } from "@prisma/debug";
 
@@ -1840,5 +1954,6 @@ export {
   isPrismaValuePlaceholder,
   noopTracingHelper,
   normalizeJsonProtocolValues,
+  normalizeRawJsonProtocolResponse,
   safeJsonStringify
 };

package/dist/raw-json-protocol.d.ts

@@ -0,0 +1,6 @@
+export type RawResponse = {
+    columns: string[];
+    types: string[];
+    rows: unknown[][];
+};
+export declare function normalizeRawJsonProtocolResponse(response: RawResponse): RawResponse;

package/package.json

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