gemi 0.21.1 → 0.23.0

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

@@ -1 +1 @@
-{"version":3,"file":"HttpReload.d.ts","sourceRoot":"","sources":["../../client/HttpReload.tsx"],"names":[],"mappings":"AAOA,eAAO,MAAM,UAAU,mCAyCtB,CAAC"}
+{"version":3,"file":"HttpReload.d.ts","sourceRoot":"","sources":["../../client/HttpReload.tsx"],"names":[],"mappings":"AAOA,eAAO,MAAM,UAAU,mCA2CtB,CAAC"}

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;CACZ,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;IACZ,KAAK,EAAE,OAAO,UAAU,CAAC,KAAK,CAAC;IAC/B,IAAI,EAAE,MAAM,CAAC;gBAGX,GAAG,EAAE,MAAM,EACX,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAM,EACtC,KAAK,EAAE,OAAO,UAAU,CAAC,KAAK,EAC9B,IAAI,EAAE,MAAM;IAqBd,UAAU,CAAC,UAAU,EAAE,MAAM;IA+B7B,MAAM,CAAC,UAAU,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,IAAI,EAAE,GAAG,KAAK,GAAG;YAoBnC,cAAc;CAgD7B"}
+{"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;CACZ,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;IACZ,KAAK,EAAE,OAAO,UAAU,CAAC,KAAK,CAAC;IAC/B,IAAI,EAAE,MAAM,CAAC;gBAGX,GAAG,EAAE,MAAM,EACX,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAM,EACtC,KAAK,EAAE,OAAO,UAAU,CAAC,KAAK,EAC9B,IAAI,EAAE,MAAM;IAqBd,UAAU,CAAC,UAAU,EAAE,MAAM;IA+B7B,MAAM,CAAC,UAAU,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,IAAI,EAAE,GAAG,KAAK,GAAG;YAqBnC,cAAc;CAsD7B"}

package/dist/client/index.js

@@ -10,7 +10,7 @@ var __privateAdd = (obj, member, value) => member.has(obj) ? __typeError("Cannot
 var __privateSet = (obj, member, value, setter) => (__accessCheck(obj, member, "write to private field"), setter ? setter.call(obj, value) : member.set(obj, value), value);
 var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "access private method"), method);
 var _i, _n, _t, _e, _s, _l, _o, _d, _p, _g, _H_instances, r_fn, R_fn, b_fn, u_fn, m_fn, a_fn, P_fn, E_fn, S_fn, O_fn, k_fn, x_fn, h_fn, f_fn, T_fn, A_fn, y_fn, w_fn, c_fn, C_fn, _a, _i2, _n2, _t2, _e2, _s2, _l2, _b;
-import require$$1, { createContext, useRef, useContext, useState, useEffect, useCallback, useSyncExternalStore, useMemo, memo, lazy, StrictMode, useTransition, Component, createElement, isValidElement, Fragment as Fragment$1 } from "react";
+import require$$1, { createContext, useRef, useContext, useState, useCallback, useEffect, useSyncExternalStore, useMemo, memo, lazy, StrictMode, useTransition, Component, createElement, isValidElement, Fragment as Fragment$1 } from "react";
 import { jsx, jsxs, Fragment } from "react/jsx-runtime";
 import require$$2, { createPortal } from "react-dom";
 class Subject {
@@ -83,14 +83,6 @@ class QueryResource {
     return store.get(variantKey);
   }
   mutate(variantKey, fn) {
-    const store = this.store.getValue();
-    const state = store.get(variantKey);
-    const data = fn(state.data);
-    this.staleVariants.add(variantKey);
-    this.store.next(
-      store.set(variantKey, { loading: false, data, error: null })
-    );
-    this.resolveVariant(variantKey);
     const cacheKey = [window.location.origin, this.key, variantKey].filter((s) => s.length > 0).join("?");
     try {
       if (caches) {
@@ -98,8 +90,16 @@ class QueryResource {
       }
     } catch (err) {
     }
+    const store = this.store.getValue();
+    const state = store.get(variantKey);
+    const data = fn(state.data);
+    this.staleVariants.add(variantKey);
+    this.store.next(
+      store.set(variantKey, { loading: false, data, error: null })
+    );
+    this.resolveVariant(variantKey, false, false);
   }
-  async resolveVariant(variantKey, silent = false) {
+  async resolveVariant(variantKey, silent = false, cache = true) {
     if (typeof window === "undefined") {
       return;
     }
@@ -113,7 +113,9 @@ class QueryResource {
       });
     }
     const fullUrl = [this.key, variantKey].filter((s) => s.length).join("?");
-    const response = await this.fetch(`${this.host}/api${fullUrl}`);
+    const response = await this.fetch(`${this.host}/api${fullUrl}`, {
+      cache: cache ? "default" : "reload"
+    });
     let data = null;
     try {
       data = await response.json();
@@ -247,16 +249,19 @@ function useQuery(url, ...args) {
   const retryIntervalRef = useRef(null);
   const retryingMap = useRef(/* @__PURE__ */ new Map());
   const [state, setState] = useState(() => resource.getVariant(variantKey));
-  const retry = (variantKey2) => {
-    if (!retryingMap.current.get(variantKey2)) {
-      if (config.debug) console.log("retrying", variantKey2);
-      retryingMap.current.set(variantKey2, true);
-      retryIntervalRef.current = setTimeout(() => {
-        resource.getVariant(variantKey2);
-        retryingMap.current.set(variantKey2, false);
-      }, config.retryIntervalOnError);
-    }
-  };
+  const retry = useCallback(
+    (variantKey2) => {
+      if (!retryingMap.current.get(variantKey2)) {
+        if (config.debug) console.log("retrying", variantKey2);
+        retryingMap.current.set(variantKey2, true);
+        retryIntervalRef.current = setTimeout(() => {
+          resource.getVariant(variantKey2);
+          retryingMap.current.set(variantKey2, false);
+        }, config.retryIntervalOnError);
+      }
+    },
+    [config.debug, config.retryIntervalOnError, resource]
+  );
   useEffect(() => {
     const key = JSON.stringify(params);
     if (key !== paramsRef.current) {
@@ -264,7 +269,24 @@ function useQuery(url, ...args) {
       setState(resource.getVariant(variantKey));
       paramsRef.current = key;
     }
-  }, [params]);
+  }, [params, url, variantKey, getResource, resource]);
+  const handleReload = useCallback(() => {
+    if (config.debug) {
+      console.log("Reloading query for", variantKey);
+    }
+    const data = resource.getVariant(variantKey).data;
+    resource.mutate.call(resource, variantKey, () => data);
+  }, [variantKey, resource, config.debug]);
+  useEffect(() => {
+    if (import.meta.hot) {
+      import.meta.hot.on("http-reload", handleReload);
+    }
+    return () => {
+      if (import.meta.hot) {
+        import.meta.hot.off("http-reload", handleReload);
+      }
+    };
+  }, [handleReload]);
   const handleStateUpdate = useCallback(
     (nextState) => {
       if (config.debug) {
@@ -284,7 +306,7 @@ function useQuery(url, ...args) {
         setState(nextState);
       }
     },
-    [variantKey]
+    [variantKey, config.keepPreviousData, config.debug, retry]
   );
   useEffect(() => {
     handleStateUpdate(resource.getVariant(variantKey));
@@ -295,7 +317,7 @@ function useQuery(url, ...args) {
       unsub();
       clearInterval(retryIntervalRef.current);
     };
-  }, [variantKey, resource]);
+  }, [variantKey, resource, handleStateUpdate]);
   function mutate(fn) {
     return resource.mutate.call(resource, variantKey, (data) => {
       if (data === void 0 || data === null) {
@@ -1698,18 +1720,12 @@ function useRoute() {
 }
 const HttpReload = () => {
   const { replace } = useNavigate();
-  const searchParams = useSearchParams();
+  useSearchParams();
   const { pathname } = useRoute();
-  const params = useParams();
+  useParams();
   const [reloading, setReloading] = useState(false);
   const handleReload = () => {
     setReloading(true);
-    replace(pathname, {
-      params,
-      search: searchParams.toJSON()
-    }).catch(console.log).finally(() => {
-      setReloading(false);
-    });
   };
   useEffect(() => {
     if (import.meta.hot) {
@@ -31991,19 +32007,19 @@ const Routes = (props) => {
   const { routerSubject, fetchRouteCSS } = useContext(ClientRouterContext);
   const [transitionPath, setTransitionPath] = useState([
     null,
-    routerSubject.getValue().pathname
+    routerSubject == null ? void 0 : routerSubject.getValue().pathname
   ]);
   const { breadcrumbs, pageData, i18n, prefetchedData } = useContext(ServerDataContext);
   const [routeState, setRouteState] = useState({
-    params: routerSubject.getValue().params,
-    search: routerSubject.getValue().search,
-    pathname: routerSubject.getValue().pathname,
-    views: routerSubject.getValue().views,
+    params: routerSubject == null ? void 0 : routerSubject.getValue().params,
+    search: routerSubject == null ? void 0 : routerSubject.getValue().search,
+    pathname: routerSubject == null ? void 0 : routerSubject.getValue().pathname,
+    views: routerSubject == null ? void 0 : routerSubject.getValue().views,
     action: null,
-    hash: routerSubject.getValue().hash,
-    state: routerSubject.getValue().state,
-    routePath: routerSubject.getValue().routePath,
-    locale: routerSubject.getValue().locale,
+    hash: routerSubject == null ? void 0 : routerSubject.getValue().hash,
+    state: routerSubject == null ? void 0 : routerSubject.getValue().state,
+    routePath: routerSubject == null ? void 0 : routerSubject.getValue().routePath,
+    locale: routerSubject == null ? void 0 : routerSubject.getValue().locale,
     breadcrumbs,
     data: pageData,
     i18n,
@@ -32011,7 +32027,7 @@ const Routes = (props) => {
   });
   const { replace } = useNavigate();
   useEffect(() => {
-    return routerSubject.subscribe(async (routerState) => {
+    return routerSubject == null ? void 0 : routerSubject.subscribe(async (routerState) => {
       const { pathname, search, state, views } = routerState;
       setTransitionPath((current) => {
         const [, prevTarget] = current;