fix(bindings): omit variables when all keys are nullable (#2623)

urql-graphql · Aug 19, 2022 · 39bae9f · 39bae9f
1 parent fe2b92a
commit 39bae9f
Show file tree

Hide file tree

Showing 10 changed files with 26 additions and 0 deletions.
diff --git a/.changeset/stupid-lizards-eat.md b/.changeset/stupid-lizards-eat.md
@@ -0,0 +1,8 @@
+---
+'@urql/preact': patch
+'urql': patch
+'@urql/svelte': patch
+'@urql/vue': patch
+---
+
+Tweak the variables type for when generics only contain nullable keys
diff --git a/packages/preact-urql/src/hooks/useQuery.ts b/packages/preact-urql/src/hooks/useQuery.ts
@@ -41,6 +41,8 @@ export type UseQueryArgs<
   ? {
       variables?: Variables;
     }
+  : Variables extends { [P in keyof Variables]: Variables[P] | null }
+  ? { variables?: Variables }
   : {
       variables: Variables;
     });

diff --git a/packages/preact-urql/src/hooks/useSubscription.ts b/packages/preact-urql/src/hooks/useSubscription.ts
@@ -26,6 +26,8 @@ export type UseSubscriptionArgs<
   ? {
       variables?: Variables;
     }
+  : Variables extends { [P in keyof Variables]: Variables[P] | null }
+  ? { variables?: Variables }
   : {
       variables: Variables;
     });

diff --git a/packages/react-urql/src/hooks/useQuery.ts b/packages/react-urql/src/hooks/useQuery.ts
@@ -32,6 +32,8 @@ export type UseQueryArgs<
   ? {
       variables?: Variables;
     }
+  : Variables extends { [P in keyof Variables]: Variables[P] | null }
+  ? { variables?: Variables }
   : {
       variables: Variables;
     });

diff --git a/packages/react-urql/src/hooks/useSubscription.ts b/packages/react-urql/src/hooks/useSubscription.ts
@@ -27,6 +27,8 @@ export type UseSubscriptionArgs<
   ? {
       variables?: Variables;
     }
+  : Variables extends { [P in keyof Variables]: Variables[P] | null }
+  ? { variables?: Variables }
   : {
       variables: Variables;
     });

diff --git a/packages/svelte-urql/src/mutationStore.ts b/packages/svelte-urql/src/mutationStore.ts
@@ -28,6 +28,8 @@ export type MutationArgs<
   ? {
       variables?: Variables;
     }
+  : Variables extends { [P in keyof Variables]: Variables[P] | null }
+  ? { variables?: Variables }
   : {
       variables: Variables;
     });

diff --git a/packages/svelte-urql/src/queryStore.ts b/packages/svelte-urql/src/queryStore.ts
@@ -42,6 +42,8 @@ export type QueryArgs<
   ? {
       variables?: Variables;
     }
+  : Variables extends { [P in keyof Variables]: Variables[P] | null }
+  ? { variables?: Variables }
   : {
       variables: Variables;
     });

diff --git a/packages/svelte-urql/src/subscriptionStore.ts b/packages/svelte-urql/src/subscriptionStore.ts
@@ -40,6 +40,8 @@ export type SubscriptionArgs<
   ? {
       variables?: Variables;
     }
+  : Variables extends { [P in keyof Variables]: Variables[P] | null }
+  ? { variables?: Variables }
   : {
       variables: Variables;
     });

diff --git a/packages/vue-urql/src/useQuery.ts b/packages/vue-urql/src/useQuery.ts
@@ -33,6 +33,8 @@ export type UseQueryArgs<T = any, V extends AnyVariables = AnyVariables> = {
   ? {
       variables?: MaybeRef<{ [K in keyof V]: MaybeRef<V[K]> }>;
     }
+  : V extends { [P in keyof V]: V[P] | null }
+  ? { variables?: MaybeRef<{ [K in keyof V]: MaybeRef<V[K]> }> }
   : {
       variables: MaybeRef<{ [K in keyof V]: MaybeRef<V[K]> }>;
     });

diff --git a/packages/vue-urql/src/useSubscription.ts b/packages/vue-urql/src/useSubscription.ts
@@ -33,6 +33,8 @@ export type UseSubscriptionArgs<
   ? {
       variables?: MaybeRef<{ [K in keyof V]: MaybeRef<V[K]> }>;
     }
+  : V extends { [P in keyof V]: V[P] | null }
+  ? { variables?: MaybeRef<{ [K in keyof V]: MaybeRef<V[K]> }> }
   : {
       variables: MaybeRef<{ [K in keyof V]: MaybeRef<V[K]> }>;
     });