@emeryld/rrroutes-client 2.6.13 → 2.7.0

package/dist/index.mjs

@@ -605,7 +605,8 @@ function buildGetLeaf(leaf, rqOpts, env) {
     });
   };
   const useEndpoint = (...useArgs) => {
-    const args = useArgs[0];
+    const args = expectsArgs ? useArgs[0] : void 0;
+    const useEndpointOptions = expectsArgs ? useArgs[1] : useArgs[0];
     const tuple = toArgsTuple(args);
     const queryKeys = getQueryKeys(...tuple);
     emit({
@@ -614,12 +615,18 @@ function buildGetLeaf(leaf, rqOpts, env) {
       variant: "get",
       keys: queryKeys
     });
-    const buildOptions = rqOpts ?? {};
+    const { onReceive: buildOnReceive2, ...buildQueryOptions } = rqOpts ?? {};
+    const { onReceive: useOnReceive, ...runtimeQueryOptions } = useEndpointOptions ?? {};
+    const mergedQueryOptions = {
+      ...buildQueryOptions,
+      ...runtimeQueryOptions
+    };
     const listenersRef = useRef2(/* @__PURE__ */ new Set());
     const notifyOnReceive = useCallback2((data) => {
-      buildOptions?.onReceive?.(data);
+      buildOnReceive2?.(data);
+      useOnReceive?.(data);
       listenersRef.current.forEach((listener) => listener(data));
-    }, []);
+    }, [buildOnReceive2, useOnReceive]);
     const registerOnReceive = useCallback2(
       (listener) => {
         listenersRef.current.add(listener);
@@ -631,9 +638,9 @@ function buildGetLeaf(leaf, rqOpts, env) {
     );
     const queryResult = useQuery2(
       {
-        ...buildOptions,
+        ...mergedQueryOptions,
         queryKey: getQueryKeys(...tuple),
-        placeholderData: keepPreviousData2,
+        placeholderData: mergedQueryOptions.placeholderData ?? keepPreviousData2,
         queryFn: () => fetchEndpoint(tuple, {
           onReceive: notifyOnReceive
         })
@@ -881,7 +888,8 @@ function buildInfiniteGetLeaf(leaf, rqOpts, env) {
     });
   };
   const useEndpoint = (...useArgs) => {
-    const args = useArgs[0];
+    const args = expectsArgs ? useArgs[0] : void 0;
+    const useEndpointOptions = expectsArgs ? useArgs[1] : useArgs[0];
     const tuple = toArgsTuple(args);
     const queryKeys = getQueryKeys(...tuple);
     emit({
@@ -893,11 +901,18 @@ function buildInfiniteGetLeaf(leaf, rqOpts, env) {
     const params = args?.params;
     const query = args?.query;
     const buildOptions = feedQueryOptions ?? {};
+    const { onReceive: buildOnReceive2, ...buildInfiniteQueryOptions } = buildOptions;
+    const { onReceive: useOnReceive, ...runtimeInfiniteQueryOptions } = useEndpointOptions ?? {};
+    const mergedInfiniteQueryOptions = {
+      ...buildInfiniteQueryOptions,
+      ...runtimeInfiniteQueryOptions
+    };
     const listenersRef = useRef3(/* @__PURE__ */ new Set());
     const notifyOnReceive = useCallback3((data) => {
-      buildOptions?.onReceive?.(data);
+      buildOnReceive2?.(data);
+      useOnReceive?.(data);
       listenersRef.current.forEach((listener) => listener(data));
-    }, []);
+    }, [buildOnReceive2, useOnReceive]);
     const registerOnReceive = useCallback3(
       (listener) => {
         listenersRef.current.add(listener);
@@ -915,8 +930,8 @@ function buildInfiniteGetLeaf(leaf, rqOpts, env) {
     );
     const queryResult = useInfiniteQuery(
       {
-        ...buildOptions,
-        placeholderData: buildOptions.placeholderData ?? keepPreviousData3,
+        ...mergedInfiniteQueryOptions,
+        placeholderData: mergedInfiniteQueryOptions.placeholderData ?? keepPreviousData3,
         initialPageParam: feedInitialPageParam,
         getNextPageParam: (lastPage) => cursorFromPage(lastPage),
         queryKey: queryKeys,
@@ -1055,6 +1070,7 @@ function buildMutationLeaf(leaf, rqOpts, env) {
     return next;
   };
   const mutationBuildOptions = rqOpts ?? {};
+  const { onReceive: mutationBuildOnReceive, ...mutationBuildQueryOptions } = mutationBuildOptions;
   const fetchEndpoint = async (tuple, options) => {
     const a = extractArgs(tuple);
     const params = a?.params;
@@ -1186,13 +1202,14 @@ function buildMutationLeaf(leaf, rqOpts, env) {
     const body = tupleWithBody[bodyIndex];
     const result = await fetchEndpoint(tuple, {
       body,
-      onReceive: (data) => mutationBuildOptions?.onReceive?.(data),
+      onReceive: (data) => mutationBuildOnReceive?.(data),
       requireBody: true
     });
     return result;
   };
   const useEndpoint = (...useArgs) => {
-    const args = useArgs[0];
+    const args = expectsArgs ? useArgs[0] : void 0;
+    const useEndpointOptions = expectsArgs ? useArgs[1] : useArgs[0];
     const tuple = toArgsTuple(args);
     const mutationKey = getQueryKeys(...tuple);
     emit({
@@ -1201,6 +1218,11 @@ function buildMutationLeaf(leaf, rqOpts, env) {
       variant: "mutation",
       keys: mutationKey
     });
+    const { onReceive: useOnReceive, ...runtimeMutationOptions } = useEndpointOptions ?? {};
+    const mergedMutationOptions = {
+      ...mutationBuildQueryOptions,
+      ...runtimeMutationOptions
+    };
     const listenersRef = useRef4(/* @__PURE__ */ new Set());
     const notifyListeners = useCallback4((data) => {
       listenersRef.current.forEach((listener) => listener(data));
@@ -1216,12 +1238,13 @@ function buildMutationLeaf(leaf, rqOpts, env) {
     );
     const mutationResult = useMutation(
       {
-        ...mutationBuildOptions ?? {},
+        ...mergedMutationOptions,
         mutationKey,
         mutationFn: async (body) => {
           const result = await fetchMutation(
             ...[...tuple, body]
           );
+          useOnReceive?.(result);
           notifyListeners(result);
           return result;
         }
@@ -2728,6 +2751,16 @@ function roomsFromData(data, args, toRooms) {
 }
 
 // src/sockets/socketedRoute/socket.client.helper.route.ts
+function parseUseEndpointArgs(useArgs) {
+  const firstArg = useArgs[0];
+  const firstArgRecord = firstArg && typeof firstArg === "object" ? firstArg : void 0;
+  const hasRouteArgs = Boolean(
+    firstArgRecord && (Object.prototype.hasOwnProperty.call(firstArgRecord, "params") || Object.prototype.hasOwnProperty.call(firstArgRecord, "query"))
+  );
+  const endpointArgs = hasRouteArgs ? firstArg : void 0;
+  const endpointArgsTuple = typeof endpointArgs === "undefined" ? [] : [endpointArgs];
+  return { endpointArgs, endpointArgsTuple };
+}
 function buildSocketedRoute(options) {
   const { built, toRooms, applySocket, useSocketClient: useSocketClient2, debug } = options;
   const { useEndpoint: useInnerEndpoint, ...rest } = built;
@@ -2737,11 +2770,15 @@ function buildSocketedRoute(options) {
     const endpointResult = useInnerEndpoint(
       ...useArgs
     );
-    const argsKey = useMemo3(() => safeJsonKey(useArgs[0] ?? null), [useArgs]);
+    const { endpointArgs, endpointArgsTuple } = parseUseEndpointArgs(useArgs);
+    const argsKey = useMemo3(
+      () => safeJsonKey(endpointArgs ?? null),
+      [endpointArgs]
+    );
     const [roomState, setRoomState] = useState2(
       () => roomsFromData(
         endpointResult.data,
-        useArgs[0],
+        endpointArgs,
         toRooms
       )
     );
@@ -2799,13 +2836,13 @@ function buildSocketedRoute(options) {
         setRoomState((prev) => {
           const next = mergeRoomState(
             prev,
-            toRoomsRef.current(data, useArgs[0])
+            toRoomsRef.current(data, endpointArgs)
           );
           return roomStateEqual(prev, next) ? prev : next;
         });
       });
       return unsubscribe;
-    }, [endpointResult.onReceive]);
+    }, [endpointResult.onReceive, argsKey]);
     useEffect3(() => {
       trackHookTrigger2({
         ref: deriveRoomsEffectDebugRef,
@@ -2817,7 +2854,7 @@ function buildSocketedRoute(options) {
           toRoomsRef: describeObjectReference(toRooms)
         }
       });
-      const next = roomsFromData(endpointDataRef.current, useArgs[0], toRooms);
+      const next = roomsFromData(endpointDataRef.current, endpointArgs, toRooms);
       setRoomState((prev) => roomStateEqual(prev, next) ? prev : next);
     }, [argsKey, toRooms, debug]);
     useEffect3(() => {
@@ -2936,7 +2973,7 @@ function buildSocketedRoute(options) {
                 const next = nextUpdate.fn({
                   prev,
                   payload: nextUpdate.payload,
-                  args: useArgs[0],
+                  args: endpointArgs,
                   meta: nextUpdate.meta ?? {}
                 });
                 if (next === null) return prev;
@@ -2948,7 +2985,7 @@ function buildSocketedRoute(options) {
                 }
                 const nextRoomState = roomsFromData(
                   next,
-                  useArgs[0],
+                  endpointArgs,
                   toRooms
                 );
                 setRoomState(
@@ -2956,7 +2993,7 @@ function buildSocketedRoute(options) {
                 );
                 return next;
               },
-              ...useArgs
+              ...endpointArgsTuple
             );
           }
         } finally {