@tuyau/react-query 1.0.0-beta.1 → 1.0.0-beta.2

package/build/index.d.ts

@@ -1,6 +1,6 @@
 import { SchemaEndpoint, RawRequestArgs, TuyauRegistry, InferTree, AdonisEndpoint, InferRoutes } from '@tuyau/core/types';
 import * as _tanstack_react_query from '@tanstack/react-query';
-import { SkipToken, DataTag, QueryFilters, WithRequired as WithRequired$1, UseMutationOptions, InfiniteData, InfiniteQueryObserverOptions, DefinedInitialDataOptions, UndefinedInitialDataOptions, UnusedSkipTokenOptions, QueryClient } from '@tanstack/react-query';
+import { SkipToken, DataTag, QueryFilters, WithRequired as WithRequired$1, UseMutationOptions, InfiniteData, InfiniteQueryObserverOptions, DefinedInitialDataOptions, UndefinedInitialDataOptions, UnusedSkipTokenOptions } from '@tanstack/react-query';
 import { Tuyau } from '@tuyau/core/client';
 
 type Response$2<E extends SchemaEndpoint> = E['types']['response'];
@@ -183,7 +183,6 @@ type TuyauReactQuery<R extends Record<string, SchemaEndpoint>> = TransformToReac
 
 declare function createTuyauReactQueryClient<Reg extends TuyauRegistry, Tree = InferTree<Reg>, Routes extends Record<string, AdonisEndpoint> = InferRoutes<Reg>>(options: {
     client: Tuyau<Reg, Routes>;
-    queryClient: QueryClient | (() => QueryClient);
     globalOptions?: TuyauReactRequestOptions;
 }): TransformToReactQuery<Tree>;
 

package/build/index.js

@@ -12,9 +12,23 @@ function buildKey(opts) {
   if (!request && type === "any") {
     return splitPath.length ? [splitPath] : [];
   }
-  if (type === "infinite" && isObject(request) && ("direction" in request || "cursor" in request)) {
-    const { cursor: _, direction: __, ...inputWithoutCursorAndDirection } = request;
-    return [splitPath, { request: inputWithoutCursorAndDirection, type: "infinite" }];
+  if (type === "infinite" && isObject(request)) {
+    const query = request.query;
+    const body = request.body;
+    const hasCursorInQuery = isObject(query) && ("direction" in query || "cursor" in query);
+    const hasCursorInBody = isObject(body) && ("direction" in body || "cursor" in body);
+    if (hasCursorInQuery || hasCursorInBody) {
+      const cleanedRequest = { ...request };
+      if (hasCursorInQuery && isObject(query)) {
+        const { cursor: _, direction: __, ...cleanQuery } = query;
+        cleanedRequest.query = cleanQuery;
+      }
+      if (hasCursorInBody && isObject(body)) {
+        const { cursor: _, direction: __, ...cleanBody } = body;
+        cleanedRequest.body = cleanBody;
+      }
+      return [splitPath, { request: cleanedRequest, type: "infinite" }];
+    }
   }
   return [
     splitPath,
@@ -35,6 +49,7 @@ function tuyauQueryOptions(options) {
       const effectiveAbortOnUnmount = opts?.tuyau?.abortOnUnmount ?? globalOptions?.abortOnUnmount ?? false;
       return await client.request(routeName, {
         ...request,
+        retry: 0,
         ...effectiveAbortOnUnmount ? { signal: queryFnContext.signal } : {}
       });
     };
@@ -67,6 +82,7 @@ function tuyauInfiniteQueryOptions(options) {
       }
       return await client.request(routeName, {
         ...requestArgs,
+        retry: 0,
         ...effectiveAbortOnUnmount ? { signal: queryFnContext.signal } : {}
       });
     };
@@ -92,7 +108,7 @@ function tuyauMutationOptions(options) {
   const mutationKey = getMutationKeyInternal({ segments: routeName.split(".") });
   const mutationFn = async (request) => {
     const requestArgs = request || {};
-    return await client.request(routeName, requestArgs);
+    return await client.request(routeName, { ...requestArgs, retry: 0 });
   };
   return mutationOptions({ ...opts, mutationKey, mutationFn });
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tuyau/react-query",
   "type": "module",
-  "version": "1.0.0-beta.1",
+  "version": "1.0.0-beta.2",
   "description": "React Query plugin for Tuyau",
   "author": "Julien Ripouteau <julien@ripouteau.com>",
   "license": "ISC",
@@ -21,15 +21,15 @@
     "@tuyau/core": "1.0.0-beta.2"
   },
   "devDependencies": {
-    "@adonisjs/core": "^7.0.0-next.10",
+    "@adonisjs/core": "^7.0.0-next.13",
     "@faker-js/faker": "^10.1.0",
-    "@happy-dom/global-registrator": "^20.0.10",
-    "@tanstack/react-query": "^5.90.7",
+    "@happy-dom/global-registrator": "^20.0.11",
+    "@tanstack/react-query": "^5.90.12",
     "@testing-library/react": "^16.3.0",
-    "@types/react": "^19.2.2",
+    "@types/react": "^19.2.7",
     "@vinejs/vine": "^4.1.0",
-    "react": "^19.2.0",
-    "@tuyau/core": "1.0.0-beta.4"
+    "react": "^19.2.1",
+    "@tuyau/core": "1.0.0-beta.6"
   },
   "tsup": {
     "entry": [