@graphql-tools/load 7.5.0-alpha-c3063363.0 → 7.5.1-alpha-b9b6301d.0

package/documents.d.ts

@@ -9,7 +9,7 @@ export declare const OPERATION_KINDS: KindList;
 /**
  * Kinds of AST nodes that are included in type system definition documents
  */
-export declare const NON_OPERATION_KINDS: ("Document" | "ObjectTypeDefinition" | "ObjectTypeExtension" | "InterfaceTypeDefinition" | "InterfaceTypeExtension" | "ScalarTypeDefinition" | "ScalarTypeExtension" | "EnumTypeDefinition" | "EnumTypeExtension" | "FieldDefinition" | "Field" | "FragmentDefinition" | "FragmentSpread" | "InlineFragment" | "OperationDefinition" | "SchemaDefinition" | "UnionTypeDefinition" | "InputObjectTypeDefinition" | "DirectiveDefinition" | "SchemaExtension" | "UnionTypeExtension" | "InputObjectTypeExtension" | "Name" | "VariableDefinition" | "Variable" | "SelectionSet" | "Argument" | "IntValue" | "FloatValue" | "StringValue" | "BooleanValue" | "NullValue" | "EnumValue" | "ListValue" | "ObjectValue" | "ObjectField" | "Directive" | "NamedType" | "ListType" | "NonNullType" | "OperationTypeDefinition" | "InputValueDefinition" | "EnumValueDefinition")[];
+export declare const NON_OPERATION_KINDS: KindList;
 /**
  * Asynchronously loads executable documents (i.e. operations and fragments) from
  * the provided pointers. The pointers may be individual files or a glob pattern.

package/index.js

@@ -24,8 +24,11 @@ function _interopNamespace(e) {
 }
 
 const utils = require('@graphql-tools/utils');
+const process = require('process');
 const graphql = require('graphql');
 const pLimit = _interopDefault(require('p-limit'));
+const module$1 = require('module');
+const path = require('path');
 const schema = require('@graphql-tools/schema');
 
 function normalizePointers(unnormalizedPointerOrPointers) {
@@ -44,8 +47,13 @@ function normalizePointers(unnormalizedPointerOrPointers) {
             handlePointer(rawPointer);
         }
         else if (typeof rawPointer === 'object') {
-            for (const [path, options] of Object.entries(rawPointer)) {
-                handlePointer(path, options);
+            if ('require' in rawPointer && 'config' in rawPointer) {
+                handlePointer(rawPointer['require'], rawPointer['config']);
+            }
+            else {
+                for (const [path, options] of Object.entries(rawPointer)) {
+                    handlePointer(path, options);
+                }
             }
         }
         else {
@@ -57,7 +65,7 @@ function normalizePointers(unnormalizedPointerOrPointers) {
 
 function applyDefaultOptions(options) {
     options.cache = options.cache || {};
-    options.cwd = options.cwd || (process === null || process === void 0 ? void 0 : process.cwd());
+    options.cwd = options.cwd || process.cwd();
     options.sort = 'sort' in options ? options.sort : true;
 }
 
@@ -73,7 +81,7 @@ async function loadFile(pointer, options) {
                 loaderResults === null || loaderResults === void 0 ? void 0 : loaderResults.forEach(result => results.push(result));
             }
             catch (error) {
-                if (process === null || process === void 0 ? void 0 : process.env['DEBUG']) {
+                if (process.env['DEBUG']) {
                     console.error(error);
                 }
                 if (error instanceof utils.AggregateError) {
@@ -113,7 +121,7 @@ function loadFileSync(pointer, options) {
                 loaderResults === null || loaderResults === void 0 ? void 0 : loaderResults.forEach(result => results.push(result));
             }
             catch (error) {
-                if (process === null || process === void 0 ? void 0 : process.env['DEBUG']) {
+                if (process.env['DEBUG']) {
                     console.error(error);
                 }
                 if (error instanceof utils.AggregateError) {
@@ -176,23 +184,20 @@ function useLimit(concurrency) {
     return pLimit(concurrency);
 }
 
-async function getCustomLoaderByPath(pathExpression, cwd) {
+function getCustomLoaderByPath(path$1, cwd) {
     try {
-        const [modulePath, exportName = 'default'] = pathExpression.split('#');
-        const absoluteFilePath = utils.isAbsolutePath(modulePath) ? modulePath : utils.joinPaths(cwd, modulePath);
-        const requiredModule = await new Promise(function (resolve) { resolve(_interopNamespace(require(absoluteFilePath))); });
+        const requireFn = module$1.createRequire(path.join(cwd, 'noop.js'));
+        const requiredModule = requireFn(path$1);
         if (requiredModule) {
-            if (requiredModule[exportName] && typeof requiredModule[exportName] === 'function') {
-                return requiredModule[exportName];
+            if (requiredModule.default && typeof requiredModule.default === 'function') {
+                return requiredModule.default;
             }
             if (typeof requiredModule === 'function') {
                 return requiredModule;
             }
         }
     }
-    catch (e) {
-        console.log(e);
-    }
+    catch (e) { }
     return null;
 }
 async function useCustomLoader(loaderPointer, cwd) {
@@ -350,6 +355,7 @@ function collectDocumentString({ pointer, pointerOptions, options, addSource, qu
 function collectCustomLoader({ pointer, pointerOptions, queue, addSource, options, pointerOptionMap }, next) {
     if (pointerOptions.loader) {
         return queue(async () => {
+            await Promise.all(utils.asArray(pointerOptions.require).map(m => new Promise(function (resolve) { resolve(_interopNamespace(require(m))); })));
             // eslint-disable-next-line @typescript-eslint/ban-ts-comment
             // @ts-ignore TODO options.cwd is possibly undefined, but it seems like no test covers this path
             const loader = await useCustomLoader(pointerOptions.loader, options.cwd);
@@ -365,6 +371,10 @@ function collectCustomLoader({ pointer, pointerOptions, queue, addSource, option
 function collectCustomLoaderSync({ pointer, pointerOptions, queue, addSource, options, pointerOptionMap }, next) {
     if (pointerOptions.loader) {
         return queue(() => {
+            const cwdRequire = module$1.createRequire(options.cwd || process.cwd());
+            for (const m of utils.asArray(pointerOptions.require)) {
+                cwdRequire(m);
+            }
             // eslint-disable-next-line @typescript-eslint/ban-ts-comment
             // @ts-ignore TODO options.cwd is possibly undefined, but it seems like no test covers this path
             const loader = useCustomLoaderSync(pointerOptions.loader, options.cwd);
@@ -419,7 +429,7 @@ const filterKind = (content, filterKinds) => {
             }
         }
         if (invalidDefinitions.length > 0) {
-            if (process === null || process === void 0 ? void 0 : process.env['DEBUG']) {
+            if (process.env['DEBUG']) {
                 for (const d of invalidDefinitions) {
                     console.log(`Filtered document of kind ${d.kind} due to filter policy (${filterKinds.join(', ')})`);
                 }
@@ -495,6 +505,7 @@ const CONCURRENCY_LIMIT$1 = 100;
  * Asynchronously loads any GraphQL documents (i.e. executable documents like
  * operations and fragments as well as type system definitions) from the
  * provided pointers.
+ * loadTypedefs does not merge the typeDefs when `#import` is used ( https://github.com/ardatan/graphql-tools/issues/2980#issuecomment-1003692728 )
  * @param pointerOrPointers Pointers to the sources to load the documents from
  * @param options Additional options
  */

package/index.mjs

@@ -1,6 +1,9 @@
-import { asArray, AggregateError, isAbsolutePath, joinPaths, isDocumentString, parseGraphQLSDL, getDocumentNodeFromSchema, printSchemaWithDirectives, printWithComments, resetComments, compareStrings } 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';
 
 function normalizePointers(unnormalizedPointerOrPointers) {
@@ -19,8 +22,13 @@ function normalizePointers(unnormalizedPointerOrPointers) {
             handlePointer(rawPointer);
         }
         else if (typeof rawPointer === 'object') {
-            for (const [path, options] of Object.entries(rawPointer)) {
-                handlePointer(path, options);
+            if ('require' in rawPointer && 'config' in rawPointer) {
+                handlePointer(rawPointer['require'], rawPointer['config']);
+            }
+            else {
+                for (const [path, options] of Object.entries(rawPointer)) {
+                    handlePointer(path, options);
+                }
             }
         }
         else {
@@ -32,7 +40,7 @@ function normalizePointers(unnormalizedPointerOrPointers) {
 
 function applyDefaultOptions(options) {
     options.cache = options.cache || {};
-    options.cwd = options.cwd || (process === null || process === void 0 ? void 0 : process.cwd());
+    options.cwd = options.cwd || cwd();
     options.sort = 'sort' in options ? options.sort : true;
 }
 
@@ -48,7 +56,7 @@ async function loadFile(pointer, options) {
                 loaderResults === null || loaderResults === void 0 ? void 0 : loaderResults.forEach(result => results.push(result));
             }
             catch (error) {
-                if (process === null || process === void 0 ? void 0 : process.env['DEBUG']) {
+                if (env['DEBUG']) {
                     console.error(error);
                 }
                 if (error instanceof AggregateError) {
@@ -88,7 +96,7 @@ function loadFileSync(pointer, options) {
                 loaderResults === null || loaderResults === void 0 ? void 0 : loaderResults.forEach(result => results.push(result));
             }
             catch (error) {
-                if (process === null || process === void 0 ? void 0 : process.env['DEBUG']) {
+                if (env['DEBUG']) {
                     console.error(error);
                 }
                 if (error instanceof AggregateError) {
@@ -151,23 +159,20 @@ function useLimit(concurrency) {
     return pLimit(concurrency);
 }
 
-async function getCustomLoaderByPath(pathExpression, cwd) {
+function getCustomLoaderByPath(path, cwd) {
     try {
-        const [modulePath, exportName = 'default'] = pathExpression.split('#');
-        const absoluteFilePath = isAbsolutePath(modulePath) ? modulePath : joinPaths(cwd, modulePath);
-        const requiredModule = await import(absoluteFilePath);
+        const requireFn = createRequire(join(cwd, 'noop.js'));
+        const requiredModule = requireFn(path);
         if (requiredModule) {
-            if (requiredModule[exportName] && typeof requiredModule[exportName] === 'function') {
-                return requiredModule[exportName];
+            if (requiredModule.default && typeof requiredModule.default === 'function') {
+                return requiredModule.default;
             }
             if (typeof requiredModule === 'function') {
                 return requiredModule;
             }
         }
     }
-    catch (e) {
-        console.log(e);
-    }
+    catch (e) { }
     return null;
 }
 async function useCustomLoader(loaderPointer, cwd) {
@@ -325,6 +330,7 @@ function collectDocumentString({ pointer, pointerOptions, options, addSource, qu
 function collectCustomLoader({ pointer, pointerOptions, queue, addSource, options, pointerOptionMap }, next) {
     if (pointerOptions.loader) {
         return queue(async () => {
+            await Promise.all(asArray(pointerOptions.require).map(m => import(m)));
             // eslint-disable-next-line @typescript-eslint/ban-ts-comment
             // @ts-ignore TODO options.cwd is possibly undefined, but it seems like no test covers this path
             const loader = await useCustomLoader(pointerOptions.loader, options.cwd);
@@ -340,6 +346,10 @@ function collectCustomLoader({ pointer, pointerOptions, queue, addSource, option
 function collectCustomLoaderSync({ pointer, pointerOptions, queue, addSource, options, pointerOptionMap }, next) {
     if (pointerOptions.loader) {
         return queue(() => {
+            const cwdRequire = createRequire(options.cwd || cwd());
+            for (const m of asArray(pointerOptions.require)) {
+                cwdRequire(m);
+            }
             // eslint-disable-next-line @typescript-eslint/ban-ts-comment
             // @ts-ignore TODO options.cwd is possibly undefined, but it seems like no test covers this path
             const loader = useCustomLoaderSync(pointerOptions.loader, options.cwd);
@@ -394,7 +404,7 @@ const filterKind = (content, filterKinds) => {
             }
         }
         if (invalidDefinitions.length > 0) {
-            if (process === null || process === void 0 ? void 0 : process.env['DEBUG']) {
+            if (env['DEBUG']) {
                 for (const d of invalidDefinitions) {
                     console.log(`Filtered document of kind ${d.kind} due to filter policy (${filterKinds.join(', ')})`);
                 }
@@ -470,6 +480,7 @@ const CONCURRENCY_LIMIT$1 = 100;
  * Asynchronously loads any GraphQL documents (i.e. executable documents like
  * operations and fragments as well as type system definitions) from the
  * provided pointers.
+ * loadTypedefs does not merge the typeDefs when `#import` is used ( https://github.com/ardatan/graphql-tools/issues/2980#issuecomment-1003692728 )
  * @param pointerOrPointers Pointers to the sources to load the documents from
  * @param options Additional options
  */

package/load-typedefs.d.ts

@@ -16,6 +16,7 @@ export declare type UnnormalizedTypeDefPointer = {
  * Asynchronously loads any GraphQL documents (i.e. executable documents like
  * operations and fragments as well as type system definitions) from the
  * provided pointers.
+ * loadTypedefs does not merge the typeDefs when `#import` is used ( https://github.com/ardatan/graphql-tools/issues/2980#issuecomment-1003692728 )
  * @param pointerOrPointers Pointers to the sources to load the documents from
  * @param options Additional options
  */

package/package.json

@@ -1,14 +1,14 @@
 {
   "name": "@graphql-tools/load",
-  "version": "7.5.0-alpha-c3063363.0",
+  "version": "7.5.1-alpha-b9b6301d.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"
   },
   "dependencies": {
-    "@graphql-tools/schema": "8.3.1-alpha-c3063363.0",
-    "@graphql-tools/utils": "8.6.0-alpha-c3063363.0",
+    "@graphql-tools/schema": "8.3.1",
+    "@graphql-tools/utils": "^8.5.5",
     "p-limit": "3.1.0",
     "tslib": "~2.3.0"
   },
@@ -33,6 +33,7 @@
     "./*": {
       "require": "./*.js",
       "import": "./*.mjs"
-    }
+    },
+    "./package.json": "./package.json"
   }
 }

package/utils/custom-loader.d.ts

@@ -1,4 +1,3 @@
-export declare function getCustomLoaderByPath(pathExpression: string, cwd: string): Promise<any>;
-export declare function getCustomLoaderByPathSync(pathExpression: string, cwd: string): any;
+export declare function getCustomLoaderByPath(path: string, cwd: string): any;
 export declare function useCustomLoader(loaderPointer: any, cwd: string): Promise<any>;
 export declare function useCustomLoaderSync(loaderPointer: any, cwd: string): any;

package/utils/queue.d.ts

@@ -2,7 +2,7 @@ export declare function useQueue<T>(options?: {
     concurrency?: number;
 }): {
     add(fn: () => Promise<T>): void;
-    runAll(): Promise<T[]>;
+    runAll(): Promise<Awaited<T>[]>;
 };
 export declare function useSyncQueue<T>(): {
     add(fn: () => T): void;