@emeryld/rrroutes-client 2.1.7 → 2.1.8

package/dist/index.cjs

@@ -202,33 +202,82 @@ function createRouteClient(opts) {
     const debugName = meta?.name;
     const emit = (event) => emitDebug(event, debugName);
     emit({ type: "build", leaf: leafLabel });
-    const key = (...tuple) => {
+    const getQueryKeys = (...tuple) => {
       const a = extractArgs(tuple);
       const params = a?.params;
       const query = a?.query;
       const qForKey = isGet && isFeed ? stripKey(query, cursorParam) : query;
-      return (0, import_rrroutes_contract.buildCacheKey)({ leaf, params, query: qForKey });
+      return (0, import_rrroutes_contract.buildCacheKey)({
+        leaf,
+        params,
+        query: qForKey
+      });
     };
     const invalidateExact = async (...tuple) => {
-      const queryKey = key(...tuple);
+      const queryKey = getQueryKeys(...tuple);
       await queryClient.invalidateQueries({ queryKey, exact: true });
       emit({ type: "invalidate", key: queryKey, exact: true });
     };
     const setData = (...args) => {
       const [updater, ...rest] = args;
-      const k = key(...rest);
+      const k = getQueryKeys(...rest);
+      let next;
       if (isGet && isFeed) {
-        queryClient.setQueryData(
+        next = queryClient.setQueryData(
           k,
           (prev) => typeof updater === "function" ? updater(prev) : updater
         );
       } else {
-        queryClient.setQueryData(
+        next = queryClient.setQueryData(
           k,
           (prev) => typeof updater === "function" ? updater(prev) : updater
         );
       }
       emit({ type: "setData", key: k });
+      return next;
+    };
+    const fetchGet = async (...tuple) => {
+      const a = extractArgs(tuple);
+      const params = a?.params;
+      const query = a?.query;
+      const { url, normalizedQuery, normalizedParams } = buildUrl(leaf, baseUrl, params, query);
+      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);
+        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;
+      }
     };
     if (isGet && isFeed) {
       const useEndpoint2 = (...tuple) => {
@@ -239,7 +288,7 @@ function createRouteClient(opts) {
         const { normalizedQuery, normalizedParams } = buildUrl(leaf, baseUrl, params, query);
         return (0, import_react_query.useInfiniteQuery)({
           ...rqOpts,
-          queryKey: key(...tuple),
+          queryKey: getQueryKeys(...tuple),
           initialPageParam: void 0,
           getNextPageParam: (lastPage) => getNextCursor(lastPage),
           placeholderData: import_react_query.keepPreviousData,
@@ -297,10 +346,11 @@ function createRouteClient(opts) {
         }, queryClient);
       };
       return {
-        key,
+        getQueryKeys,
         invalidate: invalidateExact,
         setData,
-        useEndpoint: useEndpoint2
+        useEndpoint: useEndpoint2,
+        fetch: fetchGet
       };
     }
     if (isGet) {
@@ -312,7 +362,7 @@ function createRouteClient(opts) {
         const { url, normalizedQuery, normalizedParams } = buildUrl(leaf, baseUrl, params, query);
         return (0, import_react_query.useQuery)({
           ...rqOpts,
-          queryKey: key(...tuple),
+          queryKey: getQueryKeys(...tuple),
           placeholderData: import_react_query.keepPreviousData,
           queryFn: async () => {
             const startedAt = Date.now();
@@ -362,10 +412,11 @@ function createRouteClient(opts) {
         }, queryClient);
       };
       return {
-        key,
+        getQueryKeys,
         invalidate: invalidateExact,
         setData,
-        useEndpoint: useEndpoint2
+        useEndpoint: useEndpoint2,
+        fetch: fetchGet
       };
     }
     const fetchEndpoint = async (...tupleWithBody) => {
@@ -438,12 +489,12 @@ function createRouteClient(opts) {
       emit({ type: "useEndpoint", leaf: leafLabel, variant: "mutation" });
       return (0, import_react_query.useMutation)({
         ...rqOpts,
-        mutationKey: key(...tuple),
+        mutationKey: getQueryKeys(...tuple),
         mutationFn: (body) => fetchEndpoint(...[...tuple, body])
       }, queryClient);
     };
     return {
-      key,
+      getQueryKeys,
       invalidate: invalidateExact,
       setData,
       useEndpoint,