@graphql-tools/executor 0.0.7 → 0.0.8-alpha-20221111130709-2fa1f285

package/cjs/execution/execute.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isIncrementalResult = exports.getFieldDef = exports.createSourceEventStream = exports.subscribe = exports.defaultFieldResolver = exports.defaultTypeResolver = exports.buildResolveInfo = exports.buildExecutionContext = exports.assertValidExecutionArguments = exports.executeSync = exports.execute = void 0;
+exports.isIncrementalResult = exports.getFieldDef = exports.createSourceEventStream = exports.flattenIncrementalResults = exports.subscribe = exports.defaultFieldResolver = exports.defaultTypeResolver = exports.buildResolveInfo = exports.buildExecutionContext = exports.assertValidExecutionArguments = exports.executeSync = exports.execute = void 0;
 const graphql_1 = require("graphql");
 const utils_1 = require("@graphql-tools/utils");
 const values_js_1 = require("./values.js");
@@ -762,10 +762,44 @@ function subscribe(args) {
     return mapSourceToResponse(exeContext, resultOrStream);
 }
 exports.subscribe = subscribe;
+function flattenIncrementalResults(incrementalResults) {
+    const subsequentIterator = incrementalResults.subsequentResults;
+    let initialResultSent = false;
+    let done = false;
+    return {
+        [Symbol.asyncIterator]() {
+            return this;
+        },
+        async next() {
+            if (done) {
+                return {
+                    value: undefined,
+                    done,
+                };
+            }
+            if (initialResultSent) {
+                return subsequentIterator.next();
+            }
+            initialResultSent = true;
+            return Promise.resolve({
+                value: incrementalResults.initialResult,
+                done,
+            });
+        },
+        return() {
+            done = true;
+            return subsequentIterator.return();
+        },
+        throw(error) {
+            done = true;
+            return subsequentIterator.throw(error);
+        },
+    };
+}
+exports.flattenIncrementalResults = flattenIncrementalResults;
 async function* ensureAsyncIterable(someExecutionResult) {
     if ('initialResult' in someExecutionResult) {
-        yield someExecutionResult.initialResult;
-        yield* someExecutionResult.subsequentResults;
+        yield* flattenIncrementalResults(someExecutionResult);
     }
     else {
         yield someExecutionResult;

package/cjs/execution/normalizedExecutor.js

@@ -1,10 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizedExecutor = void 0;
-const utils_1 = require("@graphql-tools/utils");
 const graphql_1 = require("graphql");
 const execute_js_1 = require("./execute.js");
-const repeater_1 = require("@repeaterjs/repeater");
 const value_or_promise_1 = require("value-or-promise");
 function normalizedExecutor(args) {
     const operationAST = (0, graphql_1.getOperationAST)(args.document, args.operationName);
@@ -12,56 +10,12 @@ function normalizedExecutor(args) {
         throw new Error('Must provide an operation.');
     }
     if (operationAST.operation === 'subscription') {
-        return new value_or_promise_1.ValueOrPromise(() => (0, execute_js_1.subscribe)(args))
-            .then((result) => {
-            if ((0, utils_1.isAsyncIterable)(result)) {
-                return new repeater_1.Repeater(async (push, stop) => {
-                    let stopped = false;
-                    stop.then(() => {
-                        stopped = true;
-                    });
-                    let err;
-                    try {
-                        for await (const value of result) {
-                            if (stopped) {
-                                break;
-                            }
-                            await push(value);
-                        }
-                    }
-                    catch (e) {
-                        err = e;
-                    }
-                    stop(err);
-                });
-            }
-            return result;
-        })
-            .resolve();
+        return (0, execute_js_1.subscribe)(args);
     }
     return new value_or_promise_1.ValueOrPromise(() => (0, execute_js_1.execute)(args))
         .then((result) => {
         if ('initialResult' in result) {
-            return new repeater_1.Repeater(async (push, stop) => {
-                let stopped = false;
-                stop.then(() => {
-                    stopped = true;
-                });
-                let err;
-                try {
-                    await push(result.initialResult);
-                    for await (const value of result.subsequentResults) {
-                        if (stopped) {
-                            break;
-                        }
-                        await push(value);
-                    }
-                }
-                catch (e) {
-                    err = e;
-                }
-                stop(err);
-            });
+            return (0, execute_js_1.flattenIncrementalResults)(result);
         }
         return result;
     })

package/esm/execution/execute.js

@@ -751,10 +751,43 @@ export function subscribe(args) {
     }
     return mapSourceToResponse(exeContext, resultOrStream);
 }
+export function flattenIncrementalResults(incrementalResults) {
+    const subsequentIterator = incrementalResults.subsequentResults;
+    let initialResultSent = false;
+    let done = false;
+    return {
+        [Symbol.asyncIterator]() {
+            return this;
+        },
+        async next() {
+            if (done) {
+                return {
+                    value: undefined,
+                    done,
+                };
+            }
+            if (initialResultSent) {
+                return subsequentIterator.next();
+            }
+            initialResultSent = true;
+            return Promise.resolve({
+                value: incrementalResults.initialResult,
+                done,
+            });
+        },
+        return() {
+            done = true;
+            return subsequentIterator.return();
+        },
+        throw(error) {
+            done = true;
+            return subsequentIterator.throw(error);
+        },
+    };
+}
 async function* ensureAsyncIterable(someExecutionResult) {
     if ('initialResult' in someExecutionResult) {
-        yield someExecutionResult.initialResult;
-        yield* someExecutionResult.subsequentResults;
+        yield* flattenIncrementalResults(someExecutionResult);
     }
     else {
         yield someExecutionResult;

package/esm/execution/normalizedExecutor.js

@@ -1,7 +1,5 @@
-import { isAsyncIterable } from '@graphql-tools/utils';
 import { getOperationAST } from 'graphql';
-import { execute, subscribe } from './execute.js';
-import { Repeater } from '@repeaterjs/repeater';
+import { execute, flattenIncrementalResults, subscribe } from './execute.js';
 import { ValueOrPromise } from 'value-or-promise';
 export function normalizedExecutor(args) {
     const operationAST = getOperationAST(args.document, args.operationName);
@@ -9,56 +7,12 @@ export function normalizedExecutor(args) {
         throw new Error('Must provide an operation.');
     }
     if (operationAST.operation === 'subscription') {
-        return new ValueOrPromise(() => subscribe(args))
-            .then((result) => {
-            if (isAsyncIterable(result)) {
-                return new Repeater(async (push, stop) => {
-                    let stopped = false;
-                    stop.then(() => {
-                        stopped = true;
-                    });
-                    let err;
-                    try {
-                        for await (const value of result) {
-                            if (stopped) {
-                                break;
-                            }
-                            await push(value);
-                        }
-                    }
-                    catch (e) {
-                        err = e;
-                    }
-                    stop(err);
-                });
-            }
-            return result;
-        })
-            .resolve();
+        return subscribe(args);
     }
     return new ValueOrPromise(() => execute(args))
         .then((result) => {
         if ('initialResult' in result) {
-            return new Repeater(async (push, stop) => {
-                let stopped = false;
-                stop.then(() => {
-                    stopped = true;
-                });
-                let err;
-                try {
-                    await push(result.initialResult);
-                    for await (const value of result.subsequentResults) {
-                        if (stopped) {
-                            break;
-                        }
-                        await push(value);
-                    }
-                }
-                catch (e) {
-                    err = e;
-                }
-                stop(err);
-            });
+            return flattenIncrementalResults(result);
         }
         return result;
     })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphql-tools/executor",
-  "version": "0.0.7",
+  "version": "0.0.8-alpha-20221111130709-2fa1f285",
   "sideEffects": false,
   "peerDependencies": {
     "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0"

package/typings/execution/execute.d.cts

@@ -202,6 +202,7 @@ export declare const defaultFieldResolver: GraphQLFieldResolver<unknown, unknown
  * Accepts an object with named arguments.
  */
 export declare function subscribe<TData = any, TVariables = any, TContext = any>(args: ExecutionArgs<TData, TVariables, TContext>): MaybePromise<AsyncGenerator<SingularExecutionResult<TData> | InitialIncrementalExecutionResult<TData> | SubsequentIncrementalExecutionResult<TData>, void, void> | SingularExecutionResult<TData>>;
+export declare function flattenIncrementalResults<TData>(incrementalResults: IncrementalExecutionResults<TData>): AsyncGenerator<SubsequentIncrementalExecutionResult<TData, Record<string, unknown>>, void, void>;
 /**
  * Implements the "CreateSourceEventStream" algorithm described in the
  * GraphQL specification, resolving the subscription source event stream.

package/typings/execution/execute.d.ts

@@ -202,6 +202,7 @@ export declare const defaultFieldResolver: GraphQLFieldResolver<unknown, unknown
  * Accepts an object with named arguments.
  */
 export declare function subscribe<TData = any, TVariables = any, TContext = any>(args: ExecutionArgs<TData, TVariables, TContext>): MaybePromise<AsyncGenerator<SingularExecutionResult<TData> | InitialIncrementalExecutionResult<TData> | SubsequentIncrementalExecutionResult<TData>, void, void> | SingularExecutionResult<TData>>;
+export declare function flattenIncrementalResults<TData>(incrementalResults: IncrementalExecutionResults<TData>): AsyncGenerator<SubsequentIncrementalExecutionResult<TData, Record<string, unknown>>, void, void>;
 /**
  * Implements the "CreateSourceEventStream" algorithm described in the
  * GraphQL specification, resolving the subscription source event stream.