@graphql-tools/utils 10.11.0-alpha-20251114103641-9f5dd54441b8068214cc1ae9afe2803485cf9d9d → 10.11.0-alpha-20251114142557-eae3c3166430d65945da6837f875fc7800cc1a26

package/cjs/errors.js

@@ -44,12 +44,10 @@ function createGraphQLError(message, options) {
         ? new Constructor(message, options)
         : new Constructor(message, options?.nodes, options?.source, options?.positions, options?.path, options?.originalError, options?.extensions);
     if (options?.coordinate && error.coordinate == null) {
-        Object.defineProperty(error, 'coordinate', {
-            value: options.coordinate,
-            enumerable: true,
-            configurable: true,
+        Object.defineProperties(error, {
+            coordinate: { value: options.coordinate, enumerable: true, configurable: true },
+            toJSON: { value: exports.toJSON },
         });
-        error.toJSON = exports.toJSON;
     }
     return error;
 }
@@ -59,9 +57,12 @@ function getSchemaCoordinate(error) {
 function locatedError(rawError, nodes, path, info) {
     const error = (0, graphql_1.locatedError)(rawError, nodes, path);
     // `graphql` locatedError is only changing path and nodes if it is not already defined
-    if (!error.coordinate && info) {
-        // @ts-expect-error coordinate is readonly, but we don't want to recreate it just to add coordinate
-        error.coordinate = `${info.parentType.name}.${info.fieldName}`;
+    if (!error.coordinate && info && error.coordinate == null) {
+        const coordinate = `${info.parentType.name}.${info.fieldName}`;
+        Object.defineProperties(error, {
+            coordinate: { value: coordinate, enumerable: true, configurable: true },
+            toJSON: { value: exports.toJSON },
+        });
     }
     return error;
 }

package/cjs/mergeIncrementalResult.js

@@ -1,25 +1,25 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.mergeIncrementalResult = mergeIncrementalResult;
-const merge_1 = require("dset/merge");
+const mergeDeep_js_1 = require("./mergeDeep.js");
 function mergeIncrementalResult({ incrementalResult, executionResult, }) {
     const path = ['data', ...(incrementalResult.path ?? [])];
     if (incrementalResult.items) {
         for (const item of incrementalResult.items) {
-            (0, merge_1.dset)(executionResult, path, item);
+            setObjectKeyPath(executionResult, path, item);
             // Increment the last path segment (the array index) to merge the next item at the next index
             path[path.length - 1]++;
         }
     }
     if (incrementalResult.data) {
-        (0, merge_1.dset)(executionResult, path, incrementalResult.data);
+        setObjectKeyPath(executionResult, path, incrementalResult.data);
     }
     if (incrementalResult.errors) {
         executionResult.errors = executionResult.errors || [];
         executionResult.errors.push(...incrementalResult.errors);
     }
     if (incrementalResult.extensions) {
-        (0, merge_1.dset)(executionResult, 'extensions', incrementalResult.extensions);
+        setObjectKeyPath(executionResult, ['extensions'], incrementalResult.extensions);
     }
     if (incrementalResult.incremental) {
         incrementalResult.incremental.forEach(incrementalSubResult => {
@@ -30,3 +30,24 @@ function mergeIncrementalResult({ incrementalResult, executionResult, }) {
         });
     }
 }
+function setObjectKeyPath(obj, keyPath, value) {
+    let current = obj;
+    let i;
+    for (i = 0; i < keyPath.length - 1; i++) {
+        const key = keyPath[i];
+        if (key === '__proto__' || key === 'constructor' || key === 'prototype') {
+            return;
+        }
+        if (current[key] == null) {
+            // Determine if the next key is a number to create an array, otherwise create an object
+            current[key] = typeof keyPath[i + 1] === 'number' ? [] : {};
+        }
+        current = current[key];
+    }
+    const finalKey = keyPath[i];
+    if (finalKey === '__proto__' || finalKey === 'constructor' || finalKey === 'prototype') {
+        return;
+    }
+    const existingValue = current[finalKey];
+    current[finalKey] = existingValue != null ? (0, mergeDeep_js_1.mergeDeep)([existingValue, value]) : value;
+}

package/esm/errors.js

@@ -35,12 +35,10 @@ export function createGraphQLError(message, options) {
         ? new Constructor(message, options)
         : new Constructor(message, options?.nodes, options?.source, options?.positions, options?.path, options?.originalError, options?.extensions);
     if (options?.coordinate && error.coordinate == null) {
-        Object.defineProperty(error, 'coordinate', {
-            value: options.coordinate,
-            enumerable: true,
-            configurable: true,
+        Object.defineProperties(error, {
+            coordinate: { value: options.coordinate, enumerable: true, configurable: true },
+            toJSON: { value: toJSON },
         });
-        error.toJSON = toJSON;
     }
     return error;
 }
@@ -50,9 +48,12 @@ export function getSchemaCoordinate(error) {
 export function locatedError(rawError, nodes, path, info) {
     const error = _locatedError(rawError, nodes, path);
     // `graphql` locatedError is only changing path and nodes if it is not already defined
-    if (!error.coordinate && info) {
-        // @ts-expect-error coordinate is readonly, but we don't want to recreate it just to add coordinate
-        error.coordinate = `${info.parentType.name}.${info.fieldName}`;
+    if (!error.coordinate && info && error.coordinate == null) {
+        const coordinate = `${info.parentType.name}.${info.fieldName}`;
+        Object.defineProperties(error, {
+            coordinate: { value: coordinate, enumerable: true, configurable: true },
+            toJSON: { value: toJSON },
+        });
     }
     return error;
 }

package/esm/mergeIncrementalResult.js

@@ -1,22 +1,22 @@
-import { dset } from 'dset/merge';
+import { mergeDeep } from './mergeDeep.js';
 export function mergeIncrementalResult({ incrementalResult, executionResult, }) {
     const path = ['data', ...(incrementalResult.path ?? [])];
     if (incrementalResult.items) {
         for (const item of incrementalResult.items) {
-            dset(executionResult, path, item);
+            setObjectKeyPath(executionResult, path, item);
             // Increment the last path segment (the array index) to merge the next item at the next index
             path[path.length - 1]++;
         }
     }
     if (incrementalResult.data) {
-        dset(executionResult, path, incrementalResult.data);
+        setObjectKeyPath(executionResult, path, incrementalResult.data);
     }
     if (incrementalResult.errors) {
         executionResult.errors = executionResult.errors || [];
         executionResult.errors.push(...incrementalResult.errors);
     }
     if (incrementalResult.extensions) {
-        dset(executionResult, 'extensions', incrementalResult.extensions);
+        setObjectKeyPath(executionResult, ['extensions'], incrementalResult.extensions);
     }
     if (incrementalResult.incremental) {
         incrementalResult.incremental.forEach(incrementalSubResult => {
@@ -27,3 +27,24 @@ export function mergeIncrementalResult({ incrementalResult, executionResult, })
         });
     }
 }
+function setObjectKeyPath(obj, keyPath, value) {
+    let current = obj;
+    let i;
+    for (i = 0; i < keyPath.length - 1; i++) {
+        const key = keyPath[i];
+        if (key === '__proto__' || key === 'constructor' || key === 'prototype') {
+            return;
+        }
+        if (current[key] == null) {
+            // Determine if the next key is a number to create an array, otherwise create an object
+            current[key] = typeof keyPath[i + 1] === 'number' ? [] : {};
+        }
+        current = current[key];
+    }
+    const finalKey = keyPath[i];
+    if (finalKey === '__proto__' || finalKey === 'constructor' || finalKey === 'prototype') {
+        return;
+    }
+    const existingValue = current[finalKey];
+    current[finalKey] = existingValue != null ? mergeDeep([existingValue, value]) : value;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphql-tools/utils",
-  "version": "10.11.0-alpha-20251114103641-9f5dd54441b8068214cc1ae9afe2803485cf9d9d",
+  "version": "10.11.0-alpha-20251114142557-eae3c3166430d65945da6837f875fc7800cc1a26",
   "description": "Common package containing utils and types for GraphQL tools",
   "sideEffects": false,
   "peerDependencies": {
@@ -10,7 +10,6 @@
     "@graphql-typed-document-node/core": "^3.1.1",
     "@whatwg-node/promise-helpers": "^1.0.0",
     "cross-inspect": "1.0.1",
-    "dset": "^3.1.4",
     "tslib": "^2.4.0"
   },
   "repository": {