feat(urql-exchange): support urql v4

Author: ardatan

.changeset/grumpy-pans-end.md

@@ -0,0 +1,5 @@
+---
+'@graphql-tools/executor-urql-exchange': patch
+---
+
+Support urql v4

packages/executors/urql-exchange/package.json

@@ -53,12 +53,12 @@
     "tslib": "^2.4.0"
   },
   "devDependencies": {
-    "@urql/core": "3.1.1",
-    "wonka": "6.2.3"
+    "@urql/core": "4.0.2",
+    "wonka": "6.3.1"
   },
   "peerDependencies": {
     "graphql": "^15.2.0 || ^16.0.0",
-    "@urql/core": "^3.0.0",
+    "@urql/core": "^3.0.0 || ^4.0.0",
     "wonka": "^6.0.0"
   },
   "type": "module"

packages/executors/urql-exchange/src/index.ts

@@ -8,7 +8,6 @@ import {
   mergeResultPatch,
   Operation,
   OperationResult,
-  getOperationName,
   OperationContext,
   ExchangeIO,
   AnyVariables,
@@ -21,15 +20,12 @@ export function executorExchange(executor: Executor): Exchange {
   function makeYogaSource<TData extends Record<string, any>>(
     operation: Operation<TData>
   ): Source<OperationResult<TData>> {
-    const operationName = getOperationName(operation.query);
-
     const extraFetchOptions =
       typeof operation.context.fetchOptions === 'function'
         ? operation.context.fetchOptions()
         : operation.context.fetchOptions;
     const executionRequest: ExecutionRequest<any, OperationContext> = {
       document: operation.query,
-      operationName,
       operationType: operation.kind as OperationTypeNode,
       variables: operation.variables,
       context: operation.context,
@@ -44,18 +40,22 @@ export function executorExchange(executor: Executor): Exchange {
     return make<OperationResult<TData>>(observer => {
       let ended = false;
       Promise.resolve(executor(executionRequest))
-        .then(async (result: ExecutionResult | AsyncIterable<ExecutionResult>) => {
+        .then(async result => {
           if (ended || !result) {
             return;
           }
           if (!isAsyncIterable(result)) {
-            observer.next(makeResult(operation, result));
+            observer.next(makeResult(operation, result as ExecutionResult));
           } else {
             let prevResult: OperationResult<TData, AnyVariables> | null = null;
 
             for await (const value of result) {
               if (value) {
-                prevResult = prevResult ? mergeResultPatch(prevResult, value) : makeResult(operation, value);
+                if (prevResult && value.incremental) {
+                  prevResult = mergeResultPatch(prevResult, value as ExecutionResult);
+                } else {
+                  prevResult = makeResult(operation, value as ExecutionResult);
+                }
                 observer.next(prevResult);
               }
               if (ended) {

packages/executors/urql-exchange/tests/browser-urql-exchange.spec.ts

@@ -10,6 +10,7 @@ describe('URQL Yoga Exchange', () => {
     it('skips', () => {});
     return;
   }
+  const aCharCode = 'a'.charCodeAt(0);
   const yoga = createYoga({
     logging: false,
     maskedErrors: false,
@@ -23,7 +24,7 @@ describe('URQL Yoga Exchange', () => {
           readFile(file: File!): String!
         }
         type Subscription {
-          time: String
+          alphabet: String
         }
       `,
       resolvers: {
@@ -34,11 +35,13 @@ describe('URQL Yoga Exchange', () => {
           readFile: (_, args: { file: File }) => args.file.text(),
         },
         Subscription: {
-          time: {
+          alphabet: {
             async *subscribe() {
+              let i = 0;
               while (true) {
-                await new Promise(resolve => setTimeout(resolve, 1000));
-                yield new Date().toISOString();
+                yield String.fromCharCode(aCharCode + i);
+                await new Promise(resolve => setTimeout(resolve, 300));
+                i++;
               }
             },
             resolve: str => str,
@@ -81,8 +84,8 @@ describe('URQL Yoga Exchange', () => {
     const observable = pipe(
       client.subscription(
         /* GraphQL */ `
-          subscription Time {
-            time
+          subscription Alphabet {
+            alphabet
           }
         `,
         {}
@@ -95,27 +98,24 @@ describe('URQL Yoga Exchange', () => {
     await new Promise<void>((resolve, reject) => {
       const subscription = observable.subscribe({
         next: (result: ExecutionResult) => {
-          collectedValues.push(result.data?.time as string);
+          collectedValues.push(result.data?.alphabet as string);
           i++;
           if (i > 2) {
             subscription.unsubscribe();
             resolve();
           }
         },
         complete: () => {
+          console.log('bitti');
           resolve();
         },
         error: (error: Error) => {
           reject(error);
         },
       });
     });
-    expect(collectedValues.length).toBe(3);
+    expect(collectedValues).toEqual(['a', 'b', 'c']);
     expect(i).toBe(3);
-    const now = new Date();
-    for (const value of collectedValues) {
-      expect(new Date(value).getFullYear()).toBe(now.getFullYear());
-    }
   });
   it('should handle file uploads correctly', async () => {
     const query = /* GraphQL */ `

yarn.lock

@@ -2,6 +2,11 @@
 # yarn lockfile v1
 
 
+"@0no-co/graphql.web@^1.0.0":
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/@0no-co/graphql.web/-/graphql.web-1.0.0.tgz#af3f5e3b9359d2f011bc37a93654348b92d4d893"
+  integrity sha512-JBq2pWyDchE1vVjj/+c4dzZ8stbpew4RrzpZ3vYdn1WJFGHfYg6YIX1fDdMKtSXJJM9FUlsoDOxemr9WMM2p+A==
+
 "@algolia/[email protected]":
   version "1.8.3"
   resolved "https://registry.yarnpkg.com/@algolia/autocomplete-core/-/autocomplete-core-1.8.3.tgz#97354875342a4ece9491017517bd7c7f69adec61"
@@ -3315,12 +3320,13 @@
     "@typescript-eslint/types" "5.57.1"
     eslint-visitor-keys "^3.3.0"
 
-"@urql/core@3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@urql/core/-/core-3.1.1.tgz#a49cd572360d01f2469a786b294fba2269a65e53"
-  integrity sha512-Mnxtq4I4QeFJsgs7Iytw+HyhiGxISR6qtyk66c9tipozLZ6QVxrCiUPF2HY4BxNIabaxcp+rivadvm8NAnXj4Q==
+"@urql/core@4.0.2":
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/@urql/core/-/core-4.0.2.tgz#cadcebe8bae3447847a005ca368af57c2637969e"
+  integrity sha512-GrJhMDqFP0URS47h6tMSHN/hmeTB1BNWnlXkWTxZo+b2ZB1+E9rgsuG2VTfaErXtZySGLwyCsDHtT+kZLN2cMA==
   dependencies:
-    wonka "^6.1.2"
+    "@0no-co/graphql.web" "^1.0.0"
+    wonka "^6.3.0"
 
 "@vercel/ncc@^0.36.0":
   version "0.36.1"
@@ -12337,10 +12343,10 @@ which@^2.0.1:
   dependencies:
     isexe "^2.0.0"
 
-wonka@6.2.3, wonka@^6.1.2:
-  version "6.2.3"
-  resolved "https://registry.yarnpkg.com/wonka/-/wonka-6.2.3.tgz#88f7852a23a3d53bca7411c70d66e9ce8f93a366"
-  integrity sha512-EFOYiqDeYLXSzGYt2X3aVe9Hq1XJG+Hz/HjTRRT4dZE9q95khHl5+7pzUSXI19dbMO1/2UMrTf7JT7/7JrSQSQ==
+wonka@6.3.1, wonka@^6.3.0:
+  version "6.3.1"
+  resolved "https://registry.yarnpkg.com/wonka/-/wonka-6.3.1.tgz#315b2a91e134c4032980836e6d97e13d0927634d"
+  integrity sha512-nJyGPcjuBiaLFn8QAlrHd+QjV9AlPO7snOWAhgx6aX0nQLMV6Wi0nqfrkmsXIH0efngbDOroOz2QyLnZMF16Hw==
 
 word-wrap@^1.2.3:
   version "1.2.3"