@emeryld/rrroutes-client 2.1.10 → 2.1.12

package/dist/index.cjs

@@ -251,18 +251,42 @@ function createRouteClient(opts) {
       emit({ type: "setData", key: k });
       return next;
     };
-    const fetchGet = async (...tuple) => {
+    const buildOnReceive = rqOpts?.onReceive;
+    const fetchEndpoint = async (tuple, options) => {
       const a = extractArgs(tuple);
       const params = a?.params;
-      const query = a?.query;
+      const query = options?.queryOverride ?? a?.query;
       const { url, normalizedQuery, normalizedParams } = buildUrl(leaf, baseUrl, params, query);
+      let payload;
+      const acceptsBody = Boolean(leaf.cfg.bodySchema);
+      const requiresBody = options?.requireBody ?? (!isGet && acceptsBody);
+      if (typeof options?.body !== "undefined") {
+        const normalizedBody = zParse(options.body, leaf.cfg.bodySchema);
+        const isMultipart = Array.isArray(leaf.cfg.bodyFiles) && leaf.cfg.bodyFiles.length > 0;
+        payload = isMultipart ? toFormData(normalizedBody) : normalizedBody;
+      } else if (requiresBody) {
+        throw new Error("Body is required when invoking a mutation fetch.");
+      }
       const startedAt = Date.now();
       const detail = isVerboseDebug ? { params: normalizedParams, query: normalizedQuery } : void 0;
-      emit(decorateDebugEvent({ type: "fetch", stage: "start", method, url, leaf: leafLabel }, detail));
+      emit(
+        decorateDebugEvent(
+          {
+            type: "fetch",
+            stage: "start",
+            method,
+            url,
+            leaf: leafLabel,
+            ...payload !== void 0 ? { body: payload } : {}
+          },
+          detail
+        )
+      );
       try {
-        const out = await fetcher({ url, method });
+        const out = await fetcher(
+          payload === void 0 ? { url, method } : { url, method, body: payload }
+        );
         const parsed = zParse(out, leaf.cfg.outputSchema);
-        rqOpts?.onReceive?.(parsed);
         emit(
           decorateDebugEvent(
             {
@@ -276,6 +300,7 @@ function createRouteClient(opts) {
             isVerboseDebug ? { params: normalizedParams, query: normalizedQuery, output: parsed } : void 0
           )
         );
+        options?.onReceive?.(parsed);
         return parsed;
       } catch (error) {
         emit(
@@ -287,6 +312,7 @@ function createRouteClient(opts) {
               url,
               leaf: leafLabel,
               durationMs: Date.now() - startedAt,
+              ...payload !== void 0 ? { body: payload } : {},
               error
             },
             detail
@@ -295,6 +321,15 @@ function createRouteClient(opts) {
         throw error;
       }
     };
+    const fetchGet = (...tupleWithBody) => {
+      const acceptsBody = Boolean(leaf.cfg.bodySchema);
+      const tupleLength = tupleWithBody.length;
+      const maybeBodyIndex = expectsArgs ? 1 : 0;
+      const hasBodyCandidate = acceptsBody && tupleLength > maybeBodyIndex;
+      const body = hasBodyCandidate ? tupleWithBody[tupleLength - 1] : void 0;
+      const tuple = hasBodyCandidate ? tupleWithBody.slice(0, tupleLength - 1) : tupleWithBody;
+      return fetchEndpoint(tuple, { body, onReceive: buildOnReceive, requireBody: false });
+    };
     if (isGet && isFeed) {
       const useEndpoint2 = (...useArgs) => {
         const { args, options } = splitUseEndpointArgs(useArgs, expectsArgs);
@@ -310,56 +345,18 @@ function createRouteClient(opts) {
           initialPageParam: void 0,
           getNextPageParam: (lastPage) => getNextCursor(lastPage),
           placeholderData: import_react_query.keepPreviousData,
-          queryFn: async ({ pageParam }) => {
+          queryFn: ({ pageParam }) => {
             const pageQuery = {
               ...normalizedQuery,
               ...pageParam ? { [cursorParam]: pageParam } : {}
             };
-            const { url } = buildUrl(leaf, baseUrl, params, pageQuery);
-            const startedAt = Date.now();
-            const detail = isVerboseDebug ? { ...normalizedParams ? { params: normalizedParams } : {}, ...Object.keys(pageQuery).length > 0 ? { query: pageQuery } : {} } : void 0;
-            emit(
-              decorateDebugEvent(
-                { type: "fetch", stage: "start", method, url, leaf: leafLabel },
-                detail
-              )
-            );
-            try {
-              const out = await fetcher({ url, method });
-              const parsed = zParse(out, leaf.cfg.outputSchema);
-              buildOptions?.onReceive?.(parsed);
-              options?.onReceive?.(parsed);
-              emit(
-                decorateDebugEvent(
-                  {
-                    type: "fetch",
-                    stage: "success",
-                    method,
-                    url,
-                    leaf: leafLabel,
-                    durationMs: Date.now() - startedAt
-                  },
-                  isVerboseDebug ? { params: normalizedParams, query: pageQuery, output: parsed } : void 0
-                )
-              );
-              return parsed;
-            } catch (error) {
-              emit(
-                decorateDebugEvent(
-                  {
-                    type: "fetch",
-                    stage: "error",
-                    method,
-                    url,
-                    leaf: leafLabel,
-                    durationMs: Date.now() - startedAt,
-                    error
-                  },
-                  detail
-                )
-              );
-              throw error;
-            }
+            return fetchEndpoint(tuple, {
+              queryOverride: pageQuery,
+              onReceive: (data) => {
+                buildOptions?.onReceive?.(data);
+                options?.onReceive?.(data);
+              }
+            });
           }
           // NOTE: TData is InfiniteData<T>, so we don't need a select here.
         }, queryClient);
@@ -380,57 +377,17 @@ function createRouteClient(opts) {
         const params = args?.params;
         const query = args?.query;
         const buildOptions = rqOpts ?? {};
-        const { url, normalizedQuery, normalizedParams } = buildUrl(leaf, baseUrl, params, query);
+        buildUrl(leaf, baseUrl, params, query);
         return (0, import_react_query.useQuery)({
           ...buildOptions,
           queryKey: getQueryKeys(...tuple),
           placeholderData: import_react_query.keepPreviousData,
-          queryFn: async () => {
-            const startedAt = Date.now();
-            const detail = isVerboseDebug ? { params: normalizedParams, query: normalizedQuery } : void 0;
-            emit(
-              decorateDebugEvent(
-                { type: "fetch", stage: "start", method, url, leaf: leafLabel },
-                detail
-              )
-            );
-            try {
-              const out = await fetcher({ url, method });
-              const parsed = zParse(out, leaf.cfg.outputSchema);
-              buildOptions?.onReceive?.(parsed);
-              options?.onReceive?.(parsed);
-              emit(
-                decorateDebugEvent(
-                  {
-                    type: "fetch",
-                    stage: "success",
-                    method,
-                    url,
-                    leaf: leafLabel,
-                    durationMs: Date.now() - startedAt
-                  },
-                  isVerboseDebug ? { params: normalizedParams, query: normalizedQuery, output: parsed } : void 0
-                )
-              );
-              return parsed;
-            } catch (error) {
-              emit(
-                decorateDebugEvent(
-                  {
-                    type: "fetch",
-                    stage: "error",
-                    method,
-                    url,
-                    leaf: leafLabel,
-                    durationMs: Date.now() - startedAt,
-                    error
-                  },
-                  detail
-                )
-              );
-              throw error;
+          queryFn: () => fetchEndpoint(tuple, {
+            onReceive: (data) => {
+              buildOptions?.onReceive?.(data);
+              options?.onReceive?.(data);
             }
-          }
+          })
         }, queryClient);
       };
       return {
@@ -442,71 +399,19 @@ function createRouteClient(opts) {
       };
     }
     const mutationBuildOptions = rqOpts ?? {};
-    const fetchEndpoint = async (...tupleWithBody) => {
+    const fetchMutation = async (...tupleWithBody) => {
       if (tupleWithBody.length === 0) {
         throw new Error("Body is required when invoking a mutation fetch.");
       }
       const bodyIndex = tupleWithBody.length - 1;
       const tuple = tupleWithBody.slice(0, bodyIndex);
       const body = tupleWithBody[bodyIndex];
-      const args = extractArgs(tuple);
-      const params = args?.params;
-      const query = args?.query;
-      const { url, normalizedQuery, normalizedParams } = buildUrl(leaf, baseUrl, params, query);
-      const normalizedBody = zParse(body, leaf.cfg.bodySchema);
-      const isMultipart = Array.isArray(leaf.cfg.bodyFiles) && leaf.cfg.bodyFiles.length > 0;
-      const payload = isMultipart ? toFormData(normalizedBody) : normalizedBody;
-      const startedAt = Date.now();
-      const detail = isVerboseDebug ? { params: normalizedParams, query: normalizedQuery } : void 0;
-      emit(
-        decorateDebugEvent(
-          {
-            type: "fetch",
-            stage: "start",
-            method,
-            url,
-            leaf: leafLabel,
-            body: payload
-          },
-          detail
-        )
-      );
-      try {
-        const out = await fetcher({ url, method, body: payload });
-        const parsed = zParse(out, leaf.cfg.outputSchema);
-        mutationBuildOptions?.onReceive?.(parsed);
-        emit(
-          decorateDebugEvent(
-            {
-              type: "fetch",
-              stage: "success",
-              method,
-              url,
-              leaf: leafLabel,
-              durationMs: Date.now() - startedAt
-            },
-            isVerboseDebug ? { params: normalizedParams, query: normalizedQuery, output: parsed } : void 0
-          )
-        );
-        return parsed;
-      } catch (error) {
-        emit(
-          decorateDebugEvent(
-            {
-              type: "fetch",
-              stage: "error",
-              method,
-              url,
-              leaf: leafLabel,
-              durationMs: Date.now() - startedAt,
-              body: payload,
-              error
-            },
-            detail
-          )
-        );
-        throw error;
-      }
+      const result = await fetchEndpoint(tuple, {
+        body,
+        onReceive: (data) => mutationBuildOptions?.onReceive?.(data),
+        requireBody: true
+      });
+      return result;
     };
     const useEndpoint = (...useArgs) => {
       const { args, options } = splitUseEndpointArgs(useArgs, expectsArgs);
@@ -516,7 +421,7 @@ function createRouteClient(opts) {
         ...mutationBuildOptions,
         mutationKey: getQueryKeys(...tuple),
         mutationFn: async (body) => {
-          const result = await fetchEndpoint(...[...tuple, body]);
+          const result = await fetchMutation(...[...tuple, body]);
           options?.onReceive?.(result);
           return result;
         }
@@ -527,7 +432,7 @@ function createRouteClient(opts) {
       invalidate: invalidateExact,
       setData,
       useEndpoint,
-      fetch: fetchEndpoint
+      fetch: fetchMutation
     };
   }
   return {
@@ -776,7 +681,7 @@ function useSocketConnection(args) {
       if (autoLeave && normalizedRooms.length > 0) client.leaveRooms(normalizedRooms, args.leaveMeta);
       if (onCleanup) onCleanup();
     };
-  }, args.deps ?? [client, event, onMessage, autoJoin, autoLeave, ...normalizedRooms]);
+  }, [client, event, onMessage, autoJoin, autoLeave, ...normalizedRooms]);
 }
 
 // src/sockets/socket.client.index.ts
@@ -1145,7 +1050,8 @@ var SocketClient = class {
         rooms: this.toArray(rooms),
         err: "sys:room_join handler aborted join"
       });
-      return;
+      return async () => {
+      };
     }
     const list = this.toArray(rooms);
     const toJoin = [];
@@ -1168,13 +1074,17 @@ var SocketClient = class {
           err: "payload validation failed",
           details: this.getValidationDetails(payloadResult.error)
         });
-        return;
+        return async () => {
+        };
       }
       const payload = payloadResult.data;
       const normalizedRooms = this.toArray(payload.rooms);
       this.socket.emit("sys:room_join", payload);
       this.dbg({ type: "room", phase: "join", rooms: normalizedRooms });
     }
+    return async () => {
+      await this.leaveRooms(rooms, meta);
+    };
   }
   async leaveRooms(rooms, meta) {
     if (!this.socket) {