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

package/dist/index.d.mts

@@ -7,7 +7,15 @@ import { SqlQueryable } from '@prisma/driver-adapter-utils';
 import { SqlResultSet } from '@prisma/driver-adapter-utils';
 import { Transaction } from '@prisma/driver-adapter-utils';
 
-declare type ConnectorType = 'mysql' | 'mongodb' | 'sqlite' | 'postgresql' | 'postgres' | 'prisma+postgres' | 'sqlserver' | 'cockroachdb';
+export declare type BigIntTaggedValue = {
+    $type: 'BigInt';
+    value: string;
+};
+
+export declare type BytesTaggedValue = {
+    $type: 'Bytes';
+    value: string;
+};
 
 export declare class DataMapperError extends Error {
     name: string;
@@ -26,6 +34,16 @@ export declare type DataRule = {
     type: 'never';
 };
 
+export declare type DateTaggedValue = {
+    $type: 'DateTime';
+    value: string;
+};
+
+export declare type DecimalTaggedValue = {
+    $type: 'Decimal';
+    value: string;
+};
+
 /**
  * Checks if two objects representing the names and values of key columns match. A match is
  * defined by one of the sets of keys being a subset of the other. This function also
@@ -33,6 +51,11 @@ export declare type DataRule = {
  */
 export declare function doKeysMatch(lhs: {}, rhs: {}): boolean;
 
+export declare type EnumTaggedValue = {
+    $type: 'Enum';
+    value: string;
+};
+
 declare type ExtendedSpanOptions = SpanOptions & {
     name: string;
 };
@@ -61,6 +84,13 @@ export declare type FieldOperation = {
     value: PrismaValue;
 };
 
+export declare type FieldRefTaggedValue = {
+    $type: 'FieldRef';
+    value: {
+        _ref: string;
+    };
+};
+
 export declare type Fragment = {
     type: 'stringChunk';
     chunk: string;
@@ -96,8 +126,19 @@ export declare type JoinExpression = {
     isRelationUnique: boolean;
 };
 
+export declare type JsonInputTaggedValue = DateTaggedValue | DecimalTaggedValue | BytesTaggedValue | BigIntTaggedValue | FieldRefTaggedValue | JsonTaggedValue | EnumTaggedValue;
+
+export declare type JsonOutputTaggedValue = DateTaggedValue | DecimalTaggedValue | BytesTaggedValue | BigIntTaggedValue | JsonTaggedValue;
+
+export declare type JsonTaggedValue = {
+    $type: 'Json';
+    value: string;
+};
+
 export declare const noopTracingHelper: TracingHelper;
 
+export declare function normalizeJsonProtocolValues(result: unknown): unknown;
+
 export declare type Pagination = {
     cursor: Record<string, PrismaValue> | null;
     take: number | null;
@@ -356,7 +397,7 @@ export declare function safeJsonStringify(obj: unknown): string;
 /**
  * `provider` property as defined in Prisma Schema (may differ from {@link @prisma/driver-adapter-utils#Provider}).
  */
-export declare type SchemaProvider = ConnectorType;
+export declare type SchemaProvider = 'cockroachdb' | 'mongodb' | 'mysql' | 'postgres' | 'postgresql' | 'prisma+postgres' | 'sqlite' | 'sqlserver';
 
 declare type SpanCallback<R> = (span?: Span, context?: Context) => R;
 

package/dist/index.d.ts

@@ -7,7 +7,15 @@ import { SqlQueryable } from '@prisma/driver-adapter-utils';
 import { SqlResultSet } from '@prisma/driver-adapter-utils';
 import { Transaction } from '@prisma/driver-adapter-utils';
 
-declare type ConnectorType = 'mysql' | 'mongodb' | 'sqlite' | 'postgresql' | 'postgres' | 'prisma+postgres' | 'sqlserver' | 'cockroachdb';
+export declare type BigIntTaggedValue = {
+    $type: 'BigInt';
+    value: string;
+};
+
+export declare type BytesTaggedValue = {
+    $type: 'Bytes';
+    value: string;
+};
 
 export declare class DataMapperError extends Error {
     name: string;
@@ -26,6 +34,16 @@ export declare type DataRule = {
     type: 'never';
 };
 
+export declare type DateTaggedValue = {
+    $type: 'DateTime';
+    value: string;
+};
+
+export declare type DecimalTaggedValue = {
+    $type: 'Decimal';
+    value: string;
+};
+
 /**
  * Checks if two objects representing the names and values of key columns match. A match is
  * defined by one of the sets of keys being a subset of the other. This function also
@@ -33,6 +51,11 @@ export declare type DataRule = {
  */
 export declare function doKeysMatch(lhs: {}, rhs: {}): boolean;
 
+export declare type EnumTaggedValue = {
+    $type: 'Enum';
+    value: string;
+};
+
 declare type ExtendedSpanOptions = SpanOptions & {
     name: string;
 };
@@ -61,6 +84,13 @@ export declare type FieldOperation = {
     value: PrismaValue;
 };
 
+export declare type FieldRefTaggedValue = {
+    $type: 'FieldRef';
+    value: {
+        _ref: string;
+    };
+};
+
 export declare type Fragment = {
     type: 'stringChunk';
     chunk: string;
@@ -96,8 +126,19 @@ export declare type JoinExpression = {
     isRelationUnique: boolean;
 };
 
+export declare type JsonInputTaggedValue = DateTaggedValue | DecimalTaggedValue | BytesTaggedValue | BigIntTaggedValue | FieldRefTaggedValue | JsonTaggedValue | EnumTaggedValue;
+
+export declare type JsonOutputTaggedValue = DateTaggedValue | DecimalTaggedValue | BytesTaggedValue | BigIntTaggedValue | JsonTaggedValue;
+
+export declare type JsonTaggedValue = {
+    $type: 'Json';
+    value: string;
+};
+
 export declare const noopTracingHelper: TracingHelper;
 
+export declare function normalizeJsonProtocolValues(result: unknown): unknown;
+
 export declare type Pagination = {
     cursor: Record<string, PrismaValue> | null;
     take: number | null;
@@ -356,7 +397,7 @@ export declare function safeJsonStringify(obj: unknown): string;
 /**
  * `provider` property as defined in Prisma Schema (may differ from {@link @prisma/driver-adapter-utils#Provider}).
  */
-export declare type SchemaProvider = ConnectorType;
+export declare type SchemaProvider = 'cockroachdb' | 'mongodb' | 'mysql' | 'postgres' | 'postgresql' | 'prisma+postgres' | 'sqlite' | 'sqlserver';
 
 declare type SpanCallback<R> = (span?: Span, context?: Context) => R;
 

package/dist/index.js

@@ -42,6 +42,7 @@ __export(index_exports, {
   isPrismaValueGenerator: () => isPrismaValueGenerator,
   isPrismaValuePlaceholder: () => isPrismaValuePlaceholder,
   noopTracingHelper: () => noopTracingHelper,
+  normalizeJsonProtocolValues: () => normalizeJsonProtocolValues,
   safeJsonStringify: () => safeJsonStringify
 });
 module.exports = __toCommonJS(index_exports);
@@ -62,20 +63,74 @@ function doKeysMatch(lhs, rhs) {
   const rhsKeys = Object.keys(rhs);
   const smallerKeyList = lhsKeys.length < rhsKeys.length ? lhsKeys : rhsKeys;
   return smallerKeyList.every((key) => {
-    if (typeof lhs[key] !== typeof rhs[key]) {
-      if (typeof lhs[key] === "number" || typeof rhs[key] === "number") {
-        return `${lhs[key]}` === `${rhs[key]}`;
-      } else if (typeof lhs[key] === "bigint" || typeof rhs[key] === "bigint") {
-        return BigInt(`${lhs[key]}`.replace(/n$/, "")) === BigInt(`${rhs[key]}`.replace(/n$/, ""));
-      } else if (lhs[key] instanceof Date || rhs[key] instanceof Date) {
-        return (/* @__PURE__ */ new Date(`${lhs[key]}`)).getTime() === (/* @__PURE__ */ new Date(`${rhs[key]}`)).getTime();
-      } else if (import_decimal.default.isDecimal(lhs[key]) || import_decimal.default.isDecimal(rhs[key])) {
-        return new import_decimal.default(`${lhs[key]}`).equals(new import_decimal.default(`${rhs[key]}`));
-      }
+    if (typeof lhs[key] === typeof rhs[key] && typeof lhs[key] !== "object") {
+      return lhs[key] === rhs[key];
+    }
+    if (import_decimal.default.isDecimal(lhs[key]) || import_decimal.default.isDecimal(rhs[key])) {
+      const lhsDecimal = asDecimal(lhs[key]);
+      const rhsDecimal = asDecimal(rhs[key]);
+      return lhsDecimal && rhsDecimal && lhsDecimal.equals(rhsDecimal);
+    } else if (lhs[key] instanceof Uint8Array || rhs[key] instanceof Uint8Array) {
+      const lhsBuffer = asBuffer(lhs[key]);
+      const rhsBuffer = asBuffer(rhs[key]);
+      return lhsBuffer && rhsBuffer && lhsBuffer.equals(rhsBuffer);
+    } else if (lhs[key] instanceof Date || rhs[key] instanceof Date) {
+      return asDate(lhs[key])?.getTime() === asDate(rhs[key])?.getTime();
+    } else if (typeof lhs[key] === "bigint" || typeof rhs[key] === "bigint") {
+      return asBigInt(lhs[key]) === asBigInt(rhs[key]);
+    } else if (typeof lhs[key] === "number" || typeof rhs[key] === "number") {
+      return asNumber(lhs[key]) === asNumber(rhs[key]);
     }
     return isDeepStrictEqual(lhs[key], rhs[key]);
   });
 }
+function asDecimal(value) {
+  if (import_decimal.default.isDecimal(value)) {
+    return value;
+  } else if (typeof value === "number" || typeof value === "string") {
+    return new import_decimal.default(value);
+  } else {
+    return;
+  }
+}
+function asBuffer(value) {
+  if (Buffer.isBuffer(value)) {
+    return value;
+  } else if (value instanceof Uint8Array) {
+    return Buffer.from(value.buffer, value.byteOffset, value.byteLength);
+  } else if (typeof value === "string") {
+    return Buffer.from(value, "base64");
+  } else {
+    return;
+  }
+}
+function asDate(value) {
+  if (value instanceof Date) {
+    return value;
+  } else if (typeof value === "string" || typeof value === "number") {
+    return new Date(value);
+  } else {
+    return;
+  }
+}
+function asBigInt(value) {
+  if (typeof value === "bigint") {
+    return value;
+  } else if (typeof value === "number" || typeof value === "string") {
+    return BigInt(value);
+  } else {
+    return;
+  }
+}
+function asNumber(value) {
+  if (typeof value === "number") {
+    return value;
+  } else if (typeof value === "string") {
+    return Number(value);
+  } else {
+    return;
+  }
+}
 function safeJsonStringify(obj) {
   return JSON.stringify(obj, (_key, val) => {
     if (typeof val === "bigint") {
@@ -1063,7 +1118,7 @@ var QueryInterpreter = class _QueryInterpreter {
           node.args.map((arg) => this.interpretNode(arg, queryable, scope, generators).then((res) => res.value))
         );
         return {
-          value: parts.length > 0 ? parts.reduce((acc, part) => asNumber(acc) + asNumber(part)) : 0
+          value: parts.length > 0 ? parts.reduce((acc, part) => asNumber2(acc) + asNumber2(part)) : 0
         };
       }
       case "execute": {
@@ -1237,7 +1292,7 @@ function isEmpty(value) {
 function asList(value) {
   return Array.isArray(value) ? value : [value];
 }
-function asNumber(value) {
+function asNumber2(value) {
   if (typeof value === "number") {
     return value;
   }
@@ -1322,14 +1377,14 @@ function evalFieldOperation(op, value, scope, generators) {
     case "set":
       return evaluateParam(op.value, scope, generators);
     case "add":
-      return asNumber(value) + asNumber(evaluateParam(op.value, scope, generators));
+      return asNumber2(value) + asNumber2(evaluateParam(op.value, scope, generators));
     case "subtract":
-      return asNumber(value) - asNumber(evaluateParam(op.value, scope, generators));
+      return asNumber2(value) - asNumber2(evaluateParam(op.value, scope, generators));
     case "multiply":
-      return asNumber(value) * asNumber(evaluateParam(op.value, scope, generators));
+      return asNumber2(value) * asNumber2(evaluateParam(op.value, scope, generators));
     case "divide": {
-      const lhs = asNumber(value);
-      const rhs = asNumber(evaluateParam(op.value, scope, generators));
+      const lhs = asNumber2(value);
+      const rhs = asNumber2(evaluateParam(op.value, scope, generators));
       if (rhs === 0) {
         return null;
       }
@@ -1340,6 +1395,53 @@ function evalFieldOperation(op, value, scope, generators) {
   }
 }
 
+// src/json-protocol.ts
+var import_decimal3 = require("decimal.js");
+function normalizeJsonProtocolValues(result) {
+  if (result === null) {
+    return result;
+  }
+  if (Array.isArray(result)) {
+    return result.map(normalizeJsonProtocolValues);
+  }
+  if (typeof result === "object") {
+    if (isTaggedValue(result)) {
+      return normalizeTaggedValue(result);
+    }
+    if (result.constructor !== null && result.constructor.name !== "Object") {
+      return result;
+    }
+    return mapObjectValues(result, normalizeJsonProtocolValues);
+  }
+  return result;
+}
+function isTaggedValue(value) {
+  return value !== null && typeof value == "object" && typeof value["$type"] === "string";
+}
+function normalizeTaggedValue({ $type, value }) {
+  switch ($type) {
+    case "BigInt":
+      return { $type, value: String(value) };
+    case "Bytes":
+      return { $type, value };
+    case "DateTime":
+      return { $type, value: new Date(value).toISOString() };
+    case "Decimal":
+      return { $type, value: String(new import_decimal3.Decimal(value)) };
+    case "Json":
+      return { $type, value: JSON.stringify(JSON.parse(value)) };
+    default:
+      assertNever(value, "Unknown tagged value");
+  }
+}
+function mapObjectValues(object, mapper) {
+  const result = {};
+  for (const key of Object.keys(object)) {
+    result[key] = mapper(object[key], key);
+  }
+  return result;
+}
+
 // src/transactionManager/TransactionManager.ts
 var import_debug = require("@prisma/debug");
 
@@ -1601,5 +1703,6 @@ var TransactionManager = class {
   isPrismaValueGenerator,
   isPrismaValuePlaceholder,
   noopTracingHelper,
+  normalizeJsonProtocolValues,
   safeJsonStringify
 });

package/dist/index.mjs

@@ -14,20 +14,74 @@ function doKeysMatch(lhs, rhs) {
   const rhsKeys = Object.keys(rhs);
   const smallerKeyList = lhsKeys.length < rhsKeys.length ? lhsKeys : rhsKeys;
   return smallerKeyList.every((key) => {
-    if (typeof lhs[key] !== typeof rhs[key]) {
-      if (typeof lhs[key] === "number" || typeof rhs[key] === "number") {
-        return `${lhs[key]}` === `${rhs[key]}`;
-      } else if (typeof lhs[key] === "bigint" || typeof rhs[key] === "bigint") {
-        return BigInt(`${lhs[key]}`.replace(/n$/, "")) === BigInt(`${rhs[key]}`.replace(/n$/, ""));
-      } else if (lhs[key] instanceof Date || rhs[key] instanceof Date) {
-        return (/* @__PURE__ */ new Date(`${lhs[key]}`)).getTime() === (/* @__PURE__ */ new Date(`${rhs[key]}`)).getTime();
-      } else if (Decimal.isDecimal(lhs[key]) || Decimal.isDecimal(rhs[key])) {
-        return new Decimal(`${lhs[key]}`).equals(new Decimal(`${rhs[key]}`));
-      }
+    if (typeof lhs[key] === typeof rhs[key] && typeof lhs[key] !== "object") {
+      return lhs[key] === rhs[key];
+    }
+    if (Decimal.isDecimal(lhs[key]) || Decimal.isDecimal(rhs[key])) {
+      const lhsDecimal = asDecimal(lhs[key]);
+      const rhsDecimal = asDecimal(rhs[key]);
+      return lhsDecimal && rhsDecimal && lhsDecimal.equals(rhsDecimal);
+    } else if (lhs[key] instanceof Uint8Array || rhs[key] instanceof Uint8Array) {
+      const lhsBuffer = asBuffer(lhs[key]);
+      const rhsBuffer = asBuffer(rhs[key]);
+      return lhsBuffer && rhsBuffer && lhsBuffer.equals(rhsBuffer);
+    } else if (lhs[key] instanceof Date || rhs[key] instanceof Date) {
+      return asDate(lhs[key])?.getTime() === asDate(rhs[key])?.getTime();
+    } else if (typeof lhs[key] === "bigint" || typeof rhs[key] === "bigint") {
+      return asBigInt(lhs[key]) === asBigInt(rhs[key]);
+    } else if (typeof lhs[key] === "number" || typeof rhs[key] === "number") {
+      return asNumber(lhs[key]) === asNumber(rhs[key]);
     }
     return isDeepStrictEqual(lhs[key], rhs[key]);
   });
 }
+function asDecimal(value) {
+  if (Decimal.isDecimal(value)) {
+    return value;
+  } else if (typeof value === "number" || typeof value === "string") {
+    return new Decimal(value);
+  } else {
+    return;
+  }
+}
+function asBuffer(value) {
+  if (Buffer.isBuffer(value)) {
+    return value;
+  } else if (value instanceof Uint8Array) {
+    return Buffer.from(value.buffer, value.byteOffset, value.byteLength);
+  } else if (typeof value === "string") {
+    return Buffer.from(value, "base64");
+  } else {
+    return;
+  }
+}
+function asDate(value) {
+  if (value instanceof Date) {
+    return value;
+  } else if (typeof value === "string" || typeof value === "number") {
+    return new Date(value);
+  } else {
+    return;
+  }
+}
+function asBigInt(value) {
+  if (typeof value === "bigint") {
+    return value;
+  } else if (typeof value === "number" || typeof value === "string") {
+    return BigInt(value);
+  } else {
+    return;
+  }
+}
+function asNumber(value) {
+  if (typeof value === "number") {
+    return value;
+  } else if (typeof value === "string") {
+    return Number(value);
+  } else {
+    return;
+  }
+}
 function safeJsonStringify(obj) {
   return JSON.stringify(obj, (_key, val) => {
     if (typeof val === "bigint") {
@@ -1015,7 +1069,7 @@ var QueryInterpreter = class _QueryInterpreter {
           node.args.map((arg) => this.interpretNode(arg, queryable, scope, generators).then((res) => res.value))
         );
         return {
-          value: parts.length > 0 ? parts.reduce((acc, part) => asNumber(acc) + asNumber(part)) : 0
+          value: parts.length > 0 ? parts.reduce((acc, part) => asNumber2(acc) + asNumber2(part)) : 0
         };
       }
       case "execute": {
@@ -1189,7 +1243,7 @@ function isEmpty(value) {
 function asList(value) {
   return Array.isArray(value) ? value : [value];
 }
-function asNumber(value) {
+function asNumber2(value) {
   if (typeof value === "number") {
     return value;
   }
@@ -1274,14 +1328,14 @@ function evalFieldOperation(op, value, scope, generators) {
     case "set":
       return evaluateParam(op.value, scope, generators);
     case "add":
-      return asNumber(value) + asNumber(evaluateParam(op.value, scope, generators));
+      return asNumber2(value) + asNumber2(evaluateParam(op.value, scope, generators));
     case "subtract":
-      return asNumber(value) - asNumber(evaluateParam(op.value, scope, generators));
+      return asNumber2(value) - asNumber2(evaluateParam(op.value, scope, generators));
     case "multiply":
-      return asNumber(value) * asNumber(evaluateParam(op.value, scope, generators));
+      return asNumber2(value) * asNumber2(evaluateParam(op.value, scope, generators));
     case "divide": {
-      const lhs = asNumber(value);
-      const rhs = asNumber(evaluateParam(op.value, scope, generators));
+      const lhs = asNumber2(value);
+      const rhs = asNumber2(evaluateParam(op.value, scope, generators));
       if (rhs === 0) {
         return null;
       }
@@ -1292,6 +1346,53 @@ function evalFieldOperation(op, value, scope, generators) {
   }
 }
 
+// src/json-protocol.ts
+import { Decimal as Decimal3 } from "decimal.js";
+function normalizeJsonProtocolValues(result) {
+  if (result === null) {
+    return result;
+  }
+  if (Array.isArray(result)) {
+    return result.map(normalizeJsonProtocolValues);
+  }
+  if (typeof result === "object") {
+    if (isTaggedValue(result)) {
+      return normalizeTaggedValue(result);
+    }
+    if (result.constructor !== null && result.constructor.name !== "Object") {
+      return result;
+    }
+    return mapObjectValues(result, normalizeJsonProtocolValues);
+  }
+  return result;
+}
+function isTaggedValue(value) {
+  return value !== null && typeof value == "object" && typeof value["$type"] === "string";
+}
+function normalizeTaggedValue({ $type, value }) {
+  switch ($type) {
+    case "BigInt":
+      return { $type, value: String(value) };
+    case "Bytes":
+      return { $type, value };
+    case "DateTime":
+      return { $type, value: new Date(value).toISOString() };
+    case "Decimal":
+      return { $type, value: String(new Decimal3(value)) };
+    case "Json":
+      return { $type, value: JSON.stringify(JSON.parse(value)) };
+    default:
+      assertNever(value, "Unknown tagged value");
+  }
+}
+function mapObjectValues(object, mapper) {
+  const result = {};
+  for (const key of Object.keys(object)) {
+    result[key] = mapper(object[key], key);
+  }
+  return result;
+}
+
 // src/transactionManager/TransactionManager.ts
 import { Debug } from "@prisma/debug";
 
@@ -1552,5 +1653,6 @@ export {
   isPrismaValueGenerator,
   isPrismaValuePlaceholder,
   noopTracingHelper,
+  normalizeJsonProtocolValues,
   safeJsonStringify
 };

package/dist/json-protocol.d.ts

@@ -0,0 +1,33 @@
+export type DateTaggedValue = {
+    $type: 'DateTime';
+    value: string;
+};
+export type DecimalTaggedValue = {
+    $type: 'Decimal';
+    value: string;
+};
+export type BytesTaggedValue = {
+    $type: 'Bytes';
+    value: string;
+};
+export type BigIntTaggedValue = {
+    $type: 'BigInt';
+    value: string;
+};
+export type FieldRefTaggedValue = {
+    $type: 'FieldRef';
+    value: {
+        _ref: string;
+    };
+};
+export type EnumTaggedValue = {
+    $type: 'Enum';
+    value: string;
+};
+export type JsonTaggedValue = {
+    $type: 'Json';
+    value: string;
+};
+export type JsonInputTaggedValue = DateTaggedValue | DecimalTaggedValue | BytesTaggedValue | BigIntTaggedValue | FieldRefTaggedValue | JsonTaggedValue | EnumTaggedValue;
+export type JsonOutputTaggedValue = DateTaggedValue | DecimalTaggedValue | BytesTaggedValue | BigIntTaggedValue | JsonTaggedValue;
+export declare function normalizeJsonProtocolValues(result: unknown): unknown;

package/dist/schema.d.ts

@@ -1,5 +1,4 @@
-import type { ConnectorType } from '@prisma/generator';
 /**
  * `provider` property as defined in Prisma Schema (may differ from {@link @prisma/driver-adapter-utils#Provider}).
  */
-export type SchemaProvider = ConnectorType;
+export type SchemaProvider = 'cockroachdb' | 'mongodb' | 'mysql' | 'postgres' | 'postgresql' | 'prisma+postgres' | 'sqlite' | 'sqlserver';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@prisma/client-engine-runtime",
-  "version": "6.12.0-dev.4",
+  "version": "6.12.0-dev.40",
   "description": "This package is intended for Prisma's internal use",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -31,15 +31,14 @@
     "nanoid": "5.1.5",
     "ulid": "3.0.0",
     "uuid": "11.1.0",
-    "@prisma/driver-adapter-utils": "6.12.0-dev.4",
-    "@prisma/debug": "6.12.0-dev.4"
+    "@prisma/debug": "6.12.0-dev.40",
+    "@prisma/driver-adapter-utils": "6.12.0-dev.40"
   },
   "devDependencies": {
     "@types/jest": "29.5.14",
     "@types/node": "18.19.76",
     "jest": "29.7.0",
-    "jest-junit": "16.0.0",
-    "@prisma/generator": "6.12.0-dev.4"
+    "jest-junit": "16.0.0"
   },
   "files": [
     "dist"