@graphql-tools/load-files 6.5.2 → 6.6.0-alpha-b76ec274.0

package/{index.js → cjs/index.js}

@@ -1,36 +1,15 @@
-'use strict';
-
-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 globby = require('globby');
-const globby__default = _interopDefault(globby);
-const unixify = _interopDefault(require('unixify'));
-const path = require('path');
-const fs = require('fs');
-const graphql = require('graphql');
-
-const { readFile, stat } = fs.promises;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.loadFiles = exports.loadFilesSync = void 0;
+const tslib_1 = require("tslib");
+const globby_1 = tslib_1.__importStar(require("globby"));
+const unixify_1 = tslib_1.__importDefault(require("unixify"));
+const path_1 = require("path");
+const fs_1 = require("fs");
+const graphql_1 = require("graphql");
+const module_1 = require("module");
+const process_1 = require("process");
+const { readFile, stat } = fs_1.promises;
 const DEFAULT_IGNORED_EXTENSIONS = ['spec', 'test', 'd', 'map'];
 const DEFAULT_EXTENSIONS = ['gql', 'graphql', 'graphqls', 'ts', 'js'];
 const DEFAULT_EXPORT_NAMES = ['schema', 'typeDef', 'typeDefs', 'resolver', 'resolvers'];
@@ -63,7 +42,7 @@ function asArray(obj) {
 }
 function isDirectorySync(path) {
     try {
-        const pathStat = fs.statSync(path);
+        const pathStat = (0, fs_1.statSync)(path);
         return pathStat.isDirectory();
     }
     catch (e) {
@@ -80,7 +59,7 @@ async function isDirectory(path) {
     }
 }
 function scanForFilesSync(globStr, globOptions = {}) {
-    return globby.sync(globStr, { absolute: true, ...globOptions });
+    return (0, globby_1.sync)(globStr, { absolute: true, ...globOptions });
 }
 function formatExtension(extension) {
     return extension.charAt(0) === '.' ? extension : `.${extension}`;
@@ -97,6 +76,7 @@ const LoadFilesDefaultOptions = {
     requireMethod: null,
     globOptions: {
         absolute: true,
+        cwd: (0, process_1.cwd)(),
     },
     exportNames: DEFAULT_EXPORT_NAMES,
     recursive: true,
@@ -108,36 +88,37 @@ 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);
+        ? buildGlob((0, unixify_1.default)(path), execOptions.extensions, execOptions.ignoredExtensions, execOptions.recursive)
+        : (0, unixify_1.default)(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 || (0, module_1.createRequire)((0, path_1.join)(((_b = options === null || options === void 0 ? void 0 : options.globOptions) === null || _b === void 0 ? void 0 : _b.cwd) || (0, process_1.cwd)(), 'noop.js'));
     return relevantPaths
-        .map(path$1 => {
-        if (!checkExtension(path$1, options)) {
+        .map(path => {
+        if (!checkExtension(path, options)) {
             return null;
         }
-        if (isIndex(path$1, execOptions.extensions) && options.ignoreIndex) {
+        if (isIndex(path, execOptions.extensions) && options.ignoreIndex) {
             return false;
         }
-        const extension = path.extname(path$1);
+        const extension = (0, path_1.extname)(path);
         if (extension === formatExtension('js') || extension === formatExtension('ts') || execOptions.useRequire) {
-            const fileExports = requireMethod(path$1);
+            const fileExports = requireMethod(path);
             const extractedExport = extractExports(fileExports);
             return extractedExport;
         }
         else {
-            const maybeSDL = fs.readFileSync(path$1, { encoding: 'utf-8' });
+            const maybeSDL = (0, fs_1.readFileSync)(path, { encoding: 'utf-8' });
             return tryToParse(maybeSDL);
         }
     })
         .filter(v => v);
 }
+exports.loadFilesSync = loadFilesSync;
 async function scanForFiles(globStr, globOptions = {}) {
-    return globby__default(globStr, { absolute: true, ...globOptions });
+    return (0, globby_1.default)(globStr, { absolute: true, ...globOptions });
 }
 const checkExtension = (path, { extensions, ignoredExtensions }) => {
     if (ignoredExtensions) {
@@ -175,38 +156,45 @@ async function loadFiles(pattern, options = LoadFilesDefaultOptions) {
     var _a;
     const execOptions = { ...LoadFilesDefaultOptions, ...options };
     const relevantPaths = await scanForFiles(await Promise.all(asArray(pattern).map(async (path) => (await isDirectory(path))
-        ? buildGlob(unixify(path), execOptions.extensions, execOptions.ignoredExtensions, execOptions.recursive)
-        : unixify(path))), options.globOptions);
+        ? buildGlob((0, unixify_1.default)(path), execOptions.extensions, execOptions.ignoredExtensions, execOptions.recursive)
+        : (0, unixify_1.default)(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) => Promise.resolve().then(() => tslib_1.__importStar(require(path))).catch(importError => {
+        var _a;
+        const cwdRequire = (0, module_1.createRequire)((0, path_1.join)(((_a = options === null || options === void 0 ? void 0 : options.globOptions) === null || _a === void 0 ? void 0 : _a.cwd) || (0, process_1.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))
-        .map(async (path$1) => {
-        const extension = path.extname(path$1);
+        .map(async (path) => {
+        const extension = (0, path_1.extname)(path);
         if (extension === formatExtension('js') || extension === formatExtension('ts') || execOptions.useRequire) {
-            const fileExports = await requireMethod(path$1);
+            const fileExports = await requireMethod(path);
             const extractedExport = extractExports(fileExports);
             return extractedExport;
         }
         else {
-            const maybeSDL = await readFile(path$1, { encoding: 'utf-8' });
+            const maybeSDL = await readFile(path, { encoding: 'utf-8' });
             return tryToParse(maybeSDL);
         }
     }));
 }
+exports.loadFiles = loadFiles;
 function isIndex(path, extensions = []) {
     const IS_INDEX = /(\/|\\)index\.[^\/\\]+$/i; // (/ or \) AND `index.` AND (everything except \ and /)(end of line)
     return IS_INDEX.test(path) && extensions.some(ext => path.endsWith(formatExtension(ext)));
 }
 function tryToParse(maybeSDL) {
     try {
-        return graphql.parse(maybeSDL);
+        return (0, graphql_1.parse)(maybeSDL);
     }
     catch (e) {
         return maybeSDL;
     }
 }
-
-exports.loadFiles = loadFiles;
-exports.loadFilesSync = loadFilesSync;

package/cjs/package.json

@@ -0,0 +1 @@
+{"type":"commonjs"}

package/{index.mjs → esm/index.js}

@@ -1,10 +1,11 @@
-import globby, { sync } from 'globby';
+import globby, { sync as globbySync } from 'globby';
 import unixify from 'unixify';
-import { extname } from 'path';
-import { readFileSync, promises, statSync } from 'fs';
+import { extname, join } from 'path';
+import { statSync, readFileSync, promises as fsPromises } from 'fs';
 import { parse } from 'graphql';
-
-const { readFile, stat } = promises;
+import { createRequire } from 'module';
+import { cwd } from 'process';
+const { readFile, stat } = fsPromises;
 const DEFAULT_IGNORED_EXTENSIONS = ['spec', 'test', 'd', 'map'];
 const DEFAULT_EXTENSIONS = ['gql', 'graphql', 'graphqls', 'ts', 'js'];
 const DEFAULT_EXPORT_NAMES = ['schema', 'typeDef', 'typeDefs', 'resolver', 'resolvers'];
@@ -54,7 +55,7 @@ async function isDirectory(path) {
     }
 }
 function scanForFilesSync(globStr, globOptions = {}) {
-    return sync(globStr, { absolute: true, ...globOptions });
+    return globbySync(globStr, { absolute: true, ...globOptions });
 }
 function formatExtension(extension) {
     return extension.charAt(0) === '.' ? extension : `.${extension}`;
@@ -71,6 +72,7 @@ const LoadFilesDefaultOptions = {
     requireMethod: null,
     globOptions: {
         absolute: true,
+        cwd: cwd(),
     },
     exportNames: DEFAULT_EXPORT_NAMES,
     recursive: true,
@@ -81,14 +83,14 @@ const LoadFilesDefaultOptions = {
  * @param pattern Glob pattern or patterns to use when loading files
  * @param options Additional options
  */
-function loadFilesSync(pattern, options = LoadFilesDefaultOptions) {
-    var _a;
+export function loadFilesSync(pattern, options = LoadFilesDefaultOptions) {
+    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)) {
@@ -145,14 +147,23 @@ const checkExtension = (path, { extensions, ignoredExtensions }) => {
  * @param pattern Glob pattern or patterns to use when loading files
  * @param options Additional options
  */
-async function loadFiles(pattern, options = LoadFilesDefaultOptions) {
+export async function loadFiles(pattern, options = LoadFilesDefaultOptions) {
     var _a;
     const execOptions = { ...LoadFilesDefaultOptions, ...options };
     const relevantPaths = await scanForFiles(await Promise.all(asArray(pattern).map(async (path) => (await isDirectory(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 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))
@@ -181,5 +192,3 @@ function tryToParse(maybeSDL) {
         return maybeSDL;
     }
 }
-
-export { loadFiles, loadFilesSync };

package/package.json

@@ -1,15 +1,15 @@
 {
   "name": "@graphql-tools/load-files",
-  "version": "6.5.2",
+  "version": "6.6.0-alpha-b76ec274.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"
+    "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0"
   },
   "dependencies": {
-    "globby": "11.0.4",
-    "tslib": "~2.3.0",
-    "unixify": "1.0.0"
+    "globby": "11.1.0",
+    "unixify": "1.0.0",
+    "tslib": "^2.4.0"
   },
   "repository": {
     "type": "git",
@@ -18,20 +18,42 @@
   },
   "author": "Dotan Simha <dotansimha@gmail.com>",
   "license": "MIT",
-  "main": "index.js",
-  "module": "index.mjs",
-  "typings": "index.d.ts",
+  "main": "cjs/index.js",
+  "module": "esm/index.js",
+  "typings": "typings/index.d.ts",
   "typescript": {
-    "definition": "index.d.ts"
+    "definition": "typings/index.d.ts"
   },
+  "type": "module",
   "exports": {
     ".": {
-      "require": "./index.js",
-      "import": "./index.mjs"
+      "require": {
+        "types": "./typings/index.d.ts",
+        "default": "./cjs/index.js"
+      },
+      "import": {
+        "types": "./typings/index.d.ts",
+        "default": "./esm/index.js"
+      },
+      "default": {
+        "types": "./typings/index.d.ts",
+        "default": "./esm/index.js"
+      }
     },
     "./*": {
-      "require": "./*.js",
-      "import": "./*.mjs"
-    }
+      "require": {
+        "types": "./typings/*.d.ts",
+        "default": "./cjs/*.js"
+      },
+      "import": {
+        "types": "./typings/*.d.ts",
+        "default": "./esm/*.js"
+      },
+      "default": {
+        "types": "./typings/*.d.ts",
+        "default": "./esm/*.js"
+      }
+    },
+    "./package.json": "./package.json"
   }
-}
+}

package/README.md

@@ -1,5 +0,0 @@
-Check API Reference for more information about this package;
-https://www.graphql-tools.com/docs/api/modules/load_files_src
-
-You can also learn more about File Loading in this chapter;
-https://www.graphql-tools.com/docs/schema-merging#file-loading