@emeryld/rrroutes-client 2.7.2 → 2.7.4

package/dist/index.mjs

@@ -264,6 +264,16 @@ function buildUrl(leaf, baseUrl, params, query) {
   const url = `${baseUrl ?? ""}${path}${toSearchString(normalizedQuery)}`;
   return { url, normalizedQuery, normalizedParams };
 }
+function areEndpointArgsComplete(leaf, args) {
+  const params = args?.params;
+  const query = args?.query;
+  try {
+    buildUrl(leaf, "", params, query);
+    return true;
+  } catch {
+    return false;
+  }
+}
 function isBlobLike(value) {
   return typeof Blob !== "undefined" && value instanceof Blob;
 }
@@ -607,6 +617,7 @@ function buildGetLeaf(leaf, rqOpts, env) {
   const useEndpoint = (...useArgs) => {
     const args = expectsArgs ? useArgs[0] : void 0;
     const useEndpointOptions = expectsArgs ? useArgs[1] : useArgs[0];
+    const hasCompleteArgs = !expectsArgs || areEndpointArgsComplete(leaf, args);
     const tuple = toArgsTuple(args);
     const queryKeys = getQueryKeys(...tuple);
     emit({
@@ -621,6 +632,8 @@ function buildGetLeaf(leaf, rqOpts, env) {
       ...buildQueryOptions,
       ...runtimeQueryOptions
     };
+    const mergedEnabled = mergedQueryOptions.enabled;
+    const guardedEnabled = hasCompleteArgs && (typeof mergedEnabled === "undefined" ? true : mergedEnabled);
     const listenersRef = useRef2(/* @__PURE__ */ new Set());
     const notifyOnReceive = useCallback2((data) => {
       buildOnReceive2?.(data);
@@ -639,11 +652,17 @@ function buildGetLeaf(leaf, rqOpts, env) {
     const queryResult = useQuery2(
       {
         ...mergedQueryOptions,
+        enabled: guardedEnabled,
         queryKey: getQueryKeys(...tuple),
         placeholderData: mergedQueryOptions.placeholderData ?? keepPreviousData2,
-        queryFn: () => fetchEndpoint(tuple, {
-          onReceive: notifyOnReceive
-        })
+        queryFn: () => {
+          if (!hasCompleteArgs) {
+            return Promise.resolve(void 0);
+          }
+          return fetchEndpoint(tuple, {
+            onReceive: notifyOnReceive
+          });
+        }
       },
       queryClient
     );
@@ -890,6 +909,7 @@ function buildInfiniteGetLeaf(leaf, rqOpts, env) {
   const useEndpoint = (...useArgs) => {
     const args = expectsArgs ? useArgs[0] : void 0;
     const useEndpointOptions = expectsArgs ? useArgs[1] : useArgs[0];
+    const hasCompleteArgs = !expectsArgs || areEndpointArgsComplete(leaf, args);
     const tuple = toArgsTuple(args);
     const queryKeys = getQueryKeys(...tuple);
     emit({
@@ -907,6 +927,8 @@ function buildInfiniteGetLeaf(leaf, rqOpts, env) {
       ...buildInfiniteQueryOptions,
       ...runtimeInfiniteQueryOptions
     };
+    const mergedEnabled = mergedInfiniteQueryOptions.enabled;
+    const guardedEnabled = hasCompleteArgs && (typeof mergedEnabled === "undefined" ? true : mergedEnabled);
     const listenersRef = useRef3(/* @__PURE__ */ new Set());
     const notifyOnReceive = useCallback3((data) => {
       buildOnReceive2?.(data);
@@ -922,20 +944,22 @@ function buildInfiniteGetLeaf(leaf, rqOpts, env) {
       },
       []
     );
-    const { normalizedQuery, normalizedParams } = buildUrl(
-      { ...leaf, cfg: leafCfg },
-      baseUrl,
-      params,
-      query
-    );
+    const { normalizedQuery, normalizedParams } = hasCompleteArgs ? buildUrl({ ...leaf, cfg: leafCfg }, baseUrl, params, query) : {
+      normalizedQuery: query ?? {},
+      normalizedParams: params ?? {}
+    };
     const queryResult = useInfiniteQuery(
       {
         ...mergedInfiniteQueryOptions,
+        enabled: guardedEnabled,
         placeholderData: mergedInfiniteQueryOptions.placeholderData ?? keepPreviousData3,
         initialPageParam: feedInitialPageParam,
         getNextPageParam: (lastPage) => cursorFromPage(lastPage),
         queryKey: queryKeys,
         queryFn: ({ pageParam }) => {
+          if (!hasCompleteArgs) {
+            return Promise.resolve(void 0);
+          }
           if (!effectiveSplitPageSize) {
             const pageQuery = {
               ...normalizedQuery,
@@ -2721,12 +2745,15 @@ function mergeRoomState(prev, toRoomsResult) {
     leaveMeta: toRoomsResult.leaveMeta ?? prev.leaveMeta
   };
 }
-function roomsFromData(data, args, toRooms) {
+function roomsFromData(data, args, toRooms, meta) {
   if (data == null) return { rooms: [] };
   let state = { rooms: [] };
   const add = (input) => {
     const mergeForValue = (value) => {
-      state = mergeRoomState(state, toRooms(value, args));
+      state = mergeRoomState(
+        state,
+        toRooms({ data: value, args, meta })
+      );
     };
     if (Array.isArray(input)) {
       input.forEach((entry) => mergeForValue(entry));
@@ -2761,8 +2788,21 @@ function parseUseEndpointArgs(useArgs) {
   const endpointArgsTuple = typeof endpointArgs === "undefined" ? [] : [endpointArgs];
   return { endpointArgs, endpointArgsTuple };
 }
+function useDefaultSocketedRouteContext() {
+  return void 0;
+}
+function createToRoomsMeta(appContext) {
+  return { appContext };
+}
 function buildSocketedRoute(options) {
-  const { built, toRooms, applySocket, useSocketClient: useSocketClient2, debug } = options;
+  const {
+    built,
+    toRooms,
+    applySocket,
+    useSocketClient: useSocketClient2,
+    useContext: useRouteContext = useDefaultSocketedRouteContext,
+    debug
+  } = options;
   const { useEndpoint: useInnerEndpoint, ...rest } = built;
   const useEndpoint = (...useArgs) => {
     const client = useSocketClient2();
@@ -2770,6 +2810,11 @@ function buildSocketedRoute(options) {
     const endpointResult = useInnerEndpoint(
       ...useArgs
     );
+    const appContext = useRouteContext();
+    const toRoomsMeta = useMemo3(
+      () => createToRoomsMeta(appContext),
+      [appContext]
+    );
     const { endpointArgs, endpointArgsTuple } = parseUseEndpointArgs(useArgs);
     const argsKey = useMemo3(
       () => safeJsonKey(endpointArgs ?? null),
@@ -2779,7 +2824,8 @@ function buildSocketedRoute(options) {
       () => roomsFromData(
         endpointResult.data,
         endpointArgs,
-        toRooms
+        toRooms,
+        toRoomsMeta
       )
     );
     const renderCountRef = useRef6(0);
@@ -2788,6 +2834,7 @@ function buildSocketedRoute(options) {
       endpointResult.data
     );
     const toRoomsRef = useRef6(toRooms);
+    const toRoomsMetaRef = useRef6(toRoomsMeta);
     const onReceiveEffectDebugRef = useRef6(null);
     const deriveRoomsEffectDebugRef = useRef6(null);
     const joinRoomsEffectDebugRef = useRef6(null);
@@ -2795,6 +2842,7 @@ function buildSocketedRoute(options) {
     renderCountRef.current += 1;
     endpointDataRef.current = endpointResult.data;
     toRoomsRef.current = toRooms;
+    toRoomsMetaRef.current = toRoomsMeta;
     const roomsKey = useMemo3(() => roomState.rooms.join("|"), [roomState.rooms]);
     const joinMetaKey = useMemo3(
       () => safeJsonKey(roomState.joinMeta ?? null),
@@ -2836,7 +2884,11 @@ function buildSocketedRoute(options) {
         setRoomState((prev) => {
           const next = mergeRoomState(
             prev,
-            toRoomsRef.current(data, endpointArgs)
+            toRoomsRef.current({
+              data,
+              args: endpointArgs,
+              meta: toRoomsMetaRef.current
+            })
           );
           return roomStateEqual(prev, next) ? prev : next;
         });
@@ -2854,9 +2906,14 @@ function buildSocketedRoute(options) {
           toRoomsRef: describeObjectReference(toRooms)
         }
       });
-      const next = roomsFromData(endpointDataRef.current, endpointArgs, toRooms);
+      const next = roomsFromData(
+        endpointDataRef.current,
+        endpointArgs,
+        toRooms,
+        toRoomsMeta
+      );
       setRoomState((prev) => roomStateEqual(prev, next) ? prev : next);
-    }, [argsKey, toRooms, debug]);
+    }, [argsKey, toRooms, toRoomsMeta, debug]);
     useEffect3(() => {
       trackHookTrigger2({
         ref: joinRoomsEffectDebugRef,
@@ -2974,7 +3031,10 @@ function buildSocketedRoute(options) {
                   prev,
                   payload: nextUpdate.payload,
                   args: endpointArgs,
-                  meta: nextUpdate.meta ?? {}
+                  meta: {
+                    ...nextUpdate.meta ?? {},
+                    appContext: toRoomsMetaRef.current.appContext
+                  }
                 });
                 if (next === null) return prev;
                 if (shouldWarnSocketMutationGuard() && isSameObjectReference(prev, next) && !sameRefWarnedEvents.has(nextUpdate.event)) {
@@ -2986,7 +3046,8 @@ function buildSocketedRoute(options) {
                 const nextRoomState = roomsFromData(
                   next,
                   endpointArgs,
-                  toRooms
+                  toRooms,
+                  toRoomsMetaRef.current
                 );
                 setRoomState(
                   (prevRoomState) => roomStateEqual(prevRoomState, nextRoomState) ? prevRoomState : nextRoomState