gemi 0.33.0 → 0.33.2

package/dist/client/QueryResource.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"QueryResource.d.ts","sourceRoot":"","sources":["../../client/QueryResource.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAE3C,KAAK,KAAK,GAAG;IACX,OAAO,EAAE,OAAO,CAAC;IACjB,IAAI,EAAE,GAAG,CAAC;IACV,KAAK,EAAE,GAAG,CAAC;IACX,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,qBAAa,aAAa;IACxB,KAAK,EAAE,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC;IACnC,aAAa,cAAqB;IAClC,eAAe,sBAA6B;IAC5C,GAAG,EAAE,MAAM,CAAC;gBAEA,GAAG,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;IAkB1D,UAAU,CAAC,UAAU,EAAE,MAAM;IAgC7B,MAAM,CAAC,UAAU,EAAE,MAAM,EAAE,EAAE,GAAE,CAAC,IAAI,EAAE,GAAG,KAAK,GAAoB;IAmClE,OAAO,CAAC,UAAU,EAAE,MAAM;YAIZ,cAAc;CA+D7B"}
+{"version":3,"file":"QueryResource.d.ts","sourceRoot":"","sources":["../../client/QueryResource.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAE3C,KAAK,KAAK,GAAG;IACX,OAAO,EAAE,OAAO,CAAC;IACjB,IAAI,EAAE,GAAG,CAAC;IACV,KAAK,EAAE,GAAG,CAAC;IACX,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,qBAAa,aAAa;IACxB,KAAK,EAAE,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC;IACnC,aAAa,cAAqB;IAClC,eAAe,sBAA6B;IAC5C,GAAG,EAAE,MAAM,CAAC;gBAEA,GAAG,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;IAkB1D,UAAU,CAAC,UAAU,EAAE,MAAM;IA8B7B,MAAM,CAAC,UAAU,EAAE,MAAM,EAAE,EAAE,GAAE,CAAC,IAAI,EAAE,GAAG,KAAK,GAAoB;IAmClE,OAAO,CAAC,UAAU,EAAE,MAAM;YAIZ,cAAc;CAgE7B"}

package/dist/client/auth/useSignOut.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useSignOut.d.ts","sourceRoot":"","sources":["../../../client/auth/useSignOut.ts"],"names":[],"mappings":"AAGA,UAAU,cAAc;IACtB,SAAS,CAAC,EAAE,MAAM,IAAI,CAAC;CACxB;AAMD,wBAAgB,UAAU,CAAC,IAAI,GAAE,cAA4B;;;;;;;;;;EAa5D"}
+{"version":3,"file":"useSignOut.d.ts","sourceRoot":"","sources":["../../../client/auth/useSignOut.ts"],"names":[],"mappings":"AAGA,UAAU,cAAc;IACtB,SAAS,CAAC,EAAE,MAAM,IAAI,CAAC;CACxB;AAMD,wBAAgB,UAAU,CAAC,IAAI,GAAE,cAA4B;;;;;;;;;;EAY5D"}

package/dist/client/index.js

@@ -122,7 +122,7 @@ class QueryResource {
       store.set(variantKey, {
         loading: true,
         data: previousState == null ? void 0 : previousState.data,
-        error: previousState == null ? void 0 : previousState.data,
+        error: previousState == null ? void 0 : previousState.error,
         version: previousState == null ? void 0 : previousState.version
       });
     }
@@ -144,6 +144,7 @@ class QueryResource {
           version: previousState == null ? void 0 : previousState.version
         })
       );
+      return;
     }
     if (response.ok) {
       this.store.next(
@@ -247,7 +248,8 @@ function useQuery(url, ...args) {
   const options = { ...defaultOptions$1, ..._options };
   const config = { ...defaultConfig, ..._config };
   const params = "params" in options ? { ..._params, ...options.params } : _params;
-  const paramsRef = useRef(JSON.stringify(params));
+  const paramsKey = JSON.stringify(params);
+  const paramsRef = useRef(paramsKey);
   const search = "search" in options ? options.search ?? {} : {};
   const { getResource } = useContext(QueryManagerContext);
   const normalPath = applyParams$1(url, params);
@@ -261,6 +263,8 @@ function useQuery(url, ...args) {
   const [resource, setResource] = useState(
     () => getResource(normalPath, fallbackData)
   );
+  const configRef = useRef(config);
+  configRef.current = config;
   const refreshIntervalRef = useRef(
     null
   );
@@ -271,6 +275,7 @@ function useQuery(url, ...args) {
     null
   );
   const refetchUntilDurationRef = useRef(0);
+  const prefetchedRef = useRef(false);
   const [state, setState] = useState(() => {
     if (lazy2) {
       return { loading: false, data: null, error: null, version: 0 };
@@ -278,35 +283,34 @@ function useQuery(url, ...args) {
     return resource.getVariant(variantKey);
   });
   const retry = useCallback(
-    (variantKey2) => {
-      if (!retryingMap.current.get(variantKey2)) {
-        if (config.debug) console.log("retrying", variantKey2);
-        retryingMap.current.set(variantKey2, true);
+    (vk) => {
+      if (!retryingMap.current.get(vk)) {
+        if (configRef.current.debug) console.log("retrying", vk);
+        retryingMap.current.set(vk, true);
         retryIntervalRef.current = setTimeout(() => {
-          resource.getVariant(variantKey2);
-          retryingMap.current.set(variantKey2, false);
-        }, config.retryIntervalOnError);
+          resource.getVariant(vk);
+          retryingMap.current.set(vk, false);
+        }, configRef.current.retryIntervalOnError);
       }
     },
-    [config.debug, config.retryIntervalOnError, resource]
+    [resource]
   );
   useEffect(() => {
-    const key = JSON.stringify(params);
-    if (key !== paramsRef.current) {
-      setResource(getResource(applyParams$1(url, params)));
+    if (paramsKey !== paramsRef.current) {
+      setResource(getResource(normalPath));
       if (fetchedRef.current) {
         setState(resource.getVariant(variantKey));
       }
-      paramsRef.current = key;
+      paramsRef.current = paramsKey;
     }
-  }, [params, url, variantKey, getResource, resource]);
+  }, [paramsKey, normalPath, variantKey, getResource, resource]);
   const handleReload = useCallback(() => {
-    if (config.debug) {
+    if (configRef.current.debug) {
       console.log("Reloading query for", variantKey);
     }
     const data = resource.getVariant(variantKey).data;
-    resource.mutate.call(resource, variantKey, () => data);
-  }, [variantKey, resource, config.debug]);
+    resource.mutate(variantKey, () => data);
+  }, [variantKey, resource]);
   useEffect(() => {
     if (!fetchedRef.current) return;
     refreshIntervalRef.current = setInterval(() => {
@@ -330,14 +334,15 @@ function useQuery(url, ...args) {
   }, [handleReload]);
   const handleStateUpdate = useCallback(
     (nextState) => {
-      if (config.debug) {
+      const cfg = configRef.current;
+      if (cfg.debug) {
         console.log("state updating due to url update", variantKey);
         console.log(nextState);
       }
       if (nextState.error) {
         retry(variantKey);
       }
-      if (config.keepPreviousData) {
+      if (cfg.keepPreviousData) {
         if (nextState.loading) {
           setState((s) => ({ ...s, loading: true }));
         } else {
@@ -346,8 +351,8 @@ function useQuery(url, ...args) {
       } else {
         setState(nextState);
       }
-      if (config.refetchUntil && !nextState.loading && nextState.data && !nextState.error) {
-        const nextDuration = config.refetchUntil(
+      if (cfg.refetchUntil && !nextState.loading && nextState.data && !nextState.error) {
+        const nextDuration = cfg.refetchUntil(
           nextState.data,
           refetchUntilDurationRef.current
         );
@@ -361,13 +366,13 @@ function useQuery(url, ...args) {
         }
       }
     },
-    [variantKey, config.keepPreviousData, config.debug, config.refetchUntil, retry, resource]
+    [variantKey, retry, resource]
   );
   useEffect(() => {
     if (fetchedRef.current) {
       handleStateUpdate(resource.getVariant(variantKey));
     }
-    const unsub = resource.store.subscribe.call(resource.store, (store) => {
+    const unsub = resource.store.subscribe((store) => {
       const variant = store.get(variantKey);
       if (variant) {
         handleStateUpdate(variant);
@@ -375,19 +380,37 @@ function useQuery(url, ...args) {
     });
     return () => {
       unsub();
-      clearInterval(retryIntervalRef.current);
+      clearTimeout(retryIntervalRef.current);
       if (refetchUntilTimerRef.current) {
         clearTimeout(refetchUntilTimerRef.current);
       }
     };
   }, [variantKey, resource, handleStateUpdate]);
+  const trigger = useCallback(() => {
+    fetchedRef.current = true;
+    const store = resource.store.getValue();
+    const variant = store.get(variantKey);
+    if (!variant || !variant.loading && !variant.data) {
+      resource.refetch(variantKey);
+    }
+  }, [resource, variantKey]);
+  const prefetch = useCallback(() => {
+    if (prefetchedRef.current) return;
+    prefetchedRef.current = true;
+    fetchedRef.current = true;
+    resource.refetch(variantKey);
+  }, [resource, variantKey]);
+  useCallback(() => {
+    fetchedRef.current = true;
+    resource.refetch(variantKey);
+  }, [resource, variantKey]);
   function mutate(fn) {
     if (!fn) {
       fetchedRef.current = true;
       resource.refetch(variantKey);
       return;
     }
-    return resource.mutate.call(resource, variantKey, (data) => {
+    return resource.mutate(variantKey, (data) => {
       if (data === void 0 || data === null) {
         console.warn("Mutate function called before the query.");
         return;
@@ -422,7 +445,8 @@ function useQuery(url, ...args) {
     loading: (state == null ? void 0 : state.loading) ?? true,
     error: state == null ? void 0 : state.error,
     mutate,
-    refetch: () => mutate(null),
+    trigger,
+    prefetch,
     version: state == null ? void 0 : state.version
   };
 }
@@ -2545,13 +2569,13 @@ const Link = memo((props) => {
   );
 });
 const Redirect = (props) => {
-  const { href, params = {}, search = {}, action } = props;
+  const { href, params = {}, search = {}, action = "replace" } = props;
   const { push, replace } = useNavigate();
   useEffect(() => {
-    if (action === "push") {
-      push(href, { params, search });
-    } else {
+    if (action === "replace") {
       replace(href, { params, search });
+    } else {
+      push(href, { params, search });
     }
   }, [replace, action, push, params, search, href]);
   return /* @__PURE__ */ jsx(Fragment, {});
@@ -32649,15 +32673,14 @@ const defaultArgs$1 = {
   }
 };
 function useSignOut(args = defaultArgs$1) {
-  const { mutate } = useQuery("/auth/me");
-  return useMutation(
-    "POST",
+  const mutator = useMutate();
+  return usePost(
     "/auth/sign-out",
     {},
     {
       onSuccess: () => {
         args.onSuccess();
-        mutate(null);
+        mutator({ path: "/auth/me" });
       }
     }
   );