@prisma/client-engine-runtime 6.9.0-dev.10 → 6.9.0-dev.12

package/dist/index.d.mts

@@ -7,6 +7,10 @@ import { SqlQueryable } from '@prisma/driver-adapter-utils';
 import { SqlResultSet } from '@prisma/driver-adapter-utils';
 import { Transaction } from '@prisma/driver-adapter-utils';
 
+export declare class DataMapperError extends Error {
+    name: string;
+}
+
 export declare type DataRule = {
     type: 'rowCountEq';
     args: number;

package/dist/index.d.ts

@@ -7,6 +7,10 @@ import { SqlQueryable } from '@prisma/driver-adapter-utils';
 import { SqlResultSet } from '@prisma/driver-adapter-utils';
 import { Transaction } from '@prisma/driver-adapter-utils';
 
+export declare class DataMapperError extends Error {
+    name: string;
+}
+
 export declare type DataRule = {
     type: 'rowCountEq';
     args: number;

package/dist/index.js

@@ -30,6 +30,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/index.ts
 var index_exports = {};
 __export(index_exports, {
+  DataMapperError: () => DataMapperError,
   QueryInterpreter: () => QueryInterpreter,
   TransactionManager: () => TransactionManager,
   TransactionManagerError: () => TransactionManagerError,
@@ -42,8 +43,8 @@ __export(index_exports, {
 });
 module.exports = __toCommonJS(index_exports);
 
-// src/interpreter/QueryInterpreter.ts
-var import_api = require("@opentelemetry/api");
+// src/interpreter/DataMapper.ts
+var import_decimal = __toESM(require("decimal.js"));
 
 // src/utils.ts
 function assertNever(_, message) {
@@ -53,6 +54,117 @@ function isDeepStrictEqual(a, b) {
   return a === b || a !== null && b !== null && typeof a === "object" && typeof b === "object" && Object.keys(a).length === Object.keys(b).length && Object.keys(a).every((key) => isDeepStrictEqual(a[key], b[key]));
 }
 
+// src/interpreter/DataMapper.ts
+var DataMapperError = class extends Error {
+  name = "DataMapperError";
+};
+function applyDataMap(data, structure) {
+  switch (structure.type) {
+    case "Object":
+      return mapArrayOrObject(data, structure.fields);
+    case "Value":
+      return mapValue(data, structure.resultType);
+    default:
+      assertNever(structure, `Invalid data mapping type: '${structure.type}'`);
+  }
+}
+function mapArrayOrObject(data, fields) {
+  if (data === null) return null;
+  if (Array.isArray(data)) {
+    const rows = data;
+    return rows.map((row) => mapObject(row, fields));
+  }
+  if (typeof data === "object") {
+    const row = data;
+    return mapObject(row, fields);
+  }
+  if (typeof data === "string") {
+    let decodedData;
+    try {
+      decodedData = JSON.parse(data);
+    } catch (error) {
+      throw new DataMapperError(`Expected an array or object, got a string that is not valid JSON`, {
+        cause: error
+      });
+    }
+    return mapArrayOrObject(decodedData, fields);
+  }
+  throw new DataMapperError(`Expected an array or an object, got: ${typeof data}`);
+}
+function mapObject(data, fields) {
+  if (typeof data !== "object") {
+    throw new DataMapperError(`Expected an object, but got '${typeof data}'`);
+  }
+  const result = {};
+  for (const [name, node] of Object.entries(fields)) {
+    switch (node.type) {
+      case "Object": {
+        if (!node.flattened && !Object.hasOwn(data, name)) {
+          throw new DataMapperError(
+            `Missing data field (Object): '${name}'; node: ${JSON.stringify(node)}; data: ${JSON.stringify(data)}`
+          );
+        }
+        const target = node.flattened ? data : data[name];
+        result[name] = mapArrayOrObject(target, node.fields);
+        break;
+      }
+      case "Value":
+        {
+          const dbName = node.dbName;
+          if (Object.hasOwn(data, dbName)) {
+            result[name] = mapValue(data[dbName], node.resultType);
+          } else {
+            throw new DataMapperError(
+              `Missing data field (Value): '${dbName}'; node: ${JSON.stringify(node)}; data: ${JSON.stringify(data)}`
+            );
+          }
+        }
+        break;
+      default:
+        assertNever(node, `DataMapper: Invalid data mapping node type: '${node.type}'`);
+    }
+  }
+  return result;
+}
+function mapValue(value, 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 "Decimal":
+      return typeof value === "number" ? new import_decimal.default(value) : new import_decimal.default(`${value}`);
+    case "Date":
+      return value instanceof Date ? value : /* @__PURE__ */ new Date(`${value}`);
+    case "Array": {
+      const values = value;
+      return values.map((v) => mapValue(v, resultType.inner));
+    }
+    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}`);
+      }
+      return new Uint8Array(value);
+    }
+    default:
+      assertNever(resultType, `DataMapper: Unknown result type: ${resultType.type}`);
+  }
+}
+
+// src/interpreter/QueryInterpreter.ts
+var import_api = require("@opentelemetry/api");
+
 // src/tracing.ts
 var noopTracingHelper = {
   runInChildSpan(_, callback) {
@@ -215,101 +327,6 @@ function renderConstraint(constraint) {
   return "(not available)";
 }
 
-// src/interpreter/DataMapper.ts
-var import_decimal = __toESM(require("decimal.js"));
-function applyDataMap(data, structure) {
-  switch (structure.type) {
-    case "Object":
-      return mapArrayOrObject(data, structure.fields);
-    case "Value":
-      return mapValue(data, structure.resultType);
-    default:
-      assertNever(structure, `Invalid data mapping type: '${structure.type}'`);
-  }
-}
-function mapArrayOrObject(data, fields) {
-  if (data === null) return null;
-  if (Array.isArray(data)) {
-    const rows = data;
-    return rows.map((row) => mapObject(row, fields));
-  }
-  if (typeof data === "object") {
-    const row = data;
-    return mapObject(row, fields);
-  }
-  throw new Error(`DataMapper: Expected an array or an object, got: ${typeof data}`);
-}
-function mapObject(data, fields) {
-  if (typeof data !== "object") {
-    throw new Error(`DataMapper: Expected an object, but got '${typeof data}'`);
-  }
-  const result = {};
-  for (const [name, node] of Object.entries(fields)) {
-    switch (node.type) {
-      case "Object": {
-        if (!node.flattened && !Object.hasOwn(data, name)) {
-          throw new Error(
-            `DataMapper: Missing data field (Object): '${name}'; node: ${JSON.stringify(node)}; data: ${JSON.stringify(data)}`
-          );
-        }
-        const target = node.flattened ? data : data[name];
-        result[name] = mapArrayOrObject(target, node.fields);
-        break;
-      }
-      case "Value":
-        {
-          const dbName = node.dbName;
-          if (Object.hasOwn(data, dbName)) {
-            result[name] = mapValue(data[dbName], node.resultType);
-          } else {
-            throw new Error(
-              `DataMapper: Missing data field (Value): '${dbName}'; node: ${JSON.stringify(node)}; data: ${JSON.stringify(data)}`
-            );
-          }
-        }
-        break;
-      default:
-        assertNever(node, `DataMapper: Invalid data mapping node type: '${node.type}'`);
-    }
-  }
-  return result;
-}
-function mapValue(value, 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 "Decimal":
-      return typeof value === "number" ? new import_decimal.default(value) : new import_decimal.default(`${value}`);
-    case "Date":
-      return value instanceof Date ? value : /* @__PURE__ */ new Date(`${value}`);
-    case "Array": {
-      const values = value;
-      return values.map((v) => mapValue(v, resultType.inner));
-    }
-    case "Object":
-      return typeof value === "string" ? value : JSON.stringify(value);
-    case "Bytes": {
-      if (!Array.isArray(value)) {
-        throw new Error(`DataMapper: Bytes data is invalid, got: ${typeof value}`);
-      }
-      return new Uint8Array(value);
-    }
-    default:
-      assertNever(resultType, `DataMapper: Unknown result type: ${resultType.type}`);
-  }
-}
-
 // src/interpreter/generators.ts
 var import_cuid = __toESM(require("@bugsnag/cuid"));
 var import_cuid2 = require("@paralleldrive/cuid2");
@@ -742,6 +759,9 @@ var QueryInterpreter = class _QueryInterpreter {
       }
       case "join": {
         const parent = await this.interpretNode(node.args.parent, queryable, scope, generators);
+        if (parent === null) {
+          return null;
+        }
         const children = await Promise.all(
           node.args.children.map(async (joinExpr) => ({
             joinExpr,
@@ -1160,6 +1180,7 @@ var TransactionManager = class {
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  DataMapperError,
   QueryInterpreter,
   TransactionManager,
   TransactionManagerError,

package/dist/index.mjs

@@ -1,5 +1,5 @@
-// src/interpreter/QueryInterpreter.ts
-import { SpanKind } from "@opentelemetry/api";
+// src/interpreter/DataMapper.ts
+import Decimal from "decimal.js";
 
 // src/utils.ts
 function assertNever(_, message) {
@@ -9,6 +9,117 @@ function isDeepStrictEqual(a, b) {
   return a === b || a !== null && b !== null && typeof a === "object" && typeof b === "object" && Object.keys(a).length === Object.keys(b).length && Object.keys(a).every((key) => isDeepStrictEqual(a[key], b[key]));
 }
 
+// src/interpreter/DataMapper.ts
+var DataMapperError = class extends Error {
+  name = "DataMapperError";
+};
+function applyDataMap(data, structure) {
+  switch (structure.type) {
+    case "Object":
+      return mapArrayOrObject(data, structure.fields);
+    case "Value":
+      return mapValue(data, structure.resultType);
+    default:
+      assertNever(structure, `Invalid data mapping type: '${structure.type}'`);
+  }
+}
+function mapArrayOrObject(data, fields) {
+  if (data === null) return null;
+  if (Array.isArray(data)) {
+    const rows = data;
+    return rows.map((row) => mapObject(row, fields));
+  }
+  if (typeof data === "object") {
+    const row = data;
+    return mapObject(row, fields);
+  }
+  if (typeof data === "string") {
+    let decodedData;
+    try {
+      decodedData = JSON.parse(data);
+    } catch (error) {
+      throw new DataMapperError(`Expected an array or object, got a string that is not valid JSON`, {
+        cause: error
+      });
+    }
+    return mapArrayOrObject(decodedData, fields);
+  }
+  throw new DataMapperError(`Expected an array or an object, got: ${typeof data}`);
+}
+function mapObject(data, fields) {
+  if (typeof data !== "object") {
+    throw new DataMapperError(`Expected an object, but got '${typeof data}'`);
+  }
+  const result = {};
+  for (const [name, node] of Object.entries(fields)) {
+    switch (node.type) {
+      case "Object": {
+        if (!node.flattened && !Object.hasOwn(data, name)) {
+          throw new DataMapperError(
+            `Missing data field (Object): '${name}'; node: ${JSON.stringify(node)}; data: ${JSON.stringify(data)}`
+          );
+        }
+        const target = node.flattened ? data : data[name];
+        result[name] = mapArrayOrObject(target, node.fields);
+        break;
+      }
+      case "Value":
+        {
+          const dbName = node.dbName;
+          if (Object.hasOwn(data, dbName)) {
+            result[name] = mapValue(data[dbName], node.resultType);
+          } else {
+            throw new DataMapperError(
+              `Missing data field (Value): '${dbName}'; node: ${JSON.stringify(node)}; data: ${JSON.stringify(data)}`
+            );
+          }
+        }
+        break;
+      default:
+        assertNever(node, `DataMapper: Invalid data mapping node type: '${node.type}'`);
+    }
+  }
+  return result;
+}
+function mapValue(value, 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 "Decimal":
+      return typeof value === "number" ? new Decimal(value) : new Decimal(`${value}`);
+    case "Date":
+      return value instanceof Date ? value : /* @__PURE__ */ new Date(`${value}`);
+    case "Array": {
+      const values = value;
+      return values.map((v) => mapValue(v, resultType.inner));
+    }
+    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}`);
+      }
+      return new Uint8Array(value);
+    }
+    default:
+      assertNever(resultType, `DataMapper: Unknown result type: ${resultType.type}`);
+  }
+}
+
+// src/interpreter/QueryInterpreter.ts
+import { SpanKind } from "@opentelemetry/api";
+
 // src/tracing.ts
 var noopTracingHelper = {
   runInChildSpan(_, callback) {
@@ -171,101 +282,6 @@ function renderConstraint(constraint) {
   return "(not available)";
 }
 
-// src/interpreter/DataMapper.ts
-import Decimal from "decimal.js";
-function applyDataMap(data, structure) {
-  switch (structure.type) {
-    case "Object":
-      return mapArrayOrObject(data, structure.fields);
-    case "Value":
-      return mapValue(data, structure.resultType);
-    default:
-      assertNever(structure, `Invalid data mapping type: '${structure.type}'`);
-  }
-}
-function mapArrayOrObject(data, fields) {
-  if (data === null) return null;
-  if (Array.isArray(data)) {
-    const rows = data;
-    return rows.map((row) => mapObject(row, fields));
-  }
-  if (typeof data === "object") {
-    const row = data;
-    return mapObject(row, fields);
-  }
-  throw new Error(`DataMapper: Expected an array or an object, got: ${typeof data}`);
-}
-function mapObject(data, fields) {
-  if (typeof data !== "object") {
-    throw new Error(`DataMapper: Expected an object, but got '${typeof data}'`);
-  }
-  const result = {};
-  for (const [name, node] of Object.entries(fields)) {
-    switch (node.type) {
-      case "Object": {
-        if (!node.flattened && !Object.hasOwn(data, name)) {
-          throw new Error(
-            `DataMapper: Missing data field (Object): '${name}'; node: ${JSON.stringify(node)}; data: ${JSON.stringify(data)}`
-          );
-        }
-        const target = node.flattened ? data : data[name];
-        result[name] = mapArrayOrObject(target, node.fields);
-        break;
-      }
-      case "Value":
-        {
-          const dbName = node.dbName;
-          if (Object.hasOwn(data, dbName)) {
-            result[name] = mapValue(data[dbName], node.resultType);
-          } else {
-            throw new Error(
-              `DataMapper: Missing data field (Value): '${dbName}'; node: ${JSON.stringify(node)}; data: ${JSON.stringify(data)}`
-            );
-          }
-        }
-        break;
-      default:
-        assertNever(node, `DataMapper: Invalid data mapping node type: '${node.type}'`);
-    }
-  }
-  return result;
-}
-function mapValue(value, 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 "Decimal":
-      return typeof value === "number" ? new Decimal(value) : new Decimal(`${value}`);
-    case "Date":
-      return value instanceof Date ? value : /* @__PURE__ */ new Date(`${value}`);
-    case "Array": {
-      const values = value;
-      return values.map((v) => mapValue(v, resultType.inner));
-    }
-    case "Object":
-      return typeof value === "string" ? value : JSON.stringify(value);
-    case "Bytes": {
-      if (!Array.isArray(value)) {
-        throw new Error(`DataMapper: Bytes data is invalid, got: ${typeof value}`);
-      }
-      return new Uint8Array(value);
-    }
-    default:
-      assertNever(resultType, `DataMapper: Unknown result type: ${resultType.type}`);
-  }
-}
-
 // src/interpreter/generators.ts
 import cuid1 from "@bugsnag/cuid";
 import { createId as cuid2 } from "@paralleldrive/cuid2";
@@ -698,6 +714,9 @@ var QueryInterpreter = class _QueryInterpreter {
       }
       case "join": {
         const parent = await this.interpretNode(node.args.parent, queryable, scope, generators);
+        if (parent === null) {
+          return null;
+        }
         const children = await Promise.all(
           node.args.children.map(async (joinExpr) => ({
             joinExpr,
@@ -1115,6 +1134,7 @@ var TransactionManager = class {
   }
 };
 export {
+  DataMapperError,
   QueryInterpreter,
   TransactionManager,
   TransactionManagerError,

package/dist/interpreter/DataMapper.d.ts

@@ -1,3 +1,6 @@
 import { ResultNode } from '../QueryPlan';
 import { Value } from './scope';
+export declare class DataMapperError extends Error {
+    name: string;
+}
 export declare function applyDataMap(data: Value, structure: ResultNode): Value;

package/package.json

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