@graphql-tools/schema 8.0.0-alpha-650c4a14.0 → 8.0.1

package/es5/index.js

@@ -468,7 +468,7 @@ function setFieldProperties(field, propertiesObj) {
  * ```
  */
 function makeExecutableSchema(_a) {
-    var typeDefs = _a.typeDefs, _b = _a.resolvers, resolvers = _b === void 0 ? {} : _b, _c = _a.resolverValidationOptions, resolverValidationOptions = _c === void 0 ? {} : _c, userProvidedSchemaTransforms = _a.schemaTransforms, _d = _a.parseOptions, parseOptions = _d === void 0 ? {} : _d, _e = _a.inheritResolversFromInterfaces, inheritResolversFromInterfaces = _e === void 0 ? false : _e, pruningOptions = _a.pruningOptions, _f = _a.updateResolversInPlace, updateResolversInPlace = _f === void 0 ? false : _f;
+    var typeDefs = _a.typeDefs, _b = _a.resolvers, resolvers = _b === void 0 ? {} : _b, _c = _a.resolverValidationOptions, resolverValidationOptions = _c === void 0 ? {} : _c, _d = _a.parseOptions, parseOptions = _d === void 0 ? {} : _d, _e = _a.inheritResolversFromInterfaces, inheritResolversFromInterfaces = _e === void 0 ? false : _e, pruningOptions = _a.pruningOptions, _f = _a.updateResolversInPlace, updateResolversInPlace = _f === void 0 ? false : _f;
     // Validate and clean up arguments
     if (typeof resolverValidationOptions !== 'object') {
         throw new Error('Expected `resolverValidationOptions` to be an object');
@@ -476,41 +476,30 @@ function makeExecutableSchema(_a) {
     if (!typeDefs) {
         throw new Error('Must provide typeDefs');
     }
-    // Arguments are now validated and cleaned up
-    var schemaTransforms = [
-        function (schema) {
-            // We allow passing in an array of resolver maps, in which case we merge them
-            var schemaWithResolvers = addResolversToSchema({
-                schema: schema,
-                resolvers: merge.mergeResolvers(resolvers),
-                resolverValidationOptions: resolverValidationOptions,
-                inheritResolversFromInterfaces: inheritResolversFromInterfaces,
-                updateResolversInPlace: updateResolversInPlace,
-            });
-            if (Object.keys(resolverValidationOptions).length > 0) {
-                assertResolversPresent(schemaWithResolvers, resolverValidationOptions);
-            }
-            return schemaWithResolvers;
-        },
-    ];
-    if (userProvidedSchemaTransforms) {
-        schemaTransforms.push(function (schema) {
-            return userProvidedSchemaTransforms.reduce(function (s, schemaTransform) { return schemaTransform(s); }, schema);
-        });
-    }
-    if (pruningOptions) {
-        schemaTransforms.push(utils.pruneSchema);
-    }
-    var schemaFromTypeDefs;
+    var schema;
     if (parseOptions === null || parseOptions === void 0 ? void 0 : parseOptions.commentDescriptions) {
         var mergedTypeDefs = merge.mergeTypeDefs(typeDefs, tslib.__assign(tslib.__assign({}, parseOptions), { commentDescriptions: true }));
-        schemaFromTypeDefs = graphql.buildSchema(mergedTypeDefs, parseOptions);
+        schema = graphql.buildSchema(mergedTypeDefs, parseOptions);
     }
     else {
         var mergedTypeDefs = merge.mergeTypeDefs(typeDefs, parseOptions);
-        schemaFromTypeDefs = graphql.buildASTSchema(mergedTypeDefs, parseOptions);
+        schema = graphql.buildASTSchema(mergedTypeDefs, parseOptions);
     }
-    return schemaTransforms.reduce(function (schema, schemaTransform) { return schemaTransform(schema); }, schemaFromTypeDefs);
+    if (pruningOptions) {
+        schema = utils.pruneSchema(schema);
+    }
+    // We allow passing in an array of resolver maps, in which case we merge them
+    schema = addResolversToSchema({
+        schema: schema,
+        resolvers: merge.mergeResolvers(resolvers),
+        resolverValidationOptions: resolverValidationOptions,
+        inheritResolversFromInterfaces: inheritResolversFromInterfaces,
+        updateResolversInPlace: updateResolversInPlace,
+    });
+    if (Object.keys(resolverValidationOptions).length > 0) {
+        assertResolversPresent(schema, resolverValidationOptions);
+    }
+    return schema;
 }
 
 exports.addResolversToSchema = addResolversToSchema;

package/es5/index.mjs

@@ -464,7 +464,7 @@ function setFieldProperties(field, propertiesObj) {
  * ```
  */
 function makeExecutableSchema(_a) {
-    var typeDefs = _a.typeDefs, _b = _a.resolvers, resolvers = _b === void 0 ? {} : _b, _c = _a.resolverValidationOptions, resolverValidationOptions = _c === void 0 ? {} : _c, userProvidedSchemaTransforms = _a.schemaTransforms, _d = _a.parseOptions, parseOptions = _d === void 0 ? {} : _d, _e = _a.inheritResolversFromInterfaces, inheritResolversFromInterfaces = _e === void 0 ? false : _e, pruningOptions = _a.pruningOptions, _f = _a.updateResolversInPlace, updateResolversInPlace = _f === void 0 ? false : _f;
+    var typeDefs = _a.typeDefs, _b = _a.resolvers, resolvers = _b === void 0 ? {} : _b, _c = _a.resolverValidationOptions, resolverValidationOptions = _c === void 0 ? {} : _c, _d = _a.parseOptions, parseOptions = _d === void 0 ? {} : _d, _e = _a.inheritResolversFromInterfaces, inheritResolversFromInterfaces = _e === void 0 ? false : _e, pruningOptions = _a.pruningOptions, _f = _a.updateResolversInPlace, updateResolversInPlace = _f === void 0 ? false : _f;
     // Validate and clean up arguments
     if (typeof resolverValidationOptions !== 'object') {
         throw new Error('Expected `resolverValidationOptions` to be an object');
@@ -472,41 +472,30 @@ function makeExecutableSchema(_a) {
     if (!typeDefs) {
         throw new Error('Must provide typeDefs');
     }
-    // Arguments are now validated and cleaned up
-    var schemaTransforms = [
-        function (schema) {
-            // We allow passing in an array of resolver maps, in which case we merge them
-            var schemaWithResolvers = addResolversToSchema({
-                schema: schema,
-                resolvers: mergeResolvers(resolvers),
-                resolverValidationOptions: resolverValidationOptions,
-                inheritResolversFromInterfaces: inheritResolversFromInterfaces,
-                updateResolversInPlace: updateResolversInPlace,
-            });
-            if (Object.keys(resolverValidationOptions).length > 0) {
-                assertResolversPresent(schemaWithResolvers, resolverValidationOptions);
-            }
-            return schemaWithResolvers;
-        },
-    ];
-    if (userProvidedSchemaTransforms) {
-        schemaTransforms.push(function (schema) {
-            return userProvidedSchemaTransforms.reduce(function (s, schemaTransform) { return schemaTransform(s); }, schema);
-        });
-    }
-    if (pruningOptions) {
-        schemaTransforms.push(pruneSchema);
-    }
-    var schemaFromTypeDefs;
+    var schema;
     if (parseOptions === null || parseOptions === void 0 ? void 0 : parseOptions.commentDescriptions) {
         var mergedTypeDefs = mergeTypeDefs(typeDefs, __assign(__assign({}, parseOptions), { commentDescriptions: true }));
-        schemaFromTypeDefs = buildSchema(mergedTypeDefs, parseOptions);
+        schema = buildSchema(mergedTypeDefs, parseOptions);
     }
     else {
         var mergedTypeDefs = mergeTypeDefs(typeDefs, parseOptions);
-        schemaFromTypeDefs = buildASTSchema(mergedTypeDefs, parseOptions);
+        schema = buildASTSchema(mergedTypeDefs, parseOptions);
     }
-    return schemaTransforms.reduce(function (schema, schemaTransform) { return schemaTransform(schema); }, schemaFromTypeDefs);
+    if (pruningOptions) {
+        schema = pruneSchema(schema);
+    }
+    // We allow passing in an array of resolver maps, in which case we merge them
+    schema = addResolversToSchema({
+        schema: schema,
+        resolvers: mergeResolvers(resolvers),
+        resolverValidationOptions: resolverValidationOptions,
+        inheritResolversFromInterfaces: inheritResolversFromInterfaces,
+        updateResolversInPlace: updateResolversInPlace,
+    });
+    if (Object.keys(resolverValidationOptions).length > 0) {
+        assertResolversPresent(schema, resolverValidationOptions);
+    }
+    return schema;
 }
 
 export { addResolversToSchema, assertResolversPresent, chainResolvers, checkForResolveTypeResolver, extendResolversFromInterfaces, makeExecutableSchema };

package/es5/makeExecutableSchema.d.ts

@@ -44,4 +44,4 @@ import { IExecutableSchemaDefinition } from './types';
  * })
  * ```
  */
-export declare function makeExecutableSchema<TContext = any>({ typeDefs, resolvers, resolverValidationOptions, schemaTransforms: userProvidedSchemaTransforms, parseOptions, inheritResolversFromInterfaces, pruningOptions, updateResolversInPlace, }: IExecutableSchemaDefinition<TContext>): GraphQLSchema;
+export declare function makeExecutableSchema<TContext = any>({ typeDefs, resolvers, resolverValidationOptions, parseOptions, inheritResolversFromInterfaces, pruningOptions, updateResolversInPlace, }: IExecutableSchemaDefinition<TContext>): GraphQLSchema;

package/es5/package.json

@@ -1,14 +1,14 @@
 {
   "name": "@graphql-tools/schema/es5",
-  "version": "8.0.0-alpha-650c4a14.0",
+  "version": "8.0.1",
   "description": "A set of utils for faster development of GraphQL tools",
   "sideEffects": false,
   "peerDependencies": {
     "graphql": "^14.0.0 || ^15.0.0"
   },
   "dependencies": {
-    "@graphql-tools/merge": "6.2.15-alpha-650c4a14.0",
-    "@graphql-tools/utils": "8.0.0-alpha-650c4a14.0",
+    "@graphql-tools/merge": "6.2.16",
+    "@graphql-tools/utils": "8.0.1",
     "tslib": "~2.3.0",
     "value-or-promise": "1.0.10"
   },

package/es5/types.d.ts

@@ -1,4 +1,3 @@
-import { GraphQLSchema } from 'graphql';
 import { TypeSource, IResolvers, IResolverValidationOptions, GraphQLParseOptions, PruneSchemaOptions } from '@graphql-tools/utils';
 /**
  * Configuration object for creating an executable schema
@@ -16,10 +15,6 @@ export interface IExecutableSchemaDefinition<TContext = any> {
      * Additional options for validating the provided resolvers
      */
     resolverValidationOptions?: IResolverValidationOptions;
-    /**
-     * An array of schema transformation functions
-     */
-    schemaTransforms?: ExecutableSchemaTransformation[];
     /**
      * Additional options for parsing the type definitions if they are provided
      * as a string
@@ -39,4 +34,3 @@ export interface IExecutableSchemaDefinition<TContext = any> {
      */
     updateResolversInPlace?: boolean;
 }
-export declare type ExecutableSchemaTransformation = (schema: GraphQLSchema) => GraphQLSchema;

package/index.js

@@ -473,7 +473,7 @@ function setFieldProperties(field, propertiesObj) {
  * })
  * ```
  */
-function makeExecutableSchema({ typeDefs, resolvers = {}, resolverValidationOptions = {}, schemaTransforms: userProvidedSchemaTransforms, parseOptions = {}, inheritResolversFromInterfaces = false, pruningOptions, updateResolversInPlace = false, }) {
+function makeExecutableSchema({ typeDefs, resolvers = {}, resolverValidationOptions = {}, parseOptions = {}, inheritResolversFromInterfaces = false, pruningOptions, updateResolversInPlace = false, }) {
     // Validate and clean up arguments
     if (typeof resolverValidationOptions !== 'object') {
         throw new Error('Expected `resolverValidationOptions` to be an object');
@@ -481,42 +481,33 @@ function makeExecutableSchema({ typeDefs, resolvers = {}, resolverValidationOpti
     if (!typeDefs) {
         throw new Error('Must provide typeDefs');
     }
-    // Arguments are now validated and cleaned up
-    const schemaTransforms = [
-        schema => {
-            // We allow passing in an array of resolver maps, in which case we merge them
-            const schemaWithResolvers = addResolversToSchema({
-                schema,
-                resolvers: merge.mergeResolvers(resolvers),
-                resolverValidationOptions,
-                inheritResolversFromInterfaces,
-                updateResolversInPlace,
-            });
-            if (Object.keys(resolverValidationOptions).length > 0) {
-                assertResolversPresent(schemaWithResolvers, resolverValidationOptions);
-            }
-            return schemaWithResolvers;
-        },
-    ];
-    if (userProvidedSchemaTransforms) {
-        schemaTransforms.push(schema => userProvidedSchemaTransforms.reduce((s, schemaTransform) => schemaTransform(s), schema));
-    }
-    if (pruningOptions) {
-        schemaTransforms.push(utils.pruneSchema);
-    }
-    let schemaFromTypeDefs;
+    let schema;
     if (parseOptions === null || parseOptions === void 0 ? void 0 : parseOptions.commentDescriptions) {
         const mergedTypeDefs = merge.mergeTypeDefs(typeDefs, {
             ...parseOptions,
             commentDescriptions: true,
         });
-        schemaFromTypeDefs = graphql.buildSchema(mergedTypeDefs, parseOptions);
+        schema = graphql.buildSchema(mergedTypeDefs, parseOptions);
     }
     else {
         const mergedTypeDefs = merge.mergeTypeDefs(typeDefs, parseOptions);
-        schemaFromTypeDefs = graphql.buildASTSchema(mergedTypeDefs, parseOptions);
+        schema = graphql.buildASTSchema(mergedTypeDefs, parseOptions);
     }
-    return schemaTransforms.reduce((schema, schemaTransform) => schemaTransform(schema), schemaFromTypeDefs);
+    if (pruningOptions) {
+        schema = utils.pruneSchema(schema);
+    }
+    // We allow passing in an array of resolver maps, in which case we merge them
+    schema = addResolversToSchema({
+        schema,
+        resolvers: merge.mergeResolvers(resolvers),
+        resolverValidationOptions,
+        inheritResolversFromInterfaces,
+        updateResolversInPlace,
+    });
+    if (Object.keys(resolverValidationOptions).length > 0) {
+        assertResolversPresent(schema, resolverValidationOptions);
+    }
+    return schema;
 }
 
 exports.addResolversToSchema = addResolversToSchema;

package/index.mjs

@@ -469,7 +469,7 @@ function setFieldProperties(field, propertiesObj) {
  * })
  * ```
  */
-function makeExecutableSchema({ typeDefs, resolvers = {}, resolverValidationOptions = {}, schemaTransforms: userProvidedSchemaTransforms, parseOptions = {}, inheritResolversFromInterfaces = false, pruningOptions, updateResolversInPlace = false, }) {
+function makeExecutableSchema({ typeDefs, resolvers = {}, resolverValidationOptions = {}, parseOptions = {}, inheritResolversFromInterfaces = false, pruningOptions, updateResolversInPlace = false, }) {
     // Validate and clean up arguments
     if (typeof resolverValidationOptions !== 'object') {
         throw new Error('Expected `resolverValidationOptions` to be an object');
@@ -477,42 +477,33 @@ function makeExecutableSchema({ typeDefs, resolvers = {}, resolverValidationOpti
     if (!typeDefs) {
         throw new Error('Must provide typeDefs');
     }
-    // Arguments are now validated and cleaned up
-    const schemaTransforms = [
-        schema => {
-            // We allow passing in an array of resolver maps, in which case we merge them
-            const schemaWithResolvers = addResolversToSchema({
-                schema,
-                resolvers: mergeResolvers(resolvers),
-                resolverValidationOptions,
-                inheritResolversFromInterfaces,
-                updateResolversInPlace,
-            });
-            if (Object.keys(resolverValidationOptions).length > 0) {
-                assertResolversPresent(schemaWithResolvers, resolverValidationOptions);
-            }
-            return schemaWithResolvers;
-        },
-    ];
-    if (userProvidedSchemaTransforms) {
-        schemaTransforms.push(schema => userProvidedSchemaTransforms.reduce((s, schemaTransform) => schemaTransform(s), schema));
-    }
-    if (pruningOptions) {
-        schemaTransforms.push(pruneSchema);
-    }
-    let schemaFromTypeDefs;
+    let schema;
     if (parseOptions === null || parseOptions === void 0 ? void 0 : parseOptions.commentDescriptions) {
         const mergedTypeDefs = mergeTypeDefs(typeDefs, {
             ...parseOptions,
             commentDescriptions: true,
         });
-        schemaFromTypeDefs = buildSchema(mergedTypeDefs, parseOptions);
+        schema = buildSchema(mergedTypeDefs, parseOptions);
     }
     else {
         const mergedTypeDefs = mergeTypeDefs(typeDefs, parseOptions);
-        schemaFromTypeDefs = buildASTSchema(mergedTypeDefs, parseOptions);
+        schema = buildASTSchema(mergedTypeDefs, parseOptions);
     }
-    return schemaTransforms.reduce((schema, schemaTransform) => schemaTransform(schema), schemaFromTypeDefs);
+    if (pruningOptions) {
+        schema = pruneSchema(schema);
+    }
+    // We allow passing in an array of resolver maps, in which case we merge them
+    schema = addResolversToSchema({
+        schema,
+        resolvers: mergeResolvers(resolvers),
+        resolverValidationOptions,
+        inheritResolversFromInterfaces,
+        updateResolversInPlace,
+    });
+    if (Object.keys(resolverValidationOptions).length > 0) {
+        assertResolversPresent(schema, resolverValidationOptions);
+    }
+    return schema;
 }
 
 export { addResolversToSchema, assertResolversPresent, chainResolvers, checkForResolveTypeResolver, extendResolversFromInterfaces, makeExecutableSchema };

package/makeExecutableSchema.d.ts

@@ -44,4 +44,4 @@ import { IExecutableSchemaDefinition } from './types';
  * })
  * ```
  */
-export declare function makeExecutableSchema<TContext = any>({ typeDefs, resolvers, resolverValidationOptions, schemaTransforms: userProvidedSchemaTransforms, parseOptions, inheritResolversFromInterfaces, pruningOptions, updateResolversInPlace, }: IExecutableSchemaDefinition<TContext>): GraphQLSchema;
+export declare function makeExecutableSchema<TContext = any>({ typeDefs, resolvers, resolverValidationOptions, parseOptions, inheritResolversFromInterfaces, pruningOptions, updateResolversInPlace, }: IExecutableSchemaDefinition<TContext>): GraphQLSchema;

package/package.json

@@ -1,14 +1,14 @@
 {
   "name": "@graphql-tools/schema",
-  "version": "8.0.0-alpha-650c4a14.0",
+  "version": "8.0.1",
   "description": "A set of utils for faster development of GraphQL tools",
   "sideEffects": false,
   "peerDependencies": {
     "graphql": "^14.0.0 || ^15.0.0"
   },
   "dependencies": {
-    "@graphql-tools/merge": "6.2.15-alpha-650c4a14.0",
-    "@graphql-tools/utils": "8.0.0-alpha-650c4a14.0",
+    "@graphql-tools/merge": "6.2.16",
+    "@graphql-tools/utils": "8.0.1",
     "tslib": "~2.3.0",
     "value-or-promise": "1.0.10"
   },

package/types.d.ts

@@ -1,4 +1,3 @@
-import { GraphQLSchema } from 'graphql';
 import { TypeSource, IResolvers, IResolverValidationOptions, GraphQLParseOptions, PruneSchemaOptions } from '@graphql-tools/utils';
 /**
  * Configuration object for creating an executable schema
@@ -16,10 +15,6 @@ export interface IExecutableSchemaDefinition<TContext = any> {
      * Additional options for validating the provided resolvers
      */
     resolverValidationOptions?: IResolverValidationOptions;
-    /**
-     * An array of schema transformation functions
-     */
-    schemaTransforms?: ExecutableSchemaTransformation[];
     /**
      * Additional options for parsing the type definitions if they are provided
      * as a string
@@ -39,4 +34,3 @@ export interface IExecutableSchemaDefinition<TContext = any> {
      */
     updateResolversInPlace?: boolean;
 }
-export declare type ExecutableSchemaTransformation = (schema: GraphQLSchema) => GraphQLSchema;