@graphql-tools/executor-http 1.2.0-alpha-66d4b92ec6c93cfa4098b6caf98cffd89e210038 → 1.2.0

package/CHANGELOG.md

@@ -1,10 +1,10 @@
 # @graphql-tools/executor-http
 
-## 1.2.0-alpha-66d4b92ec6c93cfa4098b6caf98cffd89e210038
+## 1.2.0
 
 ### Minor Changes
 
-- [#313](https://github.com/graphql-hive/gateway/pull/313) [`e994596`](https://github.com/graphql-hive/gateway/commit/e9945962de597d7547bbca174bdcc63f2c98260d) Thanks [@ardatan](https://github.com/ardatan)! - Automatic Persisted Queries support for upstream requests
+- [#313](https://github.com/graphql-hive/gateway/pull/313) [`367b359`](https://github.com/graphql-hive/gateway/commit/367b3593cb7fd51c42ef4a13ab4adac202845734) Thanks [@ardatan](https://github.com/ardatan)! - Automatic Persisted Queries support for upstream requests
 
   For HTTP Executor;
 

package/dist/index.cjs

@@ -14,64 +14,6 @@ function isGraphQLUpload(upload) {
   return typeof upload.createReadStream === "function";
 }
 
-function createAbortErrorReason() {
-  return new Error("Executor was disposed.");
-}
-function createGraphQLErrorForAbort(reason, extensions) {
-  return utils.createGraphQLError("The operation was aborted. reason: " + reason, {
-    extensions
-  });
-}
-function createResultForAbort(reason, extensions) {
-  return {
-    errors: [createGraphQLErrorForAbort(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),
-    (hashBuffer) => {
-      let hashHex = "";
-      for (const bytes of new Uint8Array(hashBuffer)) {
-        hashHex += bytes.toString(16).padStart(2, "0");
-      }
-      return hashHex;
-    }
-  );
-}
-function jsonStringifyBody(body) {
-  let str = "{";
-  let prev = false;
-  if (body.query) {
-    str += `"query":"${body.query.replaceAll('"', '\\"')}"`;
-    prev = true;
-  }
-  if (body.variables) {
-    if (prev) {
-      str += ",";
-    }
-    str += `"variables":${JSON.stringify(body.variables)}`;
-    prev = true;
-  }
-  if (body.operationName) {
-    if (prev) {
-      str += ",";
-    }
-    str += `"operationName":"${body.operationName}"`;
-    prev = true;
-  }
-  if (body.extensions) {
-    if (prev) {
-      str += ",";
-    }
-    str += `"extensions":${JSON.stringify(body.extensions)}`;
-  }
-  str += "}";
-  return str;
-}
-
 function collectAsyncIterableValues(asyncIterable) {
   const values = [];
   const iterator = asyncIterable[Symbol.asyncIterator]();
@@ -93,15 +35,16 @@ function createFormDataFromVariables(body, {
   FormData: FormDataCtor = fetch.FormData
 }) {
   if (!body.variables) {
-    return jsonStringifyBody(body);
+    return JSON.stringify(body);
   }
+  const vars = Object.assign({}, body.variables);
   const { clone, files } = extractFiles.extractFiles(
-    body.variables,
+    vars,
     "variables",
     (v) => extractFiles.isExtractableFile(v) || v?.promise || utils.isAsyncIterable(v) || v?.then || typeof v?.arrayBuffer === "function"
   );
   if (files.size === 0) {
-    return jsonStringifyBody(body);
+    return JSON.stringify(body);
   }
   const map = {};
   const uploads = [];
@@ -114,7 +57,7 @@ function createFormDataFromVariables(body, {
   const form = new FormDataCtor();
   form.append(
     "operations",
-    jsonStringifyBody({
+    JSON.stringify({
       ...body,
       variables: clone
     })
@@ -181,6 +124,34 @@ const defaultPrintFn = utils.memoize1(function defaultPrintFn2(document) {
   return graphql.stripIgnoredCharacters(graphql.print(document));
 });
 
+function createAbortErrorReason() {
+  return new Error("Executor was disposed.");
+}
+function createGraphQLErrorForAbort(reason, extensions) {
+  return utils.createGraphQLError("The operation was aborted. reason: " + reason, {
+    extensions
+  });
+}
+function createResultForAbort(reason, extensions) {
+  return {
+    errors: [createGraphQLErrorForAbort(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),
+    (hashBuffer) => {
+      let hashHex = "";
+      for (const bytes of new Uint8Array(hashBuffer)) {
+        hashHex += bytes.toString(16).padStart(2, "0");
+      }
+      return hashHex;
+    }
+  );
+}
+
 const DELIM = "\n\n";
 function isReadableStream(value) {
   return value && typeof value.getReader === "function";

package/dist/index.d.cts

@@ -80,6 +80,12 @@ interface HTTPExecutorOptions {
      */
     disposable?: boolean;
 }
+type SerializedRequest = {
+    query?: string;
+    variables?: Record<string, any>;
+    operationName?: string;
+    extensions?: any;
+};
 type HeadersConfig = Record<string, string>;
 declare function buildHTTPExecutor(options?: Omit<HTTPExecutorOptions, 'fetch'> & {
     fetch: SyncFetchFn;
@@ -92,4 +98,4 @@ declare function buildHTTPExecutor(options?: Omit<HTTPExecutorOptions, 'fetch'>
 }): DisposableAsyncExecutor<any, HTTPExecutorOptions>;
 declare function buildHTTPExecutor(options?: Omit<HTTPExecutorOptions, 'fetch'>): DisposableAsyncExecutor<any, HTTPExecutorOptions>;
 
-export { type AsyncFetchFn, type AsyncImportFn, type FetchFn, type HTTPExecutorOptions, type HeadersConfig, type RegularFetchFn, type SyncFetchFn, type SyncImportFn, type SyncResponse, buildHTTPExecutor, isLiveQueryOperationDefinitionNode };
+export { type AsyncFetchFn, type AsyncImportFn, type FetchFn, type HTTPExecutorOptions, type HeadersConfig, type RegularFetchFn, type SerializedRequest, type SyncFetchFn, type SyncImportFn, type SyncResponse, buildHTTPExecutor, isLiveQueryOperationDefinitionNode };

package/dist/index.d.ts

@@ -80,6 +80,12 @@ interface HTTPExecutorOptions {
      */
     disposable?: boolean;
 }
+type SerializedRequest = {
+    query?: string;
+    variables?: Record<string, any>;
+    operationName?: string;
+    extensions?: any;
+};
 type HeadersConfig = Record<string, string>;
 declare function buildHTTPExecutor(options?: Omit<HTTPExecutorOptions, 'fetch'> & {
     fetch: SyncFetchFn;
@@ -92,4 +98,4 @@ declare function buildHTTPExecutor(options?: Omit<HTTPExecutorOptions, 'fetch'>
 }): DisposableAsyncExecutor<any, HTTPExecutorOptions>;
 declare function buildHTTPExecutor(options?: Omit<HTTPExecutorOptions, 'fetch'>): DisposableAsyncExecutor<any, HTTPExecutorOptions>;
 
-export { type AsyncFetchFn, type AsyncImportFn, type FetchFn, type HTTPExecutorOptions, type HeadersConfig, type RegularFetchFn, type SyncFetchFn, type SyncImportFn, type SyncResponse, buildHTTPExecutor, isLiveQueryOperationDefinitionNode };
+export { type AsyncFetchFn, type AsyncImportFn, type FetchFn, type HTTPExecutorOptions, type HeadersConfig, type RegularFetchFn, type SerializedRequest, type SyncFetchFn, type SyncImportFn, type SyncResponse, buildHTTPExecutor, isLiveQueryOperationDefinitionNode };

package/dist/index.js

@@ -1,6 +1,6 @@
-import { createGraphQLError, mapMaybePromise, isAsyncIterable, isPromise, memoize1, inspect, mapAsyncIterator, mergeIncrementalResult, getOperationASTFromRequest } from '@graphql-tools/utils';
+import { isAsyncIterable, isPromise, mapMaybePromise, memoize1, createGraphQLError, inspect, mapAsyncIterator, mergeIncrementalResult, getOperationASTFromRequest } from '@graphql-tools/utils';
 import { DisposableSymbols } from '@whatwg-node/disposablestack';
-import { TextEncoder, crypto, File, FormData, TextDecoder, fetch } from '@whatwg-node/fetch';
+import { File, FormData, TextEncoder, crypto, TextDecoder, fetch } from '@whatwg-node/fetch';
 import { ValueOrPromise } from 'value-or-promise';
 import { extractFiles, isExtractableFile } from 'extract-files';
 import { stripIgnoredCharacters, print } from 'graphql';
@@ -12,64 +12,6 @@ function isGraphQLUpload(upload) {
   return typeof upload.createReadStream === "function";
 }
 
-function createAbortErrorReason() {
-  return new Error("Executor was disposed.");
-}
-function createGraphQLErrorForAbort(reason, extensions) {
-  return createGraphQLError("The operation was aborted. reason: " + reason, {
-    extensions
-  });
-}
-function createResultForAbort(reason, extensions) {
-  return {
-    errors: [createGraphQLErrorForAbort(reason, extensions)]
-  };
-}
-function hashSHA256(str) {
-  const textEncoder = new TextEncoder();
-  const utf8 = textEncoder.encode(str);
-  return mapMaybePromise(
-    crypto.subtle.digest("SHA-256", utf8),
-    (hashBuffer) => {
-      let hashHex = "";
-      for (const bytes of new Uint8Array(hashBuffer)) {
-        hashHex += bytes.toString(16).padStart(2, "0");
-      }
-      return hashHex;
-    }
-  );
-}
-function jsonStringifyBody(body) {
-  let str = "{";
-  let prev = false;
-  if (body.query) {
-    str += `"query":"${body.query.replaceAll('"', '\\"')}"`;
-    prev = true;
-  }
-  if (body.variables) {
-    if (prev) {
-      str += ",";
-    }
-    str += `"variables":${JSON.stringify(body.variables)}`;
-    prev = true;
-  }
-  if (body.operationName) {
-    if (prev) {
-      str += ",";
-    }
-    str += `"operationName":"${body.operationName}"`;
-    prev = true;
-  }
-  if (body.extensions) {
-    if (prev) {
-      str += ",";
-    }
-    str += `"extensions":${JSON.stringify(body.extensions)}`;
-  }
-  str += "}";
-  return str;
-}
-
 function collectAsyncIterableValues(asyncIterable) {
   const values = [];
   const iterator = asyncIterable[Symbol.asyncIterator]();
@@ -91,15 +33,16 @@ function createFormDataFromVariables(body, {
   FormData: FormDataCtor = FormData
 }) {
   if (!body.variables) {
-    return jsonStringifyBody(body);
+    return JSON.stringify(body);
   }
+  const vars = Object.assign({}, body.variables);
   const { clone, files } = extractFiles(
-    body.variables,
+    vars,
     "variables",
     (v) => isExtractableFile(v) || v?.promise || isAsyncIterable(v) || v?.then || typeof v?.arrayBuffer === "function"
   );
   if (files.size === 0) {
-    return jsonStringifyBody(body);
+    return JSON.stringify(body);
   }
   const map = {};
   const uploads = [];
@@ -112,7 +55,7 @@ function createFormDataFromVariables(body, {
   const form = new FormDataCtor();
   form.append(
     "operations",
-    jsonStringifyBody({
+    JSON.stringify({
       ...body,
       variables: clone
     })
@@ -179,6 +122,34 @@ const defaultPrintFn = memoize1(function defaultPrintFn2(document) {
   return stripIgnoredCharacters(print(document));
 });
 
+function createAbortErrorReason() {
+  return new Error("Executor was disposed.");
+}
+function createGraphQLErrorForAbort(reason, extensions) {
+  return createGraphQLError("The operation was aborted. reason: " + reason, {
+    extensions
+  });
+}
+function createResultForAbort(reason, extensions) {
+  return {
+    errors: [createGraphQLErrorForAbort(reason, extensions)]
+  };
+}
+function hashSHA256(str) {
+  const textEncoder = new TextEncoder();
+  const utf8 = textEncoder.encode(str);
+  return mapMaybePromise(
+    crypto.subtle.digest("SHA-256", utf8),
+    (hashBuffer) => {
+      let hashHex = "";
+      for (const bytes of new Uint8Array(hashBuffer)) {
+        hashHex += bytes.toString(16).padStart(2, "0");
+      }
+      return hashHex;
+    }
+  );
+}
+
 const DELIM = "\n\n";
 function isReadableStream(value) {
   return value && typeof value.getReader === "function";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphql-tools/executor-http",
-  "version": "1.2.0-alpha-66d4b92ec6c93cfa4098b6caf98cffd89e210038",
+  "version": "1.2.0",
   "type": "module",
   "description": "A set of utils for faster development of GraphQL tools",
   "repository": {