@graphql-tools/load 7.4.1-alpha-d26984bf.0 → 7.5.0-alpha-4a5363f2.0

package/index.js

@@ -4,12 +4,28 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 function _interopDefault (ex) { return (ex && (typeof ex === 'object') && 'default' in ex) ? ex['default'] : ex; }
 
+function _interopNamespace(e) {
+    if (e && e.__esModule) { return e; } else {
+        var n = {};
+        if (e) {
+            Object.keys(e).forEach(function (k) {
+                var d = Object.getOwnPropertyDescriptor(e, k);
+                Object.defineProperty(n, k, d.get ? d : {
+                    enumerable: true,
+                    get: function () {
+                        return e[k];
+                    }
+                });
+            });
+        }
+        n['default'] = e;
+        return n;
+    }
+}
+
 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) {
@@ -41,7 +57,7 @@ function normalizePointers(unnormalizedPointerOrPointers) {
 
 function applyDefaultOptions(options) {
     options.cache = options.cache || {};
-    options.cwd = options.cwd || process.cwd();
+    options.cwd = options.cwd || (process === null || process === void 0 ? void 0 : process.cwd());
     options.sort = 'sort' in options ? options.sort : true;
 }
 
@@ -57,7 +73,7 @@ async function loadFile(pointer, options) {
                 loaderResults === null || loaderResults === void 0 ? void 0 : loaderResults.forEach(result => results.push(result));
             }
             catch (error) {
-                if (process.env['DEBUG']) {
+                if (process === null || process === void 0 ? void 0 : process.env['DEBUG']) {
                     console.error(error);
                 }
                 if (error instanceof utils.AggregateError) {
@@ -97,7 +113,7 @@ function loadFileSync(pointer, options) {
                 loaderResults === null || loaderResults === void 0 ? void 0 : loaderResults.forEach(result => results.push(result));
             }
             catch (error) {
-                if (process.env['DEBUG']) {
+                if (process === null || process === void 0 ? void 0 : process.env['DEBUG']) {
                     console.error(error);
                 }
                 if (error instanceof utils.AggregateError) {
@@ -160,20 +176,23 @@ function useLimit(concurrency) {
     return pLimit(concurrency);
 }
 
-function getCustomLoaderByPath(path$1, cwd) {
+async function getCustomLoaderByPath(pathExpression, cwd) {
     try {
-        const requireFn = module$1.createRequire(path.join(cwd, 'noop.js'));
-        const requiredModule = requireFn(path$1);
+        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))); });
         if (requiredModule) {
-            if (requiredModule.default && typeof requiredModule.default === 'function') {
-                return requiredModule.default;
+            if (requiredModule[exportName] && typeof requiredModule[exportName] === 'function') {
+                return requiredModule[exportName];
             }
             if (typeof requiredModule === 'function') {
                 return requiredModule;
             }
         }
     }
-    catch (e) { }
+    catch (e) {
+        console.log(e);
+    }
     return null;
 }
 async function useCustomLoader(loaderPointer, cwd) {
@@ -400,7 +419,7 @@ const filterKind = (content, filterKinds) => {
             }
         }
         if (invalidDefinitions.length > 0) {
-            if (process.env['DEBUG']) {
+            if (process === null || process === void 0 ? void 0 : process.env['DEBUG']) {
                 for (const d of invalidDefinitions) {
                     console.log(`Filtered document of kind ${d.kind} due to filter policy (${filterKinds.join(', ')})`);
                 }

package/index.mjs

@@ -1,9 +1,6 @@
-import { asArray, AggregateError, isDocumentString, parseGraphQLSDL, getDocumentNodeFromSchema, printSchemaWithDirectives, printWithComments, resetComments, compareStrings } from '@graphql-tools/utils';
-import { cwd, env } from 'process';
+import { asArray, AggregateError, isAbsolutePath, joinPaths, isDocumentString, parseGraphQLSDL, getDocumentNodeFromSchema, printSchemaWithDirectives, printWithComments, resetComments, compareStrings } from '@graphql-tools/utils';
 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) {
@@ -35,7 +32,7 @@ function normalizePointers(unnormalizedPointerOrPointers) {
 
 function applyDefaultOptions(options) {
     options.cache = options.cache || {};
-    options.cwd = options.cwd || cwd();
+    options.cwd = options.cwd || (process === null || process === void 0 ? void 0 : process.cwd());
     options.sort = 'sort' in options ? options.sort : true;
 }
 
@@ -51,7 +48,7 @@ async function loadFile(pointer, options) {
                 loaderResults === null || loaderResults === void 0 ? void 0 : loaderResults.forEach(result => results.push(result));
             }
             catch (error) {
-                if (env['DEBUG']) {
+                if (process === null || process === void 0 ? void 0 : process.env['DEBUG']) {
                     console.error(error);
                 }
                 if (error instanceof AggregateError) {
@@ -91,7 +88,7 @@ function loadFileSync(pointer, options) {
                 loaderResults === null || loaderResults === void 0 ? void 0 : loaderResults.forEach(result => results.push(result));
             }
             catch (error) {
-                if (env['DEBUG']) {
+                if (process === null || process === void 0 ? void 0 : process.env['DEBUG']) {
                     console.error(error);
                 }
                 if (error instanceof AggregateError) {
@@ -154,20 +151,23 @@ function useLimit(concurrency) {
     return pLimit(concurrency);
 }
 
-function getCustomLoaderByPath(path, cwd) {
+async function getCustomLoaderByPath(pathExpression, cwd) {
     try {
-        const requireFn = createRequire(join(cwd, 'noop.js'));
-        const requiredModule = requireFn(path);
+        const [modulePath, exportName = 'default'] = pathExpression.split('#');
+        const absoluteFilePath = isAbsolutePath(modulePath) ? modulePath : joinPaths(cwd, modulePath);
+        const requiredModule = await import(absoluteFilePath);
         if (requiredModule) {
-            if (requiredModule.default && typeof requiredModule.default === 'function') {
-                return requiredModule.default;
+            if (requiredModule[exportName] && typeof requiredModule[exportName] === 'function') {
+                return requiredModule[exportName];
             }
             if (typeof requiredModule === 'function') {
                 return requiredModule;
             }
         }
     }
-    catch (e) { }
+    catch (e) {
+        console.log(e);
+    }
     return null;
 }
 async function useCustomLoader(loaderPointer, cwd) {
@@ -394,7 +394,7 @@ const filterKind = (content, filterKinds) => {
             }
         }
         if (invalidDefinitions.length > 0) {
-            if (env['DEBUG']) {
+            if (process === null || process === void 0 ? void 0 : process.env['DEBUG']) {
                 for (const d of invalidDefinitions) {
                     console.log(`Filtered document of kind ${d.kind} due to filter policy (${filterKinds.join(', ')})`);
                 }

package/package.json

@@ -1,14 +1,14 @@
 {
   "name": "@graphql-tools/load",
-  "version": "7.4.1-alpha-d26984bf.0",
+  "version": "7.5.0-alpha-4a5363f2.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-d26984bf.0",
-    "@graphql-tools/utils": "8.5.0-alpha-d26984bf.0",
+    "@graphql-tools/schema": "8.3.1-alpha-4a5363f2.0",
+    "@graphql-tools/utils": "8.6.0-alpha-4a5363f2.0",
     "p-limit": "3.1.0",
     "tslib": "~2.3.0"
   },

package/utils/custom-loader.d.ts

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