@emeryld/rrroutes-client 2.2.7 → 2.2.8

package/dist/index.cjs

@@ -68,19 +68,9 @@ var defaultFetcher = async (req) => {
 };
 
 // src/routesV3.client.index.ts
+var import_react = require("react");
 var import_react_query = require("@tanstack/react-query");
 var import_rrroutes_contract = require("@emeryld/rrroutes-contract");
-function splitUseEndpointArgs(useArgs, expectsArgs) {
-  if (useArgs.length === 0) return { args: void 0, options: void 0 };
-  if (!expectsArgs) {
-    return { args: void 0, options: useArgs[0] };
-  }
-  const [maybeArgs, maybeOptions] = useArgs;
-  return {
-    args: maybeArgs,
-    options: useArgs.length > 1 ? maybeOptions : void 0
-  };
-}
 var toUpper = (m) => m.toUpperCase();
 function zParse(value, schema) {
   return schema ? schema.parse(value) : value;
@@ -332,14 +322,31 @@ function createRouteClient(opts) {
     };
     if (isGet && isFeed) {
       const useEndpoint2 = (...useArgs) => {
-        const { args, options } = splitUseEndpointArgs(useArgs, expectsArgs);
+        const args = useArgs[0];
         emit({ type: "useEndpoint", leaf: leafLabel, variant: "infiniteGet" });
         const tuple = toArgsTuple(args);
         const params = args?.params;
         const query = args?.query;
         const buildOptions = rqOpts ?? {};
+        const listenersRef = (0, import_react.useRef)(/* @__PURE__ */ new Set());
+        const notifyOnReceive = (0, import_react.useCallback)(
+          (data) => {
+            buildOptions?.onReceive?.(data);
+            listenersRef.current.forEach((listener) => listener(data));
+          },
+          []
+        );
+        const registerOnReceive = (0, import_react.useCallback)(
+          (listener) => {
+            listenersRef.current.add(listener);
+            return () => {
+              listenersRef.current.delete(listener);
+            };
+          },
+          []
+        );
         const { normalizedQuery, normalizedParams } = buildUrl(leaf, baseUrl, params, query);
-        return (0, import_react_query.useInfiniteQuery)({
+        const queryResult = (0, import_react_query.useInfiniteQuery)({
           ...buildOptions,
           queryKey: getQueryKeys(...tuple),
           initialPageParam: void 0,
@@ -352,14 +359,12 @@ function createRouteClient(opts) {
             };
             return fetchEndpoint(tuple, {
               queryOverride: pageQuery,
-              onReceive: (data) => {
-                buildOptions?.onReceive?.(data);
-                options?.onReceive?.(data);
-              }
+              onReceive: notifyOnReceive
             });
           }
           // NOTE: TData is InfiniteData<T>, so we don't need a select here.
         }, queryClient);
+        return { ...queryResult, onReceive: registerOnReceive };
       };
       return {
         getQueryKeys,
@@ -371,24 +376,39 @@ function createRouteClient(opts) {
     }
     if (isGet) {
       const useEndpoint2 = (...useArgs) => {
-        const { args, options } = splitUseEndpointArgs(useArgs, expectsArgs);
+        const args = useArgs[0];
         emit({ type: "useEndpoint", leaf: leafLabel, variant: "get" });
         const tuple = toArgsTuple(args);
         const params = args?.params;
         const query = args?.query;
         const buildOptions = rqOpts ?? {};
+        const listenersRef = (0, import_react.useRef)(/* @__PURE__ */ new Set());
+        const notifyOnReceive = (0, import_react.useCallback)(
+          (data) => {
+            buildOptions?.onReceive?.(data);
+            listenersRef.current.forEach((listener) => listener(data));
+          },
+          []
+        );
+        const registerOnReceive = (0, import_react.useCallback)(
+          (listener) => {
+            listenersRef.current.add(listener);
+            return () => {
+              listenersRef.current.delete(listener);
+            };
+          },
+          []
+        );
         buildUrl(leaf, baseUrl, params, query);
-        return (0, import_react_query.useQuery)({
+        const queryResult = (0, import_react_query.useQuery)({
           ...buildOptions,
           queryKey: getQueryKeys(...tuple),
           placeholderData: import_react_query.keepPreviousData,
           queryFn: () => fetchEndpoint(tuple, {
-            onReceive: (data) => {
-              buildOptions?.onReceive?.(data);
-              options?.onReceive?.(data);
-            }
+            onReceive: notifyOnReceive
           })
         }, queryClient);
+        return { ...queryResult, onReceive: registerOnReceive };
       };
       return {
         getQueryKeys,
@@ -414,18 +434,29 @@ function createRouteClient(opts) {
       return result;
     };
     const useEndpoint = (...useArgs) => {
-      const { args, options } = splitUseEndpointArgs(useArgs, expectsArgs);
+      const args = useArgs[0];
       emit({ type: "useEndpoint", leaf: leafLabel, variant: "mutation" });
       const tuple = toArgsTuple(args);
-      return (0, import_react_query.useMutation)({
+      const listenersRef = (0, import_react.useRef)(/* @__PURE__ */ new Set());
+      const notifyListeners = (0, import_react.useCallback)((data) => {
+        listenersRef.current.forEach((listener) => listener(data));
+      }, []);
+      const registerOnReceive = (0, import_react.useCallback)((listener) => {
+        listenersRef.current.add(listener);
+        return () => {
+          listenersRef.current.delete(listener);
+        };
+      }, []);
+      const mutationResult = (0, import_react_query.useMutation)({
         ...mutationBuildOptions,
         mutationKey: getQueryKeys(...tuple),
         mutationFn: async (body) => {
           const result = await fetchMutation(...[...tuple, body]);
-          options?.onReceive?.(result);
+          notifyListeners(result);
           return result;
         }
       }, queryClient);
+      return { ...mutationResult, onReceive: registerOnReceive };
     };
     return {
       getQueryKeys,