@graphql-tools/utils 12.0.1 → 12.0.2-alpha-20260916134337-40efa53cfd526d3944a85c9f8cd8d00a16f052dd

package/cjs/extractExtensionsFromSchema.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.extractExtensionsFromSchema = extractExtensionsFromSchema;
+const graphql_1 = require("graphql");
 const helpers_js_1 = require("./helpers.js");
 const Interfaces_js_1 = require("./Interfaces.js");
 const mapSchema_js_1 = require("./mapSchema.js");
@@ -10,6 +11,13 @@ function handleDirectiveExtensions(extensions, removeDirectives) {
     const finalExtensions = {
         ...rest,
     };
+    // GraphQL v17+ preserves symbol-keyed extensions (toObjMapWithSymbols); copy them
+    // explicitly because object rest/spread only keeps enumerable string keys.
+    if (graphql_1.versionInfo.major >= 17) {
+        for (const sym of Object.getOwnPropertySymbols(extensions)) {
+            finalExtensions[sym] = extensions[sym];
+        }
+    }
     if (!removeDirectives) {
         if (existingDirectives != null) {
             const directives = {};

package/cjs/mergeDeep.js

@@ -2,7 +2,45 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.mergeDeep = mergeDeep;
 const helpers_js_1 = require("./helpers.js");
-function mergeDeep(sources, respectPrototype = false, respectArrays = false, respectArrayLength = false, respectNonEnumerableSymbols = false) {
+function isMergeDeepOptions(value) {
+    return value != null && typeof value === 'object' && !Array.isArray(value);
+}
+function resolveRespectSymbols(respectSymbols) {
+    switch (respectSymbols) {
+        case 'all':
+            return { enumerable: true, nonEnumerable: true };
+        case 'enumerable':
+            return { enumerable: true, nonEnumerable: false };
+        case 'nonenumerable':
+            return { enumerable: false, nonEnumerable: true };
+        default:
+            return { enumerable: false, nonEnumerable: false };
+    }
+}
+function normalizeMergeDeepOptions(respectPrototypeOrOptions, respectArrays = false, respectArrayLength = false, respectNonEnumerableSymbols = false) {
+    if (isMergeDeepOptions(respectPrototypeOrOptions)) {
+        return {
+            respectPrototype: respectPrototypeOrOptions.respectPrototype ?? false,
+            respectArrays: respectPrototypeOrOptions.respectArrays ?? false,
+            respectArrayLength: respectPrototypeOrOptions.respectArrayLength ?? false,
+            respectSymbols: respectPrototypeOrOptions.respectSymbols ?? false,
+        };
+    }
+    return {
+        respectPrototype: respectPrototypeOrOptions ?? false,
+        respectArrays,
+        respectArrayLength,
+        // Legacy 5th positional arg maps to non-enumerable-only symbol handling.
+        respectSymbols: respectNonEnumerableSymbols ? 'nonenumerable' : false,
+    };
+}
+function mergeDeep(sources, respectPrototypeOrOptions = false, respectArrays = false, respectArrayLength = false, respectNonEnumerableSymbols = false) {
+    const options = normalizeMergeDeepOptions(respectPrototypeOrOptions, respectArrays, respectArrayLength, respectNonEnumerableSymbols);
+    return mergeDeepWithOptions(sources, options);
+}
+function mergeDeepWithOptions(sources, options) {
+    const { respectPrototype, respectArrayLength, respectSymbols } = options;
+    const { enumerable: respectEnumerableSymbols, nonEnumerable: respectNonEnumerableSymbols } = resolveRespectSymbols(respectSymbols);
     if (sources.length === 0) {
         return;
     }
@@ -27,7 +65,7 @@ function mergeDeep(sources, respectPrototype = false, respectArrays = false, res
         return false;
     });
     if (respectArrayLength && areArraysInTheSameLength) {
-        return new Array(expectedLength).fill(null).map((_, index) => mergeDeep(sources.map(source => source[index]), respectPrototype, respectArrays, respectArrayLength, respectNonEnumerableSymbols));
+        return new Array(expectedLength).fill(null).map((_, index) => mergeDeepWithOptions(sources.map(source => source[index]), options));
     }
     if (allArrays) {
         return sources.flat(1);
@@ -74,17 +112,29 @@ function mergeDeep(sources, respectPrototype = false, respectArrays = false, res
                 // skip above, which would otherwise silently discard this override and keep the prior
                 // value.
                 if (Object.prototype.hasOwnProperty.call(output, key) && source[key] !== undefined) {
-                    output[key] = mergeDeep([output[key], source[key]], respectPrototype, respectArrays, respectArrayLength, respectNonEnumerableSymbols);
+                    output[key] = mergeDeepWithOptions([output[key], source[key]], options);
                 }
                 else {
                     output[key] = source[key];
                 }
             }
-            if (respectNonEnumerableSymbols && output != null) {
+            if (output != null && (respectEnumerableSymbols || respectNonEnumerableSymbols)) {
                 for (const sym of Object.getOwnPropertySymbols(source)) {
                     const descriptor = Object.getOwnPropertyDescriptor(source, sym);
                     if (!descriptor.enumerable) {
-                        Object.defineProperty(output, sym, descriptor);
+                        if (respectNonEnumerableSymbols) {
+                            Object.defineProperty(output, sym, descriptor);
+                        }
+                        continue;
+                    }
+                    if (!respectEnumerableSymbols) {
+                        continue;
+                    }
+                    if (Object.prototype.hasOwnProperty.call(output, sym) && source[sym] !== undefined) {
+                        output[sym] = mergeDeepWithOptions([output[sym], source[sym]], options);
+                    }
+                    else {
+                        output[sym] = source[sym];
                     }
                 }
             }
@@ -94,7 +144,7 @@ function mergeDeep(sources, respectPrototype = false, respectArrays = false, res
                 output = source;
             }
             else {
-                output = mergeDeep([output, source], respectPrototype, respectArrays, respectArrayLength);
+                output = mergeDeepWithOptions([output, source], options);
             }
         }
         else {

package/esm/extractExtensionsFromSchema.js

@@ -1,3 +1,4 @@
+import { versionInfo } from 'graphql';
 import { asArray } from './helpers.js';
 import { MapperKind } from './Interfaces.js';
 import { mapSchema } from './mapSchema.js';
@@ -7,6 +8,13 @@ function handleDirectiveExtensions(extensions, removeDirectives) {
     const finalExtensions = {
         ...rest,
     };
+    // GraphQL v17+ preserves symbol-keyed extensions (toObjMapWithSymbols); copy them
+    // explicitly because object rest/spread only keeps enumerable string keys.
+    if (versionInfo.major >= 17) {
+        for (const sym of Object.getOwnPropertySymbols(extensions)) {
+            finalExtensions[sym] = extensions[sym];
+        }
+    }
     if (!removeDirectives) {
         if (existingDirectives != null) {
             const directives = {};

package/esm/mergeDeep.js

@@ -1,5 +1,43 @@
 import { isSome } from './helpers.js';
-export function mergeDeep(sources, respectPrototype = false, respectArrays = false, respectArrayLength = false, respectNonEnumerableSymbols = false) {
+function isMergeDeepOptions(value) {
+    return value != null && typeof value === 'object' && !Array.isArray(value);
+}
+function resolveRespectSymbols(respectSymbols) {
+    switch (respectSymbols) {
+        case 'all':
+            return { enumerable: true, nonEnumerable: true };
+        case 'enumerable':
+            return { enumerable: true, nonEnumerable: false };
+        case 'nonenumerable':
+            return { enumerable: false, nonEnumerable: true };
+        default:
+            return { enumerable: false, nonEnumerable: false };
+    }
+}
+function normalizeMergeDeepOptions(respectPrototypeOrOptions, respectArrays = false, respectArrayLength = false, respectNonEnumerableSymbols = false) {
+    if (isMergeDeepOptions(respectPrototypeOrOptions)) {
+        return {
+            respectPrototype: respectPrototypeOrOptions.respectPrototype ?? false,
+            respectArrays: respectPrototypeOrOptions.respectArrays ?? false,
+            respectArrayLength: respectPrototypeOrOptions.respectArrayLength ?? false,
+            respectSymbols: respectPrototypeOrOptions.respectSymbols ?? false,
+        };
+    }
+    return {
+        respectPrototype: respectPrototypeOrOptions ?? false,
+        respectArrays,
+        respectArrayLength,
+        // Legacy 5th positional arg maps to non-enumerable-only symbol handling.
+        respectSymbols: respectNonEnumerableSymbols ? 'nonenumerable' : false,
+    };
+}
+export function mergeDeep(sources, respectPrototypeOrOptions = false, respectArrays = false, respectArrayLength = false, respectNonEnumerableSymbols = false) {
+    const options = normalizeMergeDeepOptions(respectPrototypeOrOptions, respectArrays, respectArrayLength, respectNonEnumerableSymbols);
+    return mergeDeepWithOptions(sources, options);
+}
+function mergeDeepWithOptions(sources, options) {
+    const { respectPrototype, respectArrayLength, respectSymbols } = options;
+    const { enumerable: respectEnumerableSymbols, nonEnumerable: respectNonEnumerableSymbols } = resolveRespectSymbols(respectSymbols);
     if (sources.length === 0) {
         return;
     }
@@ -24,7 +62,7 @@ export function mergeDeep(sources, respectPrototype = false, respectArrays = fal
         return false;
     });
     if (respectArrayLength && areArraysInTheSameLength) {
-        return new Array(expectedLength).fill(null).map((_, index) => mergeDeep(sources.map(source => source[index]), respectPrototype, respectArrays, respectArrayLength, respectNonEnumerableSymbols));
+        return new Array(expectedLength).fill(null).map((_, index) => mergeDeepWithOptions(sources.map(source => source[index]), options));
     }
     if (allArrays) {
         return sources.flat(1);
@@ -71,17 +109,29 @@ export function mergeDeep(sources, respectPrototype = false, respectArrays = fal
                 // skip above, which would otherwise silently discard this override and keep the prior
                 // value.
                 if (Object.prototype.hasOwnProperty.call(output, key) && source[key] !== undefined) {
-                    output[key] = mergeDeep([output[key], source[key]], respectPrototype, respectArrays, respectArrayLength, respectNonEnumerableSymbols);
+                    output[key] = mergeDeepWithOptions([output[key], source[key]], options);
                 }
                 else {
                     output[key] = source[key];
                 }
             }
-            if (respectNonEnumerableSymbols && output != null) {
+            if (output != null && (respectEnumerableSymbols || respectNonEnumerableSymbols)) {
                 for (const sym of Object.getOwnPropertySymbols(source)) {
                     const descriptor = Object.getOwnPropertyDescriptor(source, sym);
                     if (!descriptor.enumerable) {
-                        Object.defineProperty(output, sym, descriptor);
+                        if (respectNonEnumerableSymbols) {
+                            Object.defineProperty(output, sym, descriptor);
+                        }
+                        continue;
+                    }
+                    if (!respectEnumerableSymbols) {
+                        continue;
+                    }
+                    if (Object.prototype.hasOwnProperty.call(output, sym) && source[sym] !== undefined) {
+                        output[sym] = mergeDeepWithOptions([output[sym], source[sym]], options);
+                    }
+                    else {
+                        output[sym] = source[sym];
                     }
                 }
             }
@@ -91,7 +141,7 @@ export function mergeDeep(sources, respectPrototype = false, respectArrays = fal
                 output = source;
             }
             else {
-                output = mergeDeep([output, source], respectPrototype, respectArrays, respectArrayLength);
+                output = mergeDeepWithOptions([output, source], options);
             }
         }
         else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphql-tools/utils",
-  "version": "12.0.1",
+  "version": "12.0.2-alpha-20260916134337-40efa53cfd526d3944a85c9f8cd8d00a16f052dd",
   "description": "Common package containing utils and types for GraphQL tools",
   "sideEffects": false,
   "peerDependencies": {

package/typings/mergeDeep.d.cts

@@ -5,5 +5,20 @@ type UnionToIntersection<U> = (U extends any ? (k: U) => void : never) extends (
 type UnboxIntersection<T> = T extends {
     0: infer U;
 } ? U : never;
+export type MergeDeepRespectSymbols = false | 'enumerable' | 'nonenumerable' | 'all';
+export interface MergeDeepOptions {
+    respectPrototype?: boolean;
+    respectArrays?: boolean;
+    respectArrayLength?: boolean;
+    /**
+     * How to handle own symbol keys while merging.
+     * - `false` / omitted: drop symbols (historical default)
+     * - `'enumerable'`: merge enumerable symbols like string keys
+     * - `'nonenumerable'`: copy non-enumerable symbols via property descriptors
+     * - `'all'`: both
+     */
+    respectSymbols?: MergeDeepRespectSymbols;
+}
+export declare function mergeDeep<S extends any[]>(sources: S, options?: MergeDeepOptions): UnboxIntersection<UnionToIntersection<BoxedTupleTypes<S>>> & any;
 export declare function mergeDeep<S extends any[]>(sources: S, respectPrototype?: boolean, respectArrays?: boolean, respectArrayLength?: boolean, respectNonEnumerableSymbols?: boolean): UnboxIntersection<UnionToIntersection<BoxedTupleTypes<S>>> & any;
 export {};

package/typings/mergeDeep.d.ts

@@ -5,5 +5,20 @@ type UnionToIntersection<U> = (U extends any ? (k: U) => void : never) extends (
 type UnboxIntersection<T> = T extends {
     0: infer U;
 } ? U : never;
+export type MergeDeepRespectSymbols = false | 'enumerable' | 'nonenumerable' | 'all';
+export interface MergeDeepOptions {
+    respectPrototype?: boolean;
+    respectArrays?: boolean;
+    respectArrayLength?: boolean;
+    /**
+     * How to handle own symbol keys while merging.
+     * - `false` / omitted: drop symbols (historical default)
+     * - `'enumerable'`: merge enumerable symbols like string keys
+     * - `'nonenumerable'`: copy non-enumerable symbols via property descriptors
+     * - `'all'`: both
+     */
+    respectSymbols?: MergeDeepRespectSymbols;
+}
+export declare function mergeDeep<S extends any[]>(sources: S, options?: MergeDeepOptions): UnboxIntersection<UnionToIntersection<BoxedTupleTypes<S>>> & any;
 export declare function mergeDeep<S extends any[]>(sources: S, respectPrototype?: boolean, respectArrays?: boolean, respectArrayLength?: boolean, respectNonEnumerableSymbols?: boolean): UnboxIntersection<UnionToIntersection<BoxedTupleTypes<S>>> & any;
 export {};

package/typings/types.d.cts

@@ -72,7 +72,7 @@ export declare enum DirectiveLocation {
     INPUT_OBJECT = "INPUT_OBJECT",
     INPUT_FIELD_DEFINITION = "INPUT_FIELD_DEFINITION"
 }
-export type ExtensionsObject = Record<string, any>;
+export type ExtensionsObject = Record<string | symbol, any>;
 export type ObjectTypeExtensions = {
     type: 'object';
     fields: Record<string, {

package/typings/types.d.ts

@@ -72,7 +72,7 @@ export declare enum DirectiveLocation {
     INPUT_OBJECT = "INPUT_OBJECT",
     INPUT_FIELD_DEFINITION = "INPUT_FIELD_DEFINITION"
 }
-export type ExtensionsObject = Record<string, any>;
+export type ExtensionsObject = Record<string | symbol, any>;
 export type ObjectTypeExtensions = {
     type: 'object';
     fields: Record<string, {