@graphql-tools/schema 8.3.10 → 9.0.0-alpha-7172a2c3.0

package/addResolversToSchema.d.ts

@@ -1,3 +1,3 @@
 import { GraphQLSchema } from 'graphql';
-import { IResolvers, IResolverValidationOptions, IAddResolversToSchemaOptions } from '@graphql-tools/utils';
-export declare function addResolversToSchema(schemaOrOptions: GraphQLSchema | IAddResolversToSchemaOptions, legacyInputResolvers?: IResolvers, legacyInputValidationOptions?: IResolverValidationOptions): GraphQLSchema;
+import { IAddResolversToSchemaOptions } from '@graphql-tools/utils';
+export declare function addResolversToSchema({ schema, resolvers: inputResolvers, defaultFieldResolver, resolverValidationOptions, inheritResolversFromInterfaces, updateResolversInPlace, }: IAddResolversToSchemaOptions): GraphQLSchema;

package/index.js

@@ -108,15 +108,7 @@ 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;
+function addResolversToSchema({ schema, resolvers: inputResolvers, defaultFieldResolver, resolverValidationOptions = {}, inheritResolversFromInterfaces = false, updateResolversInPlace = false, }) {
     const { requireResolversToMatchSchema = 'error', requireResolversForResolveType } = resolverValidationOptions;
     const resolvers = inheritResolversFromInterfaces
         ? extendResolversFromInterfaces(schema, inputResolvers)
@@ -435,12 +427,11 @@ function setFieldProperties(field, propertiesObj) {
  * of these. If a function is provided, it will be passed no arguments and
  * should return an array of strings or `DocumentNode`s.
  *
- * Note: You can use `graphql-tag` to not only parse a string into a
- * `DocumentNode` but also to provide additional syntax highlighting in your
- * editor (with the appropriate editor plugin).
+ * Note: You can use GraphQL magic comment provide additional syntax
+ * highlighting in your editor (with the appropriate editor plugin).
  *
  * ```js
- * const typeDefs = gql`
+ * const typeDefs = /* GraphQL *\/ `
  *   type Query {
  *     posts: [Post]
  *     author(id: Int!): Author
@@ -520,17 +511,28 @@ function makeExecutableSchema({ typeDefs, resolvers = {}, resolverValidationOpti
  * @param config Configuration object
  */
 function mergeSchemas(config) {
-    const extractedTypeDefs = utils.asArray(config.typeDefs || []);
-    const extractedResolvers = utils.asArray(config.resolvers || []);
-    const extractedSchemaExtensions = utils.asArray(config.schemaExtensions || []);
-    const schemas = config.schemas || [];
-    for (const schema of schemas) {
-        extractedTypeDefs.push(schema);
-        extractedResolvers.push(utils.getResolversFromSchema(schema));
-        extractedSchemaExtensions.push(merge.extractExtensionsFromSchema(schema));
+    const extractedTypeDefs = [];
+    const extractedResolvers = [];
+    const extractedSchemaExtensions = [];
+    if (config.schemas != null) {
+        for (const schema of config.schemas) {
+            extractedTypeDefs.push(schema);
+            extractedResolvers.push(utils.getResolversFromSchema(schema));
+            extractedSchemaExtensions.push(merge.extractExtensionsFromSchema(schema));
+        }
+    }
+    if (config.typeDefs != null) {
+        extractedTypeDefs.push(config.typeDefs);
+    }
+    if (config.resolvers != null) {
+        const additionalResolvers = utils.asArray(config.resolvers);
+        extractedResolvers.push(...additionalResolvers);
+    }
+    if (config.schemaExtensions != null) {
+        const additionalSchemaExtensions = utils.asArray(config.schemaExtensions);
+        extractedSchemaExtensions.push(...additionalSchemaExtensions);
     }
     return makeExecutableSchema({
-        parseOptions: config,
         ...config,
         typeDefs: extractedTypeDefs,
         resolvers: extractedResolvers,

package/index.mjs

@@ -1,4 +1,4 @@
-import { isScalarType, getNamedType, defaultFieldResolver, isSchema, isSpecifiedScalarType, isEnumType, isUnionType, isObjectType, isInterfaceType, GraphQLEnumType, GraphQLScalarType, GraphQLUnionType, GraphQLObjectType, GraphQLInterfaceType, buildSchema, buildASTSchema } from 'graphql';
+import { isScalarType, getNamedType, defaultFieldResolver, isSpecifiedScalarType, isEnumType, isUnionType, isObjectType, isInterfaceType, GraphQLEnumType, GraphQLScalarType, GraphQLUnionType, GraphQLObjectType, GraphQLInterfaceType, isSchema, buildSchema, buildASTSchema } from 'graphql';
 import { forEachField, mapSchema, MapperKind, forEachDefaultValue, serializeInputValue, healSchema, parseInputValue, pruneSchema, asArray, getResolversFromSchema } from '@graphql-tools/utils';
 import { mergeTypeDefs, mergeResolvers, mergeExtensions, applyExtensions, extractExtensionsFromSchema } from '@graphql-tools/merge';
 
@@ -104,15 +104,7 @@ 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;
+function addResolversToSchema({ schema, resolvers: inputResolvers, defaultFieldResolver, resolverValidationOptions = {}, inheritResolversFromInterfaces = false, updateResolversInPlace = false, }) {
     const { requireResolversToMatchSchema = 'error', requireResolversForResolveType } = resolverValidationOptions;
     const resolvers = inheritResolversFromInterfaces
         ? extendResolversFromInterfaces(schema, inputResolvers)
@@ -431,12 +423,11 @@ function setFieldProperties(field, propertiesObj) {
  * of these. If a function is provided, it will be passed no arguments and
  * should return an array of strings or `DocumentNode`s.
  *
- * Note: You can use `graphql-tag` to not only parse a string into a
- * `DocumentNode` but also to provide additional syntax highlighting in your
- * editor (with the appropriate editor plugin).
+ * Note: You can use GraphQL magic comment provide additional syntax
+ * highlighting in your editor (with the appropriate editor plugin).
  *
  * ```js
- * const typeDefs = gql`
+ * const typeDefs = /* GraphQL *\/ `
  *   type Query {
  *     posts: [Post]
  *     author(id: Int!): Author
@@ -516,17 +507,28 @@ function makeExecutableSchema({ typeDefs, resolvers = {}, resolverValidationOpti
  * @param config Configuration object
  */
 function mergeSchemas(config) {
-    const extractedTypeDefs = asArray(config.typeDefs || []);
-    const extractedResolvers = asArray(config.resolvers || []);
-    const extractedSchemaExtensions = asArray(config.schemaExtensions || []);
-    const schemas = config.schemas || [];
-    for (const schema of schemas) {
-        extractedTypeDefs.push(schema);
-        extractedResolvers.push(getResolversFromSchema(schema));
-        extractedSchemaExtensions.push(extractExtensionsFromSchema(schema));
+    const extractedTypeDefs = [];
+    const extractedResolvers = [];
+    const extractedSchemaExtensions = [];
+    if (config.schemas != null) {
+        for (const schema of config.schemas) {
+            extractedTypeDefs.push(schema);
+            extractedResolvers.push(getResolversFromSchema(schema));
+            extractedSchemaExtensions.push(extractExtensionsFromSchema(schema));
+        }
+    }
+    if (config.typeDefs != null) {
+        extractedTypeDefs.push(config.typeDefs);
+    }
+    if (config.resolvers != null) {
+        const additionalResolvers = asArray(config.resolvers);
+        extractedResolvers.push(...additionalResolvers);
+    }
+    if (config.schemaExtensions != null) {
+        const additionalSchemaExtensions = asArray(config.schemaExtensions);
+        extractedSchemaExtensions.push(...additionalSchemaExtensions);
     }
     return makeExecutableSchema({
-        parseOptions: config,
         ...config,
         typeDefs: extractedTypeDefs,
         resolvers: extractedResolvers,

package/makeExecutableSchema.d.ts

@@ -8,12 +8,11 @@ import { IExecutableSchemaDefinition } from './types';
  * of these. If a function is provided, it will be passed no arguments and
  * should return an array of strings or `DocumentNode`s.
  *
- * Note: You can use `graphql-tag` to not only parse a string into a
- * `DocumentNode` but also to provide additional syntax highlighting in your
- * editor (with the appropriate editor plugin).
+ * Note: You can use GraphQL magic comment provide additional syntax
+ * highlighting in your editor (with the appropriate editor plugin).
  *
  * ```js
- * const typeDefs = gql`
+ * const typeDefs = /* GraphQL *\/ `
  *   type Query {
  *     posts: [Post]
  *     author(id: Int!): Author

package/merge-schemas.d.ts

@@ -3,7 +3,7 @@ import { IExecutableSchemaDefinition } from './types';
 /**
  * Configuration object for schema merging
  */
-export declare type MergeSchemasConfig<T = any> = Partial<IExecutableSchemaDefinition<T>> & IExecutableSchemaDefinition<T>['parseOptions'] & {
+export declare type MergeSchemasConfig<T = any> = Partial<IExecutableSchemaDefinition<T>> & {
     /**
      * The schemas to be merged
      */

package/package.json

@@ -1,15 +1,15 @@
 {
   "name": "@graphql-tools/schema",
-  "version": "8.3.10",
+  "version": "9.0.0-alpha-7172a2c3.0",
   "description": "A set of utils for faster development of GraphQL tools",
   "sideEffects": false,
   "peerDependencies": {
     "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0"
   },
   "dependencies": {
-    "@graphql-tools/merge": "8.2.10",
-    "@graphql-tools/utils": "8.6.9",
-    "tslib": "~2.3.0",
+    "@graphql-tools/merge": "8.2.11",
+    "@graphql-tools/utils": "8.6.10",
+    "tslib": "~2.4.0",
     "value-or-promise": "1.0.11"
   },
   "repository": {