@graphql-tools/load 7.5.12-alpha-565a0007.0 → 7.5.12

package/index.js

@@ -30,7 +30,6 @@ 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 = [];
@@ -609,17 +608,18 @@ 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 { typeDefs, resolvers, schemaExtensions } = collectSchemaParts(sources);
-    const schema$1 = schema.mergeSchemas({
+    const { schemas, typeDefs } = collectSchemasAndTypeDefs(sources);
+    const mergeSchemasOptions = {
         ...options,
+        schemas: schemas.concat((_a = options.schemas) !== null && _a !== void 0 ? _a : []),
         typeDefs,
-        resolvers,
-        schemaExtensions,
-    });
+    };
+    const schema$1 = schema.mergeSchemas(mergeSchemasOptions);
     if (options === null || options === void 0 ? void 0 : options.includeSources) {
         includeSources(schema$1, sources);
     }
@@ -635,12 +635,11 @@ function loadSchemaSync(schemaPointers, options) {
         filterKinds: OPERATION_KINDS,
         ...options,
     });
-    const { typeDefs, resolvers, schemaExtensions } = collectSchemaParts(sources);
+    const { schemas, typeDefs } = collectSchemasAndTypeDefs(sources);
     const schema$1 = schema.mergeSchemas({
-        ...options,
+        schemas,
         typeDefs,
-        resolvers,
-        schemaExtensions,
+        ...options,
     });
     if (options === null || options === void 0 ? void 0 : options.includeSources) {
         includeSources(schema$1, sources);
@@ -663,27 +662,20 @@ function includeSources(schema, sources) {
         extendedSources: sources,
     };
 }
-function collectSchemaParts(sources) {
+function collectSchemasAndTypeDefs(sources) {
+    const schemas = [];
     const typeDefs = [];
-    const resolvers = [];
-    const schemaExtensions = [];
     for (const source of sources) {
         if (source.schema) {
-            typeDefs.push(source.schema);
-            resolvers.push(utils.getResolversFromSchema(source.schema));
-            schemaExtensions.push(merge.extractExtensionsFromSchema(source.schema));
+            schemas.push(source.schema);
         }
-        else {
-            const typeDef = source.document || source.rawSDL;
-            if (typeDef) {
-                typeDefs.push(typeDef);
-            }
+        else if (source.document) {
+            typeDefs.push(source.document);
         }
     }
     return {
+        schemas,
         typeDefs,
-        resolvers,
-        schemaExtensions,
     };
 }
 

package/index.mjs

@@ -1,11 +1,10 @@
-import { asArray, AggregateError, isDocumentString, parseGraphQLSDL, getDocumentNodeFromSchema, printSchemaWithDirectives, printWithComments, resetComments, compareStrings, getResolversFromSchema } from '@graphql-tools/utils';
+import { asArray, AggregateError, isDocumentString, parseGraphQLSDL, getDocumentNodeFromSchema, printSchemaWithDirectives, printWithComments, resetComments, compareStrings } 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 { extractExtensionsFromSchema } from '@graphql-tools/merge';
 
 function normalizePointers(unnormalizedPointerOrPointers) {
     const ignore = [];
@@ -584,17 +583,18 @@ 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 { typeDefs, resolvers, schemaExtensions } = collectSchemaParts(sources);
-    const schema = mergeSchemas({
+    const { schemas, typeDefs } = collectSchemasAndTypeDefs(sources);
+    const mergeSchemasOptions = {
         ...options,
+        schemas: schemas.concat((_a = options.schemas) !== null && _a !== void 0 ? _a : []),
         typeDefs,
-        resolvers,
-        schemaExtensions,
-    });
+    };
+    const schema = mergeSchemas(mergeSchemasOptions);
     if (options === null || options === void 0 ? void 0 : options.includeSources) {
         includeSources(schema, sources);
     }
@@ -610,12 +610,11 @@ function loadSchemaSync(schemaPointers, options) {
         filterKinds: OPERATION_KINDS,
         ...options,
     });
-    const { typeDefs, resolvers, schemaExtensions } = collectSchemaParts(sources);
+    const { schemas, typeDefs } = collectSchemasAndTypeDefs(sources);
     const schema = mergeSchemas({
-        ...options,
+        schemas,
         typeDefs,
-        resolvers,
-        schemaExtensions,
+        ...options,
     });
     if (options === null || options === void 0 ? void 0 : options.includeSources) {
         includeSources(schema, sources);
@@ -638,27 +637,20 @@ function includeSources(schema, sources) {
         extendedSources: sources,
     };
 }
-function collectSchemaParts(sources) {
+function collectSchemasAndTypeDefs(sources) {
+    const schemas = [];
     const typeDefs = [];
-    const resolvers = [];
-    const schemaExtensions = [];
     for (const source of sources) {
         if (source.schema) {
-            typeDefs.push(source.schema);
-            resolvers.push(getResolversFromSchema(source.schema));
-            schemaExtensions.push(extractExtensionsFromSchema(source.schema));
+            schemas.push(source.schema);
         }
-        else {
-            const typeDef = source.document || source.rawSDL;
-            if (typeDef) {
-                typeDefs.push(typeDef);
-            }
+        else if (source.document) {
+            typeDefs.push(source.document);
         }
     }
     return {
+        schemas,
         typeDefs,
-        resolvers,
-        schemaExtensions,
     };
 }
 

package/package.json

@@ -1,15 +1,14 @@
 {
   "name": "@graphql-tools/load",
-  "version": "7.5.12-alpha-565a0007.0",
+  "version": "7.5.12",
   "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.11",
-    "@graphql-tools/schema": "9.0.0-alpha-565a0007.0",
-    "@graphql-tools/utils": "8.6.10",
+    "@graphql-tools/schema": "8.3.12",
+    "@graphql-tools/utils": "8.6.11",
     "p-limit": "3.1.0",
     "tslib": "~2.4.0"
   },