@emeryld/rrroutes-client 2.6.7 → 2.6.9

package/dist/index.cjs

@@ -1383,11 +1383,12 @@ function createRouteClient(opts) {
         const encodedLeaf = encodeLeafKey(leaf);
         keyByAlias.set(alias, encodedLeaf);
         const branchInput = input[alias];
-        const args = branchInput?.args;
+        const query = branchInput?.query;
+        const params = branchInput?.params;
         const body = branchInput?.body;
         payload[encodedLeaf] = {
-          ...args?.params !== void 0 ? { params: args.params } : {},
-          ...args?.query !== void 0 ? { query: args.query } : {},
+          ...params !== void 0 ? { params } : {},
+          ...query !== void 0 ? { query } : {},
           ...body !== void 0 ? { body } : {}
         };
       }
@@ -1496,6 +1497,168 @@ function buildRouter(routeClient, routes) {
   ));
 }
 
+// src/sockets/socket.client.context.provider.tsx
+var React3 = __toESM(require("react"), 1);
+
+// src/sockets/socket.client.context.client.ts
+var React = __toESM(require("react"), 1);
+var SocketCtx = React.createContext(null);
+function useSocketClient() {
+  const ctx = React.useContext(SocketCtx);
+  if (!ctx)
+    throw new Error("SocketClient not found. Wrap with <SocketProvider>.");
+  return ctx;
+}
+
+// src/sockets/socket.client.context.connection.ts
+var React2 = __toESM(require("react"), 1);
+function useSocketConnection(args) {
+  const {
+    event,
+    rooms,
+    onMessage,
+    onCleanup,
+    autoJoin = true,
+    autoLeave = true
+  } = args;
+  const client = useSocketClient();
+  const normalizedRooms = React2.useMemo(
+    () => rooms == null ? [] : Array.isArray(rooms) ? rooms : [rooms],
+    [rooms]
+  );
+  const reportAsyncError = React2.useCallback(
+    (phase, error) => {
+      if (typeof console !== "undefined" && typeof console.warn === "function") {
+        console.warn(`[socket] useSocketConnection ${phase} failed`, error);
+      }
+    },
+    []
+  );
+  React2.useEffect(() => {
+    if (autoJoin && normalizedRooms.length > 0)
+      void client.joinRooms(normalizedRooms, args.joinMeta).catch((error) => reportAsyncError("joinRooms", error));
+    const unsubscribe = client.on(event, (payload, meta) => {
+      onMessage(payload, meta);
+    });
+    return () => {
+      unsubscribe();
+      if (autoLeave && normalizedRooms.length > 0)
+        void client.leaveRooms(normalizedRooms, args.leaveMeta).catch((error) => reportAsyncError("leaveRooms", error));
+      if (onCleanup) onCleanup();
+    };
+  }, [
+    client,
+    event,
+    onMessage,
+    autoJoin,
+    autoLeave,
+    reportAsyncError,
+    ...normalizedRooms
+  ]);
+}
+
+// src/sockets/socket.client.context.debug.ts
+function dbg(dbgOpts, e) {
+  if (!dbgOpts?.logger) return;
+  if (!dbgOpts[e.type]) return;
+  try {
+    dbgOpts.logger(e);
+  } catch (error) {
+    if (typeof console !== "undefined" && typeof console.warn === "function") {
+      console.warn("[socket] provider debug logger threw", error);
+    }
+  }
+}
+function isProbablySocket(value) {
+  if (!value || typeof value !== "object") return false;
+  const anyVal = value;
+  const ctorName = anyVal.constructor?.name;
+  if (ctorName === "Socket") return true;
+  return ("connected" in anyVal || "recovered" in anyVal) && typeof anyVal.on === "function" && typeof anyVal.emit === "function";
+}
+function describeSocketLike(value) {
+  if (!value) return null;
+  const id = value.id ?? "unknown";
+  const connected = value.connected ?? false;
+  const recovered = typeof value.recovered === "boolean" ? ` recovered=${value.recovered}` : "";
+  return `[Socket id=${id} connected=${connected}${recovered}]`;
+}
+function safeDescribeHookValue(value) {
+  if (value == null) return value;
+  const valueType = typeof value;
+  if (valueType === "string" || valueType === "number" || valueType === "boolean") {
+    return value;
+  }
+  if (valueType === "bigint" || valueType === "symbol") return String(value);
+  if (valueType === "function")
+    return `[function ${value.name || "anonymous"}]`;
+  if (Array.isArray(value)) return `[array length=${value.length}]`;
+  if (isProbablySocket(value)) return describeSocketLike(value);
+  const ctorName = value.constructor?.name ?? "object";
+  const keys = Object.keys(value);
+  const keyPreview = keys.slice(0, 4).join(",");
+  const suffix = keys.length > 4 ? ",\u2026" : "";
+  return `[${ctorName} keys=${keyPreview}${suffix}]`;
+}
+function summarizeEvents(events) {
+  if (!events || typeof events !== "object")
+    return safeDescribeHookValue(events);
+  const keys = Object.keys(events);
+  if (!keys.length) return "[events empty]";
+  const preview = keys.slice(0, 4).join(",");
+  const suffix = keys.length > 4 ? ",\u2026" : "";
+  return `[events count=${keys.length} keys=${preview}${suffix}]`;
+}
+function summarizeBaseOptions(options) {
+  if (!options || typeof options !== "object")
+    return safeDescribeHookValue(options);
+  const obj = options;
+  const keys = Object.keys(obj);
+  if (!keys.length) return "[baseOptions empty]";
+  const preview = keys.slice(0, 4).join(",");
+  const suffix = keys.length > 4 ? ",\u2026" : "";
+  const hasDebug = "debug" in obj;
+  return `[baseOptions keys=${preview}${suffix} debug=${hasDebug}]`;
+}
+function summarizeMeta(meta, label) {
+  if (meta == null) return null;
+  if (typeof meta !== "object") return safeDescribeHookValue(meta);
+  const keys = Object.keys(meta);
+  if (!keys.length) return `[${label} empty]`;
+  const preview = keys.slice(0, 4).join(",");
+  const suffix = keys.length > 4 ? ",\u2026" : "";
+  return `[${label} keys=${preview}${suffix}]`;
+}
+function createHookDebugEvent(prev, next, hook) {
+  const reason = prev ? "change" : "init";
+  const changed = Object.keys(next).reduce((acc, dependency) => {
+    const prevValue = prev ? prev[dependency] : void 0;
+    const nextValue = next[dependency];
+    if (!prev || !Object.is(prevValue, nextValue)) {
+      acc.push({
+        dependency,
+        previous: safeDescribeHookValue(prevValue),
+        next: safeDescribeHookValue(nextValue)
+      });
+    }
+    return acc;
+  }, []);
+  if (!changed.length) return null;
+  return { type: "hook", phase: hook, reason, changes: changed };
+}
+function trackHookTrigger({
+  ref,
+  hook,
+  providerDebug,
+  snapshot
+}) {
+  const prev = ref.current;
+  ref.current = snapshot;
+  if (!providerDebug?.logger || !providerDebug?.hook) return;
+  const event = createHookDebugEvent(prev, snapshot, hook);
+  if (event) dbg(providerDebug, event);
+}
+
 // src/sockets/socket.client.sys.ts
 var import_zod = require("zod");
 var roomValueSchema = import_zod.z.union([import_zod.z.array(import_zod.z.string()), import_zod.z.string()]);
@@ -2299,168 +2462,6 @@ var SocketClient = class {
   }
 };
 
-// src/sockets/socket.client.context.provider.tsx
-var React3 = __toESM(require("react"), 1);
-
-// src/sockets/socket.client.context.client.ts
-var React = __toESM(require("react"), 1);
-var SocketCtx = React.createContext(null);
-function useSocketClient() {
-  const ctx = React.useContext(SocketCtx);
-  if (!ctx)
-    throw new Error("SocketClient not found. Wrap with <SocketProvider>.");
-  return ctx;
-}
-
-// src/sockets/socket.client.context.connection.ts
-var React2 = __toESM(require("react"), 1);
-function useSocketConnection(args) {
-  const {
-    event,
-    rooms,
-    onMessage,
-    onCleanup,
-    autoJoin = true,
-    autoLeave = true
-  } = args;
-  const client = useSocketClient();
-  const normalizedRooms = React2.useMemo(
-    () => rooms == null ? [] : Array.isArray(rooms) ? rooms : [rooms],
-    [rooms]
-  );
-  const reportAsyncError = React2.useCallback(
-    (phase, error) => {
-      if (typeof console !== "undefined" && typeof console.warn === "function") {
-        console.warn(`[socket] useSocketConnection ${phase} failed`, error);
-      }
-    },
-    []
-  );
-  React2.useEffect(() => {
-    if (autoJoin && normalizedRooms.length > 0)
-      void client.joinRooms(normalizedRooms, args.joinMeta).catch((error) => reportAsyncError("joinRooms", error));
-    const unsubscribe = client.on(event, (payload, meta) => {
-      onMessage(payload, meta);
-    });
-    return () => {
-      unsubscribe();
-      if (autoLeave && normalizedRooms.length > 0)
-        void client.leaveRooms(normalizedRooms, args.leaveMeta).catch((error) => reportAsyncError("leaveRooms", error));
-      if (onCleanup) onCleanup();
-    };
-  }, [
-    client,
-    event,
-    onMessage,
-    autoJoin,
-    autoLeave,
-    reportAsyncError,
-    ...normalizedRooms
-  ]);
-}
-
-// src/sockets/socket.client.context.debug.ts
-function dbg(dbgOpts, e) {
-  if (!dbgOpts?.logger) return;
-  if (!dbgOpts[e.type]) return;
-  try {
-    dbgOpts.logger(e);
-  } catch (error) {
-    if (typeof console !== "undefined" && typeof console.warn === "function") {
-      console.warn("[socket] provider debug logger threw", error);
-    }
-  }
-}
-function isProbablySocket(value) {
-  if (!value || typeof value !== "object") return false;
-  const anyVal = value;
-  const ctorName = anyVal.constructor?.name;
-  if (ctorName === "Socket") return true;
-  return ("connected" in anyVal || "recovered" in anyVal) && typeof anyVal.on === "function" && typeof anyVal.emit === "function";
-}
-function describeSocketLike(value) {
-  if (!value) return null;
-  const id = value.id ?? "unknown";
-  const connected = value.connected ?? false;
-  const recovered = typeof value.recovered === "boolean" ? ` recovered=${value.recovered}` : "";
-  return `[Socket id=${id} connected=${connected}${recovered}]`;
-}
-function safeDescribeHookValue(value) {
-  if (value == null) return value;
-  const valueType = typeof value;
-  if (valueType === "string" || valueType === "number" || valueType === "boolean") {
-    return value;
-  }
-  if (valueType === "bigint" || valueType === "symbol") return String(value);
-  if (valueType === "function")
-    return `[function ${value.name || "anonymous"}]`;
-  if (Array.isArray(value)) return `[array length=${value.length}]`;
-  if (isProbablySocket(value)) return describeSocketLike(value);
-  const ctorName = value.constructor?.name ?? "object";
-  const keys = Object.keys(value);
-  const keyPreview = keys.slice(0, 4).join(",");
-  const suffix = keys.length > 4 ? ",\u2026" : "";
-  return `[${ctorName} keys=${keyPreview}${suffix}]`;
-}
-function summarizeEvents(events) {
-  if (!events || typeof events !== "object")
-    return safeDescribeHookValue(events);
-  const keys = Object.keys(events);
-  if (!keys.length) return "[events empty]";
-  const preview = keys.slice(0, 4).join(",");
-  const suffix = keys.length > 4 ? ",\u2026" : "";
-  return `[events count=${keys.length} keys=${preview}${suffix}]`;
-}
-function summarizeBaseOptions(options) {
-  if (!options || typeof options !== "object")
-    return safeDescribeHookValue(options);
-  const obj = options;
-  const keys = Object.keys(obj);
-  if (!keys.length) return "[baseOptions empty]";
-  const preview = keys.slice(0, 4).join(",");
-  const suffix = keys.length > 4 ? ",\u2026" : "";
-  const hasDebug = "debug" in obj;
-  return `[baseOptions keys=${preview}${suffix} debug=${hasDebug}]`;
-}
-function summarizeMeta(meta, label) {
-  if (meta == null) return null;
-  if (typeof meta !== "object") return safeDescribeHookValue(meta);
-  const keys = Object.keys(meta);
-  if (!keys.length) return `[${label} empty]`;
-  const preview = keys.slice(0, 4).join(",");
-  const suffix = keys.length > 4 ? ",\u2026" : "";
-  return `[${label} keys=${preview}${suffix}]`;
-}
-function createHookDebugEvent(prev, next, hook) {
-  const reason = prev ? "change" : "init";
-  const changed = Object.keys(next).reduce((acc, dependency) => {
-    const prevValue = prev ? prev[dependency] : void 0;
-    const nextValue = next[dependency];
-    if (!prev || !Object.is(prevValue, nextValue)) {
-      acc.push({
-        dependency,
-        previous: safeDescribeHookValue(prevValue),
-        next: safeDescribeHookValue(nextValue)
-      });
-    }
-    return acc;
-  }, []);
-  if (!changed.length) return null;
-  return { type: "hook", phase: hook, reason, changes: changed };
-}
-function trackHookTrigger({
-  ref,
-  hook,
-  providerDebug,
-  snapshot
-}) {
-  const prev = ref.current;
-  ref.current = snapshot;
-  if (!providerDebug?.logger || !providerDebug?.hook) return;
-  const event = createHookDebugEvent(prev, snapshot, hook);
-  if (event) dbg(providerDebug, event);
-}
-
 // src/sockets/socket.client.context.provider.tsx
 var import_jsx_runtime = require("react/jsx-runtime");
 function buildSocketProvider(args) {
@@ -2777,11 +2778,17 @@ function buildSocketedRoute(options) {
     );
     const renderCountRef = (0, import_react5.useRef)(0);
     const clientReadyRef = (0, import_react5.useRef)(null);
+    const endpointDataRef = (0, import_react5.useRef)(
+      endpointResult.data
+    );
+    const toRoomsRef = (0, import_react5.useRef)(toRooms);
     const onReceiveEffectDebugRef = (0, import_react5.useRef)(null);
     const deriveRoomsEffectDebugRef = (0, import_react5.useRef)(null);
     const joinRoomsEffectDebugRef = (0, import_react5.useRef)(null);
     const applySocketEffectDebugRef = (0, import_react5.useRef)(null);
     renderCountRef.current += 1;
+    endpointDataRef.current = endpointResult.data;
+    toRoomsRef.current = toRooms;
     const roomsKey = (0, import_react5.useMemo)(() => roomState.rooms.join("|"), [roomState.rooms]);
     const joinMetaKey = (0, import_react5.useMemo)(
       () => safeJsonKey(roomState.joinMeta ?? null),
@@ -2816,35 +2823,31 @@ function buildSocketedRoute(options) {
         phase: "endpoint_on_receive_effect",
         debug,
         snapshot: {
-          endpointResultRef: describeObjectReference(endpointResult),
-          endpointDataRef: describeObjectReference(endpointResult.data),
-          toRoomsRef: describeObjectReference(toRooms)
+          onReceiveRef: describeObjectReference(endpointResult.onReceive)
         }
       });
       const unsubscribe = endpointResult.onReceive((data) => {
         setRoomState((prev) => {
-          const next = mergeRoomState(prev, toRooms(data));
+          const next = mergeRoomState(prev, toRoomsRef.current(data));
           return roomStateEqual(prev, next) ? prev : next;
         });
       });
       return unsubscribe;
-    }, [endpointResult, toRooms, debug]);
+    }, [endpointResult.onReceive]);
     (0, import_react5.useEffect)(() => {
       trackHookTrigger2({
         ref: deriveRoomsEffectDebugRef,
         phase: "derive_rooms_effect",
         debug,
         snapshot: {
-          endpointDataRef: describeObjectReference(endpointResult.data),
+          argsKey,
+          endpointDataRef: describeObjectReference(endpointDataRef.current),
           toRoomsRef: describeObjectReference(toRooms)
         }
       });
-      const next = roomsFromData(
-        endpointResult.data,
-        toRooms
-      );
+      const next = roomsFromData(endpointDataRef.current, toRooms);
       setRoomState((prev) => roomStateEqual(prev, next) ? prev : next);
-    }, [endpointResult.data, toRooms, debug]);
+    }, [argsKey, toRooms, debug]);
     (0, import_react5.useEffect)(() => {
       trackHookTrigger2({
         ref: joinRoomsEffectDebugRef,