@emeryld/rrroutes-client 2.3.8 → 2.3.10

package/dist/index.mjs

@@ -313,14 +313,16 @@ function createRouteClient(opts) {
             } : void 0
           )
         );
-        let parsed = out;
         if (validateResponses) {
           if (!leafCfg.outputSchema) {
             throw new Error(
               `No output schema defined for leaf ${leafLabel}, cannot validate response.`
             );
           }
-          parsed = lowProfileParse(leafCfg.outputSchema, out);
+          out.data = lowProfileParse(
+            leafCfg.outputSchema,
+            out.data
+          );
           emit(
             decorateDebugEvent(
               {
@@ -334,13 +336,13 @@ function createRouteClient(opts) {
               isVerboseDebug ? {
                 params: normalizedParams,
                 query: normalizedQuery,
-                output: parsed
+                output: out
               } : void 0
             )
           );
         }
-        options?.onReceive?.(parsed);
-        return parsed;
+        options?.onReceive?.(out.data);
+        return out.data;
       } catch (error) {
         emit(
           decorateDebugEvent(
@@ -376,8 +378,14 @@ function createRouteClient(opts) {
     if (isGet && isFeed) {
       const useEndpoint2 = (...useArgs) => {
         const args = useArgs[0];
-        emit({ type: "useEndpoint", leaf: leafLabel, variant: "infiniteGet" });
         const tuple = toArgsTuple(args);
+        const queryKeys = getQueryKeys(...tuple);
+        emit({
+          type: "useEndpoint",
+          leaf: leafLabel,
+          variant: "infiniteGet",
+          keys: queryKeys
+        });
         const params = args?.params;
         const query = args?.query;
         const buildOptions = rqOpts ?? {};
@@ -404,7 +412,7 @@ function createRouteClient(opts) {
         const queryResult = useInfiniteQuery(
           {
             ...buildOptions,
-            queryKey: getQueryKeys(...tuple),
+            queryKey: queryKeys,
             initialPageParam: void 0,
             getNextPageParam: (lastPage) => getNextCursor(lastPage),
             placeholderData: keepPreviousData,
@@ -435,8 +443,14 @@ function createRouteClient(opts) {
     if (isGet) {
       const useEndpoint2 = (...useArgs) => {
         const args = useArgs[0];
-        emit({ type: "useEndpoint", leaf: leafLabel, variant: "get" });
         const tuple = toArgsTuple(args);
+        const queryKeys = getQueryKeys(...tuple);
+        emit({
+          type: "useEndpoint",
+          leaf: leafLabel,
+          variant: "get",
+          keys: queryKeys
+        });
         const params = args?.params;
         const query = args?.query;
         const buildOptions = rqOpts ?? {};
@@ -493,8 +507,14 @@ function createRouteClient(opts) {
     };
     const useEndpoint = (...useArgs) => {
       const args = useArgs[0];
-      emit({ type: "useEndpoint", leaf: leafLabel, variant: "mutation" });
       const tuple = toArgsTuple(args);
+      const mutationKey = getQueryKeys(...tuple);
+      emit({
+        type: "useEndpoint",
+        leaf: leafLabel,
+        variant: "mutation",
+        keys: mutationKey
+      });
       const listenersRef = useRef(/* @__PURE__ */ new Set());
       const notifyListeners = useCallback((data) => {
         listenersRef.current.forEach((listener) => listener(data));
@@ -511,7 +531,7 @@ function createRouteClient(opts) {
       const mutationResult = useMutation(
         {
           ...mutationBuildOptions,
-          mutationKey: getQueryKeys(...tuple),
+          mutationKey,
           mutationFn: async (body) => {
             const result = await fetchMutation(
               ...[...tuple, body]