Ensure operation.getContext and operation.setContext functions are callable for links after removeTypenameFromVariables

.changeset/popular-beers-move.md

@@ -0,0 +1,5 @@
+---
+'@apollo/client': patch
+---
+
+Fix an issue when using a link that relied on `operation.getContext` and `operation.setContext` would error out when it was declared after the `removeTypenameFromVariables` link.

src/link/remove-typename/__tests__/removeTypenameFromVariables.ts

@@ -517,3 +517,24 @@ test('handles when declared variables are unused', async () => {
     },
   });
 });
+
+test('ensures operation.getContext and operation.setContext functions are properly forwarded', async () => {
+  const query = gql`
+    query Test($foo: FooInput) {
+      someField(foo: $foo)
+    }
+  `;
+
+  const link = removeTypenameFromVariables();
+
+  const operationWithoutVariables = await execute(link, { query });
+  const operationWithVariables = await execute(link, {
+    query,
+    variables: { foo: { __typename: 'FooInput', bar: true } },
+  });
+
+  expect(typeof operationWithoutVariables.getContext).toBe('function');
+  expect(typeof operationWithoutVariables.setContext).toBe('function');
+  expect(typeof operationWithVariables.getContext).toBe('function');
+  expect(typeof operationWithVariables.setContext).toBe('function');
+});

src/link/remove-typename/removeTypenameFromVariables.ts

@@ -22,16 +22,13 @@ export function removeTypenameFromVariables(
     const { except } = options;
     const { query, variables } = operation;
 
-    if (!variables) {
-      return forward(operation);
+    if (variables) {
+      operation.variables = except
+        ? maybeStripTypenameUsingConfig(query, variables, except)
+        : stripTypename(variables);
     }
 
-    return forward({
-      ...operation,
-      variables: except
-        ? maybeStripTypenameUsingConfig(query, variables, except)
-        : stripTypename(variables),
-    });
+    return forward(operation);
   });
 }