@graphql-tools/schema 9.0.0-alpha-9ec77577.0 → 9.0.0-alpha-7052f15d.0

package/index.js

@@ -462,7 +462,7 @@ function setFieldProperties(field, propertiesObj) {
  * })
  * ```
  */
-function makeExecutableSchema({ typeDefs, resolvers = {}, resolverValidationOptions = {}, parseOptions = {}, inheritResolversFromInterfaces = false, pruningOptions, updateResolversInPlace = false, schemaExtensions, }) {
+function makeExecutableSchema({ typeDefs, resolvers = {}, resolverValidationOptions = {}, inheritResolversFromInterfaces = false, pruningOptions, updateResolversInPlace = false, schemaExtensions, ...otherOptions }) {
     // Validate and clean up arguments
     if (typeof resolverValidationOptions !== 'object') {
         throw new Error('Expected `resolverValidationOptions` to be an object');
@@ -474,16 +474,16 @@ function makeExecutableSchema({ typeDefs, resolvers = {}, resolverValidationOpti
     if (graphql.isSchema(typeDefs)) {
         schema = typeDefs;
     }
-    else if (parseOptions === null || parseOptions === void 0 ? void 0 : parseOptions.commentDescriptions) {
+    else if (otherOptions === null || otherOptions === void 0 ? void 0 : otherOptions.commentDescriptions) {
         const mergedTypeDefs = merge.mergeTypeDefs(typeDefs, {
-            ...parseOptions,
+            ...otherOptions,
             commentDescriptions: true,
         });
-        schema = graphql.buildSchema(mergedTypeDefs, parseOptions);
+        schema = graphql.buildSchema(mergedTypeDefs, otherOptions);
     }
     else {
-        const mergedTypeDefs = merge.mergeTypeDefs(typeDefs, parseOptions);
-        schema = graphql.buildASTSchema(mergedTypeDefs, parseOptions);
+        const mergedTypeDefs = merge.mergeTypeDefs(typeDefs, otherOptions);
+        schema = graphql.buildASTSchema(mergedTypeDefs, otherOptions);
     }
     if (pruningOptions) {
         schema = utils.pruneSchema(schema);

package/index.mjs

@@ -458,7 +458,7 @@ function setFieldProperties(field, propertiesObj) {
  * })
  * ```
  */
-function makeExecutableSchema({ typeDefs, resolvers = {}, resolverValidationOptions = {}, parseOptions = {}, inheritResolversFromInterfaces = false, pruningOptions, updateResolversInPlace = false, schemaExtensions, }) {
+function makeExecutableSchema({ typeDefs, resolvers = {}, resolverValidationOptions = {}, inheritResolversFromInterfaces = false, pruningOptions, updateResolversInPlace = false, schemaExtensions, ...otherOptions }) {
     // Validate and clean up arguments
     if (typeof resolverValidationOptions !== 'object') {
         throw new Error('Expected `resolverValidationOptions` to be an object');
@@ -470,16 +470,16 @@ function makeExecutableSchema({ typeDefs, resolvers = {}, resolverValidationOpti
     if (isSchema(typeDefs)) {
         schema = typeDefs;
     }
-    else if (parseOptions === null || parseOptions === void 0 ? void 0 : parseOptions.commentDescriptions) {
+    else if (otherOptions === null || otherOptions === void 0 ? void 0 : otherOptions.commentDescriptions) {
         const mergedTypeDefs = mergeTypeDefs(typeDefs, {
-            ...parseOptions,
+            ...otherOptions,
             commentDescriptions: true,
         });
-        schema = buildSchema(mergedTypeDefs, parseOptions);
+        schema = buildSchema(mergedTypeDefs, otherOptions);
     }
     else {
-        const mergedTypeDefs = mergeTypeDefs(typeDefs, parseOptions);
-        schema = buildASTSchema(mergedTypeDefs, parseOptions);
+        const mergedTypeDefs = mergeTypeDefs(typeDefs, otherOptions);
+        schema = buildASTSchema(mergedTypeDefs, otherOptions);
     }
     if (pruningOptions) {
         schema = pruneSchema(schema);

package/makeExecutableSchema.d.ts

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

package/package.json

@@ -1,14 +1,14 @@
 {
   "name": "@graphql-tools/schema",
-  "version": "9.0.0-alpha-9ec77577.0",
+  "version": "9.0.0-alpha-7052f15d.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"
+    "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0"
   },
   "dependencies": {
-    "@graphql-tools/merge": "8.2.11",
-    "@graphql-tools/utils": "8.6.10",
+    "@graphql-tools/merge": "8.2.13",
+    "@graphql-tools/utils": "8.6.12",
     "tslib": "~2.4.0",
     "value-or-promise": "1.0.11"
   },

package/types.d.ts

@@ -4,7 +4,7 @@ import { BuildSchemaOptions } from 'graphql';
 /**
  * Configuration object for creating an executable schema
  */
-export interface IExecutableSchemaDefinition<TContext = any> {
+export interface IExecutableSchemaDefinition<TContext = any> extends BuildSchemaOptions, GraphQLParseOptions {
     /**
      * The type definitions used to create the schema
      */
@@ -17,11 +17,6 @@ export interface IExecutableSchemaDefinition<TContext = any> {
      * Additional options for validating the provided resolvers
      */
     resolverValidationOptions?: IResolverValidationOptions;
-    /**
-     * Additional options for parsing the type definitions if they are provided
-     * as a string
-     */
-    parseOptions?: BuildSchemaOptions & GraphQLParseOptions;
     /**
      * GraphQL object types that implement interfaces will inherit any missing
      * resolvers from their interface types defined in the `resolvers` object