@graphql-tools/load 7.5.14-alpha-7052f15d.0 → 7.5.14

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,11 +608,22 @@ function loadDocumentsSync(pointerOrPointers, options) {
  * @param options Additional options
  */
 async function loadSchema(schemaPointers, options) {
+    var _a;
     const sources = await loadTypedefs(schemaPointers, {
         ...options,
         filterKinds: OPERATION_KINDS,
     });
-    return getSchemaFromSources(sources, options);
+    const { schemas, typeDefs } = collectSchemasAndTypeDefs(sources);
+    const mergeSchemasOptions = {
+        ...options,
+        schemas: schemas.concat((_a = options.schemas) !== null && _a !== void 0 ? _a : []),
+        typeDefs,
+    };
+    const schema$1 = schema.mergeSchemas(mergeSchemasOptions);
+    if (options === null || options === void 0 ? void 0 : options.includeSources) {
+        includeSources(schema$1, sources);
+    }
+    return options.sort ? graphql.lexicographicSortSchema(schema$1) : schema$1;
 }
 /**
  * Synchronously loads a schema from the provided pointers.
@@ -625,7 +635,16 @@ function loadSchemaSync(schemaPointers, options) {
         filterKinds: OPERATION_KINDS,
         ...options,
     });
-    return getSchemaFromSources(sources, options);
+    const { schemas, typeDefs } = collectSchemasAndTypeDefs(sources);
+    const schema$1 = schema.mergeSchemas({
+        schemas,
+        typeDefs,
+        ...options,
+    });
+    if (options === null || options === void 0 ? void 0 : options.includeSources) {
+        includeSources(schema$1, sources);
+    }
+    return options.sort ? graphql.lexicographicSortSchema(schema$1) : schema$1;
 }
 function includeSources(schema, sources) {
     const finalSources = [];
@@ -643,40 +662,20 @@ function includeSources(schema, sources) {
         extendedSources: sources,
     };
 }
-function getSchemaFromSources(sources, options) {
-    const { typeDefs, resolvers, schemaExtensions } = collectSchemaParts(sources);
-    const schema$1 = schema.mergeSchemas({
-        ...options,
-        typeDefs,
-        resolvers,
-        schemaExtensions,
-    });
-    if (options === null || options === void 0 ? void 0 : options.includeSources) {
-        includeSources(schema$1, sources);
-    }
-    return options.sort ? graphql.lexicographicSortSchema(schema$1) : schema$1;
-}
-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,11 +583,22 @@ function loadDocumentsSync(pointerOrPointers, options) {
  * @param options Additional options
  */
 async function loadSchema(schemaPointers, options) {
+    var _a;
     const sources = await loadTypedefs(schemaPointers, {
         ...options,
         filterKinds: OPERATION_KINDS,
     });
-    return getSchemaFromSources(sources, options);
+    const { schemas, typeDefs } = collectSchemasAndTypeDefs(sources);
+    const mergeSchemasOptions = {
+        ...options,
+        schemas: schemas.concat((_a = options.schemas) !== null && _a !== void 0 ? _a : []),
+        typeDefs,
+    };
+    const schema = mergeSchemas(mergeSchemasOptions);
+    if (options === null || options === void 0 ? void 0 : options.includeSources) {
+        includeSources(schema, sources);
+    }
+    return options.sort ? lexicographicSortSchema(schema) : schema;
 }
 /**
  * Synchronously loads a schema from the provided pointers.
@@ -600,7 +610,16 @@ function loadSchemaSync(schemaPointers, options) {
         filterKinds: OPERATION_KINDS,
         ...options,
     });
-    return getSchemaFromSources(sources, options);
+    const { schemas, typeDefs } = collectSchemasAndTypeDefs(sources);
+    const schema = mergeSchemas({
+        schemas,
+        typeDefs,
+        ...options,
+    });
+    if (options === null || options === void 0 ? void 0 : options.includeSources) {
+        includeSources(schema, sources);
+    }
+    return options.sort ? lexicographicSortSchema(schema) : schema;
 }
 function includeSources(schema, sources) {
     const finalSources = [];
@@ -618,40 +637,20 @@ function includeSources(schema, sources) {
         extendedSources: sources,
     };
 }
-function getSchemaFromSources(sources, options) {
-    const { typeDefs, resolvers, schemaExtensions } = collectSchemaParts(sources);
-    const schema = mergeSchemas({
-        ...options,
-        typeDefs,
-        resolvers,
-        schemaExtensions,
-    });
-    if (options === null || options === void 0 ? void 0 : options.includeSources) {
-        includeSources(schema, sources);
-    }
-    return options.sort ? lexicographicSortSchema(schema) : schema;
-}
-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,17 +1,16 @@
 {
   "name": "@graphql-tools/load",
-  "version": "7.5.14-alpha-7052f15d.0",
+  "version": "7.5.14",
   "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/merge": "8.2.13",
-    "@graphql-tools/schema": "9.0.0-alpha-7052f15d.0",
-    "@graphql-tools/utils": "8.6.12",
+    "@graphql-tools/schema": "8.3.14",
+    "@graphql-tools/utils": "8.6.13",
     "p-limit": "3.1.0",
-    "tslib": "~2.4.0"
+    "tslib": "^2.4.0"
   },
   "repository": {
     "type": "git",

package/schema.d.ts

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