fix: locale switcher correctly works w/ localized Makeswift paths

Author: agurtovoy

core/vibes/soul/primitives/navigation/_actions/localized-pathname.ts

@@ -0,0 +1,54 @@
+'use server';
+
+import { getSiteVersion } from '@makeswift/runtime/next/server';
+import { client as makeswiftClient } from '~/lib/makeswift/client';
+import { defaultLocale } from '~/i18n/locales';
+
+const getPageInfo = async ({
+  pathname,
+  locale,
+}: {
+  pathname: string;
+  locale: string | undefined;
+}) =>
+  makeswiftClient
+    .getPages({
+      locale: locale === defaultLocale ? undefined : locale,
+      pathPrefix: pathname,
+      siteVersion: await getSiteVersion(),
+    })
+    .filter((page) => page.path === pathname)
+    .toArray()
+    .then((pages) => (pages.length === 0 ? null : pages[0]));
+
+const getPathname = (variants: Array<{ locale: string; path: string }>, locale: string) =>
+  variants.find((v) => v.locale === locale)?.path;
+
+export async function getLocalizedPathname({
+  pathname,
+  activeLocale,
+  targetLocale,
+}: {
+  pathname: string;
+  activeLocale: string | undefined;
+  targetLocale: string;
+}) {
+  // fallback to page info for default locale if there is no page info for active locale
+  const fallbackPageInfo =
+    activeLocale === defaultLocale
+      ? Promise.resolve(null)
+      : getPageInfo({ pathname, locale: undefined });
+
+  const localizedPageInfo = await getPageInfo({ pathname, locale: activeLocale });
+  const pageInfo = localizedPageInfo ?? (await fallbackPageInfo);
+
+  if (pageInfo == null) {
+    return pathname;
+  }
+
+  return (
+    getPathname(pageInfo.localizedVariants, targetLocale) ??
+    getPathname(pageInfo.localizedVariants, defaultLocale) ??
+    pathname
+  );
+}

core/vibes/soul/primitives/navigation/index.tsx

@@ -30,6 +30,8 @@ import { Link } from '~/components/link';
 import { usePathname, useRouter } from '~/i18n/routing';
 import { useSearch } from '~/lib/search';
 
+import { getLocalizedPathname } from './_actions/localized-pathname';
+
 interface Link {
   label: string;
   href: string;
@@ -862,21 +864,32 @@ function SearchResults({
   );
 }
 
-const useSwitchLocale = () => {
+const useSwitchLocale = ({ activeLocale }: { activeLocale: Locale | undefined }) => {
   const pathname = usePathname();
   const router = useRouter();
   const params = useParams();
   const searchParams = useSearchParams();
 
   return useCallback(
-    (locale: string) =>
+    async (locale: string) => {
+      const localizedPathname = await getLocalizedPathname({
+        pathname,
+        activeLocale: activeLocale?.id,
+        targetLocale: locale,
+      });
+
       router.push(
-        // @ts-expect-error -- TypeScript will validate that only known `params`
-        // are used in combination with a given `pathname`. Since the two will
-        // always match for the current route, we can skip runtime checks.
-        { pathname, params, query: Object.fromEntries(searchParams.entries()) },
+        {
+          pathname: localizedPathname,
+          // @ts-expect-error -- TypeScript will validate that only known `params`
+          // are used in combination with a given `pathname`. Since the two will
+          // always match for the current route, we can skip runtime checks.
+          params,
+          query: Object.fromEntries(searchParams.entries()),
+        },
         { locale },
-      ),
+      );
+    },
     [pathname, params, router, searchParams],
   );
 };
@@ -892,7 +905,7 @@ function LocaleSwitcher({
 }) {
   const activeLocale = locales.find((locale) => locale.id === activeLocaleId);
   const [isPending, startTransition] = useTransition();
-  const switchLocale = useSwitchLocale();
+  const switchLocale = useSwitchLocale({ activeLocale });
 
   return (
     <div className={className}>