ardatan · Nov 23, 2023 · Nov 23, 2023 · Nov 23, 2023 · Nov 24, 2023 · Nov 24, 2023
diff --git a/benchmark/federation/CHANGELOG.md b/benchmark/federation/CHANGELOG.md
@@ -1,5 +1,13 @@
 # federation-benchmark
 
+## 0.0.109
+
+### Patch Changes
+
+- Updated dependencies
+  [[`efedc590`](https://github.com/ardatan/graphql-tools/commit/efedc59018ea1d63f86973d0c6608b3c7ddc2e71)]:
+  - @graphql-tools/federation@1.1.12
+
 ## 0.0.108
 
 ### Patch Changes

diff --git a/benchmark/federation/package.json b/benchmark/federation/package.json
@@ -1,6 +1,6 @@
 {
   "name": "federation-benchmark",
-  "version": "0.0.108",
+  "version": "0.0.109",
   "private": true,
   "scripts": {
     "loadtest:federation": "k6 -e ENDPOINT=federation run k6.js",
@@ -9,9 +9,9 @@
     "start": "cross-env NODE_ENV=production node index.js"
   },
   "dependencies": {
-    "@apollo/gateway": "2.5.7",
-    "@apollo/subgraph": "2.5.7",
-    "@graphql-tools/federation": "1.1.11",
+    "@apollo/gateway": "2.6.2",
+    "@apollo/subgraph": "2.6.2",
+    "@graphql-tools/federation": "1.1.12",
     "@graphql-tools/stitch": "9.0.3",
     "cross-env": "7.0.3",
     "express": "4.18.2",

diff --git a/package.json b/package.json
@@ -43,44 +43,44 @@
     "ts:check": "tsc --noEmit"
   },
   "devDependencies": {
-    "@babel/core": "7.23.3",
+    "@babel/core": "7.23.6",
     "@babel/plugin-proposal-class-properties": "7.18.6",
-    "@babel/preset-env": "7.23.3",
+    "@babel/preset-env": "7.23.6",
     "@babel/preset-typescript": "7.23.3",
-    "@changesets/changelog-github": "0.4.8",
-    "@changesets/cli": "2.26.2",
-    "@theguild/prettier-config": "2.0.2",
+    "@changesets/changelog-github": "0.5.0",
+    "@changesets/cli": "2.27.1",
+    "@theguild/prettier-config": "2.0.3",
     "@types/debug": "4.1.12",
-    "@types/jest": "29.5.10",
-    "@types/node": "20.9.4",
-    "@typescript-eslint/eslint-plugin": "6.12.0",
-    "@typescript-eslint/parser": "6.12.0",
+    "@types/jest": "29.5.11",
+    "@types/node": "20.10.5",
+    "@typescript-eslint/eslint-plugin": "6.15.0",
+    "@typescript-eslint/parser": "6.15.0",
     "babel-jest": "29.7.0",
     "bob-the-bundler": "7.0.1",
     "chalk": "4.1.2",
     "concurrently": "8.2.2",
-    "eslint": "8.54.0",
-    "eslint-config-prettier": "9.0.0",
+    "eslint": "8.56.0",
+    "eslint-config-prettier": "9.1.0",
     "eslint-config-standard": "17.1.0",
-    "eslint-plugin-import": "2.29.0",
-    "eslint-plugin-n": "16.3.1",
+    "eslint-plugin-import": "2.29.1",
+    "eslint-plugin-n": "16.5.0",
     "eslint-plugin-promise": "6.1.1",
     "eslint-plugin-standard": "5.0.0",
     "globby": "11.1.0",
     "graphql": "16.8.1",
     "graphql-subscriptions": "2.0.0",
     "husky": "8.0.3",
     "jest": "29.7.0",
-    "lint-staged": "15.1.0",
+    "lint-staged": "15.2.0",
     "patch-package": "8.0.0",
-    "prettier": "3.1.0",
-    "prettier-plugin-tailwindcss": "0.5.7",
+    "prettier": "3.1.1",
+    "prettier-plugin-tailwindcss": "0.5.9",
     "ts-jest": "29.1.1",
-    "ts-node": "10.9.1",
-    "typedoc": "0.25.3",
+    "ts-node": "10.9.2",
+    "typedoc": "0.25.4",
     "typedoc-plugin-markdown": "3.16.0",
     "typedoc-plugin-rename-defaults": "0.7.0",
-    "typescript": "5.3.2",
+    "typescript": "5.3.3",
     "weak-napi": "2.0.2"
   },
   "resolutions": {

diff --git a/packages/executors/apollo-link/package.json b/packages/executors/apollo-link/package.json
@@ -56,7 +56,7 @@
     "tslib": "^2.3.1"
   },
   "devDependencies": {
-    "@apollo/client": "3.8.7"
+    "@apollo/client": "3.8.8"
   },
   "publishConfig": {
     "directory": "dist",

diff --git a/packages/executors/http/CHANGELOG.md b/packages/executors/http/CHANGELOG.md
@@ -1,5 +1,21 @@
 # @graphql-tools/executor-http
 
+## 1.0.5
+
+### Patch Changes
+
+- [`a4463d3`](https://github.com/ardatan/graphql-tools/commit/a4463d3607f33b176828bc48b6895adf3120aeec)
+  Thanks [@ardatan](https://github.com/ardatan)! - Remove headers from extensions in the GraphQL
+  request
+
+## 1.0.4
+
+### Patch Changes
+
+- [#5724](https://github.com/ardatan/graphql-tools/pull/5724)
+  [`cfbd2e07`](https://github.com/ardatan/graphql-tools/commit/cfbd2e07aff0c773a2e2766ea5fd34b628e72f1f)
+  Thanks [@enisdenjo](https://github.com/enisdenjo)! - Handle chunked and no-space messages in SSE
+
 ## 1.0.3
 
 ### Patch Changes

diff --git a/packages/executors/http/package.json b/packages/executors/http/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@graphql-tools/executor-http",
-  "version": "1.0.3",
+  "version": "1.0.5",
   "type": "module",
   "description": "A set of utils for faster development of GraphQL tools",
   "repository": {

diff --git a/packages/executors/http/src/handleAsyncIterable.ts b/packages/executors/http/src/handleAsyncIterable.ts
@@ -1,22 +1,34 @@
 /* eslint-disable no-labels */
 import { TextDecoder } from '@whatwg-node/fetch';
 
+const DELIM = '\n\n';
+
 export async function* handleAsyncIterable(asyncIterable: AsyncIterable<Uint8Array | string>) {
   const textDecoder = new TextDecoder();
+  let currChunk = '';
   outer: for await (const chunk of asyncIterable) {
-    const chunkStr =
-      typeof chunk === 'string' ? chunk : textDecoder.decode(chunk, { stream: true });
-    for (const part of chunkStr.split('\n\n')) {
-      if (part) {
-        const eventStr = part.split('event: ')[1];
-        const dataStr = part.split('data: ')[1];
-        if (eventStr === 'complete') {
-          break outer;
-        }
-        if (dataStr) {
-          const data = JSON.parse(dataStr);
-          yield data.payload || data;
-        }
+    currChunk += typeof chunk === 'string' ? chunk : textDecoder.decode(chunk);
+    for (;;) {
+      const delimIndex = currChunk.indexOf(DELIM);
+      if (delimIndex === -1) {
+        // incomplete message, wait for more chunks
+        continue outer;
+      }
+
+      const msg = currChunk.slice(0, delimIndex); // whole message
+      currChunk = currChunk.slice(delimIndex + DELIM.length); // remainder
+
+      // data
+      const dataStr = msg.split('data:')[1]?.trim();
+      if (dataStr) {
+        const data = JSON.parse(dataStr);
+        yield data.payload || data;
+      }
+
+      // event
+      const event = msg.split('event:')[1]?.trim();
+      if (event === 'complete') {
+        break outer;
       }
     }
   }

diff --git a/packages/executors/http/src/index.ts b/packages/executors/http/src/index.ts
@@ -126,13 +126,20 @@ export function buildHTTPExecutor(
     }
 
     const endpoint = request.extensions?.endpoint || options?.endpoint || '/graphql';
-    const headers = Object.assign(
-      {
-        accept,
-      },
-      (typeof options?.headers === 'function' ? options.headers(request) : options?.headers) || {},
-      request.extensions?.headers || {},
-    );
+    const headers = { accept };
+
+    if (options?.headers) {
+      Object.assign(
+        headers,
+        typeof options?.headers === 'function' ? options.headers(request) : options?.headers,
+      );
+    }
+
+    if (request.extensions?.headers) {
+      const { headers: headersFromExtensions, ...restExtensions } = request.extensions;
+      Object.assign(headers, headersFromExtensions);
+      request.extensions = restExtensions;
+    }
 
     const query = print(request.document);
 

diff --git a/packages/executors/http/tests/buildHTTPExecutor.test.ts b/packages/executors/http/tests/buildHTTPExecutor.test.ts
@@ -114,4 +114,34 @@ describe('buildHTTPExecutor', () => {
     });
     expect(method).toBe('POST');
   });
+
+  it('should not encode headers from extensions', async () => {
+    const executor = buildHTTPExecutor({
+      useGETForQueries: true,
+      fetch(url) {
+        expect(url).not.toMatch(/(Authorization|headers)/i);
+        return new Response(JSON.stringify({ data: { hello: 'world!' } }), {
+          headers: { 'Content-Type': 'application/json' },
+        });
+      },
+    });
+    const result = (await executor({
+      document: parse(/* GraphQL */ `
+        query {
+          hello
+        }
+      `),
+      extensions: {
+        headers: {
+          Authorization: 'Token',
+        },
+      },
+    })) as ExecutionResult;
+
+    expect(result.data).toMatchInlineSnapshot(`
+      {
+        "hello": "world!",
+      }
+    `);
+  });
 });
diff --git a/packages/executors/http/tests/handleEventStreamResponse.test.ts b/packages/executors/http/tests/handleEventStreamResponse.test.ts
@@ -42,4 +42,89 @@ describe('handleEventStreamResponse', () => {
       },
     });
   });
+
+  it('should handle an event without spaces', async () => {
+    const readableStream = new ReadableStream<Uint8Array>({
+      start(controller) {
+        controller.enqueue(encoder.encode('event:complete\n'));
+        controller.enqueue(encoder.encode('data:{"foo":"bar"}\n'));
+        controller.enqueue(encoder.encode('\n'));
+      },
+    });
+
+    const response = new Response(readableStream);
+    const asyncIterable = handleEventStreamResponse(response);
+    const iterator = asyncIterable[Symbol.asyncIterator]();
+
+    await expect(iterator.next()).resolves.toMatchInlineSnapshot(`
+{
+  "done": false,
+  "value": {
+    "foo": "bar",
+  },
+}
+`);
+  });
+
+  it('should handle a chunked event with data', async () => {
+    let currChunk = 0;
+    const chunks = [
+      'event: next\n',
+      'data: { "foo":',
+      '"bar" }\n\n',
+      'event: next',
+      '\ndata: { "foo": "baz" }\n',
+      '\nevent: next\ndata: { "foo": "',
+      'bay"',
+      ' }\n',
+      '\n',
+    ];
+
+    const readableStream = new ReadableStream<Uint8Array>({
+      async pull(controller) {
+        const chunk = chunks[currChunk++];
+        if (chunk) {
+          await new Promise(resolve => setTimeout(resolve, 0)); // stream chunk after one tick
+          controller.enqueue(encoder.encode(chunk));
+        } else {
+          controller.close();
+        }
+      },
+    });
+
+    const response = new Response(readableStream);
+    const asyncIterable = handleEventStreamResponse(response);
+    const iterator = asyncIterable[Symbol.asyncIterator]();
+
+    await expect(iterator.next()).resolves.toMatchInlineSnapshot(`
+{
+  "done": false,
+  "value": {
+    "foo": "bar",
+  },
+}
+`);
+    await expect(iterator.next()).resolves.toMatchInlineSnapshot(`
+{
+  "done": false,
+  "value": {
+    "foo": "baz",
+  },
+}
+`);
+    await expect(iterator.next()).resolves.toMatchInlineSnapshot(`
+{
+  "done": false,
+  "value": {
+    "foo": "bay",
+  },
+}
+`);
+    await expect(iterator.next()).resolves.toMatchInlineSnapshot(`
+{
+  "done": true,
+  "value": undefined,
+}
+`);
+  });
 });
diff --git a/packages/executors/legacy-ws/CHANGELOG.md b/packages/executors/legacy-ws/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @graphql-tools/executor-legacy-ws
 
+## 1.0.5
+
+### Patch Changes
+
+- [#5762](https://github.com/ardatan/graphql-tools/pull/5762)
+  [`701cfd3`](https://github.com/ardatan/graphql-tools/commit/701cfd331e60b5d77563be140671d52691aa7348)
+  Thanks [@renovate](https://github.com/apps/renovate)! - dependencies updates:
+  - Updated dependency [`ws@8.15.0` ↗︎](https://www.npmjs.com/package/ws/v/8.15.0) (from `8.14.2`,
+    in `dependencies`)
+
 ## 1.0.4
 
 ### Patch Changes

diff --git a/packages/executors/legacy-ws/package.json b/packages/executors/legacy-ws/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@graphql-tools/executor-legacy-ws",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "type": "module",
   "description": "A set of utils for faster development of GraphQL tools",
   "repository": {
@@ -53,9 +53,9 @@
   "dependencies": {
     "@graphql-tools/utils": "^10.0.0",
     "@types/ws": "^8.0.0",
-    "isomorphic-ws": "5.0.0",
+    "isomorphic-ws": "^5.0.0",
     "tslib": "^2.4.0",
-    "ws": "8.14.2"
+    "ws": "^8.15.0"
   },
   "publishConfig": {
     "directory": "dist",

diff --git a/packages/executors/urql-exchange/package.json b/packages/executors/urql-exchange/package.json
@@ -52,7 +52,7 @@
     "tslib": "^2.4.0"
   },
   "devDependencies": {
-    "@urql/core": "4.2.0",
+    "@urql/core": "4.2.2",
     "wonka": "6.3.4"
   },
   "publishConfig": {

diff --git a/packages/federation/CHANGELOG.md b/packages/federation/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @graphql-tools/federation
 
+## 1.1.12
+
+### Patch Changes
+
+- [`efedc590`](https://github.com/ardatan/graphql-tools/commit/efedc59018ea1d63f86973d0c6608b3c7ddc2e71)
+  Thanks [@ardatan](https://github.com/ardatan)! - Handle unions correctly
+
 ## 1.1.11
 
 ### Patch Changes