@graphql-tools/executor-apollo-link 1.0.9 → 1.0.10
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.
- package/cjs/index.js +22 -21
- package/esm/index.js +23 -22
- package/package.json +1 -1
package/cjs/index.js
CHANGED
|
@@ -8,36 +8,37 @@ const apollo = apolloImport?.default ?? apolloImport;
|
|
|
8
8
|
function createApolloRequestHandler(executor) {
|
|
9
9
|
return function ApolloRequestHandler(operation) {
|
|
10
10
|
return new apollo.Observable(observer => {
|
|
11
|
-
|
|
12
|
-
.then(() => executor({
|
|
11
|
+
const executionRequest = {
|
|
13
12
|
document: operation.query,
|
|
14
13
|
variables: operation.variables,
|
|
15
14
|
operationName: operation.operationName,
|
|
16
15
|
extensions: operation.extensions,
|
|
17
16
|
context: operation.getContext(),
|
|
18
|
-
}
|
|
19
|
-
|
|
17
|
+
};
|
|
18
|
+
let disposed = false;
|
|
19
|
+
let dispose = () => {
|
|
20
|
+
disposed = true;
|
|
21
|
+
};
|
|
22
|
+
(async function execution() {
|
|
23
|
+
const results = await executor(executionRequest);
|
|
24
|
+
// request couldve been disposed before getting results
|
|
25
|
+
if (disposed)
|
|
26
|
+
return;
|
|
20
27
|
if ((0, utils_1.isAsyncIterable)(results)) {
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
}
|
|
28
|
-
observer.complete();
|
|
29
|
-
});
|
|
28
|
+
dispose = () => {
|
|
29
|
+
results[Symbol.asyncIterator]().return?.();
|
|
30
|
+
};
|
|
31
|
+
for await (const result of results) {
|
|
32
|
+
observer.next(result);
|
|
33
|
+
}
|
|
30
34
|
}
|
|
31
|
-
else
|
|
35
|
+
else {
|
|
32
36
|
observer.next(results);
|
|
33
|
-
observer.complete();
|
|
34
37
|
}
|
|
35
|
-
})
|
|
36
|
-
.
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
}
|
|
40
|
-
});
|
|
38
|
+
})()
|
|
39
|
+
.then(() => observer.complete())
|
|
40
|
+
.catch(e => observer.error(e));
|
|
41
|
+
return () => dispose();
|
|
41
42
|
});
|
|
42
43
|
};
|
|
43
44
|
}
|
package/esm/index.js
CHANGED
|
@@ -1,39 +1,40 @@
|
|
|
1
1
|
import * as apolloImport from '@apollo/client';
|
|
2
|
-
import {
|
|
2
|
+
import { isAsyncIterable } from '@graphql-tools/utils';
|
|
3
3
|
const apollo = apolloImport?.default ?? apolloImport;
|
|
4
4
|
function createApolloRequestHandler(executor) {
|
|
5
5
|
return function ApolloRequestHandler(operation) {
|
|
6
6
|
return new apollo.Observable(observer => {
|
|
7
|
-
|
|
8
|
-
.then(() => executor({
|
|
7
|
+
const executionRequest = {
|
|
9
8
|
document: operation.query,
|
|
10
9
|
variables: operation.variables,
|
|
11
10
|
operationName: operation.operationName,
|
|
12
11
|
extensions: operation.extensions,
|
|
13
12
|
context: operation.getContext(),
|
|
14
|
-
}
|
|
15
|
-
|
|
13
|
+
};
|
|
14
|
+
let disposed = false;
|
|
15
|
+
let dispose = () => {
|
|
16
|
+
disposed = true;
|
|
17
|
+
};
|
|
18
|
+
(async function execution() {
|
|
19
|
+
const results = await executor(executionRequest);
|
|
20
|
+
// request couldve been disposed before getting results
|
|
21
|
+
if (disposed)
|
|
22
|
+
return;
|
|
16
23
|
if (isAsyncIterable(results)) {
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
}
|
|
24
|
-
observer.complete();
|
|
25
|
-
});
|
|
24
|
+
dispose = () => {
|
|
25
|
+
results[Symbol.asyncIterator]().return?.();
|
|
26
|
+
};
|
|
27
|
+
for await (const result of results) {
|
|
28
|
+
observer.next(result);
|
|
29
|
+
}
|
|
26
30
|
}
|
|
27
|
-
else
|
|
31
|
+
else {
|
|
28
32
|
observer.next(results);
|
|
29
|
-
observer.complete();
|
|
30
33
|
}
|
|
31
|
-
})
|
|
32
|
-
.
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
}
|
|
36
|
-
});
|
|
34
|
+
})()
|
|
35
|
+
.then(() => observer.complete())
|
|
36
|
+
.catch(e => observer.error(e));
|
|
37
|
+
return () => dispose();
|
|
37
38
|
});
|
|
38
39
|
};
|
|
39
40
|
}
|