@graphql-tools/schema 8.4.0 → 8.4.1-alpha-1f8de7bd.0

package/index.js

@@ -108,94 +108,12 @@ function extendResolversFromInterfaces(schema, resolvers) {
     return extendedResolvers;
 }
 
-function addResolversToSchema(schemaOrOptions, legacyInputResolvers, legacyInputValidationOptions) {
-    const options = graphql.isSchema(schemaOrOptions)
-        ? {
-            schema: schemaOrOptions,
-            resolvers: legacyInputResolvers !== null && legacyInputResolvers !== void 0 ? legacyInputResolvers : {},
-            resolverValidationOptions: legacyInputValidationOptions,
-        }
-        : schemaOrOptions;
-    let { schema, resolvers: inputResolvers, defaultFieldResolver, resolverValidationOptions = {}, inheritResolversFromInterfaces = false, updateResolversInPlace = false, } = options;
-    const { requireResolversToMatchSchema = 'error', requireResolversForResolveType } = resolverValidationOptions;
-    const resolvers = inheritResolversFromInterfaces
-        ? extendResolversFromInterfaces(schema, inputResolvers)
-        : inputResolvers;
-    for (const typeName in resolvers) {
-        const resolverValue = resolvers[typeName];
-        const resolverType = typeof resolverValue;
-        if (resolverType !== 'object') {
-            throw new Error(`"${typeName}" defined in resolvers, but has invalid value "${resolverValue}". The resolver's value must be of type object.`);
-        }
-        const type = schema.getType(typeName);
-        if (type == null) {
-            if (requireResolversToMatchSchema === 'ignore') {
-                continue;
-            }
-            throw new Error(`"${typeName}" defined in resolvers, but not in schema`);
-        }
-        else if (graphql.isSpecifiedScalarType(type)) {
-            // allow -- without recommending -- overriding of specified scalar types
-            for (const fieldName in resolverValue) {
-                if (fieldName.startsWith('__')) {
-                    type[fieldName.substring(2)] = resolverValue[fieldName];
-                }
-                else {
-                    type[fieldName] = resolverValue[fieldName];
-                }
-            }
-        }
-        else if (graphql.isEnumType(type)) {
-            const values = type.getValues();
-            for (const fieldName in resolverValue) {
-                if (!fieldName.startsWith('__') &&
-                    !values.some(value => value.name === fieldName) &&
-                    requireResolversToMatchSchema &&
-                    requireResolversToMatchSchema !== 'ignore') {
-                    throw new Error(`${type.name}.${fieldName} was defined in resolvers, but not present within ${type.name}`);
-                }
-            }
-        }
-        else if (graphql.isUnionType(type)) {
-            for (const fieldName in resolverValue) {
-                if (!fieldName.startsWith('__') &&
-                    requireResolversToMatchSchema &&
-                    requireResolversToMatchSchema !== 'ignore') {
-                    throw new Error(`${type.name}.${fieldName} was defined in resolvers, but ${type.name} is not an object or interface type`);
-                }
-            }
-        }
-        else if (graphql.isObjectType(type) || graphql.isInterfaceType(type)) {
-            for (const fieldName in resolverValue) {
-                if (!fieldName.startsWith('__')) {
-                    const fields = type.getFields();
-                    const field = fields[fieldName];
-                    if (field == null) {
-                        // Field present in resolver but not in schema
-                        if (requireResolversToMatchSchema && requireResolversToMatchSchema !== 'ignore') {
-                            throw new Error(`${typeName}.${fieldName} defined in resolvers, but not in schema`);
-                        }
-                    }
-                    else {
-                        // Field present in both the resolver and schema
-                        const fieldResolve = resolverValue[fieldName];
-                        if (typeof fieldResolve !== 'function' && typeof fieldResolve !== 'object') {
-                            throw new Error(`Resolver ${typeName}.${fieldName} must be object or function`);
-                        }
-                    }
-                }
-            }
-        }
-    }
-    schema = updateResolversInPlace
-        ? addResolversToExistingSchema(schema, resolvers, defaultFieldResolver)
-        : createNewSchemaWithResolvers(schema, resolvers, defaultFieldResolver);
-    if (requireResolversForResolveType && requireResolversForResolveType !== 'ignore') {
-        checkForResolveTypeResolver(schema, requireResolversForResolveType);
+function setFieldProperties(field, propertiesObj) {
+    for (const propertyName in propertiesObj) {
+        field[propertyName] = propertiesObj[propertyName];
     }
-    return schema;
 }
-function addResolversToExistingSchema(schema, resolvers, defaultFieldResolver) {
+function addResolversToExistingSchema(schema, resolvers) {
     var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
     const typeMap = schema.getTypeMap();
     for (const typeName in resolvers) {
@@ -252,7 +170,7 @@ function addResolversToExistingSchema(schema, resolvers, defaultFieldResolver) {
                     enumValueConfigMap[fieldName].value = resolverValue[fieldName];
                 }
             }
-            typeMap[typeName] = new graphql.GraphQLEnumType(config);
+            Object.assign(typeMap[typeName], new graphql.GraphQLEnumType(config));
         }
         else if (graphql.isUnionType(type)) {
             for (const fieldName in resolverValue) {
@@ -283,10 +201,99 @@ function addResolversToExistingSchema(schema, resolvers, defaultFieldResolver) {
             }
         }
     }
+}
+
+function addResolversToSchema(schemaOrOptions, legacyInputResolvers, legacyInputValidationOptions) {
+    const options = graphql.isSchema(schemaOrOptions)
+        ? {
+            schema: schemaOrOptions,
+            resolvers: legacyInputResolvers !== null && legacyInputResolvers !== void 0 ? legacyInputResolvers : {},
+            resolverValidationOptions: legacyInputValidationOptions,
+        }
+        : schemaOrOptions;
+    let { schema, resolvers: inputResolvers, defaultFieldResolver, resolverValidationOptions = {}, inheritResolversFromInterfaces = false, updateResolversInPlace = false, } = options;
+    const { requireResolversToMatchSchema = 'error', requireResolversForResolveType } = resolverValidationOptions;
+    const resolvers = inheritResolversFromInterfaces
+        ? extendResolversFromInterfaces(schema, inputResolvers)
+        : inputResolvers;
+    for (const typeName in resolvers) {
+        const resolverValue = resolvers[typeName];
+        const resolverType = typeof resolverValue;
+        if (resolverType !== 'object') {
+            throw new Error(`"${typeName}" defined in resolvers, but has invalid value "${resolverValue}". The resolver's value must be of type object.`);
+        }
+        const type = schema.getType(typeName);
+        if (type == null) {
+            if (requireResolversToMatchSchema === 'ignore') {
+                continue;
+            }
+            throw new Error(`"${typeName}" defined in resolvers, but not in schema`);
+        }
+        else if (graphql.isSpecifiedScalarType(type)) {
+            // allow -- without recommending -- overriding of specified scalar types
+            for (const fieldName in resolverValue) {
+                if (fieldName.startsWith('__')) {
+                    type[fieldName.substring(2)] = resolverValue[fieldName];
+                }
+                else {
+                    type[fieldName] = resolverValue[fieldName];
+                }
+            }
+        }
+        else if (graphql.isEnumType(type)) {
+            const values = type.getValues();
+            for (const fieldName in resolverValue) {
+                if (!fieldName.startsWith('__') &&
+                    !values.some(value => value.name === fieldName) &&
+                    requireResolversToMatchSchema &&
+                    requireResolversToMatchSchema !== 'ignore') {
+                    throw new Error(`${type.name}.${fieldName} was defined in resolvers, but not present within ${type.name}`);
+                }
+            }
+        }
+        else if (graphql.isUnionType(type)) {
+            for (const fieldName in resolverValue) {
+                if (!fieldName.startsWith('__') &&
+                    requireResolversToMatchSchema &&
+                    requireResolversToMatchSchema !== 'ignore') {
+                    throw new Error(`${type.name}.${fieldName} was defined in resolvers, but ${type.name} is not an object or interface type`);
+                }
+            }
+        }
+        else if (graphql.isObjectType(type) || graphql.isInterfaceType(type)) {
+            for (const fieldName in resolverValue) {
+                if (!fieldName.startsWith('__')) {
+                    const fields = type.getFields();
+                    const field = fields[fieldName];
+                    if (field == null) {
+                        // Field present in resolver but not in schema
+                        if (requireResolversToMatchSchema && requireResolversToMatchSchema !== 'ignore') {
+                            throw new Error(`${typeName}.${fieldName} defined in resolvers, but not in schema`);
+                        }
+                    }
+                    else {
+                        // Field present in both the resolver and schema
+                        const fieldResolve = resolverValue[fieldName];
+                        if (typeof fieldResolve !== 'function' && typeof fieldResolve !== 'object') {
+                            throw new Error(`Resolver ${typeName}.${fieldName} must be object or function`);
+                        }
+                    }
+                }
+            }
+        }
+    }
+    schema = updateResolversInPlace
+        ? addResolversToExistingSchemaWithHealing(schema, resolvers, defaultFieldResolver)
+        : createNewSchemaWithResolvers(schema, resolvers, defaultFieldResolver);
+    if (requireResolversForResolveType && requireResolversForResolveType !== 'ignore') {
+        checkForResolveTypeResolver(schema, requireResolversForResolveType);
+    }
+    return schema;
+}
+function addResolversToExistingSchemaWithHealing(schema, resolvers, defaultFieldResolver) {
+    addResolversToExistingSchema(schema, resolvers);
     // serialize all default values prior to healing fields with new scalar/enum types.
     utils.forEachDefaultValue(schema, utils.serializeInputValue);
-    // schema may have new scalar/enum types that require healing
-    utils.healSchema(schema);
     // reparse all default values with new parsing functions.
     utils.forEachDefaultValue(schema, utils.parseInputValue);
     if (defaultFieldResolver != null) {
@@ -404,7 +411,7 @@ function createNewSchemaWithResolvers(schema, resolvers, defaultFieldResolver) {
                         newFieldConfig.resolve = fieldResolve.bind(resolverValue);
                     }
                     else {
-                        setFieldProperties(newFieldConfig, fieldResolve);
+                        setFieldProperties$1(newFieldConfig, fieldResolve);
                     }
                     return newFieldConfig;
                 }
@@ -421,7 +428,7 @@ function createNewSchemaWithResolvers(schema, resolvers, defaultFieldResolver) {
     }
     return schema;
 }
-function setFieldProperties(field, propertiesObj) {
+function setFieldProperties$1(field, propertiesObj) {
     for (const propertyName in propertiesObj) {
         field[propertyName] = propertiesObj[propertyName];
     }

package/index.mjs

@@ -1,5 +1,5 @@
-import { isScalarType, getNamedType, defaultFieldResolver, isSchema, isSpecifiedScalarType, isEnumType, isUnionType, isObjectType, isInterfaceType, GraphQLEnumType, GraphQLScalarType, GraphQLUnionType, GraphQLObjectType, GraphQLInterfaceType, buildSchema, buildASTSchema } from 'graphql';
-import { forEachField, mapSchema, MapperKind, forEachDefaultValue, serializeInputValue, healSchema, parseInputValue, pruneSchema, asArray, getResolversFromSchema } from '@graphql-tools/utils';
+import { isScalarType, getNamedType, defaultFieldResolver, isEnumType, GraphQLEnumType, isUnionType, isObjectType, isInterfaceType, isSchema, isSpecifiedScalarType, GraphQLScalarType, GraphQLUnionType, GraphQLObjectType, GraphQLInterfaceType, buildSchema, buildASTSchema } from 'graphql';
+import { forEachField, mapSchema, MapperKind, forEachDefaultValue, serializeInputValue, parseInputValue, pruneSchema, asArray, getResolversFromSchema } from '@graphql-tools/utils';
 import { mergeTypeDefs, mergeResolvers, mergeExtensions, applyExtensions, extractExtensionsFromSchema } from '@graphql-tools/merge';
 
 function assertResolversPresent(schema, resolverValidationOptions = {}) {
@@ -104,94 +104,12 @@ function extendResolversFromInterfaces(schema, resolvers) {
     return extendedResolvers;
 }
 
-function addResolversToSchema(schemaOrOptions, legacyInputResolvers, legacyInputValidationOptions) {
-    const options = isSchema(schemaOrOptions)
-        ? {
-            schema: schemaOrOptions,
-            resolvers: legacyInputResolvers !== null && legacyInputResolvers !== void 0 ? legacyInputResolvers : {},
-            resolverValidationOptions: legacyInputValidationOptions,
-        }
-        : schemaOrOptions;
-    let { schema, resolvers: inputResolvers, defaultFieldResolver, resolverValidationOptions = {}, inheritResolversFromInterfaces = false, updateResolversInPlace = false, } = options;
-    const { requireResolversToMatchSchema = 'error', requireResolversForResolveType } = resolverValidationOptions;
-    const resolvers = inheritResolversFromInterfaces
-        ? extendResolversFromInterfaces(schema, inputResolvers)
-        : inputResolvers;
-    for (const typeName in resolvers) {
-        const resolverValue = resolvers[typeName];
-        const resolverType = typeof resolverValue;
-        if (resolverType !== 'object') {
-            throw new Error(`"${typeName}" defined in resolvers, but has invalid value "${resolverValue}". The resolver's value must be of type object.`);
-        }
-        const type = schema.getType(typeName);
-        if (type == null) {
-            if (requireResolversToMatchSchema === 'ignore') {
-                continue;
-            }
-            throw new Error(`"${typeName}" defined in resolvers, but not in schema`);
-        }
-        else if (isSpecifiedScalarType(type)) {
-            // allow -- without recommending -- overriding of specified scalar types
-            for (const fieldName in resolverValue) {
-                if (fieldName.startsWith('__')) {
-                    type[fieldName.substring(2)] = resolverValue[fieldName];
-                }
-                else {
-                    type[fieldName] = resolverValue[fieldName];
-                }
-            }
-        }
-        else if (isEnumType(type)) {
-            const values = type.getValues();
-            for (const fieldName in resolverValue) {
-                if (!fieldName.startsWith('__') &&
-                    !values.some(value => value.name === fieldName) &&
-                    requireResolversToMatchSchema &&
-                    requireResolversToMatchSchema !== 'ignore') {
-                    throw new Error(`${type.name}.${fieldName} was defined in resolvers, but not present within ${type.name}`);
-                }
-            }
-        }
-        else if (isUnionType(type)) {
-            for (const fieldName in resolverValue) {
-                if (!fieldName.startsWith('__') &&
-                    requireResolversToMatchSchema &&
-                    requireResolversToMatchSchema !== 'ignore') {
-                    throw new Error(`${type.name}.${fieldName} was defined in resolvers, but ${type.name} is not an object or interface type`);
-                }
-            }
-        }
-        else if (isObjectType(type) || isInterfaceType(type)) {
-            for (const fieldName in resolverValue) {
-                if (!fieldName.startsWith('__')) {
-                    const fields = type.getFields();
-                    const field = fields[fieldName];
-                    if (field == null) {
-                        // Field present in resolver but not in schema
-                        if (requireResolversToMatchSchema && requireResolversToMatchSchema !== 'ignore') {
-                            throw new Error(`${typeName}.${fieldName} defined in resolvers, but not in schema`);
-                        }
-                    }
-                    else {
-                        // Field present in both the resolver and schema
-                        const fieldResolve = resolverValue[fieldName];
-                        if (typeof fieldResolve !== 'function' && typeof fieldResolve !== 'object') {
-                            throw new Error(`Resolver ${typeName}.${fieldName} must be object or function`);
-                        }
-                    }
-                }
-            }
-        }
-    }
-    schema = updateResolversInPlace
-        ? addResolversToExistingSchema(schema, resolvers, defaultFieldResolver)
-        : createNewSchemaWithResolvers(schema, resolvers, defaultFieldResolver);
-    if (requireResolversForResolveType && requireResolversForResolveType !== 'ignore') {
-        checkForResolveTypeResolver(schema, requireResolversForResolveType);
+function setFieldProperties(field, propertiesObj) {
+    for (const propertyName in propertiesObj) {
+        field[propertyName] = propertiesObj[propertyName];
     }
-    return schema;
 }
-function addResolversToExistingSchema(schema, resolvers, defaultFieldResolver) {
+function addResolversToExistingSchema(schema, resolvers) {
     var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
     const typeMap = schema.getTypeMap();
     for (const typeName in resolvers) {
@@ -248,7 +166,7 @@ function addResolversToExistingSchema(schema, resolvers, defaultFieldResolver) {
                     enumValueConfigMap[fieldName].value = resolverValue[fieldName];
                 }
             }
-            typeMap[typeName] = new GraphQLEnumType(config);
+            Object.assign(typeMap[typeName], new GraphQLEnumType(config));
         }
         else if (isUnionType(type)) {
             for (const fieldName in resolverValue) {
@@ -279,10 +197,99 @@ function addResolversToExistingSchema(schema, resolvers, defaultFieldResolver) {
             }
         }
     }
+}
+
+function addResolversToSchema(schemaOrOptions, legacyInputResolvers, legacyInputValidationOptions) {
+    const options = isSchema(schemaOrOptions)
+        ? {
+            schema: schemaOrOptions,
+            resolvers: legacyInputResolvers !== null && legacyInputResolvers !== void 0 ? legacyInputResolvers : {},
+            resolverValidationOptions: legacyInputValidationOptions,
+        }
+        : schemaOrOptions;
+    let { schema, resolvers: inputResolvers, defaultFieldResolver, resolverValidationOptions = {}, inheritResolversFromInterfaces = false, updateResolversInPlace = false, } = options;
+    const { requireResolversToMatchSchema = 'error', requireResolversForResolveType } = resolverValidationOptions;
+    const resolvers = inheritResolversFromInterfaces
+        ? extendResolversFromInterfaces(schema, inputResolvers)
+        : inputResolvers;
+    for (const typeName in resolvers) {
+        const resolverValue = resolvers[typeName];
+        const resolverType = typeof resolverValue;
+        if (resolverType !== 'object') {
+            throw new Error(`"${typeName}" defined in resolvers, but has invalid value "${resolverValue}". The resolver's value must be of type object.`);
+        }
+        const type = schema.getType(typeName);
+        if (type == null) {
+            if (requireResolversToMatchSchema === 'ignore') {
+                continue;
+            }
+            throw new Error(`"${typeName}" defined in resolvers, but not in schema`);
+        }
+        else if (isSpecifiedScalarType(type)) {
+            // allow -- without recommending -- overriding of specified scalar types
+            for (const fieldName in resolverValue) {
+                if (fieldName.startsWith('__')) {
+                    type[fieldName.substring(2)] = resolverValue[fieldName];
+                }
+                else {
+                    type[fieldName] = resolverValue[fieldName];
+                }
+            }
+        }
+        else if (isEnumType(type)) {
+            const values = type.getValues();
+            for (const fieldName in resolverValue) {
+                if (!fieldName.startsWith('__') &&
+                    !values.some(value => value.name === fieldName) &&
+                    requireResolversToMatchSchema &&
+                    requireResolversToMatchSchema !== 'ignore') {
+                    throw new Error(`${type.name}.${fieldName} was defined in resolvers, but not present within ${type.name}`);
+                }
+            }
+        }
+        else if (isUnionType(type)) {
+            for (const fieldName in resolverValue) {
+                if (!fieldName.startsWith('__') &&
+                    requireResolversToMatchSchema &&
+                    requireResolversToMatchSchema !== 'ignore') {
+                    throw new Error(`${type.name}.${fieldName} was defined in resolvers, but ${type.name} is not an object or interface type`);
+                }
+            }
+        }
+        else if (isObjectType(type) || isInterfaceType(type)) {
+            for (const fieldName in resolverValue) {
+                if (!fieldName.startsWith('__')) {
+                    const fields = type.getFields();
+                    const field = fields[fieldName];
+                    if (field == null) {
+                        // Field present in resolver but not in schema
+                        if (requireResolversToMatchSchema && requireResolversToMatchSchema !== 'ignore') {
+                            throw new Error(`${typeName}.${fieldName} defined in resolvers, but not in schema`);
+                        }
+                    }
+                    else {
+                        // Field present in both the resolver and schema
+                        const fieldResolve = resolverValue[fieldName];
+                        if (typeof fieldResolve !== 'function' && typeof fieldResolve !== 'object') {
+                            throw new Error(`Resolver ${typeName}.${fieldName} must be object or function`);
+                        }
+                    }
+                }
+            }
+        }
+    }
+    schema = updateResolversInPlace
+        ? addResolversToExistingSchemaWithHealing(schema, resolvers, defaultFieldResolver)
+        : createNewSchemaWithResolvers(schema, resolvers, defaultFieldResolver);
+    if (requireResolversForResolveType && requireResolversForResolveType !== 'ignore') {
+        checkForResolveTypeResolver(schema, requireResolversForResolveType);
+    }
+    return schema;
+}
+function addResolversToExistingSchemaWithHealing(schema, resolvers, defaultFieldResolver) {
+    addResolversToExistingSchema(schema, resolvers);
     // serialize all default values prior to healing fields with new scalar/enum types.
     forEachDefaultValue(schema, serializeInputValue);
-    // schema may have new scalar/enum types that require healing
-    healSchema(schema);
     // reparse all default values with new parsing functions.
     forEachDefaultValue(schema, parseInputValue);
     if (defaultFieldResolver != null) {
@@ -400,7 +407,7 @@ function createNewSchemaWithResolvers(schema, resolvers, defaultFieldResolver) {
                         newFieldConfig.resolve = fieldResolve.bind(resolverValue);
                     }
                     else {
-                        setFieldProperties(newFieldConfig, fieldResolve);
+                        setFieldProperties$1(newFieldConfig, fieldResolve);
                     }
                     return newFieldConfig;
                 }
@@ -417,7 +424,7 @@ function createNewSchemaWithResolvers(schema, resolvers, defaultFieldResolver) {
     }
     return schema;
 }
-function setFieldProperties(field, propertiesObj) {
+function setFieldProperties$1(field, propertiesObj) {
     for (const propertyName in propertiesObj) {
         field[propertyName] = propertiesObj[propertyName];
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphql-tools/schema",
-  "version": "8.4.0",
+  "version": "8.4.1-alpha-1f8de7bd.0",
   "description": "A set of utils for faster development of GraphQL tools",
   "sideEffects": false,
   "peerDependencies": {