@graphql-tools/batch-execute 8.5.20 → 8.5.21
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -6,6 +6,7 @@ const dataloader_1 = tslib_1.__importDefault(require("dataloader"));
|
|
|
6
6
|
const utils_1 = require("@graphql-tools/utils");
|
|
7
7
|
const mergeRequests_js_1 = require("./mergeRequests.js");
|
|
8
8
|
const splitResult_js_1 = require("./splitResult.js");
|
|
9
|
+
const value_or_promise_1 = require("value-or-promise");
|
|
9
10
|
function createBatchingExecutor(executor, dataLoaderOptions, extensionsReducer = defaultExtensionsReducer) {
|
|
10
11
|
const loadFn = createLoadFn(executor, extensionsReducer);
|
|
11
12
|
const loader = new dataloader_1.default(loadFn, dataLoaderOptions);
|
|
@@ -16,7 +17,7 @@ function createBatchingExecutor(executor, dataLoaderOptions, extensionsReducer =
|
|
|
16
17
|
}
|
|
17
18
|
exports.createBatchingExecutor = createBatchingExecutor;
|
|
18
19
|
function createLoadFn(executor, extensionsReducer) {
|
|
19
|
-
return
|
|
20
|
+
return function batchExecuteLoadFn(requests) {
|
|
20
21
|
const execBatches = [];
|
|
21
22
|
let index = 0;
|
|
22
23
|
const request = requests[index];
|
|
@@ -39,12 +40,10 @@ function createLoadFn(executor, extensionsReducer) {
|
|
|
39
40
|
execBatches.push(currentBatch);
|
|
40
41
|
}
|
|
41
42
|
}
|
|
42
|
-
|
|
43
|
+
return value_or_promise_1.ValueOrPromise.all(execBatches.map(execBatch => new value_or_promise_1.ValueOrPromise(() => {
|
|
43
44
|
const mergedRequests = (0, mergeRequests_js_1.mergeRequests)(execBatch, extensionsReducer);
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
}));
|
|
47
|
-
return results.flat();
|
|
45
|
+
return executor(mergedRequests);
|
|
46
|
+
}).then(resultBatches => (0, splitResult_js_1.splitResult)(resultBatches, execBatch.length)))).then(results => results.flat());
|
|
48
47
|
};
|
|
49
48
|
}
|
|
50
49
|
function defaultExtensionsReducer(mergedExtensions, request) {
|
|
@@ -2,6 +2,7 @@ import DataLoader from 'dataloader';
|
|
|
2
2
|
import { getOperationASTFromRequest } from '@graphql-tools/utils';
|
|
3
3
|
import { mergeRequests } from './mergeRequests.js';
|
|
4
4
|
import { splitResult } from './splitResult.js';
|
|
5
|
+
import { ValueOrPromise } from 'value-or-promise';
|
|
5
6
|
export function createBatchingExecutor(executor, dataLoaderOptions, extensionsReducer = defaultExtensionsReducer) {
|
|
6
7
|
const loadFn = createLoadFn(executor, extensionsReducer);
|
|
7
8
|
const loader = new DataLoader(loadFn, dataLoaderOptions);
|
|
@@ -11,7 +12,7 @@ export function createBatchingExecutor(executor, dataLoaderOptions, extensionsRe
|
|
|
11
12
|
};
|
|
12
13
|
}
|
|
13
14
|
function createLoadFn(executor, extensionsReducer) {
|
|
14
|
-
return
|
|
15
|
+
return function batchExecuteLoadFn(requests) {
|
|
15
16
|
const execBatches = [];
|
|
16
17
|
let index = 0;
|
|
17
18
|
const request = requests[index];
|
|
@@ -34,12 +35,10 @@ function createLoadFn(executor, extensionsReducer) {
|
|
|
34
35
|
execBatches.push(currentBatch);
|
|
35
36
|
}
|
|
36
37
|
}
|
|
37
|
-
|
|
38
|
+
return ValueOrPromise.all(execBatches.map(execBatch => new ValueOrPromise(() => {
|
|
38
39
|
const mergedRequests = mergeRequests(execBatch, extensionsReducer);
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
}));
|
|
42
|
-
return results.flat();
|
|
40
|
+
return executor(mergedRequests);
|
|
41
|
+
}).then(resultBatches => splitResult(resultBatches, execBatch.length)))).then(results => results.flat());
|
|
43
42
|
};
|
|
44
43
|
}
|
|
45
44
|
function defaultExtensionsReducer(mergedExtensions, request) {
|