gemi 0.13.7 → 0.13.8

package/dist/client/index.js

@@ -557,13 +557,14 @@ function useLocation() {
   if (!ctx) {
     throw new Error("Router context not found");
   }
-  const { hash, pathname, search, state } = ctx;
+  const { hash, pathname, search, state, locale } = ctx;
   return {
     hash,
     key: pathname,
     pathname,
     search,
-    state
+    state,
+    locale
   };
 }
 function _extends() {
@@ -651,7 +652,7 @@ function createBrowserHistory(options) {
   }
   window2.addEventListener(PopStateEventType, handlePop);
   var action = Action.Pop;
-  var _getIndexAndLocation2 = getIndexAndLocation(), index = _getIndexAndLocation2[0], location2 = _getIndexAndLocation2[1];
+  var _getIndexAndLocation2 = getIndexAndLocation(), index = _getIndexAndLocation2[0], location = _getIndexAndLocation2[1];
   var listeners = createEvents();
   var blockers = createEvents();
   if (index == null) {
@@ -668,7 +669,7 @@ function createBrowserHistory(options) {
       state = null;
     }
     return readOnly(_extends({
-      pathname: location2.pathname,
+      pathname: location.pathname,
       hash: "",
       search: ""
     }, typeof to === "string" ? parsePath(to) : to, {
@@ -683,10 +684,10 @@ function createBrowserHistory(options) {
       idx: index2
     }, createHref(nextLocation)];
   }
-  function allowTx(action2, location3, retry) {
+  function allowTx(action2, location2, retry) {
     return !blockers.length || (blockers.call({
       action: action2,
-      location: location3,
+      location: location2,
       retry
     }), false);
   }
@@ -694,10 +695,10 @@ function createBrowserHistory(options) {
     action = nextAction;
     var _getIndexAndLocation3 = getIndexAndLocation();
     index = _getIndexAndLocation3[0];
-    location2 = _getIndexAndLocation3[1];
+    location = _getIndexAndLocation3[1];
     listeners.call({
       action,
-      location: location2
+      location
     });
   }
   function push(to, state) {
@@ -736,7 +737,7 @@ function createBrowserHistory(options) {
       return action;
     },
     get location() {
-      return location2;
+      return location;
     },
     createHref,
     push,
@@ -1663,6 +1664,77 @@ const HttpReload = () => {
     document.body
   );
 };
+const I18nContext = createContext({});
+const I18nProvider = (props) => {
+  const { i18n } = useContext(ServerDataContext);
+  const { fetch: fetch2, host } = useContext(HttpClientContext);
+  const [currentLocale, setCurrentLocale] = useState(i18n.currentLocale);
+  const dictionary = useRef(
+    (() => {
+      const dictionary2 = /* @__PURE__ */ new Map();
+      for (const [locale, value] of Object.entries((i18n == null ? void 0 : i18n.dictionary) ?? {})) {
+        const components = /* @__PURE__ */ new Map();
+        for (const [component, translations] of Object.entries(value)) {
+          components.set(component, translations);
+        }
+        dictionary2.set(locale, components);
+      }
+      return dictionary2;
+    })()
+  );
+  function updateDictionary(translations = {}, locale) {
+    for (const [locale2, value] of Object.entries(translations)) {
+      if (!dictionary.current.has(locale2)) {
+        dictionary.current.set(locale2, /* @__PURE__ */ new Map());
+      }
+      const scopes = dictionary.current.get(locale2);
+      for (const [scope, translations2] of Object.entries(value)) {
+        if (!scopes.has(scope)) {
+          scopes.set(scope, {});
+        }
+        scopes.set(scope, translations2);
+      }
+    }
+    changeLocale(locale);
+  }
+  const changeLocale = (locale) => {
+    if (dictionary.current.has(locale)) {
+      setCurrentLocale(locale);
+    }
+  };
+  const getTranslations = (locale) => {
+    return (component) => {
+      return dictionary.current.get(locale).get(component);
+    };
+  };
+  const fetchTranslations = async (pathname, locale, signal) => {
+    if (Object.keys(i18n).length === 0) {
+      return;
+    }
+    const response = await fetch2(
+      `${host}/api/__gemi__/services/i18n/translations/${locale || currentLocale}${pathname === "/" ? "" : pathname}`,
+      {
+        signal
+      }
+    );
+    const translations = await response.json();
+    updateDictionary(translations);
+  };
+  return /* @__PURE__ */ jsx(
+    I18nContext.Provider,
+    {
+      value: {
+        getComponentTranslations: getTranslations(currentLocale),
+        locale: currentLocale,
+        changeLocale,
+        updateDictionary,
+        fetchTranslations,
+        supportedLocales: i18n.supportedLocales
+      },
+      children: props.children
+    }
+  );
+};
 const ClientRouterContext = createContext(
   {}
 );
@@ -1677,12 +1749,14 @@ const ClientRouterProvider = (props) => {
     pageData,
     params,
     searchParams,
-    breadcrumbs
+    breadcrumbs,
+    urlLocaleSegment
   } = props;
   const navigationAbortControllerRef = useRef(new AbortController());
   const [isNavigatingSubject] = useState(() => {
     return new Subject(false);
   });
+  const { supportedLocales, locale } = useContext(I18nContext);
   const { fetch: fetch2, host } = useContext(HttpClientContext);
   const [progressManager] = useState(new ProgressManager(isNavigatingSubject));
   const pageDataRef = useRef(structuredClone(pageData));
@@ -1701,7 +1775,8 @@ const ClientRouterProvider = (props) => {
       pathname,
       hash: "",
       action: null,
-      routePath: currentPath
+      routePath: currentPath,
+      locale
     });
   });
   const [history] = useState(() => {
@@ -1713,10 +1788,12 @@ const ClientRouterProvider = (props) => {
   });
   const findMatchingRouteFromParams = useMemo(
     () => (pathname2) => {
+      let routePath = pathname2.replace("/en-US", "").replace("/tr-TR", "");
+      routePath = routePath === "" ? "/" : routePath;
       const candidates = [];
       for (const route of Object.keys(routeManifest)) {
         const urlPattern = new me({ pathname: route });
-        if (urlPattern.test({ pathname: pathname2 })) {
+        if (urlPattern.test({ pathname: routePath })) {
           candidates.push(route);
         }
       }
@@ -1753,26 +1830,38 @@ const ClientRouterProvider = (props) => {
     [findMatchingRouteFromParams]
   );
   useEffect(() => {
-    history == null ? void 0 : history.listen(({ location: location2, action }) => {
+    history == null ? void 0 : history.listen(({ location, action }) => {
       if (!window.scrollHistory) {
         window.scrollHistory = /* @__PURE__ */ new Map();
       }
       const { hash, pathname: pathname2, search } = routerSubject.getValue();
-      const key = [pathname2, hash, search].join("");
+      const key = [pathname2, search, hash].join("");
       window.scrollHistory.set(key, window.scrollY);
-      const routePath = getRoutePathnameFromHref(location2.pathname);
+      let _pathname = location.pathname;
+      let _locale = null;
+      for (const locale2 of supportedLocales) {
+        if (_pathname.startsWith(`/${locale2}`)) {
+          _locale = locale2;
+          _pathname = _pathname.replace(`/${locale2}`, "");
+          break;
+        }
+      }
+      _pathname = _pathname === "" ? "/" : _pathname;
+      const routePath = getRoutePathnameFromHref(_pathname);
       routerSubject.next({
-        views: getViewPathsFromPathname(location2.pathname),
-        params: getParams(location2.pathname),
-        search: location2.search,
-        state: location2.state,
-        pathname: location2.pathname,
+        views: getViewPathsFromPathname(_pathname),
+        params: getParams(_pathname),
+        search: location.search,
+        state: location.state,
+        pathname: _pathname,
         action,
         routePath,
-        hash: location2.hash
+        hash: location.hash,
+        locale: _locale
       });
     });
   }, [
+    supportedLocales,
     history,
     routerSubject,
     getParams,
@@ -1843,7 +1932,8 @@ const ClientRouterProvider = (props) => {
         progressManager,
         fetchRouteCSS,
         breadcrumbsCache: breadcrumbsCache.current,
-        routerSubject
+        routerSubject,
+        urlLocaleSegment
       },
       children: [
         children,
@@ -1854,6 +1944,7 @@ const ClientRouterProvider = (props) => {
 };
 function useNavigate() {
   const { history, setNavigationAbortController } = useContext(ClientRouterContext);
+  const location = useLocation();
   function action(pushOrReplace) {
     return async (path, ...args) => {
       const navigationAbortController = new AbortController();
@@ -1862,22 +1953,32 @@ function useNavigate() {
       const {
         search = {},
         params = {},
-        shallow
+        shallow,
+        locale,
+        hash
       } = {
         params: {},
         shallow: false,
+        locale: null,
+        hash: "",
         ...options
       };
       const urlSearchParams = new URLSearchParams(search);
+      let localeSegment = location.locale;
+      if (locale) {
+        localeSegment = locale;
+      }
+      const routePath = applyParams$1(path, params);
       const navigationPath = [
-        applyParams$1(path, params),
+        `${localeSegment ? `/${localeSegment}` : ""}${routePath}`,
         urlSearchParams.toString()
-      ].join("?");
+      ].filter((s) => s.length > 0).join("?");
+      const finalPath = [navigationPath, hash].filter(Boolean).join("");
       if (shallow) {
-        history == null ? void 0 : history[pushOrReplace](navigationPath);
+        history == null ? void 0 : history[pushOrReplace](finalPath, { shallow });
         return;
       }
-      history == null ? void 0 : history[pushOrReplace](navigationPath);
+      history == null ? void 0 : history[pushOrReplace](finalPath);
     };
   }
   return {
@@ -1958,9 +2059,9 @@ class SearchParams {
 }
 function useSearchParams() {
   const { push } = useNavigate();
-  const { search } = useContext(RouteStateContext);
+  const { search, pathname } = useContext(RouteStateContext);
   const callback = (search2, shallow) => {
-    push(location.pathname, {
+    push(pathname, {
       search: search2,
       shallow
     });
@@ -2010,17 +2111,23 @@ const Link = (props) => {
   const {
     href,
     onClick,
+    hash = "",
     active = false,
     params = {},
     search = {},
     ...rest
   } = { params: _params, search: {}, ...props };
   const { push } = useNavigate();
-  const location2 = useLocation();
+  const location = useLocation();
   const searchParams = new URLSearchParams(normalizeSearch(search));
   const path = applyParams$1(href, params);
-  const targetHref = [path, searchParams.toString()].filter((s) => s.length > 0).join("?");
-  const currentHref = [location2.pathname, location2.search].filter((item) => !!item).join("");
+  const urlLocaleSegment = location.locale;
+  const localeSegment = urlLocaleSegment ? `/${urlLocaleSegment}` : "";
+  const targetHref = [
+    [`${localeSegment}${path}`, searchParams.toString()].filter((s) => s.length > 0).join("?"),
+    hash
+  ].join("");
+  const currentHref = [location.pathname, location.search, location.hash].filter((item) => !!item).join("");
   return /* @__PURE__ */ jsx(
     "a",
     {
@@ -2034,12 +2141,18 @@ const Link = (props) => {
             return;
           }
         }
-        e.preventDefault();
+        let currentPath = window.location.pathname.replace(localeSegment, "");
+        currentPath = currentPath === "" ? "/" : currentPath;
+        onClick == null ? void 0 : onClick(e);
+        if (hash === "") {
+          e.preventDefault();
+        }
         onClick == null ? void 0 : onClick(e);
         push(href, {
+          hash,
           search,
           params,
-          shallow: path === window.location.pathname
+          shallow: path === currentPath
         });
       },
       ...rest
@@ -31508,75 +31621,6 @@ const ComponentsProvider = (props) => {
     }
   );
 };
-const I18nContext = createContext({});
-const I18nProvider = (props) => {
-  const { i18n } = useContext(ServerDataContext);
-  const { fetch: fetch2, host } = useContext(HttpClientContext);
-  const [currentLocale, setCurrentLocale] = useState(i18n.currentLocale);
-  const dictionary = useRef(
-    (() => {
-      const dictionary2 = /* @__PURE__ */ new Map();
-      for (const [locale, value] of Object.entries((i18n == null ? void 0 : i18n.dictionary) ?? {})) {
-        const components = /* @__PURE__ */ new Map();
-        for (const [component, translations] of Object.entries(value)) {
-          components.set(component, translations);
-        }
-        dictionary2.set(locale, components);
-      }
-      return dictionary2;
-    })()
-  );
-  function updateDictionary(translations = {}) {
-    for (const [locale, value] of Object.entries(translations)) {
-      if (!dictionary.current.has(locale)) {
-        dictionary.current.set(locale, /* @__PURE__ */ new Map());
-      }
-      const scopes = dictionary.current.get(locale);
-      for (const [scope, translations2] of Object.entries(value)) {
-        if (!scopes.has(scope)) {
-          scopes.set(scope, {});
-        }
-        scopes.set(scope, translations2);
-      }
-    }
-  }
-  const changeLocale = (locale) => {
-    if (dictionary.current.has(locale)) {
-      setCurrentLocale(locale);
-    }
-  };
-  const getTranslations = (locale) => {
-    return (component) => {
-      return dictionary.current.get(locale).get(component);
-    };
-  };
-  const fetchTranslations = async (pathname, locale, signal) => {
-    if (Object.keys(i18n).length === 0) {
-      return;
-    }
-    const response = await fetch2(
-      `${host}/api/__gemi__/services/i18n/translations/${locale || currentLocale}${pathname === "/" ? "" : pathname}`,
-      {
-        signal
-      }
-    );
-    const translations = await response.json();
-    updateDictionary(translations);
-  };
-  return /* @__PURE__ */ jsx(
-    I18nContext.Provider,
-    {
-      value: {
-        getComponentTranslations: getTranslations(currentLocale),
-        locale: currentLocale,
-        changeLocale,
-        updateDictionary,
-        fetchTranslations
-      },
-      children: props.children
-    }
-  );
-};
 const WebSocketContext = createContext(
   {}
 );
@@ -31635,7 +31679,7 @@ function restoreScroll(action = null, _pathname = "no path") {
     return;
   }
   const { pathname, search, hash } = window.location;
-  const key = [pathname, hash, search].join("");
+  const key = [pathname, search, hash].join("");
   const sh = window.scrollHistory;
   const scrollPosition = sh == null ? void 0 : sh.get(key);
   if (action !== Action.Pop) {
@@ -31718,7 +31762,8 @@ const Routes = (props) => {
     action: null,
     hash: routerSubject.getValue().hash,
     state: routerSubject.getValue().state,
-    routePath: routerSubject.getValue().routePath
+    routePath: routerSubject.getValue().routePath,
+    locale: routerSubject.getValue().locale
   });
   const { replace } = useNavigate();
   useEffect(() => {
@@ -31735,7 +31780,10 @@ const Routes = (props) => {
         setRouteState(routerState);
         return;
       }
-      const url = `${host}${pathname}.json${search}`;
+      const localeSegment = routerState.locale ? `/${routerState.locale}` : "";
+      const _pathname = localeSegment.length > 0 && pathname === "/" ? "" : pathname;
+      const pathnameWithLocaleSegment = `${localeSegment}${_pathname}`;
+      const url = `${host}${pathnameWithLocaleSegment}.json${search}`;
       const [res] = await Promise.all([
         fetch2(url),
         fetchRouteCSS(pathname),
@@ -31763,7 +31811,7 @@ const Routes = (props) => {
         }
         updatePageData(data, breadcrumbs);
         updatePrefecthedData(prefetchedData);
-        updateDictionary((i18n == null ? void 0 : i18n.dictionary) ?? {});
+        updateDictionary((i18n == null ? void 0 : i18n.dictionary) ?? {}, (i18n == null ? void 0 : i18n.currentLocale) ?? "");
         if (is404) {
           startTransition(() => {
             setRouteState((state2) => ({
@@ -31820,6 +31868,7 @@ const ClientRouter = (props) => {
       currentPath: router.currentPath,
       routeManifest,
       breadcrumbs,
+      urlLocaleSegment: router.urlLocaleSegment,
       children: /* @__PURE__ */ jsx(StrictMode, { children: /* @__PURE__ */ jsx(RootLayout, { children: /* @__PURE__ */ jsx(Routes, { componentTree }) }) })
     }
   ) }) }) }) });
@@ -32103,10 +32152,17 @@ function useTranslator(component) {
 function useLocale() {
   const { changeLocale, locale, fetchTranslations } = useContext(I18nContext);
   const { getRoutePathnameFromHref } = useContext(ClientRouterContext);
-  const { pathname } = useLocation();
+  const { pathname, search } = useLocation();
+  const { replace } = useNavigate();
   const setLocale = async (locale2) => {
-    await fetchTranslations(getRoutePathnameFromHref(pathname), locale2);
+    const urlSearchParams = new URLSearchParams(search);
     changeLocale(locale2);
+    replace(pathname, {
+      locale: locale2,
+      // TODO: fix: this conversion is wrong, because there can be multiple
+      // search params with the same name
+      search: Object.fromEntries(urlSearchParams.entries())
+    });
   };
   return [locale, setLocale];
 }