(core) - Fix empty and no variables resulting in differing keys

urql-graphql · Jun 3, 2021 · e1f5a8d · e1f5a8d
1 parent f5e0b88
commit e1f5a8d
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git a/.changeset/two-beers-exist.md b/.changeset/two-beers-exist.md
@@ -0,0 +1,5 @@
+---
+'@urql/core': patch
+---
+
+Treat empty variables the same as no variables in `@urql/core`'s `createRequest`.
diff --git a/packages/core/src/utils/request.test.ts b/packages/core/src/utils/request.test.ts
@@ -2,6 +2,11 @@ import { parse, print } from 'graphql';
 import { gql } from '../gql';
 import { createRequest } from './request';
 
+jest.mock('./hash', () => ({
+  hash: jest.requireActual('./hash').hash,
+  phash: (x: number) => x,
+}));
+
 it('should hash identical queries identically', () => {
   const reqA = createRequest('{ test }');
   const reqB = createRequest('{ test }');

diff --git a/packages/core/src/utils/request.ts b/packages/core/src/utils/request.ts
@@ -78,13 +78,12 @@ export const createRequest = <Data = any, Variables = object>(
   q: string | DocumentNode | TypedDocumentNode<Data, Variables>,
   vars?: Variables
 ): GraphQLRequest<Data, Variables> => {
+  if (!vars) vars = {} as Variables;
   const query = keyDocument(q);
   return {
-    key: vars
-      ? phash(query.__key, stringifyVariables(vars)) >>> 0
-      : query.__key,
+    key: phash(query.__key, stringifyVariables(vars)) >>> 0,
     query,
-    variables: vars || ({} as Variables),
+    variables: vars,
   };
 };