@graphql-tools/executor-http 1.2.8 → 1.2.9-alpha-3b2000e3a6b9e871ed2700b7795f23d2a15358ce

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @graphql-tools/executor-http
 
+## 1.2.9-alpha-3b2000e3a6b9e871ed2700b7795f23d2a15358ce
+
+### Patch Changes
+
+- [#726](https://github.com/graphql-hive/gateway/pull/726) [`3b2000e`](https://github.com/graphql-hive/gateway/commit/3b2000e3a6b9e871ed2700b7795f23d2a15358ce) Thanks [@ardatan](https://github.com/ardatan)! - dependencies updates:
+
+  - Added dependency [`@whatwg-node/promise-helpers@^1.0.0` ↗︎](https://www.npmjs.com/package/@whatwg-node/promise-helpers/v/1.0.0) (to `dependencies`)
+
 ## 1.2.8
 
 ### Patch Changes

package/dist/index.cjs

@@ -4,6 +4,7 @@ var executorCommon = require('@graphql-tools/executor-common');
 var utils = require('@graphql-tools/utils');
 var disposablestack = require('@whatwg-node/disposablestack');
 var fetch = require('@whatwg-node/fetch');
+var promiseHelpers = require('@whatwg-node/promise-helpers');
 var valueOrPromise = require('value-or-promise');
 var extractFiles = require('extract-files');
 var repeater = require('@repeaterjs/repeater');
@@ -19,15 +20,18 @@ function collectAsyncIterableValues(asyncIterable) {
   const values = [];
   const iterator = asyncIterable[Symbol.asyncIterator]();
   function iterate() {
-    return utils.mapMaybePromise(iterator.next(), ({ value, done }) => {
-      if (value != null) {
-        values.push(value);
-      }
-      if (done) {
-        return values;
+    return promiseHelpers.handleMaybePromise(
+      () => iterator.next(),
+      ({ value, done }) => {
+        if (value != null) {
+          values.push(value);
+        }
+        if (done) {
+          return values;
+        }
+        return iterate();
       }
-      return iterate();
-    });
+    );
   }
   return iterate();
 }
@@ -67,15 +71,15 @@ function createFormDataFromVariables(body, {
   function handleUpload(upload, i) {
     const indexStr = i.toString();
     if (upload != null) {
-      return utils.mapMaybePromise(
-        upload?.promise || upload,
+      return promiseHelpers.handleMaybePromise(
+        () => upload?.promise || upload,
         (upload2) => {
           const filename = upload2.filename || upload2.name || upload2.path || `blob-${indexStr}`;
           if (isBlob(upload2)) {
             form.append(indexStr, upload2, filename);
           } else if (utils.isAsyncIterable(upload2)) {
-            return utils.mapMaybePromise(
-              collectAsyncIterableValues(upload2),
+            return promiseHelpers.handleMaybePromise(
+              () => collectAsyncIterableValues(upload2),
               (chunks) => {
                 const blobPart = new Uint8Array(chunks);
                 form.append(
@@ -86,8 +90,8 @@ function createFormDataFromVariables(body, {
               }
             );
           } else if (isGraphQLUpload(upload2)) {
-            return utils.mapMaybePromise(
-              collectAsyncIterableValues(upload2.createReadStream()),
+            return promiseHelpers.handleMaybePromise(
+              () => collectAsyncIterableValues(upload2.createReadStream()),
               (chunks) => {
                 const blobPart = new Uint8Array(chunks);
                 form.append(
@@ -108,7 +112,7 @@ function createFormDataFromVariables(body, {
   for (const i in uploads) {
     const upload = uploads[i];
     const job = handleUpload(upload, Number(i));
-    if (utils.isPromise(job)) {
+    if (promiseHelpers.isPromise(job)) {
       jobs.push(job);
     }
   }
@@ -151,8 +155,8 @@ function createResultForAbort(reason, extensions) {
 function hashSHA256(str) {
   const textEncoder = new fetch.TextEncoder();
   const utf8 = textEncoder.encode(str);
-  return utils.mapMaybePromise(
-    fetch.crypto.subtle.digest("SHA-256", utf8),
+  return promiseHelpers.handleMaybePromise(
+    () => fetch.crypto.subtle.digest("SHA-256", utf8),
     (hashBuffer) => {
       let hashHex = "";
       for (const bytes of new Uint8Array(hashBuffer)) {
@@ -356,25 +360,28 @@ function buildHTTPExecutor(options) {
     };
     if (options?.apq) {
       serializeFn = function serializeWithAPQ() {
-        return utils.mapMaybePromise(hashSHA256(query), (sha256Hash) => {
-          const extensions = request.extensions || {};
-          extensions["persistedQuery"] = {
-            version: 1,
-            sha256Hash
-          };
-          return executorCommon.serializeExecutionRequest({
-            executionRequest: {
-              ...request,
-              extensions
-            },
-            excludeQuery,
-            printFn
-          });
-        });
+        return promiseHelpers.handleMaybePromise(
+          () => hashSHA256(query),
+          (sha256Hash) => {
+            const extensions = request.extensions || {};
+            extensions["persistedQuery"] = {
+              version: 1,
+              sha256Hash
+            };
+            return executorCommon.serializeExecutionRequest({
+              executionRequest: {
+                ...request,
+                extensions
+              },
+              excludeQuery,
+              printFn
+            });
+          }
+        );
       };
     }
-    return utils.mapMaybePromise(
-      serializeFn(),
+    return promiseHelpers.handleMaybePromise(
+      () => serializeFn(),
       (body) => new valueOrPromise.ValueOrPromise(() => {
         switch (method) {
           case "GET": {
@@ -400,8 +407,8 @@ function buildHTTPExecutor(options) {
           }
           case "POST": {
             upstreamErrorExtensions.request.body = body;
-            return utils.mapMaybePromise(
-              createFormDataFromVariables(body, {
+            return promiseHelpers.handleMaybePromise(
+              () => createFormDataFromVariables(body, {
                 File: options?.File,
                 FormData: options?.FormData
               }),
@@ -536,8 +543,8 @@ function buildHTTPExecutor(options) {
   let executor = baseExecutor;
   if (options?.apq != null) {
     executor = function apqExecutor(request) {
-      return utils.mapMaybePromise(
-        baseExecutor(request, true),
+      return promiseHelpers.handleMaybePromise(
+        () => baseExecutor(request, true),
         (res) => {
           if (res.errors?.some(
             (error) => error.extensions["code"] === "PERSISTED_QUERY_NOT_FOUND" || error.message === "PersistedQueryNotFound"
@@ -567,13 +574,16 @@ function buildHTTPExecutor(options) {
             errors: [utils.createGraphQLError("No response returned from fetch")]
           };
         }
-        return utils.mapMaybePromise(prevExecutor(request), (res) => {
-          result = res;
-          if (result?.errors?.length) {
-            return retryAttempt();
+        return promiseHelpers.handleMaybePromise(
+          () => prevExecutor(request),
+          (res) => {
+            result = res;
+            if (result?.errors?.length) {
+              return retryAttempt();
+            }
+            return result;
           }
-          return result;
-        });
+        );
       }
       return retryAttempt();
     };

package/dist/index.js

@@ -1,7 +1,8 @@
 import { defaultPrintFn, serializeExecutionRequest } from '@graphql-tools/executor-common';
-import { isAsyncIterable, isPromise, mapMaybePromise, createGraphQLError, inspect, mapAsyncIterator, mergeIncrementalResult, memoize1, getOperationASTFromRequest } from '@graphql-tools/utils';
+import { isAsyncIterable, createGraphQLError, inspect, mapAsyncIterator, mergeIncrementalResult, memoize1, getOperationASTFromRequest } from '@graphql-tools/utils';
 import { DisposableSymbols } from '@whatwg-node/disposablestack';
 import { FormData, File, TextEncoder, crypto, TextDecoder, fetch } from '@whatwg-node/fetch';
+import { isPromise, handleMaybePromise } from '@whatwg-node/promise-helpers';
 import { ValueOrPromise } from 'value-or-promise';
 import { extractFiles, isExtractableFile } from 'extract-files';
 import { Repeater } from '@repeaterjs/repeater';
@@ -17,15 +18,18 @@ function collectAsyncIterableValues(asyncIterable) {
   const values = [];
   const iterator = asyncIterable[Symbol.asyncIterator]();
   function iterate() {
-    return mapMaybePromise(iterator.next(), ({ value, done }) => {
-      if (value != null) {
-        values.push(value);
-      }
-      if (done) {
-        return values;
+    return handleMaybePromise(
+      () => iterator.next(),
+      ({ value, done }) => {
+        if (value != null) {
+          values.push(value);
+        }
+        if (done) {
+          return values;
+        }
+        return iterate();
       }
-      return iterate();
-    });
+    );
   }
   return iterate();
 }
@@ -65,15 +69,15 @@ function createFormDataFromVariables(body, {
   function handleUpload(upload, i) {
     const indexStr = i.toString();
     if (upload != null) {
-      return mapMaybePromise(
-        upload?.promise || upload,
+      return handleMaybePromise(
+        () => upload?.promise || upload,
         (upload2) => {
           const filename = upload2.filename || upload2.name || upload2.path || `blob-${indexStr}`;
           if (isBlob(upload2)) {
             form.append(indexStr, upload2, filename);
           } else if (isAsyncIterable(upload2)) {
-            return mapMaybePromise(
-              collectAsyncIterableValues(upload2),
+            return handleMaybePromise(
+              () => collectAsyncIterableValues(upload2),
               (chunks) => {
                 const blobPart = new Uint8Array(chunks);
                 form.append(
@@ -84,8 +88,8 @@ function createFormDataFromVariables(body, {
               }
             );
           } else if (isGraphQLUpload(upload2)) {
-            return mapMaybePromise(
-              collectAsyncIterableValues(upload2.createReadStream()),
+            return handleMaybePromise(
+              () => collectAsyncIterableValues(upload2.createReadStream()),
               (chunks) => {
                 const blobPart = new Uint8Array(chunks);
                 form.append(
@@ -149,8 +153,8 @@ function createResultForAbort(reason, extensions) {
 function hashSHA256(str) {
   const textEncoder = new TextEncoder();
   const utf8 = textEncoder.encode(str);
-  return mapMaybePromise(
-    crypto.subtle.digest("SHA-256", utf8),
+  return handleMaybePromise(
+    () => crypto.subtle.digest("SHA-256", utf8),
     (hashBuffer) => {
       let hashHex = "";
       for (const bytes of new Uint8Array(hashBuffer)) {
@@ -354,25 +358,28 @@ function buildHTTPExecutor(options) {
     };
     if (options?.apq) {
       serializeFn = function serializeWithAPQ() {
-        return mapMaybePromise(hashSHA256(query), (sha256Hash) => {
-          const extensions = request.extensions || {};
-          extensions["persistedQuery"] = {
-            version: 1,
-            sha256Hash
-          };
-          return serializeExecutionRequest({
-            executionRequest: {
-              ...request,
-              extensions
-            },
-            excludeQuery,
-            printFn
-          });
-        });
+        return handleMaybePromise(
+          () => hashSHA256(query),
+          (sha256Hash) => {
+            const extensions = request.extensions || {};
+            extensions["persistedQuery"] = {
+              version: 1,
+              sha256Hash
+            };
+            return serializeExecutionRequest({
+              executionRequest: {
+                ...request,
+                extensions
+              },
+              excludeQuery,
+              printFn
+            });
+          }
+        );
       };
     }
-    return mapMaybePromise(
-      serializeFn(),
+    return handleMaybePromise(
+      () => serializeFn(),
       (body) => new ValueOrPromise(() => {
         switch (method) {
           case "GET": {
@@ -398,8 +405,8 @@ function buildHTTPExecutor(options) {
           }
           case "POST": {
             upstreamErrorExtensions.request.body = body;
-            return mapMaybePromise(
-              createFormDataFromVariables(body, {
+            return handleMaybePromise(
+              () => createFormDataFromVariables(body, {
                 File: options?.File,
                 FormData: options?.FormData
               }),
@@ -534,8 +541,8 @@ function buildHTTPExecutor(options) {
   let executor = baseExecutor;
   if (options?.apq != null) {
     executor = function apqExecutor(request) {
-      return mapMaybePromise(
-        baseExecutor(request, true),
+      return handleMaybePromise(
+        () => baseExecutor(request, true),
         (res) => {
           if (res.errors?.some(
             (error) => error.extensions["code"] === "PERSISTED_QUERY_NOT_FOUND" || error.message === "PersistedQueryNotFound"
@@ -565,13 +572,16 @@ function buildHTTPExecutor(options) {
             errors: [createGraphQLError("No response returned from fetch")]
           };
         }
-        return mapMaybePromise(prevExecutor(request), (res) => {
-          result = res;
-          if (result?.errors?.length) {
-            return retryAttempt();
+        return handleMaybePromise(
+          () => prevExecutor(request),
+          (res) => {
+            result = res;
+            if (result?.errors?.length) {
+              return retryAttempt();
+            }
+            return result;
           }
-          return result;
-        });
+        );
       }
       return retryAttempt();
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphql-tools/executor-http",
-  "version": "1.2.8",
+  "version": "1.2.9-alpha-3b2000e3a6b9e871ed2700b7795f23d2a15358ce",
   "type": "module",
   "description": "A set of utils for faster development of GraphQL tools",
   "repository": {
@@ -44,6 +44,7 @@
     "@repeaterjs/repeater": "^3.0.4",
     "@whatwg-node/disposablestack": "^0.0.5",
     "@whatwg-node/fetch": "^0.10.4",
+    "@whatwg-node/promise-helpers": "^1.0.0",
     "extract-files": "^11.0.0",
     "meros": "^1.2.1",
     "tslib": "^2.8.1",