@graphql-tools/load 7.1.2-alpha-a15676c3.0 → 7.1.4

package/es5/index.js

@@ -68,16 +68,15 @@ function applyDefaultOptions(options) {
 }
 
 function loadFile(pointer, options) {
+    var _a;
     return tslib.__awaiter(this, void 0, void 0, function () {
-        var cached, results;
+        var results;
         var _this = this;
-        return tslib.__generator(this, function (_a) {
-            switch (_a.label) {
+        return tslib.__generator(this, function (_b) {
+            switch (_b.label) {
                 case 0:
-                    cached = useCache({ pointer: pointer, options: options });
-                    if (cached) {
-                        return [2 /*return*/, cached];
-                    }
+                    results = (_a = options.cache) === null || _a === void 0 ? void 0 : _a[pointer];
+                    if (!!results) return [3 /*break*/, 2];
                     results = [];
                     return [4 /*yield*/, Promise.all(options.loaders.map(function (loader) { return tslib.__awaiter(_this, void 0, void 0, function () {
                             var loaderResults, error_1;
@@ -101,50 +100,51 @@ function loadFile(pointer, options) {
                             });
                         }); }))];
                 case 1:
-                    _a.sent();
-                    return [2 /*return*/, results];
+                    _b.sent();
+                    if (options.cache) {
+                        options.cache[pointer] = results;
+                    }
+                    _b.label = 2;
+                case 2: return [2 /*return*/, results];
             }
         });
     });
 }
 function loadFileSync(pointer, options) {
     var e_1, _a;
-    var cached = useCache({ pointer: pointer, options: options });
-    if (cached) {
-        return cached;
-    }
-    var results = [];
-    try {
-        for (var _b = tslib.__values(options.loaders), _c = _b.next(); !_c.done; _c = _b.next()) {
-            var loader = _c.value;
-            try {
-                // We check for the existence so it is okay to force non null
-                var loaderResults = loader.loadSync(pointer, options);
-                loaderResults === null || loaderResults === void 0 ? void 0 : loaderResults.forEach(function (result) { return results.push(result); });
-            }
-            catch (error) {
-                if (process.env['DEBUG']) {
-                    console.error("Failed to find any GraphQL type definitions in: " + pointer + " - " + error.message);
+    var _b;
+    var results = (_b = options.cache) === null || _b === void 0 ? void 0 : _b[pointer];
+    if (!results) {
+        results = [];
+        try {
+            for (var _c = tslib.__values(options.loaders), _d = _c.next(); !_d.done; _d = _c.next()) {
+                var loader = _d.value;
+                try {
+                    // We check for the existence so it is okay to force non null
+                    var loaderResults = loader.loadSync(pointer, options);
+                    loaderResults === null || loaderResults === void 0 ? void 0 : loaderResults.forEach(function (result) { return results.push(result); });
+                }
+                catch (error) {
+                    if (process.env['DEBUG']) {
+                        console.error("Failed to find any GraphQL type definitions in: " + pointer + " - " + error.message);
+                    }
+                    throw error;
                 }
-                throw error;
             }
         }
-    }
-    catch (e_1_1) { e_1 = { error: e_1_1 }; }
-    finally {
-        try {
-            if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
+        catch (e_1_1) { e_1 = { error: e_1_1 }; }
+        finally {
+            try {
+                if (_d && !_d.done && (_a = _c.return)) _a.call(_c);
+            }
+            finally { if (e_1) throw e_1.error; }
+        }
+        if (options.cache) {
+            options.cache[pointer] = results;
         }
-        finally { if (e_1) throw e_1.error; }
     }
     return results;
 }
-function useCache(_a) {
-    var pointer = _a.pointer, options = _a.options;
-    if (options['cache']) {
-        return options['cache'][pointer];
-    }
-}
 
 /**
  * Converts a string to 32bit integer
@@ -291,7 +291,6 @@ function collectSources(_a) {
                     queue = useQueue({ concurrency: CONCURRENCY_LIMIT });
                     _b = createHelpers({
                         sources: sources,
-                        options: options,
                         stack: [collectDocumentString, collectCustomLoader, collectFallback],
                     }), addSource = _b.addSource, collect = _b.collect;
                     for (pointer in pointerOptionMap) {
@@ -319,7 +318,6 @@ function collectSourcesSync(_a) {
     var queue = useSyncQueue();
     var _b = createHelpers({
         sources: sources,
-        options: options,
         stack: [collectDocumentString, collectCustomLoaderSync, collectFallbackSync],
     }), addSource = _b.addSource, collect = _b.collect;
     for (var pointer in pointerOptionMap) {
@@ -337,13 +335,10 @@ function collectSourcesSync(_a) {
     return sources;
 }
 function createHelpers(_a) {
-    var sources = _a.sources, options = _a.options, stack = _a.stack;
+    var sources = _a.sources, stack = _a.stack;
     var addSource = function (_a) {
-        var pointer = _a.pointer, source = _a.source, noCache = _a.noCache;
+        var source = _a.source;
         sources.push(source);
-        if (!noCache && options.cache) {
-            options.cache[pointer] = source;
-        }
     };
     var collect = useStack.apply(void 0, tslib.__spreadArray([], tslib.__read(stack)));
     return {

package/es5/index.mjs

@@ -62,16 +62,15 @@ function applyDefaultOptions(options) {
 }
 
 function loadFile(pointer, options) {
+    var _a;
     return __awaiter(this, void 0, void 0, function () {
-        var cached, results;
+        var results;
         var _this = this;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
+        return __generator(this, function (_b) {
+            switch (_b.label) {
                 case 0:
-                    cached = useCache({ pointer: pointer, options: options });
-                    if (cached) {
-                        return [2 /*return*/, cached];
-                    }
+                    results = (_a = options.cache) === null || _a === void 0 ? void 0 : _a[pointer];
+                    if (!!results) return [3 /*break*/, 2];
                     results = [];
                     return [4 /*yield*/, Promise.all(options.loaders.map(function (loader) { return __awaiter(_this, void 0, void 0, function () {
                             var loaderResults, error_1;
@@ -95,50 +94,51 @@ function loadFile(pointer, options) {
                             });
                         }); }))];
                 case 1:
-                    _a.sent();
-                    return [2 /*return*/, results];
+                    _b.sent();
+                    if (options.cache) {
+                        options.cache[pointer] = results;
+                    }
+                    _b.label = 2;
+                case 2: return [2 /*return*/, results];
             }
         });
     });
 }
 function loadFileSync(pointer, options) {
     var e_1, _a;
-    var cached = useCache({ pointer: pointer, options: options });
-    if (cached) {
-        return cached;
-    }
-    var results = [];
-    try {
-        for (var _b = __values(options.loaders), _c = _b.next(); !_c.done; _c = _b.next()) {
-            var loader = _c.value;
-            try {
-                // We check for the existence so it is okay to force non null
-                var loaderResults = loader.loadSync(pointer, options);
-                loaderResults === null || loaderResults === void 0 ? void 0 : loaderResults.forEach(function (result) { return results.push(result); });
-            }
-            catch (error) {
-                if (env['DEBUG']) {
-                    console.error("Failed to find any GraphQL type definitions in: " + pointer + " - " + error.message);
+    var _b;
+    var results = (_b = options.cache) === null || _b === void 0 ? void 0 : _b[pointer];
+    if (!results) {
+        results = [];
+        try {
+            for (var _c = __values(options.loaders), _d = _c.next(); !_d.done; _d = _c.next()) {
+                var loader = _d.value;
+                try {
+                    // We check for the existence so it is okay to force non null
+                    var loaderResults = loader.loadSync(pointer, options);
+                    loaderResults === null || loaderResults === void 0 ? void 0 : loaderResults.forEach(function (result) { return results.push(result); });
+                }
+                catch (error) {
+                    if (env['DEBUG']) {
+                        console.error("Failed to find any GraphQL type definitions in: " + pointer + " - " + error.message);
+                    }
+                    throw error;
                 }
-                throw error;
             }
         }
-    }
-    catch (e_1_1) { e_1 = { error: e_1_1 }; }
-    finally {
-        try {
-            if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
+        catch (e_1_1) { e_1 = { error: e_1_1 }; }
+        finally {
+            try {
+                if (_d && !_d.done && (_a = _c.return)) _a.call(_c);
+            }
+            finally { if (e_1) throw e_1.error; }
+        }
+        if (options.cache) {
+            options.cache[pointer] = results;
         }
-        finally { if (e_1) throw e_1.error; }
     }
     return results;
 }
-function useCache(_a) {
-    var pointer = _a.pointer, options = _a.options;
-    if (options['cache']) {
-        return options['cache'][pointer];
-    }
-}
 
 /**
  * Converts a string to 32bit integer
@@ -285,7 +285,6 @@ function collectSources(_a) {
                     queue = useQueue({ concurrency: CONCURRENCY_LIMIT });
                     _b = createHelpers({
                         sources: sources,
-                        options: options,
                         stack: [collectDocumentString, collectCustomLoader, collectFallback],
                     }), addSource = _b.addSource, collect = _b.collect;
                     for (pointer in pointerOptionMap) {
@@ -313,7 +312,6 @@ function collectSourcesSync(_a) {
     var queue = useSyncQueue();
     var _b = createHelpers({
         sources: sources,
-        options: options,
         stack: [collectDocumentString, collectCustomLoaderSync, collectFallbackSync],
     }), addSource = _b.addSource, collect = _b.collect;
     for (var pointer in pointerOptionMap) {
@@ -331,13 +329,10 @@ function collectSourcesSync(_a) {
     return sources;
 }
 function createHelpers(_a) {
-    var sources = _a.sources, options = _a.options, stack = _a.stack;
+    var sources = _a.sources, stack = _a.stack;
     var addSource = function (_a) {
-        var pointer = _a.pointer, source = _a.source, noCache = _a.noCache;
+        var source = _a.source;
         sources.push(source);
-        if (!noCache && options.cache) {
-            options.cache[pointer] = source;
-        }
     };
     var collect = useStack.apply(void 0, __spreadArray([], __read(stack)));
     return {

package/es5/load-typedefs.d.ts

@@ -3,7 +3,7 @@ export declare type LoadTypedefsOptions<ExtraConfig = {
     [key: string]: any;
 }> = BaseLoaderOptions & ExtraConfig & {
     cache?: {
-        [key: string]: Source;
+        [key: string]: Source[];
     };
     loaders: Loader[];
     filterKinds?: string[];

package/es5/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@graphql-tools/load/es5",
-  "version": "7.1.2-alpha-a15676c3.0",
+  "version": "7.1.4",
   "description": "A set of utils for faster development of GraphQL tools",
   "sideEffects": false,
   "peerDependencies": {
     "graphql": "^14.0.0 || ^15.0.0"
   },
   "dependencies": {
-    "@graphql-tools/merge": "7.0.0-alpha-a15676c3.0",
+    "@graphql-tools/merge": "^7.0.0",
     "@graphql-tools/utils": "8.0.2",
     "import-from": "4.0.0",
     "p-limit": "3.1.0",

package/index.js

@@ -45,51 +45,52 @@ function applyDefaultOptions(options) {
 }
 
 async function loadFile(pointer, options) {
-    const cached = useCache({ pointer, options });
-    if (cached) {
-        return cached;
-    }
-    const results = [];
-    await Promise.all(options.loaders.map(async (loader) => {
-        try {
-            const loaderResults = await loader.load(pointer, options);
-            loaderResults === null || loaderResults === void 0 ? void 0 : loaderResults.forEach(result => results.push(result));
-        }
-        catch (error) {
-            if (process.env['DEBUG']) {
-                console.error(`Failed to find any GraphQL type definitions in: ${pointer} - ${error.message}`);
+    var _a;
+    let results = (_a = options.cache) === null || _a === void 0 ? void 0 : _a[pointer];
+    if (!results) {
+        results = [];
+        await Promise.all(options.loaders.map(async (loader) => {
+            try {
+                const loaderResults = await loader.load(pointer, options);
+                loaderResults === null || loaderResults === void 0 ? void 0 : loaderResults.forEach(result => results.push(result));
+            }
+            catch (error) {
+                if (process.env['DEBUG']) {
+                    console.error(`Failed to find any GraphQL type definitions in: ${pointer} - ${error.message}`);
+                }
+                throw error;
             }
-            throw error;
+        }));
+        if (options.cache) {
+            options.cache[pointer] = results;
         }
-    }));
+    }
     return results;
 }
 function loadFileSync(pointer, options) {
-    const cached = useCache({ pointer, options });
-    if (cached) {
-        return cached;
-    }
-    const results = [];
-    for (const loader of options.loaders) {
-        try {
-            // We check for the existence so it is okay to force non null
-            const loaderResults = loader.loadSync(pointer, options);
-            loaderResults === null || loaderResults === void 0 ? void 0 : loaderResults.forEach(result => results.push(result));
-        }
-        catch (error) {
-            if (process.env['DEBUG']) {
-                console.error(`Failed to find any GraphQL type definitions in: ${pointer} - ${error.message}`);
+    var _a;
+    let results = (_a = options.cache) === null || _a === void 0 ? void 0 : _a[pointer];
+    if (!results) {
+        results = [];
+        for (const loader of options.loaders) {
+            try {
+                // We check for the existence so it is okay to force non null
+                const loaderResults = loader.loadSync(pointer, options);
+                loaderResults === null || loaderResults === void 0 ? void 0 : loaderResults.forEach(result => results.push(result));
+            }
+            catch (error) {
+                if (process.env['DEBUG']) {
+                    console.error(`Failed to find any GraphQL type definitions in: ${pointer} - ${error.message}`);
+                }
+                throw error;
             }
-            throw error;
+        }
+        if (options.cache) {
+            options.cache[pointer] = results;
         }
     }
     return results;
 }
-function useCache({ pointer, options }) {
-    if (options['cache']) {
-        return options['cache'][pointer];
-    }
-}
 
 /**
  * Converts a string to 32bit integer
@@ -200,7 +201,6 @@ async function collectSources({ pointerOptionMap, options, }) {
     const queue = useQueue({ concurrency: CONCURRENCY_LIMIT });
     const { addSource, collect } = createHelpers({
         sources,
-        options,
         stack: [collectDocumentString, collectCustomLoader, collectFallback],
     });
     for (const pointer in pointerOptionMap) {
@@ -222,7 +222,6 @@ function collectSourcesSync({ pointerOptionMap, options, }) {
     const queue = useSyncQueue();
     const { addSource, collect } = createHelpers({
         sources,
-        options,
         stack: [collectDocumentString, collectCustomLoaderSync, collectFallbackSync],
     });
     for (const pointer in pointerOptionMap) {
@@ -239,12 +238,9 @@ function collectSourcesSync({ pointerOptionMap, options, }) {
     queue.runAll();
     return sources;
 }
-function createHelpers({ sources, options, stack, }) {
-    const addSource = ({ pointer, source, noCache, }) => {
+function createHelpers({ sources, stack }) {
+    const addSource = ({ source }) => {
         sources.push(source);
-        if (!noCache && options.cache) {
-            options.cache[pointer] = source;
-        }
     };
     const collect = useStack(...stack);
     return {

package/index.mjs

@@ -39,51 +39,52 @@ function applyDefaultOptions(options) {
 }
 
 async function loadFile(pointer, options) {
-    const cached = useCache({ pointer, options });
-    if (cached) {
-        return cached;
-    }
-    const results = [];
-    await Promise.all(options.loaders.map(async (loader) => {
-        try {
-            const loaderResults = await loader.load(pointer, options);
-            loaderResults === null || loaderResults === void 0 ? void 0 : loaderResults.forEach(result => results.push(result));
-        }
-        catch (error) {
-            if (env['DEBUG']) {
-                console.error(`Failed to find any GraphQL type definitions in: ${pointer} - ${error.message}`);
+    var _a;
+    let results = (_a = options.cache) === null || _a === void 0 ? void 0 : _a[pointer];
+    if (!results) {
+        results = [];
+        await Promise.all(options.loaders.map(async (loader) => {
+            try {
+                const loaderResults = await loader.load(pointer, options);
+                loaderResults === null || loaderResults === void 0 ? void 0 : loaderResults.forEach(result => results.push(result));
+            }
+            catch (error) {
+                if (env['DEBUG']) {
+                    console.error(`Failed to find any GraphQL type definitions in: ${pointer} - ${error.message}`);
+                }
+                throw error;
             }
-            throw error;
+        }));
+        if (options.cache) {
+            options.cache[pointer] = results;
         }
-    }));
+    }
     return results;
 }
 function loadFileSync(pointer, options) {
-    const cached = useCache({ pointer, options });
-    if (cached) {
-        return cached;
-    }
-    const results = [];
-    for (const loader of options.loaders) {
-        try {
-            // We check for the existence so it is okay to force non null
-            const loaderResults = loader.loadSync(pointer, options);
-            loaderResults === null || loaderResults === void 0 ? void 0 : loaderResults.forEach(result => results.push(result));
-        }
-        catch (error) {
-            if (env['DEBUG']) {
-                console.error(`Failed to find any GraphQL type definitions in: ${pointer} - ${error.message}`);
+    var _a;
+    let results = (_a = options.cache) === null || _a === void 0 ? void 0 : _a[pointer];
+    if (!results) {
+        results = [];
+        for (const loader of options.loaders) {
+            try {
+                // We check for the existence so it is okay to force non null
+                const loaderResults = loader.loadSync(pointer, options);
+                loaderResults === null || loaderResults === void 0 ? void 0 : loaderResults.forEach(result => results.push(result));
+            }
+            catch (error) {
+                if (env['DEBUG']) {
+                    console.error(`Failed to find any GraphQL type definitions in: ${pointer} - ${error.message}`);
+                }
+                throw error;
             }
-            throw error;
+        }
+        if (options.cache) {
+            options.cache[pointer] = results;
         }
     }
     return results;
 }
-function useCache({ pointer, options }) {
-    if (options['cache']) {
-        return options['cache'][pointer];
-    }
-}
 
 /**
  * Converts a string to 32bit integer
@@ -194,7 +195,6 @@ async function collectSources({ pointerOptionMap, options, }) {
     const queue = useQueue({ concurrency: CONCURRENCY_LIMIT });
     const { addSource, collect } = createHelpers({
         sources,
-        options,
         stack: [collectDocumentString, collectCustomLoader, collectFallback],
     });
     for (const pointer in pointerOptionMap) {
@@ -216,7 +216,6 @@ function collectSourcesSync({ pointerOptionMap, options, }) {
     const queue = useSyncQueue();
     const { addSource, collect } = createHelpers({
         sources,
-        options,
         stack: [collectDocumentString, collectCustomLoaderSync, collectFallbackSync],
     });
     for (const pointer in pointerOptionMap) {
@@ -233,12 +232,9 @@ function collectSourcesSync({ pointerOptionMap, options, }) {
     queue.runAll();
     return sources;
 }
-function createHelpers({ sources, options, stack, }) {
-    const addSource = ({ pointer, source, noCache, }) => {
+function createHelpers({ sources, stack }) {
+    const addSource = ({ source }) => {
         sources.push(source);
-        if (!noCache && options.cache) {
-            options.cache[pointer] = source;
-        }
     };
     const collect = useStack(...stack);
     return {

package/load-typedefs.d.ts

@@ -3,7 +3,7 @@ export declare type LoadTypedefsOptions<ExtraConfig = {
     [key: string]: any;
 }> = BaseLoaderOptions & ExtraConfig & {
     cache?: {
-        [key: string]: Source;
+        [key: string]: Source[];
     };
     loaders: Loader[];
     filterKinds?: string[];

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@graphql-tools/load",
-  "version": "7.1.2-alpha-a15676c3.0",
+  "version": "7.1.4",
   "description": "A set of utils for faster development of GraphQL tools",
   "sideEffects": false,
   "peerDependencies": {
     "graphql": "^14.0.0 || ^15.0.0"
   },
   "dependencies": {
-    "@graphql-tools/merge": "7.0.0-alpha-a15676c3.0",
+    "@graphql-tools/merge": "^7.0.0",
     "@graphql-tools/utils": "8.0.2",
     "import-from": "4.0.0",
     "p-limit": "3.1.0",