@emeryld/rrroutes-client 2.6.10 → 2.6.12

package/dist/index.mjs

@@ -1,14 +1,149 @@
 "use client";
 
-// src/routesV3.client.ts
+// src/routesV3.client.batch.ts
 import {
-  lowProfileParse as lowProfileParse5
+  lowProfileParse
 } from "@emeryld/rrroutes-contract";
 import {
-  keepPreviousData as keepPreviousData3,
-  useQuery as useQuery2
+  keepPreviousData,
+  useQuery
 } from "@tanstack/react-query";
-import { useCallback as useCallback4, useRef as useRef4 } from "react";
+import { useCallback, useRef } from "react";
+function buildBatchBranch(leaves, options, deps) {
+  const {
+    fetchRaw,
+    queryClient,
+    validateResponses,
+    getBuiltLeaf,
+    encodeLeafKey,
+    toArgsTuple: toArgsTuple2
+  } = deps;
+  const batchMethod = options.method ?? "POST";
+  const defaultHeaders = options.headers;
+  const getQueryKeys = (input) => {
+    const out = {};
+    const argsByLeaf = input ?? {};
+    for (const [alias, built] of Object.entries(leaves)) {
+      const args = argsByLeaf[alias];
+      out[alias] = built.getQueryKeys(...toArgsTuple2(args));
+    }
+    return out;
+  };
+  const invalidateBranch = async (input) => {
+    const argsByLeaf = input ?? {};
+    await Promise.all(
+      Object.entries(leaves).map(([alias, built]) => {
+        const args = argsByLeaf[alias];
+        return built.invalidate(...toArgsTuple2(args));
+      })
+    );
+  };
+  const setDataBranch = (input) => {
+    const out = {};
+    for (const [alias, def] of Object.entries(input)) {
+      if (!def) continue;
+      const built = leaves[alias];
+      if (!built) continue;
+      out[alias] = built.setData(def.updater, ...toArgsTuple2(def.args));
+    }
+    return out;
+  };
+  const fetchBranch = async (input) => {
+    const payload = {};
+    for (const [aliasRaw, built] of Object.entries(leaves)) {
+      const leaf = getBuiltLeaf(built);
+      const encodedLeaf = encodeLeafKey(leaf);
+      const alias = aliasRaw;
+      const branchInput = input[alias];
+      const query = branchInput?.query;
+      const params = branchInput?.params;
+      const body = branchInput?.body;
+      payload[aliasRaw] = {
+        encodedLeaf,
+        ...params !== void 0 ? { params } : {},
+        ...query !== void 0 ? { query } : {},
+        ...body !== void 0 ? { body } : {}
+      };
+    }
+    const batchResponse = await fetchRaw({
+      path: options.path,
+      method: batchMethod,
+      body: payload,
+      headers: defaultHeaders
+    });
+    const rawData = batchResponse.data;
+    if (!rawData || typeof rawData !== "object" || Array.isArray(rawData)) {
+      throw new Error(
+        "Batch response must be a plain object keyed by branch aliases."
+      );
+    }
+    const mapped = {};
+    for (const [aliasRaw, built] of Object.entries(leaves)) {
+      if (!(aliasRaw in rawData)) {
+        throw new Error(`Batch response missing alias "${aliasRaw}".`);
+      }
+      const leaf = getBuiltLeaf(built);
+      const rawLeafData = rawData[aliasRaw];
+      const parsedLeafData = validateResponses && leaf.cfg.outputSchema ? lowProfileParse(leaf.cfg.outputSchema, rawLeafData) : rawLeafData;
+      if (validateResponses && !leaf.cfg.outputSchema) {
+        throw new Error(
+          `No output schema defined for leaf ${leaf.method.toUpperCase()} ${leaf.path}, cannot validate batch response.`
+        );
+      }
+      ;
+      mapped[aliasRaw] = parsedLeafData;
+    }
+    return mapped;
+  };
+  const useEndpoint = (input, rqOpts) => {
+    const queryKeys = getQueryKeys(input);
+    const branchQueryKey = [
+      "batch",
+      String(batchMethod).toLowerCase(),
+      options.path,
+      queryKeys
+    ];
+    const { onReceive, ...useQueryOptions } = rqOpts ?? {};
+    const listenersRef = useRef(/* @__PURE__ */ new Set());
+    const notifyOnReceive = useCallback(
+      (data) => {
+        onReceive?.(data);
+        listenersRef.current.forEach((listener) => listener(data));
+      },
+      [onReceive]
+    );
+    const registerOnReceive = useCallback(
+      (listener) => {
+        listenersRef.current.add(listener);
+        return () => {
+          listenersRef.current.delete(listener);
+        };
+      },
+      []
+    );
+    const queryResult = useQuery(
+      {
+        ...useQueryOptions,
+        queryKey: branchQueryKey,
+        placeholderData: useQueryOptions.placeholderData ?? keepPreviousData,
+        queryFn: async () => {
+          const result = await fetchBranch(input);
+          notifyOnReceive(result);
+          return result;
+        }
+      },
+      queryClient
+    );
+    return { ...queryResult, onReceive: registerOnReceive };
+  };
+  return {
+    fetch: fetchBranch,
+    useEndpoint,
+    getQueryKeys,
+    invalidate: invalidateBranch,
+    setData: setDataBranch
+  };
+}
 
 // src/routesV3.client.fetch.ts
 var HttpError = class extends Error {
@@ -62,15 +197,15 @@ var defaultFetcher = async (req) => {
 };
 
 // src/routesV3.client.get.ts
-import { buildCacheKey, lowProfileParse as lowProfileParse2 } from "@emeryld/rrroutes-contract";
+import { buildCacheKey, lowProfileParse as lowProfileParse3 } from "@emeryld/rrroutes-contract";
 import {
-  keepPreviousData,
-  useQuery
+  keepPreviousData as keepPreviousData2,
+  useQuery as useQuery2
 } from "@tanstack/react-query";
-import { useCallback, useRef } from "react";
+import { useCallback as useCallback2, useRef as useRef2 } from "react";
 
 // src/routesV3.client.shared.ts
-import { compilePath, lowProfileParse } from "@emeryld/rrroutes-contract";
+import { compilePath, lowProfileParse as lowProfileParse2 } from "@emeryld/rrroutes-contract";
 var toUpper = (m) => m.toUpperCase();
 function toSearchString(query) {
   if (!query) return "";
@@ -120,8 +255,8 @@ function toArgsTuple(args) {
   return typeof args === "undefined" ? [] : [args];
 }
 function buildUrl(leaf, baseUrl, params, query) {
-  const normalizedParams = leaf.cfg.paramsSchema ? lowProfileParse(leaf.cfg.paramsSchema, params) : {};
-  const normalizedQuery = leaf.cfg.querySchema ? lowProfileParse(leaf.cfg.querySchema, query) : {};
+  const normalizedParams = leaf.cfg.paramsSchema ? lowProfileParse2(leaf.cfg.paramsSchema, params) : {};
+  const normalizedQuery = leaf.cfg.querySchema ? lowProfileParse2(leaf.cfg.querySchema, query) : {};
   const path = compilePath(
     leaf.path,
     normalizedParams ?? {}
@@ -356,7 +491,7 @@ function buildGetLeaf(leaf, rqOpts, env) {
         options.body,
         leafCfg.bodyFiles
       );
-      const normalizedBody = leafCfg.bodySchema ? lowProfileParse2(leafCfg.bodySchema, regularBody) : regularBody;
+      const normalizedBody = leafCfg.bodySchema ? lowProfileParse3(leafCfg.bodySchema, regularBody) : regularBody;
       if (isMultipart && normalizedBody && typeof normalizedBody === "object") {
         payload = toFormData(
           {
@@ -413,7 +548,7 @@ function buildGetLeaf(leaf, rqOpts, env) {
             `No output schema defined for leaf ${leafLabel}, cannot validate response.`
           );
         }
-        out.data = lowProfileParse2(
+        out.data = lowProfileParse3(
           leafCfg.outputSchema,
           out.data
         );
@@ -480,12 +615,12 @@ function buildGetLeaf(leaf, rqOpts, env) {
       keys: queryKeys
     });
     const buildOptions = rqOpts ?? {};
-    const listenersRef = useRef(/* @__PURE__ */ new Set());
-    const notifyOnReceive = useCallback((data) => {
+    const listenersRef = useRef2(/* @__PURE__ */ new Set());
+    const notifyOnReceive = useCallback2((data) => {
       buildOptions?.onReceive?.(data);
       listenersRef.current.forEach((listener) => listener(data));
     }, []);
-    const registerOnReceive = useCallback(
+    const registerOnReceive = useCallback2(
       (listener) => {
         listenersRef.current.add(listener);
         return () => {
@@ -494,11 +629,11 @@ function buildGetLeaf(leaf, rqOpts, env) {
       },
       []
     );
-    const queryResult = useQuery(
+    const queryResult = useQuery2(
       {
         ...buildOptions,
         queryKey: getQueryKeys(...tuple),
-        placeholderData: keepPreviousData,
+        placeholderData: keepPreviousData2,
         queryFn: () => fetchEndpoint(tuple, {
           onReceive: notifyOnReceive
         })
@@ -517,12 +652,12 @@ function buildGetLeaf(leaf, rqOpts, env) {
 }
 
 // src/routesV3.client.infiniteGet.ts
-import { buildCacheKey as buildCacheKey2, lowProfileParse as lowProfileParse3 } from "@emeryld/rrroutes-contract";
+import { buildCacheKey as buildCacheKey2, lowProfileParse as lowProfileParse4 } from "@emeryld/rrroutes-contract";
 import {
-  keepPreviousData as keepPreviousData2,
+  keepPreviousData as keepPreviousData3,
   useInfiniteQuery
 } from "@tanstack/react-query";
-import { useCallback as useCallback2, useRef as useRef2 } from "react";
+import { useCallback as useCallback3, useRef as useRef3 } from "react";
 function mergePageOutputs(prev, next) {
   if (prev == null) return next;
   if (next == null) return prev;
@@ -632,7 +767,7 @@ function buildInfiniteGetLeaf(leaf, rqOpts, env) {
         options.body,
         leafCfg.bodyFiles
       );
-      const normalizedBody = leafCfg.bodySchema ? lowProfileParse3(leafCfg.bodySchema, regularBody) : regularBody;
+      const normalizedBody = leafCfg.bodySchema ? lowProfileParse4(leafCfg.bodySchema, regularBody) : regularBody;
       if (isMultipart && normalizedBody && typeof normalizedBody === "object") {
         payload = toFormData(
           {
@@ -689,7 +824,7 @@ function buildInfiniteGetLeaf(leaf, rqOpts, env) {
             `No output schema defined for leaf ${leafLabel}, cannot validate response.`
           );
         }
-        out.data = lowProfileParse3(
+        out.data = lowProfileParse4(
           leafCfg.outputSchema,
           out.data
         );
@@ -758,12 +893,12 @@ function buildInfiniteGetLeaf(leaf, rqOpts, env) {
     const params = args?.params;
     const query = args?.query;
     const buildOptions = feedQueryOptions ?? {};
-    const listenersRef = useRef2(/* @__PURE__ */ new Set());
-    const notifyOnReceive = useCallback2((data) => {
+    const listenersRef = useRef3(/* @__PURE__ */ new Set());
+    const notifyOnReceive = useCallback3((data) => {
       buildOptions?.onReceive?.(data);
       listenersRef.current.forEach((listener) => listener(data));
     }, []);
-    const registerOnReceive = useCallback2(
+    const registerOnReceive = useCallback3(
       (listener) => {
         listenersRef.current.add(listener);
         return () => {
@@ -781,7 +916,7 @@ function buildInfiniteGetLeaf(leaf, rqOpts, env) {
     const queryResult = useInfiniteQuery(
       {
         ...buildOptions,
-        placeholderData: buildOptions.placeholderData ?? keepPreviousData2,
+        placeholderData: buildOptions.placeholderData ?? keepPreviousData3,
         initialPageParam: feedInitialPageParam,
         getNextPageParam: (lastPage) => cursorFromPage(lastPage),
         queryKey: queryKeys,
@@ -874,11 +1009,11 @@ function buildInfiniteGetLeaf(leaf, rqOpts, env) {
 }
 
 // src/routesV3.client.mutation.ts
-import { buildCacheKey as buildCacheKey3, lowProfileParse as lowProfileParse4 } from "@emeryld/rrroutes-contract";
+import { buildCacheKey as buildCacheKey3, lowProfileParse as lowProfileParse5 } from "@emeryld/rrroutes-contract";
 import {
   useMutation
 } from "@tanstack/react-query";
-import { useCallback as useCallback3, useRef as useRef3 } from "react";
+import { useCallback as useCallback4, useRef as useRef4 } from "react";
 function buildMutationLeaf(leaf, rqOpts, env) {
   const leafCfg = leaf.cfg;
   const method = toUpper(leaf.method);
@@ -942,7 +1077,7 @@ function buildMutationLeaf(leaf, rqOpts, env) {
         options.body,
         leafCfg.bodyFiles
       );
-      const normalizedBody = leafCfg.bodySchema ? lowProfileParse4(leafCfg.bodySchema, regularBody) : regularBody;
+      const normalizedBody = leafCfg.bodySchema ? lowProfileParse5(leafCfg.bodySchema, regularBody) : regularBody;
       if (isMultipart && normalizedBody && typeof normalizedBody === "object") {
         payload = toFormData(
           {
@@ -999,7 +1134,7 @@ function buildMutationLeaf(leaf, rqOpts, env) {
             `No output schema defined for leaf ${leafLabel}, cannot validate response.`
           );
         }
-        out.data = lowProfileParse4(
+        out.data = lowProfileParse5(
           leafCfg.outputSchema,
           out.data
         );
@@ -1066,11 +1201,11 @@ function buildMutationLeaf(leaf, rqOpts, env) {
       variant: "mutation",
       keys: mutationKey
     });
-    const listenersRef = useRef3(/* @__PURE__ */ new Set());
-    const notifyListeners = useCallback3((data) => {
+    const listenersRef = useRef4(/* @__PURE__ */ new Set());
+    const notifyListeners = useCallback4((data) => {
       listenersRef.current.forEach((listener) => listener(data));
     }, []);
-    const registerOnReceive = useCallback3(
+    const registerOnReceive = useCallback4(
       (listener) => {
         listenersRef.current.add(listener);
         return () => {
@@ -1309,138 +1444,14 @@ function createRouteClient(opts) {
       throw error;
     }
   };
-  const buildBranchInternal = (leaves, options) => {
-    const batchMethod = options.method ?? "POST";
-    const defaultHeaders = options.headers;
-    const getQueryKeys = (input) => {
-      const out = {};
-      const argsByLeaf = input ?? {};
-      for (const [alias, built] of Object.entries(leaves)) {
-        const args = argsByLeaf[alias];
-        out[alias] = built.getQueryKeys(...toArgsTuple2(args));
-      }
-      return out;
-    };
-    const invalidateBranch = async (input) => {
-      const argsByLeaf = input ?? {};
-      await Promise.all(
-        Object.entries(leaves).map(([alias, built]) => {
-          const args = argsByLeaf[alias];
-          return built.invalidate(...toArgsTuple2(args));
-        })
-      );
-    };
-    const setDataBranch = (input) => {
-      const out = {};
-      for (const [alias, def] of Object.entries(input)) {
-        if (!def) continue;
-        const built = leaves[alias];
-        if (!built) continue;
-        out[alias] = built.setData(
-          def.updater,
-          ...toArgsTuple2(def.args)
-        );
-      }
-      return out;
-    };
-    const fetchBranch = async (input) => {
-      const payload = {};
-      for (const [aliasRaw, built] of Object.entries(leaves)) {
-        const leaf = getBuiltLeaf(built);
-        const encodedLeaf = encodeLeafKey(leaf);
-        const alias = aliasRaw;
-        const branchInput = input[alias];
-        const query = branchInput?.query;
-        const params = branchInput?.params;
-        const body = branchInput?.body;
-        payload[aliasRaw] = {
-          encodedLeaf,
-          ...params !== void 0 ? { params } : {},
-          ...query !== void 0 ? { query } : {},
-          ...body !== void 0 ? { body } : {}
-        };
-      }
-      const batchResponse = await fetchRaw({
-        path: options.path,
-        method: batchMethod,
-        body: payload,
-        headers: defaultHeaders
-      });
-      const rawData = batchResponse.data;
-      if (!rawData || typeof rawData !== "object" || Array.isArray(rawData)) {
-        throw new Error(
-          "Batch response must be a plain object keyed by branch aliases."
-        );
-      }
-      const mapped = {};
-      for (const [aliasRaw, built] of Object.entries(leaves)) {
-        if (!(aliasRaw in rawData)) {
-          throw new Error(`Batch response missing alias "${aliasRaw}".`);
-        }
-        const leaf = getBuiltLeaf(built);
-        const rawLeafData = rawData[aliasRaw];
-        const parsedLeafData = validateResponses && leaf.cfg.outputSchema ? lowProfileParse5(leaf.cfg.outputSchema, rawLeafData) : rawLeafData;
-        if (validateResponses && !leaf.cfg.outputSchema) {
-          throw new Error(
-            `No output schema defined for leaf ${leaf.method.toUpperCase()} ${leaf.path}, cannot validate batch response.`
-          );
-        }
-        ;
-        mapped[aliasRaw] = parsedLeafData;
-      }
-      return mapped;
-    };
-    const useEndpoint = (input, rqOpts) => {
-      const queryKeys = getQueryKeys(input);
-      const branchQueryKey = [
-        "batch",
-        String(batchMethod).toLowerCase(),
-        options.path,
-        queryKeys
-      ];
-      const { onReceive, ...useQueryOptions } = rqOpts ?? {};
-      const listenersRef = useRef4(
-        /* @__PURE__ */ new Set()
-      );
-      const notifyOnReceive = useCallback4(
-        (data) => {
-          onReceive?.(data);
-          listenersRef.current.forEach((listener) => listener(data));
-        },
-        [onReceive]
-      );
-      const registerOnReceive = useCallback4(
-        (listener) => {
-          listenersRef.current.add(listener);
-          return () => {
-            listenersRef.current.delete(listener);
-          };
-        },
-        []
-      );
-      const queryResult = useQuery2(
-        {
-          ...useQueryOptions,
-          queryKey: branchQueryKey,
-          placeholderData: useQueryOptions.placeholderData ?? keepPreviousData3,
-          queryFn: async () => {
-            const result = await fetchBranch(input);
-            notifyOnReceive(result);
-            return result;
-          }
-        },
-        queryClient
-      );
-      return { ...queryResult, onReceive: registerOnReceive };
-    };
-    return {
-      fetch: fetchBranch,
-      useEndpoint,
-      getQueryKeys,
-      invalidate: invalidateBranch,
-      setData: setDataBranch
-    };
-  };
+  const buildBranchInternal = (leaves, options) => buildBatchBranch(leaves, options, {
+    fetchRaw,
+    queryClient,
+    validateResponses,
+    getBuiltLeaf,
+    encodeLeafKey,
+    toArgsTuple: toArgsTuple2
+  });
   return {
     queryClient,
     invalidate,
@@ -1466,8 +1477,9 @@ import * as React from "react";
 var SocketCtx = React.createContext(null);
 function useSocketClient() {
   const ctx = React.useContext(SocketCtx);
-  if (!ctx)
-    throw new Error("SocketClient not found. Wrap with <SocketProvider>.");
+  if (!ctx) {
+    return null;
+  }
   return ctx;
 }
 
@@ -1496,6 +1508,7 @@ function useSocketConnection(args) {
     []
   );
   React2.useEffect(() => {
+    if (!client) return;
     if (autoJoin && normalizedRooms.length > 0)
       void client.joinRooms(normalizedRooms, args.joinMeta).catch((error) => reportAsyncError("joinRooms", error));
     const unsubscribe = client.on(event, (payload, meta) => {
@@ -2685,12 +2698,12 @@ function mergeRoomState(prev, toRoomsResult) {
     leaveMeta: toRoomsResult.leaveMeta ?? prev.leaveMeta
   };
 }
-function roomsFromData(data, toRooms) {
+function roomsFromData(data, args, toRooms) {
   if (data == null) return { rooms: [] };
   let state = { rooms: [] };
   const add = (input) => {
     const mergeForValue = (value) => {
-      state = mergeRoomState(state, toRooms(value));
+      state = mergeRoomState(state, toRooms(value, args));
     };
     if (Array.isArray(input)) {
       input.forEach((entry) => mergeForValue(entry));
@@ -2715,27 +2728,22 @@ function roomsFromData(data, 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
     );
     const argsKey = useMemo3(() => safeJsonKey(useArgs[0] ?? null), [useArgs]);
     const [roomState, setRoomState] = useState2(
-      () => roomsFromData(endpointResult.data, toRooms)
+      () => roomsFromData(
+        endpointResult.data,
+        useArgs[0],
+        toRooms
+      )
     );
     const renderCountRef = useRef6(0);
     const clientReadyRef = useRef6(null);
@@ -2789,7 +2797,10 @@ function buildSocketedRoute(options) {
       });
       const unsubscribe = endpointResult.onReceive((data) => {
         setRoomState((prev) => {
-          const next = mergeRoomState(prev, toRoomsRef.current(data));
+          const next = mergeRoomState(
+            prev,
+            toRoomsRef.current(data, useArgs[0])
+          );
           return roomStateEqual(prev, next) ? prev : next;
         });
       });
@@ -2806,7 +2817,7 @@ function buildSocketedRoute(options) {
           toRoomsRef: describeObjectReference(toRooms)
         }
       });
-      const next = roomsFromData(endpointDataRef.current, toRooms);
+      const next = roomsFromData(endpointDataRef.current, useArgs[0], toRooms);
       setRoomState((prev) => roomStateEqual(prev, next) ? prev : next);
     }, [argsKey, toRooms, debug]);
     useEffect3(() => {
@@ -2936,6 +2947,7 @@ function buildSocketedRoute(options) {
                 }
                 const nextRoomState = roomsFromData(
                   next,
+                  useArgs[0],
                   toRooms
                 );
                 setRoomState(