@graphql-tools/utils 10.11.0-alpha-20251110221147-3e773b194d7b3e752eb121d0bec4e49919d9f1f9 → 10.11.0-alpha-20251113153404-aa3328c5a0bf7ec4395c788dde43fda08409300c

package/cjs/errors.js

@@ -17,6 +17,7 @@ const possibleGraphQLErrorProperties = [
     'name',
     'stack',
     'extensions',
+    'coordinate',
 ];
 function isGraphQLErrorLike(error) {
     return (error != null &&
@@ -29,14 +30,12 @@ function createGraphQLError(message, options) {
         isGraphQLErrorLike(options.originalError)) {
         options.originalError = createGraphQLError(options.originalError.message, options.originalError);
     }
-    let error;
-    if (graphql_1.versionInfo.major >= 16) {
-        error = new graphql_1.GraphQLError(message, options);
-    }
-    else {
-        error = new graphql_1.GraphQLError(message, options?.nodes, options?.source, options?.positions, options?.path, options?.originalError, options?.extensions);
-    }
-    if (options?.coordinate != null && !error.coordinate) {
+    // To avoid type error on graphql <16, we have to use an any type here
+    const Constructor = graphql_1.GraphQLError;
+    const error = graphql_1.versionInfo.major >= 16
+        ? new Constructor(message, options)
+        : new Constructor(message, options?.nodes, options?.source, options?.positions, options?.path, options?.originalError, options?.extensions);
+    if (options?.coordinate) {
         Object.defineProperty(error, 'coordinate', {
             value: options.coordinate,
             enumerable: true,

package/cjs/mergeIncrementalResult.js

@@ -1,25 +1,25 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.mergeIncrementalResult = mergeIncrementalResult;
-const mergeDeep_js_1 = require("./mergeDeep.js");
+const merge_1 = require("dset/merge");
 function mergeIncrementalResult({ incrementalResult, executionResult, }) {
     const path = ['data', ...(incrementalResult.path ?? [])];
     if (incrementalResult.items) {
         for (const item of incrementalResult.items) {
-            setObjectKeyPath(executionResult, path, item);
+            (0, merge_1.dset)(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) {
-        setObjectKeyPath(executionResult, path, incrementalResult.data);
+        (0, merge_1.dset)(executionResult, path, incrementalResult.data);
     }
     if (incrementalResult.errors) {
         executionResult.errors = executionResult.errors || [];
         executionResult.errors.push(...incrementalResult.errors);
     }
     if (incrementalResult.extensions) {
-        setObjectKeyPath(executionResult, ['extensions'], incrementalResult.extensions);
+        (0, merge_1.dset)(executionResult, 'extensions', incrementalResult.extensions);
     }
     if (incrementalResult.incremental) {
         incrementalResult.incremental.forEach(incrementalSubResult => {
@@ -30,24 +30,3 @@ 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

@@ -1,4 +1,4 @@
-import { locatedError as _locatedError, GraphQLError, versionInfo, } from 'graphql';
+import { locatedError as _locatedError, GraphQLError, versionInfo } from 'graphql';
 const possibleGraphQLErrorProperties = [
     'message',
     'locations',
@@ -10,6 +10,7 @@ const possibleGraphQLErrorProperties = [
     'name',
     'stack',
     'extensions',
+    'coordinate',
 ];
 export function isGraphQLErrorLike(error) {
     return (error != null &&
@@ -22,14 +23,12 @@ export function createGraphQLError(message, options) {
         isGraphQLErrorLike(options.originalError)) {
         options.originalError = createGraphQLError(options.originalError.message, options.originalError);
     }
-    let error;
-    if (versionInfo.major >= 16) {
-        error = new GraphQLError(message, options);
-    }
-    else {
-        error = new GraphQLError(message, options?.nodes, options?.source, options?.positions, options?.path, options?.originalError, options?.extensions);
-    }
-    if (options?.coordinate != null && !error.coordinate) {
+    // To avoid type error on graphql <16, we have to use an any type here
+    const Constructor = GraphQLError;
+    const error = versionInfo.major >= 16
+        ? new Constructor(message, options)
+        : new Constructor(message, options?.nodes, options?.source, options?.positions, options?.path, options?.originalError, options?.extensions);
+    if (options?.coordinate) {
         Object.defineProperty(error, 'coordinate', {
             value: options.coordinate,
             enumerable: true,

package/esm/mergeIncrementalResult.js

@@ -1,22 +1,22 @@
-import { mergeDeep } from './mergeDeep.js';
+import { dset } from 'dset/merge';
 export function mergeIncrementalResult({ incrementalResult, executionResult, }) {
     const path = ['data', ...(incrementalResult.path ?? [])];
     if (incrementalResult.items) {
         for (const item of incrementalResult.items) {
-            setObjectKeyPath(executionResult, path, item);
+            dset(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) {
-        setObjectKeyPath(executionResult, path, incrementalResult.data);
+        dset(executionResult, path, incrementalResult.data);
     }
     if (incrementalResult.errors) {
         executionResult.errors = executionResult.errors || [];
         executionResult.errors.push(...incrementalResult.errors);
     }
     if (incrementalResult.extensions) {
-        setObjectKeyPath(executionResult, ['extensions'], incrementalResult.extensions);
+        dset(executionResult, 'extensions', incrementalResult.extensions);
     }
     if (incrementalResult.incremental) {
         incrementalResult.incremental.forEach(incrementalSubResult => {
@@ -27,24 +27,3 @@ 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-20251110221147-3e773b194d7b3e752eb121d0bec4e49919d9f1f9",
+  "version": "10.11.0-alpha-20251113153404-aa3328c5a0bf7ec4395c788dde43fda08409300c",
   "description": "Common package containing utils and types for GraphQL tools",
   "sideEffects": false,
   "peerDependencies": {
@@ -10,6 +10,7 @@
     "@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": {

package/typings/errors.d.cts

@@ -11,7 +11,6 @@ interface GraphQLErrorOptions {
     extensions?: any;
     coordinate?: string;
 }
-export declare function isGraphQLErrorLike(error: any): boolean;
 declare module 'graphql' {
     interface GraphQLError {
         /**
@@ -20,6 +19,7 @@ declare module 'graphql' {
         readonly coordinate?: string;
     }
 }
+export declare function isGraphQLErrorLike(error: any): boolean;
 export declare function createGraphQLError(message: string, options?: GraphQLErrorOptions): GraphQLError;
 type SchemaCoordinateInfo = {
     fieldName: string;

package/typings/errors.d.ts

@@ -11,7 +11,6 @@ interface GraphQLErrorOptions {
     extensions?: any;
     coordinate?: string;
 }
-export declare function isGraphQLErrorLike(error: any): boolean;
 declare module 'graphql' {
     interface GraphQLError {
         /**
@@ -20,6 +19,7 @@ declare module 'graphql' {
         readonly coordinate?: string;
     }
 }
+export declare function isGraphQLErrorLike(error: any): boolean;
 export declare function createGraphQLError(message: string, options?: GraphQLErrorOptions): GraphQLError;
 type SchemaCoordinateInfo = {
     fieldName: string;