@emeryld/rrroutes-client 2.6.11 → 2.6.13

package/dist/index.cjs

@@ -2734,7 +2734,7 @@ function roomsFromData(data, args, toRooms) {
   let state = { rooms: [] };
   const add = (input) => {
     const mergeForValue = (value) => {
-      state = mergeRoomState(state, toRooms(value, ...args));
+      state = mergeRoomState(state, toRooms(value, args));
     };
     if (Array.isArray(input)) {
       input.forEach((entry) => mergeForValue(entry));
@@ -2759,21 +2759,12 @@ function roomsFromData(data, args, toRooms) {
 }
 
 // src/sockets/socketedRoute/socket.client.helper.route.ts
-function isSocketClientUnavailableError(err) {
-  return err instanceof Error && err.message.includes("SocketClient not found");
-}
 function buildSocketedRoute(options) {
   const { built, toRooms, applySocket, useSocketClient: useSocketClient2, debug } = options;
   const { useEndpoint: useInnerEndpoint, ...rest } = built;
   const useEndpoint = (...useArgs) => {
-    let client = null;
+    const client = useSocketClient2();
     let socketClientError = null;
-    try {
-      client = useSocketClient2();
-    } catch (err) {
-      if (!isSocketClientUnavailableError(err)) throw err;
-      socketClientError = err;
-    }
     const endpointResult = useInnerEndpoint(
       ...useArgs
     );
@@ -2781,7 +2772,7 @@ function buildSocketedRoute(options) {
     const [roomState, setRoomState] = (0, import_react5.useState)(
       () => roomsFromData(
         endpointResult.data,
-        useArgs,
+        useArgs[0],
         toRooms
       )
     );
@@ -2839,7 +2830,7 @@ function buildSocketedRoute(options) {
         setRoomState((prev) => {
           const next = mergeRoomState(
             prev,
-            toRoomsRef.current(data, ...useArgs)
+            toRoomsRef.current(data, useArgs[0])
           );
           return roomStateEqual(prev, next) ? prev : next;
         });
@@ -2857,7 +2848,7 @@ function buildSocketedRoute(options) {
           toRoomsRef: describeObjectReference(toRooms)
         }
       });
-      const next = roomsFromData(endpointDataRef.current, useArgs, toRooms);
+      const next = roomsFromData(endpointDataRef.current, useArgs[0], toRooms);
       setRoomState((prev) => roomStateEqual(prev, next) ? prev : next);
     }, [argsKey, toRooms, debug]);
     (0, import_react5.useEffect)(() => {
@@ -2973,11 +2964,12 @@ function buildSocketedRoute(options) {
             if (!nextUpdate) continue;
             built.setData(
               (prev) => {
-                const next = nextUpdate.fn(
+                const next = nextUpdate.fn({
                   prev,
-                  nextUpdate.payload,
-                  nextUpdate.meta ? { ...nextUpdate.meta, args: useArgs } : { args: useArgs }
-                );
+                  payload: nextUpdate.payload,
+                  args: useArgs[0],
+                  meta: nextUpdate.meta ?? {}
+                });
                 if (next === null) return prev;
                 if (shouldWarnSocketMutationGuard() && isSameObjectReference(prev, next) && !sameRefWarnedEvents.has(nextUpdate.event)) {
                   sameRefWarnedEvents.add(nextUpdate.event);
@@ -2987,7 +2979,7 @@ function buildSocketedRoute(options) {
                 }
                 const nextRoomState = roomsFromData(
                   next,
-                  useArgs,
+                  useArgs[0],
                   toRooms
                 );
                 setRoomState(