@graphql-tools/load 7.5.13 → 7.5.14-alpha-950a29c9.0

package/index.js

@@ -30,6 +30,7 @@ const pLimit = _interopDefault(require('p-limit'));
 const module$1 = require('module');
 const path = require('path');
 const schema = require('@graphql-tools/schema');
+const merge = require('@graphql-tools/merge');
 
 function normalizePointers(unnormalizedPointerOrPointers) {
     const ignore = [];
@@ -608,18 +609,17 @@ function loadDocumentsSync(pointerOrPointers, options) {
  * @param options Additional options
  */
 async function loadSchema(schemaPointers, options) {
-    var _a;
     const sources = await loadTypedefs(schemaPointers, {
         ...options,
         filterKinds: OPERATION_KINDS,
     });
-    const { schemas, typeDefs } = collectSchemasAndTypeDefs(sources);
-    const mergeSchemasOptions = {
+    const { typeDefs, resolvers, schemaExtensions } = collectSchemaParts(sources);
+    const schema$1 = schema.makeExecutableSchema({
         ...options,
-        schemas: schemas.concat((_a = options.schemas) !== null && _a !== void 0 ? _a : []),
         typeDefs,
-    };
-    const schema$1 = schema.mergeSchemas(mergeSchemasOptions);
+        resolvers,
+        schemaExtensions,
+    });
     if (options === null || options === void 0 ? void 0 : options.includeSources) {
         includeSources(schema$1, sources);
     }
@@ -635,11 +635,12 @@ function loadSchemaSync(schemaPointers, options) {
         filterKinds: OPERATION_KINDS,
         ...options,
     });
-    const { schemas, typeDefs } = collectSchemasAndTypeDefs(sources);
-    const schema$1 = schema.mergeSchemas({
-        schemas,
-        typeDefs,
+    const { typeDefs, resolvers, schemaExtensions } = collectSchemaParts(sources);
+    const schema$1 = schema.makeExecutableSchema({
         ...options,
+        typeDefs,
+        resolvers,
+        schemaExtensions,
     });
     if (options === null || options === void 0 ? void 0 : options.includeSources) {
         includeSources(schema$1, sources);
@@ -662,20 +663,27 @@ function includeSources(schema, sources) {
         extendedSources: sources,
     };
 }
-function collectSchemasAndTypeDefs(sources) {
-    const schemas = [];
+function collectSchemaParts(sources) {
     const typeDefs = [];
+    const resolvers = [];
+    const schemaExtensions = [];
     for (const source of sources) {
         if (source.schema) {
-            schemas.push(source.schema);
+            typeDefs.push(source.schema);
+            resolvers.push(utils.getResolversFromSchema(source.schema));
+            schemaExtensions.push(merge.extractExtensionsFromSchema(source.schema));
         }
-        else if (source.document) {
-            typeDefs.push(source.document);
+        else {
+            const typeDef = source.document || source.rawSDL;
+            if (typeDef) {
+                typeDefs.push(typeDef);
+            }
         }
     }
     return {
-        schemas,
         typeDefs,
+        resolvers,
+        schemaExtensions,
     };
 }
 

package/index.mjs

@@ -1,10 +1,11 @@
-import { asArray, AggregateError, isDocumentString, parseGraphQLSDL, getDocumentNodeFromSchema, printSchemaWithDirectives, printWithComments, resetComments, compareStrings } from '@graphql-tools/utils';
+import { asArray, AggregateError, isDocumentString, parseGraphQLSDL, getDocumentNodeFromSchema, printSchemaWithDirectives, printWithComments, resetComments, compareStrings, getResolversFromSchema } from '@graphql-tools/utils';
 import { cwd, env } from 'process';
 import { isSchema, Kind, lexicographicSortSchema, Source, print } from 'graphql';
 import pLimit from 'p-limit';
 import { createRequire } from 'module';
 import { join } from 'path';
-import { mergeSchemas } from '@graphql-tools/schema';
+import { makeExecutableSchema } from '@graphql-tools/schema';
+import { extractExtensionsFromSchema } from '@graphql-tools/merge';
 
 function normalizePointers(unnormalizedPointerOrPointers) {
     const ignore = [];
@@ -583,18 +584,17 @@ function loadDocumentsSync(pointerOrPointers, options) {
  * @param options Additional options
  */
 async function loadSchema(schemaPointers, options) {
-    var _a;
     const sources = await loadTypedefs(schemaPointers, {
         ...options,
         filterKinds: OPERATION_KINDS,
     });
-    const { schemas, typeDefs } = collectSchemasAndTypeDefs(sources);
-    const mergeSchemasOptions = {
+    const { typeDefs, resolvers, schemaExtensions } = collectSchemaParts(sources);
+    const schema = makeExecutableSchema({
         ...options,
-        schemas: schemas.concat((_a = options.schemas) !== null && _a !== void 0 ? _a : []),
         typeDefs,
-    };
-    const schema = mergeSchemas(mergeSchemasOptions);
+        resolvers,
+        schemaExtensions,
+    });
     if (options === null || options === void 0 ? void 0 : options.includeSources) {
         includeSources(schema, sources);
     }
@@ -610,11 +610,12 @@ function loadSchemaSync(schemaPointers, options) {
         filterKinds: OPERATION_KINDS,
         ...options,
     });
-    const { schemas, typeDefs } = collectSchemasAndTypeDefs(sources);
-    const schema = mergeSchemas({
-        schemas,
-        typeDefs,
+    const { typeDefs, resolvers, schemaExtensions } = collectSchemaParts(sources);
+    const schema = makeExecutableSchema({
         ...options,
+        typeDefs,
+        resolvers,
+        schemaExtensions,
     });
     if (options === null || options === void 0 ? void 0 : options.includeSources) {
         includeSources(schema, sources);
@@ -637,20 +638,27 @@ function includeSources(schema, sources) {
         extendedSources: sources,
     };
 }
-function collectSchemasAndTypeDefs(sources) {
-    const schemas = [];
+function collectSchemaParts(sources) {
     const typeDefs = [];
+    const resolvers = [];
+    const schemaExtensions = [];
     for (const source of sources) {
         if (source.schema) {
-            schemas.push(source.schema);
+            typeDefs.push(source.schema);
+            resolvers.push(getResolversFromSchema(source.schema));
+            schemaExtensions.push(extractExtensionsFromSchema(source.schema));
         }
-        else if (source.document) {
-            typeDefs.push(source.document);
+        else {
+            const typeDef = source.document || source.rawSDL;
+            if (typeDef) {
+                typeDefs.push(typeDef);
+            }
         }
     }
     return {
-        schemas,
         typeDefs,
+        resolvers,
+        schemaExtensions,
     };
 }
 

package/package.json

@@ -1,13 +1,14 @@
 {
   "name": "@graphql-tools/load",
-  "version": "7.5.13",
+  "version": "7.5.14-alpha-950a29c9.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 || ^17.0.0"
   },
   "dependencies": {
-    "@graphql-tools/schema": "8.3.13",
+    "@graphql-tools/merge": "8.2.13",
+    "@graphql-tools/schema": "9.0.0-alpha-950a29c9.0",
     "@graphql-tools/utils": "8.6.12",
     "p-limit": "3.1.0",
     "tslib": "~2.4.0"

package/schema.d.ts

@@ -1,7 +1,7 @@
 import { LoadTypedefsOptions, UnnormalizedTypeDefPointer } from './load-typedefs';
 import { GraphQLSchema, BuildSchemaOptions } from 'graphql';
-import { MergeSchemasConfig } from '@graphql-tools/schema';
-export declare type LoadSchemaOptions = BuildSchemaOptions & LoadTypedefsOptions & Partial<MergeSchemasConfig> & {
+import { IExecutableSchemaDefinition } from '@graphql-tools/schema';
+export declare type LoadSchemaOptions = BuildSchemaOptions & LoadTypedefsOptions & Partial<IExecutableSchemaDefinition> & {
     /**
      * Adds a list of Sources in to `extensions.sources`
      *