@graphql-tools/load 7.7.2-alpha-25f2d2c4.0 → 7.7.2-alpha-20220809152812-1a2a11ba

package/cjs/documents.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.loadDocumentsSync = exports.loadDocuments = exports.NON_OPERATION_KINDS = exports.OPERATION_KINDS = void 0;
-const graphql_1 = require("@graphql-tools/graphql");
+const graphql_1 = require("graphql");
 const load_typedefs_js_1 = require("./load-typedefs.js");
 /**
  * Kinds of AST nodes that are included in executable documents

package/cjs/filter-document-kind.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.filterKind = void 0;
-const graphql_1 = require("@graphql-tools/graphql");
+const graphql_1 = require("graphql");
 const process_1 = require("process");
 /**
  * @internal

package/cjs/load-typedefs/collect-sources.js

@@ -25,7 +25,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.collectSourcesSync = exports.collectSources = void 0;
 const utils_1 = require("@graphql-tools/utils");
-const graphql_1 = require("@graphql-tools/graphql");
+const graphql_1 = require("graphql");
 const load_file_js_1 = require("./load-file.js");
 const helpers_js_1 = require("../utils/helpers.js");
 const custom_loader_js_1 = require("../utils/custom-loader.js");

package/cjs/schema.js

@@ -1,33 +1,23 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.loadSchemaSync = exports.loadSchema = void 0;
-const load_typedefs_js_1 = require("./load-typedefs.js");
-const graphql_1 = require("@graphql-tools/graphql");
-const documents_js_1 = require("./documents.js");
+const load_typedefs_1 = require("./load-typedefs");
+const graphql_1 = require("graphql");
+const documents_1 = require("./documents");
 const schema_1 = require("@graphql-tools/schema");
+const utils_1 = require("@graphql-tools/utils");
+const merge_1 = require("@graphql-tools/merge");
 /**
  * Asynchronously loads a schema from the provided pointers.
  * @param schemaPointers Pointers to the sources to load the schema from
  * @param options Additional options
  */
 async function loadSchema(schemaPointers, options) {
-    var _a, _b;
-    const sources = await (0, load_typedefs_js_1.loadTypedefs)(schemaPointers, {
+    const sources = await (0, load_typedefs_1.loadTypedefs)(schemaPointers, {
         ...options,
-        filterKinds: documents_js_1.OPERATION_KINDS,
+        filterKinds: documents_1.OPERATION_KINDS,
     });
-    const { schemas, typeDefs } = collectSchemasAndTypeDefs(sources);
-    schemas.push(...((_a = options.schemas) !== null && _a !== void 0 ? _a : []));
-    const mergeSchemasOptions = {
-        ...options,
-        schemas: schemas.concat((_b = options.schemas) !== null && _b !== void 0 ? _b : []),
-        typeDefs,
-    };
-    const schema = (typeDefs === null || typeDefs === void 0 ? void 0 : typeDefs.length) === 0 && (schemas === null || schemas === void 0 ? void 0 : schemas.length) === 1 ? schemas[0] : (0, schema_1.mergeSchemas)(mergeSchemasOptions);
-    if (options === null || options === void 0 ? void 0 : options.includeSources) {
-        includeSources(schema, sources);
-    }
-    return options.sort ? (0, graphql_1.lexicographicSortSchema)(schema) : schema;
+    return getSchemaFromSources(sources, options);
 }
 exports.loadSchema = loadSchema;
 /**
@@ -36,20 +26,11 @@ exports.loadSchema = loadSchema;
  * @param options Additional options
  */
 function loadSchemaSync(schemaPointers, options) {
-    const sources = (0, load_typedefs_js_1.loadTypedefsSync)(schemaPointers, {
-        filterKinds: documents_js_1.OPERATION_KINDS,
+    const sources = (0, load_typedefs_1.loadTypedefsSync)(schemaPointers, {
+        filterKinds: documents_1.OPERATION_KINDS,
         ...options,
     });
-    const { schemas, typeDefs } = collectSchemasAndTypeDefs(sources);
-    const schema = (0, schema_1.mergeSchemas)({
-        schemas,
-        typeDefs,
-        ...options,
-    });
-    if (options === null || options === void 0 ? void 0 : options.includeSources) {
-        includeSources(schema, sources);
-    }
-    return options.sort ? (0, graphql_1.lexicographicSortSchema)(schema) : schema;
+    return getSchemaFromSources(sources, options);
 }
 exports.loadSchemaSync = loadSchemaSync;
 function includeSources(schema, sources) {
@@ -68,19 +49,42 @@ function includeSources(schema, sources) {
         extendedSources: sources,
     };
 }
-function collectSchemasAndTypeDefs(sources) {
-    const schemas = [];
+function getSchemaFromSources(sources, options) {
+    if (sources.length === 1 && sources[0].schema != null && options.typeDefs == null && options.resolvers == null) {
+        return options.sort ? (0, graphql_1.lexicographicSortSchema)(sources[0].schema) : sources[0].schema;
+    }
+    const { typeDefs, resolvers, schemaExtensions } = collectSchemaParts(sources);
+    const schema = (0, schema_1.mergeSchemas)({
+        ...options,
+        typeDefs,
+        resolvers,
+        schemaExtensions,
+    });
+    if (options === null || options === void 0 ? void 0 : options.includeSources) {
+        includeSources(schema, sources);
+    }
+    return options.sort ? (0, graphql_1.lexicographicSortSchema)(schema) : schema;
+}
+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((0, utils_1.getResolversFromSchema)(source.schema));
+            schemaExtensions.push((0, merge_1.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/esm/documents.js

@@ -1,4 +1,4 @@
-import { Kind } from '@graphql-tools/graphql';
+import { Kind } from 'graphql';
 import { loadTypedefs, loadTypedefsSync } from './load-typedefs.js';
 /**
  * Kinds of AST nodes that are included in executable documents

package/esm/filter-document-kind.js

@@ -1,4 +1,4 @@
-import { Kind } from '@graphql-tools/graphql';
+import { Kind } from 'graphql';
 import { env } from 'process';
 /**
  * @internal

package/esm/load-typedefs/collect-sources.js

@@ -1,5 +1,5 @@
 import { isDocumentString, parseGraphQLSDL, getDocumentNodeFromSchema, asArray } from '@graphql-tools/utils';
-import { isSchema, Kind } from '@graphql-tools/graphql';
+import { isSchema, Kind } from 'graphql';
 import { loadFile, loadFileSync } from './load-file.js';
 import { stringToHash, useStack } from '../utils/helpers.js';
 import { useCustomLoader, useCustomLoaderSync } from '../utils/custom-loader.js';

package/esm/schema.js

@@ -1,30 +1,20 @@
-import { loadTypedefs, loadTypedefsSync } from './load-typedefs.js';
-import { Source as GraphQLSource, print, lexicographicSortSchema, } from '@graphql-tools/graphql';
-import { OPERATION_KINDS } from './documents.js';
+import { loadTypedefs, loadTypedefsSync } from './load-typedefs';
+import { Source as GraphQLSource, print, lexicographicSortSchema } from 'graphql';
+import { OPERATION_KINDS } from './documents';
 import { mergeSchemas } from '@graphql-tools/schema';
+import { getResolversFromSchema } from '@graphql-tools/utils';
+import { extractExtensionsFromSchema } from '@graphql-tools/merge';
 /**
  * Asynchronously loads a schema from the provided pointers.
  * @param schemaPointers Pointers to the sources to load the schema from
  * @param options Additional options
  */
 export async function loadSchema(schemaPointers, options) {
-    var _a, _b;
     const sources = await loadTypedefs(schemaPointers, {
         ...options,
         filterKinds: OPERATION_KINDS,
     });
-    const { schemas, typeDefs } = collectSchemasAndTypeDefs(sources);
-    schemas.push(...((_a = options.schemas) !== null && _a !== void 0 ? _a : []));
-    const mergeSchemasOptions = {
-        ...options,
-        schemas: schemas.concat((_b = options.schemas) !== null && _b !== void 0 ? _b : []),
-        typeDefs,
-    };
-    const schema = (typeDefs === null || typeDefs === void 0 ? void 0 : typeDefs.length) === 0 && (schemas === null || schemas === void 0 ? void 0 : schemas.length) === 1 ? schemas[0] : mergeSchemas(mergeSchemasOptions);
-    if (options === null || options === void 0 ? void 0 : options.includeSources) {
-        includeSources(schema, sources);
-    }
-    return options.sort ? lexicographicSortSchema(schema) : schema;
+    return getSchemaFromSources(sources, options);
 }
 /**
  * Synchronously loads a schema from the provided pointers.
@@ -36,16 +26,7 @@ export function loadSchemaSync(schemaPointers, options) {
         filterKinds: OPERATION_KINDS,
         ...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;
+    return getSchemaFromSources(sources, options);
 }
 function includeSources(schema, sources) {
     const finalSources = [];
@@ -63,19 +44,42 @@ function includeSources(schema, sources) {
         extendedSources: sources,
     };
 }
-function collectSchemasAndTypeDefs(sources) {
-    const schemas = [];
+function getSchemaFromSources(sources, options) {
+    if (sources.length === 1 && sources[0].schema != null && options.typeDefs == null && options.resolvers == null) {
+        return options.sort ? lexicographicSortSchema(sources[0].schema) : sources[0].schema;
+    }
+    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) {
     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,12 +1,15 @@
 {
   "name": "@graphql-tools/load",
-  "version": "7.7.2-alpha-25f2d2c4.0",
+  "version": "7.7.2-alpha-20220809152812-1a2a11ba",
   "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/utils": "8.9.1-alpha-25f2d2c4.0",
-    "@graphql-tools/schema": "8.5.2-alpha-25f2d2c4.0",
-    "@graphql-tools/graphql": "0.1.0-alpha-25f2d2c4.0",
+    "@graphql-tools/utils": "8.9.1-alpha-20220809152812-1a2a11ba",
+    "@graphql-tools/schema": "9.0.0-alpha-20220809152812-1a2a11ba",
+    "@graphql-tools/merge": "8.3.2-alpha-20220809152812-1a2a11ba",
     "p-limit": "3.1.0",
     "tslib": "^2.4.0"
   },

package/typings/documents.d.cts

@@ -1,5 +1,5 @@
 import { Source } from '@graphql-tools/utils';
-import { Kind } from '@graphql-tools/graphql';
+import { Kind } from 'graphql';
 import { LoadTypedefsOptions, UnnormalizedTypeDefPointer } from './load-typedefs.cjs';
 declare type KindList = Array<typeof Kind[keyof typeof Kind]>;
 /**

package/typings/documents.d.ts

@@ -1,5 +1,5 @@
 import { Source } from '@graphql-tools/utils';
-import { Kind } from '@graphql-tools/graphql';
+import { Kind } from 'graphql';
 import { LoadTypedefsOptions, UnnormalizedTypeDefPointer } from './load-typedefs.js';
 declare type KindList = Array<typeof Kind[keyof typeof Kind]>;
 /**

package/typings/filter-document-kind.d.cts

@@ -1,4 +1,4 @@
-import { DocumentNode } from '@graphql-tools/graphql';
+import { DocumentNode } from 'graphql';
 /**
  * @internal
  */

package/typings/filter-document-kind.d.ts

@@ -1,4 +1,4 @@
-import { DocumentNode } from '@graphql-tools/graphql';
+import { DocumentNode } from 'graphql';
 /**
  * @internal
  */

package/typings/schema.d.cts

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

package/typings/schema.d.ts

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