fix: useQuery improve override logic (#1212)

orval-labs · Feb 9, 2024 · 1aff031 · 1aff031
1 parent cb597a6
commit 1aff031
Showing 1 changed file with 18 additions and 10 deletions.
diff --git a/packages/query/src/index.ts b/packages/query/src/index.ts
@@ -1140,16 +1140,24 @@ const generateQueryHook = async (
   let implementation = '';
   let mutators = undefined;
 
-  const isQuery =
-    (Verbs.GET === verb &&
-      (override.query.useQuery ||
-        override.query.useSuspenseQuery ||
-        override.query.useInfinite ||
-        override.query.useSuspenseInfiniteQuery)) ||
-    operationQueryOptions?.useInfinite ||
-    operationQueryOptions?.useSuspenseInfiniteQuery ||
-    operationQueryOptions?.useQuery ||
-    operationQueryOptions?.useSuspenseQuery;
+  let isQuery =
+    Verbs.GET === verb &&
+    (override.query.useQuery ||
+      override.query.useSuspenseQuery ||
+      override.query.useInfinite ||
+      override.query.useSuspenseInfiniteQuery);
+  if (operationQueryOptions?.useInfinite !== undefined) {
+    isQuery = operationQueryOptions.useInfinite;
+  }
+  if (operationQueryOptions?.useSuspenseInfiniteQuery !== undefined) {
+    isQuery = operationQueryOptions.useSuspenseInfiniteQuery;
+  }
+  if (operationQueryOptions?.useQuery !== undefined) {
+    isQuery = operationQueryOptions.useQuery;
+  }
+  if (operationQueryOptions?.useSuspenseQuery !== undefined) {
+    isQuery = operationQueryOptions.useSuspenseQuery;
+  }
 
   if (isQuery) {
     const queryKeyMutator = query.queryKey