@graphql-tools/batch-execute 8.0.0-alpha-fa9b61b3.0 → 8.0.2

package/README.md

@@ -1,5 +1,6 @@
 Check API Reference for more information about this package;
-https://www.graphql-tools.com/docs/api/modules/batch-execute
+https://www.graphql-tools.com/docs/api/modules/batch_execute_src
 
 You can also learn more about Batch Delegation in this chapter;
 https://www.graphql-tools.com/docs/stitch-schema-extensions#batch-delegation
+

package/es5/README.md

@@ -1,5 +1,6 @@
 Check API Reference for more information about this package;
-https://www.graphql-tools.com/docs/api/modules/batch-execute
+https://www.graphql-tools.com/docs/api/modules/batch_execute_src
 
 You can also learn more about Batch Delegation in this chapter;
 https://www.graphql-tools.com/docs/stitch-schema-extensions#batch-delegation
+

package/es5/index.js

@@ -6,7 +6,6 @@ function _interopDefault (ex) { return (ex && (typeof ex === 'object') && 'defau
 
 const tslib = require('tslib');
 const DataLoader = _interopDefault(require('dataloader'));
-const valueOrPromise = require('value-or-promise');
 const graphql = require('graphql');
 const utils = require('@graphql-tools/utils/es5');
 
@@ -113,25 +112,37 @@ function mergeRequests(requests, extensionsReducer) {
     };
 }
 function prefixRequest(prefix, request) {
-    var _a;
-    var _b;
-    var document = aliasTopLevelFields(prefix, request.document);
-    var executionVariables = (_b = request.variables) !== null && _b !== void 0 ? _b : {};
-    var variableNames = Object.keys(executionVariables);
-    if (variableNames.length === 0) {
-        return tslib.__assign(tslib.__assign({}, request), { document: document });
+    var _a, e_2, _b;
+    var _c;
+    var executionVariables = (_c = request.variables) !== null && _c !== void 0 ? _c : {};
+    function prefixNode(node) {
+        return prefixNodeName(node, prefix);
+    }
+    var prefixedDocument = aliasTopLevelFields(prefix, request.document);
+    var executionVariableNames = Object.keys(executionVariables);
+    if (executionVariableNames.length > 0) {
+        prefixedDocument = graphql.visit(prefixedDocument, (_a = {},
+            _a[graphql.Kind.VARIABLE] = prefixNode,
+            _a[graphql.Kind.FRAGMENT_DEFINITION] = prefixNode,
+            _a[graphql.Kind.FRAGMENT_SPREAD] = prefixNode,
+            _a));
+    }
+    var prefixedVariables = {};
+    try {
+        for (var executionVariableNames_1 = tslib.__values(executionVariableNames), executionVariableNames_1_1 = executionVariableNames_1.next(); !executionVariableNames_1_1.done; executionVariableNames_1_1 = executionVariableNames_1.next()) {
+            var variableName = executionVariableNames_1_1.value;
+            prefixedVariables[prefix + variableName] = executionVariables[variableName];
+        }
+    }
+    catch (e_2_1) { e_2 = { error: e_2_1 }; }
+    finally {
+        try {
+            if (executionVariableNames_1_1 && !executionVariableNames_1_1.done && (_b = executionVariableNames_1.return)) _b.call(executionVariableNames_1);
+        }
+        finally { if (e_2) throw e_2.error; }
     }
-    document = graphql.visit(document, (_a = {},
-        _a[graphql.Kind.VARIABLE] = function (node) { return prefixNodeName(node, prefix); },
-        _a[graphql.Kind.FRAGMENT_DEFINITION] = function (node) { return prefixNodeName(node, prefix); },
-        _a[graphql.Kind.FRAGMENT_SPREAD] = function (node) { return prefixNodeName(node, prefix); },
-        _a));
-    var prefixedVariables = variableNames.reduce(function (acc, name) {
-        acc[prefix + name] = executionVariables[name];
-        return acc;
-    }, Object.create(null));
     return {
-        document: document,
+        document: prefixedDocument,
         variables: prefixedVariables,
         operationType: request.operationType,
     };
@@ -303,40 +314,52 @@ function createBatchingExecutor(executor, dataLoaderOptions, extensionsReducer)
     };
 }
 function createLoadFn(executor, extensionsReducer) {
-    var _this = this;
-    return function (requests) { return tslib.__awaiter(_this, void 0, void 0, function () {
-        var execBatches, index, request, currentBatch, operationType, currentOperationType, executionResults;
-        return tslib.__generator(this, function (_a) {
-            execBatches = [];
-            index = 0;
-            request = requests[index];
-            currentBatch = [request];
-            execBatches.push(currentBatch);
-            operationType = request.operationType;
-            while (++index < requests.length) {
-                currentOperationType = requests[index].operationType;
-                if (operationType == null) {
-                    throw new Error('Could not identify operation type of document.');
-                }
-                if (operationType === currentOperationType) {
-                    currentBatch.push(requests[index]);
-                }
-                else {
-                    currentBatch = [requests[index]];
-                    execBatches.push(currentBatch);
+    return function batchExecuteLoadFn(requests) {
+        return tslib.__awaiter(this, void 0, void 0, function () {
+            var execBatches, index, request, currentBatch, operationType, currentOperationType, results;
+            var _this = this;
+            return tslib.__generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        execBatches = [];
+                        index = 0;
+                        request = requests[index];
+                        currentBatch = [request];
+                        execBatches.push(currentBatch);
+                        operationType = request.operationType;
+                        while (++index < requests.length) {
+                            currentOperationType = requests[index].operationType;
+                            if (operationType == null) {
+                                throw new Error('Could not identify operation type of document.');
+                            }
+                            if (operationType === currentOperationType) {
+                                currentBatch.push(requests[index]);
+                            }
+                            else {
+                                currentBatch = [requests[index]];
+                                execBatches.push(currentBatch);
+                            }
+                        }
+                        return [4 /*yield*/, Promise.all(execBatches.map(function (execBatch) { return tslib.__awaiter(_this, void 0, void 0, function () {
+                                var mergedRequests, resultBatches;
+                                return tslib.__generator(this, function (_a) {
+                                    switch (_a.label) {
+                                        case 0:
+                                            mergedRequests = mergeRequests(execBatch, extensionsReducer);
+                                            return [4 /*yield*/, executor(mergedRequests)];
+                                        case 1:
+                                            resultBatches = (_a.sent());
+                                            return [2 /*return*/, splitResult(resultBatches, execBatch.length)];
+                                    }
+                                });
+                            }); }))];
+                    case 1:
+                        results = _a.sent();
+                        return [2 /*return*/, results.flat()];
                 }
-            }
-            executionResults = execBatches.map(function (execBatch) {
-                var mergedRequests = mergeRequests(execBatch, extensionsReducer);
-                return new valueOrPromise.ValueOrPromise(function () { return executor(mergedRequests); });
             });
-            return [2 /*return*/, valueOrPromise.ValueOrPromise.all(executionResults)
-                    .then(function (resultBatches) {
-                    return resultBatches.reduce(function (results, resultBatch, index) { return results.concat(splitResult(resultBatch, execBatches[index].length)); }, new Array());
-                })
-                    .resolve()];
         });
-    }); };
+    };
 }
 function defaultExtensionsReducer(mergedExtensions, request) {
     var newExtensions = request.extensions;

package/es5/index.mjs

@@ -1,6 +1,5 @@
 import { __spreadArray, __read, __values, __assign, __awaiter, __generator } from 'tslib';
 import DataLoader from 'dataloader';
-import { ValueOrPromise } from 'value-or-promise';
 import { Kind, visit } from 'graphql';
 import { relocatedError } from '@graphql-tools/utils/es5';
 
@@ -107,25 +106,37 @@ function mergeRequests(requests, extensionsReducer) {
     };
 }
 function prefixRequest(prefix, request) {
-    var _a;
-    var _b;
-    var document = aliasTopLevelFields(prefix, request.document);
-    var executionVariables = (_b = request.variables) !== null && _b !== void 0 ? _b : {};
-    var variableNames = Object.keys(executionVariables);
-    if (variableNames.length === 0) {
-        return __assign(__assign({}, request), { document: document });
+    var _a, e_2, _b;
+    var _c;
+    var executionVariables = (_c = request.variables) !== null && _c !== void 0 ? _c : {};
+    function prefixNode(node) {
+        return prefixNodeName(node, prefix);
+    }
+    var prefixedDocument = aliasTopLevelFields(prefix, request.document);
+    var executionVariableNames = Object.keys(executionVariables);
+    if (executionVariableNames.length > 0) {
+        prefixedDocument = visit(prefixedDocument, (_a = {},
+            _a[Kind.VARIABLE] = prefixNode,
+            _a[Kind.FRAGMENT_DEFINITION] = prefixNode,
+            _a[Kind.FRAGMENT_SPREAD] = prefixNode,
+            _a));
+    }
+    var prefixedVariables = {};
+    try {
+        for (var executionVariableNames_1 = __values(executionVariableNames), executionVariableNames_1_1 = executionVariableNames_1.next(); !executionVariableNames_1_1.done; executionVariableNames_1_1 = executionVariableNames_1.next()) {
+            var variableName = executionVariableNames_1_1.value;
+            prefixedVariables[prefix + variableName] = executionVariables[variableName];
+        }
+    }
+    catch (e_2_1) { e_2 = { error: e_2_1 }; }
+    finally {
+        try {
+            if (executionVariableNames_1_1 && !executionVariableNames_1_1.done && (_b = executionVariableNames_1.return)) _b.call(executionVariableNames_1);
+        }
+        finally { if (e_2) throw e_2.error; }
     }
-    document = visit(document, (_a = {},
-        _a[Kind.VARIABLE] = function (node) { return prefixNodeName(node, prefix); },
-        _a[Kind.FRAGMENT_DEFINITION] = function (node) { return prefixNodeName(node, prefix); },
-        _a[Kind.FRAGMENT_SPREAD] = function (node) { return prefixNodeName(node, prefix); },
-        _a));
-    var prefixedVariables = variableNames.reduce(function (acc, name) {
-        acc[prefix + name] = executionVariables[name];
-        return acc;
-    }, Object.create(null));
     return {
-        document: document,
+        document: prefixedDocument,
         variables: prefixedVariables,
         operationType: request.operationType,
     };
@@ -297,40 +308,52 @@ function createBatchingExecutor(executor, dataLoaderOptions, extensionsReducer)
     };
 }
 function createLoadFn(executor, extensionsReducer) {
-    var _this = this;
-    return function (requests) { return __awaiter(_this, void 0, void 0, function () {
-        var execBatches, index, request, currentBatch, operationType, currentOperationType, executionResults;
-        return __generator(this, function (_a) {
-            execBatches = [];
-            index = 0;
-            request = requests[index];
-            currentBatch = [request];
-            execBatches.push(currentBatch);
-            operationType = request.operationType;
-            while (++index < requests.length) {
-                currentOperationType = requests[index].operationType;
-                if (operationType == null) {
-                    throw new Error('Could not identify operation type of document.');
-                }
-                if (operationType === currentOperationType) {
-                    currentBatch.push(requests[index]);
-                }
-                else {
-                    currentBatch = [requests[index]];
-                    execBatches.push(currentBatch);
+    return function batchExecuteLoadFn(requests) {
+        return __awaiter(this, void 0, void 0, function () {
+            var execBatches, index, request, currentBatch, operationType, currentOperationType, results;
+            var _this = this;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        execBatches = [];
+                        index = 0;
+                        request = requests[index];
+                        currentBatch = [request];
+                        execBatches.push(currentBatch);
+                        operationType = request.operationType;
+                        while (++index < requests.length) {
+                            currentOperationType = requests[index].operationType;
+                            if (operationType == null) {
+                                throw new Error('Could not identify operation type of document.');
+                            }
+                            if (operationType === currentOperationType) {
+                                currentBatch.push(requests[index]);
+                            }
+                            else {
+                                currentBatch = [requests[index]];
+                                execBatches.push(currentBatch);
+                            }
+                        }
+                        return [4 /*yield*/, Promise.all(execBatches.map(function (execBatch) { return __awaiter(_this, void 0, void 0, function () {
+                                var mergedRequests, resultBatches;
+                                return __generator(this, function (_a) {
+                                    switch (_a.label) {
+                                        case 0:
+                                            mergedRequests = mergeRequests(execBatch, extensionsReducer);
+                                            return [4 /*yield*/, executor(mergedRequests)];
+                                        case 1:
+                                            resultBatches = (_a.sent());
+                                            return [2 /*return*/, splitResult(resultBatches, execBatch.length)];
+                                    }
+                                });
+                            }); }))];
+                    case 1:
+                        results = _a.sent();
+                        return [2 /*return*/, results.flat()];
                 }
-            }
-            executionResults = execBatches.map(function (execBatch) {
-                var mergedRequests = mergeRequests(execBatch, extensionsReducer);
-                return new ValueOrPromise(function () { return executor(mergedRequests); });
             });
-            return [2 /*return*/, ValueOrPromise.all(executionResults)
-                    .then(function (resultBatches) {
-                    return resultBatches.reduce(function (results, resultBatch, index) { return results.concat(splitResult(resultBatch, execBatches[index].length)); }, new Array());
-                })
-                    .resolve()];
         });
-    }); };
+    };
 }
 function defaultExtensionsReducer(mergedExtensions, request) {
     var newExtensions = request.extensions;

package/es5/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@graphql-tools/batch-execute/es5",
-  "version": "8.0.0-alpha-fa9b61b3.0",
+  "version": "8.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/utils": "8.0.0-alpha-fa9b61b3.0",
+    "@graphql-tools/utils": "8.0.2",
     "dataloader": "2.0.0",
     "tslib": "~2.3.0",
     "value-or-promise": "1.0.10"

package/index.js

@@ -5,7 +5,6 @@ Object.defineProperty(exports, '__esModule', { value: true });
 function _interopDefault (ex) { return (ex && (typeof ex === 'object') && 'default' in ex) ? ex['default'] : ex; }
 
 const DataLoader = _interopDefault(require('dataloader'));
-const valueOrPromise = require('value-or-promise');
 const graphql = require('graphql');
 const utils = require('@graphql-tools/utils');
 
@@ -102,23 +101,25 @@ function mergeRequests(requests, extensionsReducer) {
 }
 function prefixRequest(prefix, request) {
     var _a;
-    let document = aliasTopLevelFields(prefix, request.document);
     const executionVariables = (_a = request.variables) !== null && _a !== void 0 ? _a : {};
-    const variableNames = Object.keys(executionVariables);
-    if (variableNames.length === 0) {
-        return { ...request, document };
+    function prefixNode(node) {
+        return prefixNodeName(node, prefix);
+    }
+    let prefixedDocument = aliasTopLevelFields(prefix, request.document);
+    const executionVariableNames = Object.keys(executionVariables);
+    if (executionVariableNames.length > 0) {
+        prefixedDocument = graphql.visit(prefixedDocument, {
+            [graphql.Kind.VARIABLE]: prefixNode,
+            [graphql.Kind.FRAGMENT_DEFINITION]: prefixNode,
+            [graphql.Kind.FRAGMENT_SPREAD]: prefixNode,
+        });
+    }
+    const prefixedVariables = {};
+    for (const variableName of executionVariableNames) {
+        prefixedVariables[prefix + variableName] = executionVariables[variableName];
     }
-    document = graphql.visit(document, {
-        [graphql.Kind.VARIABLE]: (node) => prefixNodeName(node, prefix),
-        [graphql.Kind.FRAGMENT_DEFINITION]: (node) => prefixNodeName(node, prefix),
-        [graphql.Kind.FRAGMENT_SPREAD]: (node) => prefixNodeName(node, prefix),
-    });
-    const prefixedVariables = variableNames.reduce((acc, name) => {
-        acc[prefix + name] = executionVariables[name];
-        return acc;
-    }, Object.create(null));
     return {
-        document,
+        document: prefixedDocument,
         variables: prefixedVariables,
         operationType: request.operationType,
     };
@@ -300,7 +301,7 @@ function createBatchingExecutor(executor, dataLoaderOptions, extensionsReducer =
     };
 }
 function createLoadFn(executor, extensionsReducer) {
-    return async (requests) => {
+    return async function batchExecuteLoadFn(requests) {
         const execBatches = [];
         let index = 0;
         const request = requests[index];
@@ -320,13 +321,12 @@ function createLoadFn(executor, extensionsReducer) {
                 execBatches.push(currentBatch);
             }
         }
-        const executionResults = execBatches.map(execBatch => {
+        const results = await Promise.all(execBatches.map(async (execBatch) => {
             const mergedRequests = mergeRequests(execBatch, extensionsReducer);
-            return new valueOrPromise.ValueOrPromise(() => executor(mergedRequests));
-        });
-        return valueOrPromise.ValueOrPromise.all(executionResults)
-            .then(resultBatches => resultBatches.reduce((results, resultBatch, index) => results.concat(splitResult(resultBatch, execBatches[index].length)), new Array()))
-            .resolve();
+            const resultBatches = (await executor(mergedRequests));
+            return splitResult(resultBatches, execBatch.length);
+        }));
+        return results.flat();
     };
 }
 function defaultExtensionsReducer(mergedExtensions, request) {

package/index.mjs

@@ -1,5 +1,4 @@
 import DataLoader from 'dataloader';
-import { ValueOrPromise } from 'value-or-promise';
 import { Kind, visit } from 'graphql';
 import { relocatedError } from '@graphql-tools/utils';
 
@@ -96,23 +95,25 @@ function mergeRequests(requests, extensionsReducer) {
 }
 function prefixRequest(prefix, request) {
     var _a;
-    let document = aliasTopLevelFields(prefix, request.document);
     const executionVariables = (_a = request.variables) !== null && _a !== void 0 ? _a : {};
-    const variableNames = Object.keys(executionVariables);
-    if (variableNames.length === 0) {
-        return { ...request, document };
+    function prefixNode(node) {
+        return prefixNodeName(node, prefix);
+    }
+    let prefixedDocument = aliasTopLevelFields(prefix, request.document);
+    const executionVariableNames = Object.keys(executionVariables);
+    if (executionVariableNames.length > 0) {
+        prefixedDocument = visit(prefixedDocument, {
+            [Kind.VARIABLE]: prefixNode,
+            [Kind.FRAGMENT_DEFINITION]: prefixNode,
+            [Kind.FRAGMENT_SPREAD]: prefixNode,
+        });
+    }
+    const prefixedVariables = {};
+    for (const variableName of executionVariableNames) {
+        prefixedVariables[prefix + variableName] = executionVariables[variableName];
     }
-    document = visit(document, {
-        [Kind.VARIABLE]: (node) => prefixNodeName(node, prefix),
-        [Kind.FRAGMENT_DEFINITION]: (node) => prefixNodeName(node, prefix),
-        [Kind.FRAGMENT_SPREAD]: (node) => prefixNodeName(node, prefix),
-    });
-    const prefixedVariables = variableNames.reduce((acc, name) => {
-        acc[prefix + name] = executionVariables[name];
-        return acc;
-    }, Object.create(null));
     return {
-        document,
+        document: prefixedDocument,
         variables: prefixedVariables,
         operationType: request.operationType,
     };
@@ -294,7 +295,7 @@ function createBatchingExecutor(executor, dataLoaderOptions, extensionsReducer =
     };
 }
 function createLoadFn(executor, extensionsReducer) {
-    return async (requests) => {
+    return async function batchExecuteLoadFn(requests) {
         const execBatches = [];
         let index = 0;
         const request = requests[index];
@@ -314,13 +315,12 @@ function createLoadFn(executor, extensionsReducer) {
                 execBatches.push(currentBatch);
             }
         }
-        const executionResults = execBatches.map(execBatch => {
+        const results = await Promise.all(execBatches.map(async (execBatch) => {
             const mergedRequests = mergeRequests(execBatch, extensionsReducer);
-            return new ValueOrPromise(() => executor(mergedRequests));
-        });
-        return ValueOrPromise.all(executionResults)
-            .then(resultBatches => resultBatches.reduce((results, resultBatch, index) => results.concat(splitResult(resultBatch, execBatches[index].length)), new Array()))
-            .resolve();
+            const resultBatches = (await executor(mergedRequests));
+            return splitResult(resultBatches, execBatch.length);
+        }));
+        return results.flat();
     };
 }
 function defaultExtensionsReducer(mergedExtensions, request) {

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@graphql-tools/batch-execute",
-  "version": "8.0.0-alpha-fa9b61b3.0",
+  "version": "8.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/utils": "8.0.0-alpha-fa9b61b3.0",
+    "@graphql-tools/utils": "8.0.2",
     "dataloader": "2.0.0",
     "tslib": "~2.3.0",
     "value-or-promise": "1.0.10"