@graphql-tools/utils 11.0.0-alpha-20250924153515-3751f8516e3574cdd5775626a4f44e799a9c60bc → 11.0.0-alpha-20251112101412-7b3e869e04dc287cf268a3275335f28e3490d10a

package/cjs/build-operation-for-field.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.buildOperationNodeForField = buildOperationNodeForField;
 const graphql_1 = require("graphql");
+const astFromValueUntyped_js_1 = require("./astFromValueUntyped.js");
 const rootTypes_js_1 = require("./rootTypes.js");
 let operationVariables = [];
 let fieldTypeMap = new Map();
@@ -241,6 +242,25 @@ function resolveVariable(arg, name) {
             },
         };
     }
+    let defaultValue;
+    try {
+        const returnVal = (0, graphql_1.astFromValue)(arg.defaultValue, arg.type);
+        if (returnVal == null) {
+            defaultValue = undefined;
+        }
+        else {
+            defaultValue = returnVal;
+        }
+    }
+    catch (e) {
+        const returnVal = (0, astFromValueUntyped_js_1.astFromValueUntyped)(arg.defaultValue);
+        if (returnVal == null) {
+            defaultValue = undefined;
+        }
+        else {
+            defaultValue = returnVal;
+        }
+    }
     return {
         kind: graphql_1.Kind.VARIABLE_DEFINITION,
         variable: {
@@ -251,6 +271,7 @@ function resolveVariable(arg, name) {
             },
         },
         type: resolveVariableType(arg.type),
+        defaultValue,
     };
 }
 function getArgumentName(name, path) {

package/cjs/mapSchema.js

@@ -21,10 +21,11 @@ function mapSchema(schema, schemaMapper = {}) {
         directives,
     });
 }
+const builtinTypes = ['String', 'ID', 'Int', 'Float', 'Boolean'];
 function mapTypes(originalTypeMap, schema, schemaMapper, testFn = () => true) {
     const newTypeMap = {};
     for (const typeName in originalTypeMap) {
-        if (!typeName.startsWith('__')) {
+        if (!typeName.startsWith('__') && !builtinTypes.includes(typeName)) {
             const originalType = originalTypeMap[typeName];
             if (originalType == null || !testFn(originalType)) {
                 newTypeMap[typeName] = originalType;

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/cjs/print-schema-with-directives.js

@@ -123,7 +123,7 @@ function astFromSchema(schema, pathToDirectivesInExtensions) {
         return null;
     }
     const schemaNode = {
-        kind: operationTypes != null ? graphql_1.Kind.SCHEMA_DEFINITION : graphql_1.Kind.SCHEMA_EXTENSION,
+        kind: operationTypes.length ? graphql_1.Kind.SCHEMA_DEFINITION : graphql_1.Kind.SCHEMA_EXTENSION,
         operationTypes,
         // ConstXNode has been introduced in v16 but it is not compatible with XNode so we do `as any` for backwards compatibility
         directives: directives,

package/esm/build-operation-for-field.js

@@ -1,4 +1,5 @@
-import { getNamedType, isEnumType, isInterfaceType, isListType, isNonNullType, isObjectType, isScalarType, isUnionType, Kind, } from 'graphql';
+import { astFromValue, getNamedType, isEnumType, isInterfaceType, isListType, isNonNullType, isObjectType, isScalarType, isUnionType, Kind, } from 'graphql';
+import { astFromValueUntyped } from './astFromValueUntyped.js';
 import { getDefinedRootType, getRootTypeNames } from './rootTypes.js';
 let operationVariables = [];
 let fieldTypeMap = new Map();
@@ -238,6 +239,25 @@ function resolveVariable(arg, name) {
             },
         };
     }
+    let defaultValue;
+    try {
+        const returnVal = astFromValue(arg.defaultValue, arg.type);
+        if (returnVal == null) {
+            defaultValue = undefined;
+        }
+        else {
+            defaultValue = returnVal;
+        }
+    }
+    catch (e) {
+        const returnVal = astFromValueUntyped(arg.defaultValue);
+        if (returnVal == null) {
+            defaultValue = undefined;
+        }
+        else {
+            defaultValue = returnVal;
+        }
+    }
     return {
         kind: Kind.VARIABLE_DEFINITION,
         variable: {
@@ -248,6 +268,7 @@ function resolveVariable(arg, name) {
             },
         },
         type: resolveVariableType(arg.type),
+        defaultValue,
     };
 }
 function getArgumentName(name, path) {

package/esm/mapSchema.js

@@ -17,10 +17,11 @@ export function mapSchema(schema, schemaMapper = {}) {
         directives,
     });
 }
+const builtinTypes = ['String', 'ID', 'Int', 'Float', 'Boolean'];
 function mapTypes(originalTypeMap, schema, schemaMapper, testFn = () => true) {
     const newTypeMap = {};
     for (const typeName in originalTypeMap) {
-        if (!typeName.startsWith('__')) {
+        if (!typeName.startsWith('__') && !builtinTypes.includes(typeName)) {
             const originalType = originalTypeMap[typeName];
             if (originalType == null || !testFn(originalType)) {
                 newTypeMap[typeName] = originalType;

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/esm/print-schema-with-directives.js

@@ -103,7 +103,7 @@ export function astFromSchema(schema, pathToDirectivesInExtensions) {
         return null;
     }
     const schemaNode = {
-        kind: operationTypes != null ? Kind.SCHEMA_DEFINITION : Kind.SCHEMA_EXTENSION,
+        kind: operationTypes.length ? Kind.SCHEMA_DEFINITION : Kind.SCHEMA_EXTENSION,
         operationTypes,
         // ConstXNode has been introduced in v16 but it is not compatible with XNode so we do `as any` for backwards compatibility
         directives: directives,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphql-tools/utils",
-  "version": "11.0.0-alpha-20250924153515-3751f8516e3574cdd5775626a4f44e799a9c60bc",
+  "version": "11.0.0-alpha-20251112101412-7b3e869e04dc287cf268a3275335f28e3490d10a",
   "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": {