@graphql-tools/load-files 6.5.1 → 6.5.4

package/index.js

@@ -29,6 +29,8 @@ const unixify = _interopDefault(require('unixify'));
 const path = require('path');
 const fs = require('fs');
 const graphql = require('graphql');
+const module$1 = require('module');
+const process = require('process');
 
 const { readFile, stat } = fs.promises;
 const DEFAULT_IGNORED_EXTENSIONS = ['spec', 'test', 'd', 'map'];
@@ -97,6 +99,7 @@ const LoadFilesDefaultOptions = {
     requireMethod: null,
     globOptions: {
         absolute: true,
+        cwd: process.cwd(),
     },
     exportNames: DEFAULT_EXPORT_NAMES,
     recursive: true,
@@ -108,13 +111,13 @@ const LoadFilesDefaultOptions = {
  * @param options Additional options
  */
 function loadFilesSync(pattern, options = LoadFilesDefaultOptions) {
-    var _a;
+    var _a, _b;
     const execOptions = { ...LoadFilesDefaultOptions, ...options };
     const relevantPaths = scanForFilesSync(asArray(pattern).map(path => isDirectorySync(path)
         ? buildGlob(unixify(path), execOptions.extensions, execOptions.ignoredExtensions, execOptions.recursive)
         : unixify(path)), options.globOptions);
     const extractExports = execOptions.extractExports || DEFAULT_EXTRACT_EXPORTS_FACTORY((_a = execOptions.exportNames) !== null && _a !== void 0 ? _a : []);
-    const requireMethod = execOptions.requireMethod || require;
+    const requireMethod = execOptions.requireMethod || module$1.createRequire(path.join(((_b = options === null || options === void 0 ? void 0 : options.globOptions) === null || _b === void 0 ? void 0 : _b.cwd) || process.cwd(), 'noop.js'));
     return relevantPaths
         .map(path$1 => {
         if (!checkExtension(path$1, options)) {
@@ -178,7 +181,16 @@ async function loadFiles(pattern, options = LoadFilesDefaultOptions) {
         ? buildGlob(unixify(path), execOptions.extensions, execOptions.ignoredExtensions, execOptions.recursive)
         : unixify(path))), options.globOptions);
     const extractExports = execOptions.extractExports || DEFAULT_EXTRACT_EXPORTS_FACTORY((_a = execOptions.exportNames) !== null && _a !== void 0 ? _a : []);
-    const defaultRequireMethod = (path) => new Promise(function (resolve) { resolve(_interopNamespace(require(path))); }).catch(async () => require(path));
+    const defaultRequireMethod = (path$1) => new Promise(function (resolve) { resolve(_interopNamespace(require(path$1))); }).catch(importError => {
+        var _a;
+        const cwdRequire = module$1.createRequire(path.join(((_a = options === null || options === void 0 ? void 0 : options.globOptions) === null || _a === void 0 ? void 0 : _a.cwd) || process.cwd(), 'noop.js'));
+        try {
+            return cwdRequire(path$1);
+        }
+        catch (e) {
+            throw importError;
+        }
+    });
     const requireMethod = execOptions.requireMethod || defaultRequireMethod;
     return Promise.all(relevantPaths
         .filter(path => checkExtension(path, options) && !(isIndex(path, execOptions.extensions) && options.ignoreIndex))

package/index.mjs

@@ -1,8 +1,10 @@
 import globby, { sync } from 'globby';
 import unixify from 'unixify';
-import { extname } from 'path';
+import { join, extname } from 'path';
 import { readFileSync, promises, statSync } from 'fs';
 import { parse } from 'graphql';
+import { createRequire } from 'module';
+import { cwd } from 'process';
 
 const { readFile, stat } = promises;
 const DEFAULT_IGNORED_EXTENSIONS = ['spec', 'test', 'd', 'map'];
@@ -71,6 +73,7 @@ const LoadFilesDefaultOptions = {
     requireMethod: null,
     globOptions: {
         absolute: true,
+        cwd: cwd(),
     },
     exportNames: DEFAULT_EXPORT_NAMES,
     recursive: true,
@@ -82,13 +85,13 @@ const LoadFilesDefaultOptions = {
  * @param options Additional options
  */
 function loadFilesSync(pattern, options = LoadFilesDefaultOptions) {
-    var _a;
+    var _a, _b;
     const execOptions = { ...LoadFilesDefaultOptions, ...options };
     const relevantPaths = scanForFilesSync(asArray(pattern).map(path => isDirectorySync(path)
         ? buildGlob(unixify(path), execOptions.extensions, execOptions.ignoredExtensions, execOptions.recursive)
         : unixify(path)), options.globOptions);
     const extractExports = execOptions.extractExports || DEFAULT_EXTRACT_EXPORTS_FACTORY((_a = execOptions.exportNames) !== null && _a !== void 0 ? _a : []);
-    const requireMethod = execOptions.requireMethod || require;
+    const requireMethod = execOptions.requireMethod || createRequire(join(((_b = options === null || options === void 0 ? void 0 : options.globOptions) === null || _b === void 0 ? void 0 : _b.cwd) || cwd(), 'noop.js'));
     return relevantPaths
         .map(path => {
         if (!checkExtension(path, options)) {
@@ -152,7 +155,16 @@ async function loadFiles(pattern, options = LoadFilesDefaultOptions) {
         ? buildGlob(unixify(path), execOptions.extensions, execOptions.ignoredExtensions, execOptions.recursive)
         : unixify(path))), options.globOptions);
     const extractExports = execOptions.extractExports || DEFAULT_EXTRACT_EXPORTS_FACTORY((_a = execOptions.exportNames) !== null && _a !== void 0 ? _a : []);
-    const defaultRequireMethod = (path) => import(path).catch(async () => require(path));
+    const defaultRequireMethod = (path) => import(path).catch(importError => {
+        var _a;
+        const cwdRequire = createRequire(join(((_a = options === null || options === void 0 ? void 0 : options.globOptions) === null || _a === void 0 ? void 0 : _a.cwd) || cwd(), 'noop.js'));
+        try {
+            return cwdRequire(path);
+        }
+        catch (e) {
+            throw importError;
+        }
+    });
     const requireMethod = execOptions.requireMethod || defaultRequireMethod;
     return Promise.all(relevantPaths
         .filter(path => checkExtension(path, options) && !(isIndex(path, execOptions.extensions) && options.ignoreIndex))

package/package.json

@@ -1,14 +1,14 @@
 {
   "name": "@graphql-tools/load-files",
-  "version": "6.5.1",
+  "version": "6.5.4",
   "description": "A set of utils for faster development of GraphQL tools",
   "sideEffects": false,
   "peerDependencies": {
-    "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0"
+    "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0"
   },
   "dependencies": {
-    "globby": "11.0.4",
-    "tslib": "~2.3.0",
+    "globby": "11.1.0",
+    "tslib": "^2.4.0",
     "unixify": "1.0.0"
   },
   "repository": {
@@ -32,6 +32,7 @@
     "./*": {
       "require": "./*.js",
       "import": "./*.mjs"
-    }
+    },
+    "./package.json": "./package.json"
   }
 }