@graphql-tools/code-file-loader 7.0.0-alpha-fa9b61b3.0 → 7.0.2

package/es5/index.d.ts

@@ -31,6 +31,7 @@ export declare class CodeFileLoader implements Loader<CodeFileLoaderOptions> {
     private getMergedOptions;
     canLoad(pointer: string, options: CodeFileLoaderOptions): Promise<boolean>;
     canLoadSync(pointer: string, options: CodeFileLoaderOptions): boolean;
+    private _buildGlobs;
     resolveGlobs(glob: string, options: CodeFileLoaderOptions): Promise<string[]>;
     resolveGlobsSync(glob: string, options: CodeFileLoaderOptions): string[];
     load(pointer: string, options: CodeFileLoaderOptions): Promise<Source[]>;

package/es5/index.js

@@ -28,7 +28,6 @@ const graphql = require('graphql');
 const utils = require('@graphql-tools/utils/es5');
 const graphqlTagPluck = require('@graphql-tools/graphql-tag-pluck/es5');
 const globby = _interopDefault(require('globby'));
-const isGlob = _interopDefault(require('is-glob'));
 const unixify = _interopDefault(require('unixify'));
 const path = require('path');
 const process = require('process');
@@ -219,6 +218,7 @@ var FILE_EXTENSIONS = ['.ts', '.tsx', '.js', '.jsx', '.vue'];
 function createGlobbyOptions(options) {
     return tslib.__assign(tslib.__assign({ absolute: true }, options), { ignore: [] });
 }
+var buildIgnoreGlob = function (path) { return "!" + path; };
 /**
  * This loader loads GraphQL documents and type definitions from code files
  * using `graphql-tag-pluck`.
@@ -275,34 +275,38 @@ var CodeFileLoader = /** @class */ (function () {
         }
         return false;
     };
+    CodeFileLoader.prototype._buildGlobs = function (glob, options) {
+        var ignores = utils.asArray(options.ignore || []);
+        var globs = tslib.__spreadArray([unixify(glob)], tslib.__read(ignores.map(function (v) { return buildIgnoreGlob(unixify(v)); })));
+        return globs;
+    };
     CodeFileLoader.prototype.resolveGlobs = function (glob, options) {
         return tslib.__awaiter(this, void 0, void 0, function () {
-            var ignores;
+            var globs;
             return tslib.__generator(this, function (_a) {
                 options = this.getMergedOptions(options);
-                ignores = utils.asArray(options.ignore || []);
-                return [2 /*return*/, globby(tslib.__spreadArray([glob], tslib.__read(ignores.map(function (v) { return "!" + v; }).map(function (v) { return unixify(v); }))), createGlobbyOptions(options))];
+                globs = this._buildGlobs(glob, options);
+                return [2 /*return*/, globby(globs, createGlobbyOptions(options))];
             });
         });
     };
     CodeFileLoader.prototype.resolveGlobsSync = function (glob, options) {
         options = this.getMergedOptions(options);
-        var ignores = utils.asArray(options.ignore || []);
-        return globby.sync(tslib.__spreadArray([glob], tslib.__read(ignores.map(function (v) { return "!" + v; }).map(function (v) { return unixify(v); }))), createGlobbyOptions(options));
+        var globs = this._buildGlobs(glob, options);
+        return globby.sync(globs, createGlobbyOptions(options));
     };
     CodeFileLoader.prototype.load = function (pointer, options) {
         return tslib.__awaiter(this, void 0, void 0, function () {
-            var finalResult, resolvedPaths, _a, _b, _c, _d;
+            var finalResult, resolvedPaths;
             var _this = this;
-            return tslib.__generator(this, function (_e) {
-                switch (_e.label) {
+            return tslib.__generator(this, function (_a) {
+                switch (_a.label) {
                     case 0:
                         options = this.getMergedOptions(options);
                         finalResult = [];
-                        if (!isGlob(pointer)) return [3 /*break*/, 3];
                         return [4 /*yield*/, this.resolveGlobs(pointer, options)];
                     case 1:
-                        resolvedPaths = _e.sent();
+                        resolvedPaths = _a.sent();
                         return [4 /*yield*/, Promise.all(resolvedPaths.map(function (path) { return tslib.__awaiter(_this, void 0, void 0, function () {
                                 var _a, _b, _c, _d;
                                 return tslib.__generator(this, function (_e) {
@@ -319,17 +323,8 @@ var CodeFileLoader = /** @class */ (function () {
                                 });
                             }); }))];
                     case 2:
-                        _e.sent();
-                        return [3 /*break*/, 5];
-                    case 3:
-                        _b = (_a = finalResult.push).apply;
-                        _c = [finalResult];
-                        _d = [[]];
-                        return [4 /*yield*/, this.handleSinglePath(pointer, options)];
-                    case 4:
-                        _b.apply(_a, _c.concat([tslib.__spreadArray.apply(void 0, _d.concat([tslib.__read.apply(void 0, [(_e.sent())])]))]));
-                        _e.label = 5;
-                    case 5: return [2 /*return*/, finalResult];
+                        _a.sent();
+                        return [2 /*return*/, finalResult];
                 }
             });
         });
@@ -337,28 +332,25 @@ var CodeFileLoader = /** @class */ (function () {
     CodeFileLoader.prototype.loadSync = function (pointer, options) {
         var e_1, _a;
         options = this.getMergedOptions(options);
-        if (isGlob(pointer)) {
-            var resolvedPaths = this.resolveGlobsSync(pointer, options);
-            var finalResult_1 = [];
-            try {
-                for (var resolvedPaths_1 = tslib.__values(resolvedPaths), resolvedPaths_1_1 = resolvedPaths_1.next(); !resolvedPaths_1_1.done; resolvedPaths_1_1 = resolvedPaths_1.next()) {
-                    var path = resolvedPaths_1_1.value;
-                    if (this.canLoadSync(path, options)) {
-                        var result = this.handleSinglePathSync(path, options);
-                        result === null || result === void 0 ? void 0 : result.forEach(function (result) { return finalResult_1.push(result); });
-                    }
+        var resolvedPaths = this.resolveGlobsSync(pointer, options);
+        var finalResult = [];
+        try {
+            for (var resolvedPaths_1 = tslib.__values(resolvedPaths), resolvedPaths_1_1 = resolvedPaths_1.next(); !resolvedPaths_1_1.done; resolvedPaths_1_1 = resolvedPaths_1.next()) {
+                var path = resolvedPaths_1_1.value;
+                if (this.canLoadSync(path, options)) {
+                    var result = this.handleSinglePathSync(path, options);
+                    result === null || result === void 0 ? void 0 : result.forEach(function (result) { return finalResult.push(result); });
                 }
             }
-            catch (e_1_1) { e_1 = { error: e_1_1 }; }
-            finally {
-                try {
-                    if (resolvedPaths_1_1 && !resolvedPaths_1_1.done && (_a = resolvedPaths_1.return)) _a.call(resolvedPaths_1);
-                }
-                finally { if (e_1) throw e_1.error; }
+        }
+        catch (e_1_1) { e_1 = { error: e_1_1 }; }
+        finally {
+            try {
+                if (resolvedPaths_1_1 && !resolvedPaths_1_1.done && (_a = resolvedPaths_1.return)) _a.call(resolvedPaths_1);
             }
-            return finalResult_1;
+            finally { if (e_1) throw e_1.error; }
         }
-        return this.handleSinglePathSync(pointer, options);
+        return finalResult;
     };
     CodeFileLoader.prototype.handleSinglePath = function (location, options) {
         return tslib.__awaiter(this, void 0, void 0, function () {

package/es5/index.mjs

@@ -3,7 +3,6 @@ import { isSchema, parse, buildClientSchema } from 'graphql';
 import { isValidPath, asArray, parseGraphQLSDL, isDocumentNode } from '@graphql-tools/utils/es5';
 import { gqlPluckFromCodeString, gqlPluckFromCodeStringSync } from '@graphql-tools/graphql-tag-pluck/es5';
 import globby from 'globby';
-import isGlob from 'is-glob';
 import unixify from 'unixify';
 import { isAbsolute, resolve } from 'path';
 import { cwd, env } from 'process';
@@ -194,6 +193,7 @@ var FILE_EXTENSIONS = ['.ts', '.tsx', '.js', '.jsx', '.vue'];
 function createGlobbyOptions(options) {
     return __assign(__assign({ absolute: true }, options), { ignore: [] });
 }
+var buildIgnoreGlob = function (path) { return "!" + path; };
 /**
  * This loader loads GraphQL documents and type definitions from code files
  * using `graphql-tag-pluck`.
@@ -250,34 +250,38 @@ var CodeFileLoader = /** @class */ (function () {
         }
         return false;
     };
+    CodeFileLoader.prototype._buildGlobs = function (glob, options) {
+        var ignores = asArray(options.ignore || []);
+        var globs = __spreadArray([unixify(glob)], __read(ignores.map(function (v) { return buildIgnoreGlob(unixify(v)); })));
+        return globs;
+    };
     CodeFileLoader.prototype.resolveGlobs = function (glob, options) {
         return __awaiter(this, void 0, void 0, function () {
-            var ignores;
+            var globs;
             return __generator(this, function (_a) {
                 options = this.getMergedOptions(options);
-                ignores = asArray(options.ignore || []);
-                return [2 /*return*/, globby(__spreadArray([glob], __read(ignores.map(function (v) { return "!" + v; }).map(function (v) { return unixify(v); }))), createGlobbyOptions(options))];
+                globs = this._buildGlobs(glob, options);
+                return [2 /*return*/, globby(globs, createGlobbyOptions(options))];
             });
         });
     };
     CodeFileLoader.prototype.resolveGlobsSync = function (glob, options) {
         options = this.getMergedOptions(options);
-        var ignores = asArray(options.ignore || []);
-        return globby.sync(__spreadArray([glob], __read(ignores.map(function (v) { return "!" + v; }).map(function (v) { return unixify(v); }))), createGlobbyOptions(options));
+        var globs = this._buildGlobs(glob, options);
+        return globby.sync(globs, createGlobbyOptions(options));
     };
     CodeFileLoader.prototype.load = function (pointer, options) {
         return __awaiter(this, void 0, void 0, function () {
-            var finalResult, resolvedPaths, _a, _b, _c, _d;
+            var finalResult, resolvedPaths;
             var _this = this;
-            return __generator(this, function (_e) {
-                switch (_e.label) {
+            return __generator(this, function (_a) {
+                switch (_a.label) {
                     case 0:
                         options = this.getMergedOptions(options);
                         finalResult = [];
-                        if (!isGlob(pointer)) return [3 /*break*/, 3];
                         return [4 /*yield*/, this.resolveGlobs(pointer, options)];
                     case 1:
-                        resolvedPaths = _e.sent();
+                        resolvedPaths = _a.sent();
                         return [4 /*yield*/, Promise.all(resolvedPaths.map(function (path) { return __awaiter(_this, void 0, void 0, function () {
                                 var _a, _b, _c, _d;
                                 return __generator(this, function (_e) {
@@ -294,17 +298,8 @@ var CodeFileLoader = /** @class */ (function () {
                                 });
                             }); }))];
                     case 2:
-                        _e.sent();
-                        return [3 /*break*/, 5];
-                    case 3:
-                        _b = (_a = finalResult.push).apply;
-                        _c = [finalResult];
-                        _d = [[]];
-                        return [4 /*yield*/, this.handleSinglePath(pointer, options)];
-                    case 4:
-                        _b.apply(_a, _c.concat([__spreadArray.apply(void 0, _d.concat([__read.apply(void 0, [(_e.sent())])]))]));
-                        _e.label = 5;
-                    case 5: return [2 /*return*/, finalResult];
+                        _a.sent();
+                        return [2 /*return*/, finalResult];
                 }
             });
         });
@@ -312,28 +307,25 @@ var CodeFileLoader = /** @class */ (function () {
     CodeFileLoader.prototype.loadSync = function (pointer, options) {
         var e_1, _a;
         options = this.getMergedOptions(options);
-        if (isGlob(pointer)) {
-            var resolvedPaths = this.resolveGlobsSync(pointer, options);
-            var finalResult_1 = [];
-            try {
-                for (var resolvedPaths_1 = __values(resolvedPaths), resolvedPaths_1_1 = resolvedPaths_1.next(); !resolvedPaths_1_1.done; resolvedPaths_1_1 = resolvedPaths_1.next()) {
-                    var path = resolvedPaths_1_1.value;
-                    if (this.canLoadSync(path, options)) {
-                        var result = this.handleSinglePathSync(path, options);
-                        result === null || result === void 0 ? void 0 : result.forEach(function (result) { return finalResult_1.push(result); });
-                    }
+        var resolvedPaths = this.resolveGlobsSync(pointer, options);
+        var finalResult = [];
+        try {
+            for (var resolvedPaths_1 = __values(resolvedPaths), resolvedPaths_1_1 = resolvedPaths_1.next(); !resolvedPaths_1_1.done; resolvedPaths_1_1 = resolvedPaths_1.next()) {
+                var path = resolvedPaths_1_1.value;
+                if (this.canLoadSync(path, options)) {
+                    var result = this.handleSinglePathSync(path, options);
+                    result === null || result === void 0 ? void 0 : result.forEach(function (result) { return finalResult.push(result); });
                 }
             }
-            catch (e_1_1) { e_1 = { error: e_1_1 }; }
-            finally {
-                try {
-                    if (resolvedPaths_1_1 && !resolvedPaths_1_1.done && (_a = resolvedPaths_1.return)) _a.call(resolvedPaths_1);
-                }
-                finally { if (e_1) throw e_1.error; }
+        }
+        catch (e_1_1) { e_1 = { error: e_1_1 }; }
+        finally {
+            try {
+                if (resolvedPaths_1_1 && !resolvedPaths_1_1.done && (_a = resolvedPaths_1.return)) _a.call(resolvedPaths_1);
             }
-            return finalResult_1;
+            finally { if (e_1) throw e_1.error; }
         }
-        return this.handleSinglePathSync(pointer, options);
+        return finalResult;
     };
     CodeFileLoader.prototype.handleSinglePath = function (location, options) {
         return __awaiter(this, void 0, void 0, function () {

package/es5/package.json

@@ -1,14 +1,14 @@
 {
   "name": "@graphql-tools/code-file-loader/es5",
-  "version": "7.0.0-alpha-fa9b61b3.0",
+  "version": "7.0.2",
   "description": "A set of utils for faster development of GraphQL tools",
   "sideEffects": false,
   "peerDependencies": {
     "graphql": "^14.0.0 || ^15.0.0"
   },
   "dependencies": {
-    "@graphql-tools/graphql-tag-pluck": "7.0.0-alpha-fa9b61b3.0",
-    "@graphql-tools/utils": "8.0.0-alpha-fa9b61b3.0",
+    "@graphql-tools/graphql-tag-pluck": "^7.0.2",
+    "@graphql-tools/utils": "8.0.2",
     "globby": "^11.0.3",
     "is-glob": "^4.0.1",
     "tslib": "~2.3.0",

package/index.d.ts

@@ -31,6 +31,7 @@ export declare class CodeFileLoader implements Loader<CodeFileLoaderOptions> {
     private getMergedOptions;
     canLoad(pointer: string, options: CodeFileLoaderOptions): Promise<boolean>;
     canLoadSync(pointer: string, options: CodeFileLoaderOptions): boolean;
+    private _buildGlobs;
     resolveGlobs(glob: string, options: CodeFileLoaderOptions): Promise<string[]>;
     resolveGlobsSync(glob: string, options: CodeFileLoaderOptions): string[];
     load(pointer: string, options: CodeFileLoaderOptions): Promise<Source[]>;

package/index.js

@@ -27,7 +27,6 @@ const graphql = require('graphql');
 const utils = require('@graphql-tools/utils');
 const graphqlTagPluck = require('@graphql-tools/graphql-tag-pluck');
 const globby = _interopDefault(require('globby'));
-const isGlob = _interopDefault(require('is-glob'));
 const unixify = _interopDefault(require('unixify'));
 const path = require('path');
 const process = require('process');
@@ -180,6 +179,7 @@ const FILE_EXTENSIONS = ['.ts', '.tsx', '.js', '.jsx', '.vue'];
 function createGlobbyOptions(options) {
     return { absolute: true, ...options, ignore: [] };
 }
+const buildIgnoreGlob = (path) => `!${path}`;
 /**
  * This loader loads GraphQL documents and type definitions from code files
  * using `graphql-tag-pluck`.
@@ -227,44 +227,41 @@ class CodeFileLoader {
         }
         return false;
     }
+    _buildGlobs(glob, options) {
+        const ignores = utils.asArray(options.ignore || []);
+        const globs = [unixify(glob), ...ignores.map(v => buildIgnoreGlob(unixify(v)))];
+        return globs;
+    }
     async resolveGlobs(glob, options) {
         options = this.getMergedOptions(options);
-        const ignores = utils.asArray(options.ignore || []);
-        return globby([glob, ...ignores.map(v => `!${v}`).map(v => unixify(v))], createGlobbyOptions(options));
+        const globs = this._buildGlobs(glob, options);
+        return globby(globs, createGlobbyOptions(options));
     }
     resolveGlobsSync(glob, options) {
         options = this.getMergedOptions(options);
-        const ignores = utils.asArray(options.ignore || []);
-        return globby.sync([glob, ...ignores.map(v => `!${v}`).map(v => unixify(v))], createGlobbyOptions(options));
+        const globs = this._buildGlobs(glob, options);
+        return globby.sync(globs, createGlobbyOptions(options));
     }
     async load(pointer, options) {
         options = this.getMergedOptions(options);
         const finalResult = [];
-        if (isGlob(pointer)) {
-            const resolvedPaths = await this.resolveGlobs(pointer, options);
-            await Promise.all(resolvedPaths.map(async (path) => {
-                finalResult.push(...(await this.handleSinglePath(path, options)));
-            }));
-        }
-        else {
-            finalResult.push(...(await this.handleSinglePath(pointer, options)));
-        }
+        const resolvedPaths = await this.resolveGlobs(pointer, options);
+        await Promise.all(resolvedPaths.map(async (path) => {
+            finalResult.push(...(await this.handleSinglePath(path, options)));
+        }));
         return finalResult;
     }
     loadSync(pointer, options) {
         options = this.getMergedOptions(options);
-        if (isGlob(pointer)) {
-            const resolvedPaths = this.resolveGlobsSync(pointer, options);
-            const finalResult = [];
-            for (const path of resolvedPaths) {
-                if (this.canLoadSync(path, options)) {
-                    const result = this.handleSinglePathSync(path, options);
-                    result === null || result === void 0 ? void 0 : result.forEach(result => finalResult.push(result));
-                }
+        const resolvedPaths = this.resolveGlobsSync(pointer, options);
+        const finalResult = [];
+        for (const path of resolvedPaths) {
+            if (this.canLoadSync(path, options)) {
+                const result = this.handleSinglePathSync(path, options);
+                result === null || result === void 0 ? void 0 : result.forEach(result => finalResult.push(result));
             }
-            return finalResult;
         }
-        return this.handleSinglePathSync(pointer, options);
+        return finalResult;
     }
     async handleSinglePath(location, options) {
         if (!(await this.canLoad(location, options))) {

package/index.mjs

@@ -2,7 +2,6 @@ import { isSchema, parse, buildClientSchema } from 'graphql';
 import { isValidPath, asArray, parseGraphQLSDL, isDocumentNode } from '@graphql-tools/utils';
 import { gqlPluckFromCodeString, gqlPluckFromCodeStringSync } from '@graphql-tools/graphql-tag-pluck';
 import globby from 'globby';
-import isGlob from 'is-glob';
 import unixify from 'unixify';
 import { isAbsolute, resolve } from 'path';
 import { cwd, env } from 'process';
@@ -155,6 +154,7 @@ const FILE_EXTENSIONS = ['.ts', '.tsx', '.js', '.jsx', '.vue'];
 function createGlobbyOptions(options) {
     return { absolute: true, ...options, ignore: [] };
 }
+const buildIgnoreGlob = (path) => `!${path}`;
 /**
  * This loader loads GraphQL documents and type definitions from code files
  * using `graphql-tag-pluck`.
@@ -202,44 +202,41 @@ class CodeFileLoader {
         }
         return false;
     }
+    _buildGlobs(glob, options) {
+        const ignores = asArray(options.ignore || []);
+        const globs = [unixify(glob), ...ignores.map(v => buildIgnoreGlob(unixify(v)))];
+        return globs;
+    }
     async resolveGlobs(glob, options) {
         options = this.getMergedOptions(options);
-        const ignores = asArray(options.ignore || []);
-        return globby([glob, ...ignores.map(v => `!${v}`).map(v => unixify(v))], createGlobbyOptions(options));
+        const globs = this._buildGlobs(glob, options);
+        return globby(globs, createGlobbyOptions(options));
     }
     resolveGlobsSync(glob, options) {
         options = this.getMergedOptions(options);
-        const ignores = asArray(options.ignore || []);
-        return globby.sync([glob, ...ignores.map(v => `!${v}`).map(v => unixify(v))], createGlobbyOptions(options));
+        const globs = this._buildGlobs(glob, options);
+        return globby.sync(globs, createGlobbyOptions(options));
     }
     async load(pointer, options) {
         options = this.getMergedOptions(options);
         const finalResult = [];
-        if (isGlob(pointer)) {
-            const resolvedPaths = await this.resolveGlobs(pointer, options);
-            await Promise.all(resolvedPaths.map(async (path) => {
-                finalResult.push(...(await this.handleSinglePath(path, options)));
-            }));
-        }
-        else {
-            finalResult.push(...(await this.handleSinglePath(pointer, options)));
-        }
+        const resolvedPaths = await this.resolveGlobs(pointer, options);
+        await Promise.all(resolvedPaths.map(async (path) => {
+            finalResult.push(...(await this.handleSinglePath(path, options)));
+        }));
         return finalResult;
     }
     loadSync(pointer, options) {
         options = this.getMergedOptions(options);
-        if (isGlob(pointer)) {
-            const resolvedPaths = this.resolveGlobsSync(pointer, options);
-            const finalResult = [];
-            for (const path of resolvedPaths) {
-                if (this.canLoadSync(path, options)) {
-                    const result = this.handleSinglePathSync(path, options);
-                    result === null || result === void 0 ? void 0 : result.forEach(result => finalResult.push(result));
-                }
+        const resolvedPaths = this.resolveGlobsSync(pointer, options);
+        const finalResult = [];
+        for (const path of resolvedPaths) {
+            if (this.canLoadSync(path, options)) {
+                const result = this.handleSinglePathSync(path, options);
+                result === null || result === void 0 ? void 0 : result.forEach(result => finalResult.push(result));
             }
-            return finalResult;
         }
-        return this.handleSinglePathSync(pointer, options);
+        return finalResult;
     }
     async handleSinglePath(location, options) {
         if (!(await this.canLoad(location, options))) {

package/package.json

@@ -1,14 +1,14 @@
 {
   "name": "@graphql-tools/code-file-loader",
-  "version": "7.0.0-alpha-fa9b61b3.0",
+  "version": "7.0.2",
   "description": "A set of utils for faster development of GraphQL tools",
   "sideEffects": false,
   "peerDependencies": {
     "graphql": "^14.0.0 || ^15.0.0"
   },
   "dependencies": {
-    "@graphql-tools/graphql-tag-pluck": "7.0.0-alpha-fa9b61b3.0",
-    "@graphql-tools/utils": "8.0.0-alpha-fa9b61b3.0",
+    "@graphql-tools/graphql-tag-pluck": "^7.0.2",
+    "@graphql-tools/utils": "8.0.2",
     "globby": "^11.0.3",
     "is-glob": "^4.0.1",
     "tslib": "~2.3.0",