@prisma/client-engine-runtime 6.9.0-dev.25 → 6.9.0-dev.27

package/dist/index.js

@@ -96,7 +96,7 @@ function applyDataMap(data, structure) {
     case "Object":
       return mapArrayOrObject(data, structure.fields);
     case "Value":
-      return mapValue(data, structure.resultType);
+      return mapValue(data, "<result>", structure.resultType);
     default:
       assertNever(structure, `Invalid data mapping type: '${structure.type}'`);
   }
@@ -145,7 +145,7 @@ function mapObject(data, fields) {
         {
           const dbName = node.dbName;
           if (Object.hasOwn(data, dbName)) {
-            result[name] = mapValue(data[dbName], node.resultType);
+            result[name] = mapValue(data[dbName], dbName, node.resultType);
           } else {
             throw new DataMapperError(
               `Missing data field (Value): '${dbName}'; node: ${JSON.stringify(node)}; data: ${JSON.stringify(data)}`
@@ -159,41 +159,113 @@ function mapObject(data, fields) {
   }
   return result;
 }
-function mapValue(value, resultType) {
+function mapValue(value, columnName, resultType) {
   if (value === null) return null;
   switch (resultType.type) {
     case "Any":
       return value;
-    case "String":
-      return typeof value === "string" ? value : `${value}`;
-    case "Int":
-      return typeof value === "number" ? value : parseInt(`${value}`, 10);
-    case "BigInt":
-      return typeof value === "bigint" ? value : BigInt(`${value}`);
-    case "Float":
-      return typeof value === "number" ? value : parseFloat(`${value}`);
-    case "Boolean":
-      return typeof value === "boolean" ? value : value !== "0";
+    case "String": {
+      if (typeof value !== "string") {
+        throw new DataMapperError(`Expected a string in column '${columnName}', got ${typeof value}: ${value}`);
+      }
+      return value;
+    }
+    case "Int": {
+      switch (typeof value) {
+        case "number": {
+          if (Number.isInteger(value)) {
+            return value;
+          }
+          throw new DataMapperError(`Expected an integer in column '${columnName}', got float: ${value}`);
+        }
+        case "string": {
+          const numberValue = Number(value);
+          if (Number.isInteger(numberValue)) {
+            return numberValue;
+          }
+          try {
+            BigInt(value);
+          } catch {
+            throw new DataMapperError(`Expected an integer in column '${columnName}', got string: ${value}`);
+          }
+          throw new DataMapperError(
+            `Integer value in column '${columnName}' is too large to represent as a JavaScript number without loss of precision, got: ${value}. Consider using BigInt type.`
+          );
+        }
+        default:
+          throw new DataMapperError(`Expected an integer in column '${columnName}', got ${typeof value}: ${value}`);
+      }
+    }
+    case "BigInt": {
+      if (typeof value !== "number" && typeof value !== "string") {
+        throw new DataMapperError(`Expected a bigint in column '${columnName}', got ${typeof value}: ${value}`);
+      }
+      return { $type: "BigInt", value };
+    }
+    case "Float": {
+      if (typeof value === "number") return value;
+      if (typeof value === "string") {
+        const parsedValue = Number(value);
+        if (Number.isNaN(parsedValue) && !/^[-+]?nan$/.test(value.toLowerCase())) {
+          throw new DataMapperError(`Expected a float in column '${columnName}', got string: ${value}`);
+        }
+        return parsedValue;
+      }
+      throw new DataMapperError(`Expected a float in column '${columnName}', got ${typeof value}: ${value}`);
+    }
+    case "Boolean": {
+      if (typeof value === "boolean") return value;
+      if (typeof value === "number") return value === 1;
+      if (typeof value === "string") {
+        if (value === "true" || value === "TRUE" || value === "1") {
+          return true;
+        } else if (value === "false" || value === "FALSE" || value === "0") {
+          return false;
+        } else {
+          throw new DataMapperError(`Expected a boolean in column '${columnName}', got ${typeof value}: ${value}`);
+        }
+      }
+      throw new DataMapperError(`Expected a boolean in column '${columnName}', got ${typeof value}: ${value}`);
+    }
     case "Decimal":
-      return typeof value === "number" ? new import_decimal2.default(value) : new import_decimal2.default(`${value}`);
-    case "Date":
-      return value instanceof Date ? value : /* @__PURE__ */ new Date(`${value}`);
+      if (typeof value !== "number" && typeof value !== "string" && !import_decimal2.default.isDecimal(value)) {
+        throw new DataMapperError(`Expected a decimal in column '${columnName}', got ${typeof value}: ${value}`);
+      }
+      return { $type: "Decimal", value };
+    case "Date": {
+      if (typeof value === "string") {
+        return { $type: "DateTime", value: ensureTimezoneInIsoString(value) };
+      }
+      if (typeof value === "number" || value instanceof Date) {
+        return { $type: "DateTime", value };
+      }
+      throw new DataMapperError(`Expected a date in column '${columnName}', got ${typeof value}: ${value}`);
+    }
     case "Array": {
       const values = value;
-      return values.map((v) => mapValue(v, resultType.inner));
+      return values.map((v, i) => mapValue(v, `${columnName}[${i}]`, resultType.inner));
+    }
+    case "Object": {
+      const jsonValue = typeof value === "string" ? value : safeJsonStringify(value);
+      return { $type: "Json", value: jsonValue };
     }
-    case "Object":
-      return typeof value === "string" ? value : JSON.stringify(value);
     case "Bytes": {
-      if (!Array.isArray(value)) {
-        throw new DataMapperError(`Bytes data is invalid, got: ${typeof value}`);
+      if (typeof value === "string" && value.startsWith("\\x")) {
+        return { $type: "Bytes", value: Buffer.from(value.slice(2), "hex").toString("base64") };
+      }
+      if (Array.isArray(value)) {
+        return { $type: "Bytes", value: Buffer.from(value).toString("base64") };
       }
-      return new Uint8Array(value);
+      throw new DataMapperError(`Expected a byte array in column '${columnName}', got ${typeof value}: ${value}`);
     }
     default:
       assertNever(resultType, `DataMapper: Unknown result type: ${resultType.type}`);
   }
 }
+var TIMEZONE_PATTERN = /Z$|[+-]\d{2}(:?\d{2})?$/;
+function ensureTimezoneInIsoString(dt) {
+  return TIMEZONE_PATTERN.test(dt) ? dt : `${dt}Z`;
+}
 
 // src/tracing.ts
 var import_api = require("@opentelemetry/api");
@@ -661,9 +733,9 @@ function serializeRawSql(resultSet) {
   const mappers = types.map((type) => {
     switch (type) {
       case "int":
-        return (value) => typeof value === "number" ? value : parseInt(`${value}`, 10);
+        return (value) => value === null ? null : typeof value === "number" ? value : parseInt(`${value}`, 10);
       case "bigint":
-        return (value) => typeof value === "bigint" ? value : BigInt(`${value}`);
+        return (value) => value === null ? null : typeof value === "bigint" ? value : BigInt(`${value}`);
       default:
         return (value) => value;
     }

package/dist/index.mjs

@@ -48,7 +48,7 @@ function applyDataMap(data, structure) {
     case "Object":
       return mapArrayOrObject(data, structure.fields);
     case "Value":
-      return mapValue(data, structure.resultType);
+      return mapValue(data, "<result>", structure.resultType);
     default:
       assertNever(structure, `Invalid data mapping type: '${structure.type}'`);
   }
@@ -97,7 +97,7 @@ function mapObject(data, fields) {
         {
           const dbName = node.dbName;
           if (Object.hasOwn(data, dbName)) {
-            result[name] = mapValue(data[dbName], node.resultType);
+            result[name] = mapValue(data[dbName], dbName, node.resultType);
           } else {
             throw new DataMapperError(
               `Missing data field (Value): '${dbName}'; node: ${JSON.stringify(node)}; data: ${JSON.stringify(data)}`
@@ -111,41 +111,113 @@ function mapObject(data, fields) {
   }
   return result;
 }
-function mapValue(value, resultType) {
+function mapValue(value, columnName, resultType) {
   if (value === null) return null;
   switch (resultType.type) {
     case "Any":
       return value;
-    case "String":
-      return typeof value === "string" ? value : `${value}`;
-    case "Int":
-      return typeof value === "number" ? value : parseInt(`${value}`, 10);
-    case "BigInt":
-      return typeof value === "bigint" ? value : BigInt(`${value}`);
-    case "Float":
-      return typeof value === "number" ? value : parseFloat(`${value}`);
-    case "Boolean":
-      return typeof value === "boolean" ? value : value !== "0";
+    case "String": {
+      if (typeof value !== "string") {
+        throw new DataMapperError(`Expected a string in column '${columnName}', got ${typeof value}: ${value}`);
+      }
+      return value;
+    }
+    case "Int": {
+      switch (typeof value) {
+        case "number": {
+          if (Number.isInteger(value)) {
+            return value;
+          }
+          throw new DataMapperError(`Expected an integer in column '${columnName}', got float: ${value}`);
+        }
+        case "string": {
+          const numberValue = Number(value);
+          if (Number.isInteger(numberValue)) {
+            return numberValue;
+          }
+          try {
+            BigInt(value);
+          } catch {
+            throw new DataMapperError(`Expected an integer in column '${columnName}', got string: ${value}`);
+          }
+          throw new DataMapperError(
+            `Integer value in column '${columnName}' is too large to represent as a JavaScript number without loss of precision, got: ${value}. Consider using BigInt type.`
+          );
+        }
+        default:
+          throw new DataMapperError(`Expected an integer in column '${columnName}', got ${typeof value}: ${value}`);
+      }
+    }
+    case "BigInt": {
+      if (typeof value !== "number" && typeof value !== "string") {
+        throw new DataMapperError(`Expected a bigint in column '${columnName}', got ${typeof value}: ${value}`);
+      }
+      return { $type: "BigInt", value };
+    }
+    case "Float": {
+      if (typeof value === "number") return value;
+      if (typeof value === "string") {
+        const parsedValue = Number(value);
+        if (Number.isNaN(parsedValue) && !/^[-+]?nan$/.test(value.toLowerCase())) {
+          throw new DataMapperError(`Expected a float in column '${columnName}', got string: ${value}`);
+        }
+        return parsedValue;
+      }
+      throw new DataMapperError(`Expected a float in column '${columnName}', got ${typeof value}: ${value}`);
+    }
+    case "Boolean": {
+      if (typeof value === "boolean") return value;
+      if (typeof value === "number") return value === 1;
+      if (typeof value === "string") {
+        if (value === "true" || value === "TRUE" || value === "1") {
+          return true;
+        } else if (value === "false" || value === "FALSE" || value === "0") {
+          return false;
+        } else {
+          throw new DataMapperError(`Expected a boolean in column '${columnName}', got ${typeof value}: ${value}`);
+        }
+      }
+      throw new DataMapperError(`Expected a boolean in column '${columnName}', got ${typeof value}: ${value}`);
+    }
     case "Decimal":
-      return typeof value === "number" ? new Decimal2(value) : new Decimal2(`${value}`);
-    case "Date":
-      return value instanceof Date ? value : /* @__PURE__ */ new Date(`${value}`);
+      if (typeof value !== "number" && typeof value !== "string" && !Decimal2.isDecimal(value)) {
+        throw new DataMapperError(`Expected a decimal in column '${columnName}', got ${typeof value}: ${value}`);
+      }
+      return { $type: "Decimal", value };
+    case "Date": {
+      if (typeof value === "string") {
+        return { $type: "DateTime", value: ensureTimezoneInIsoString(value) };
+      }
+      if (typeof value === "number" || value instanceof Date) {
+        return { $type: "DateTime", value };
+      }
+      throw new DataMapperError(`Expected a date in column '${columnName}', got ${typeof value}: ${value}`);
+    }
     case "Array": {
       const values = value;
-      return values.map((v) => mapValue(v, resultType.inner));
+      return values.map((v, i) => mapValue(v, `${columnName}[${i}]`, resultType.inner));
+    }
+    case "Object": {
+      const jsonValue = typeof value === "string" ? value : safeJsonStringify(value);
+      return { $type: "Json", value: jsonValue };
     }
-    case "Object":
-      return typeof value === "string" ? value : JSON.stringify(value);
     case "Bytes": {
-      if (!Array.isArray(value)) {
-        throw new DataMapperError(`Bytes data is invalid, got: ${typeof value}`);
+      if (typeof value === "string" && value.startsWith("\\x")) {
+        return { $type: "Bytes", value: Buffer.from(value.slice(2), "hex").toString("base64") };
+      }
+      if (Array.isArray(value)) {
+        return { $type: "Bytes", value: Buffer.from(value).toString("base64") };
       }
-      return new Uint8Array(value);
+      throw new DataMapperError(`Expected a byte array in column '${columnName}', got ${typeof value}: ${value}`);
     }
     default:
       assertNever(resultType, `DataMapper: Unknown result type: ${resultType.type}`);
   }
 }
+var TIMEZONE_PATTERN = /Z$|[+-]\d{2}(:?\d{2})?$/;
+function ensureTimezoneInIsoString(dt) {
+  return TIMEZONE_PATTERN.test(dt) ? dt : `${dt}Z`;
+}
 
 // src/tracing.ts
 import { SpanKind } from "@opentelemetry/api";
@@ -613,9 +685,9 @@ function serializeRawSql(resultSet) {
   const mappers = types.map((type) => {
     switch (type) {
       case "int":
-        return (value) => typeof value === "number" ? value : parseInt(`${value}`, 10);
+        return (value) => value === null ? null : typeof value === "number" ? value : parseInt(`${value}`, 10);
       case "bigint":
-        return (value) => typeof value === "bigint" ? value : BigInt(`${value}`);
+        return (value) => value === null ? null : typeof value === "bigint" ? value : BigInt(`${value}`);
       default:
         return (value) => value;
     }

package/package.json

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