@graphql-mesh/apollo-link 0.105.21 → 0.105.22

package/cjs/index.js

@@ -5,6 +5,7 @@ const tslib_1 = require("tslib");
 const graphql_1 = require("graphql");
 const apolloClient = tslib_1.__importStar(require("@apollo/client"));
 const utils_1 = require("@graphql-tools/utils");
+const promise_helpers_1 = require("@whatwg-node/promise-helpers");
 const ROOT_VALUE = {};
 function createMeshApolloRequestHandler(options) {
     return function meshApolloRequestHandler(operation) {
@@ -14,21 +15,21 @@ function createMeshApolloRequestHandler(options) {
         }
         const operationFn = operationAst.operation === 'subscription' ? options.subscribe : options.execute;
         return new apolloClient.Observable(observer => {
-            (0, utils_1.mapMaybePromise)(operationFn(operation.query, operation.variables, operation.getContext(), ROOT_VALUE, operation.operationName), async (results) => {
+            (0, promise_helpers_1.handleMaybePromise)(() => operationFn(operation.query, operation.variables, operation.getContext(), ROOT_VALUE, operation.operationName), results => {
                 if ((0, utils_1.isAsyncIterable)(results)) {
-                    for await (const result of results) {
-                        if (observer.closed) {
-                            return;
+                    return (0, utils_1.fakePromise)().then(async () => {
+                        for await (const result of results) {
+                            if (observer.closed) {
+                                return;
+                            }
+                            observer.next(result);
                         }
-                        observer.next(result);
-                    }
-                    observer.complete();
-                }
-                else {
-                    if (!observer.closed) {
-                        observer.next(results);
                         observer.complete();
-                    }
+                    });
+                }
+                if (!observer.closed) {
+                    observer.next(results);
+                    observer.complete();
                 }
             }, error => {
                 if (!observer.closed) {

package/esm/index.js

@@ -1,6 +1,7 @@
 import { getOperationAST } from 'graphql';
 import * as apolloClient from '@apollo/client';
-import { isAsyncIterable, mapMaybePromise } from '@graphql-tools/utils';
+import { fakePromise, isAsyncIterable } from '@graphql-tools/utils';
+import { handleMaybePromise } from '@whatwg-node/promise-helpers';
 const ROOT_VALUE = {};
 function createMeshApolloRequestHandler(options) {
     return function meshApolloRequestHandler(operation) {
@@ -10,21 +11,21 @@ function createMeshApolloRequestHandler(options) {
         }
         const operationFn = operationAst.operation === 'subscription' ? options.subscribe : options.execute;
         return new apolloClient.Observable(observer => {
-            mapMaybePromise(operationFn(operation.query, operation.variables, operation.getContext(), ROOT_VALUE, operation.operationName), async (results) => {
+            handleMaybePromise(() => operationFn(operation.query, operation.variables, operation.getContext(), ROOT_VALUE, operation.operationName), results => {
                 if (isAsyncIterable(results)) {
-                    for await (const result of results) {
-                        if (observer.closed) {
-                            return;
+                    return fakePromise().then(async () => {
+                        for await (const result of results) {
+                            if (observer.closed) {
+                                return;
+                            }
+                            observer.next(result);
                         }
-                        observer.next(result);
-                    }
-                    observer.complete();
-                }
-                else {
-                    if (!observer.closed) {
-                        observer.next(results);
                         observer.complete();
-                    }
+                    });
+                }
+                if (!observer.closed) {
+                    observer.next(results);
+                    observer.complete();
                 }
             }, error => {
                 if (!observer.closed) {

package/package.json

@@ -1,14 +1,15 @@
 {
   "name": "@graphql-mesh/apollo-link",
-  "version": "0.105.21",
+  "version": "0.105.22",
   "sideEffects": false,
   "peerDependencies": {
     "@apollo/client": "^3.5.9",
     "graphql": "^15.2.0 || ^16.0.0"
   },
   "dependencies": {
-    "@graphql-mesh/runtime": "^0.105.21",
+    "@graphql-mesh/runtime": "^0.105.22",
     "@graphql-tools/utils": "^10.8.0",
+    "@whatwg-node/promise-helpers": "^1.0.0",
     "tslib": "^2.4.0"
   },
   "repository": {