intor 2.0.3 → 2.1.0

package/dist/next/index.d.cts

@@ -5,6 +5,7 @@ import { LinkProps as LinkProps$1 } from 'next/link';
 import { Url } from 'next/dist/shared/lib/router/router';
 import * as next_dist_shared_lib_app_router_context_shared_runtime from 'next/dist/shared/lib/app-router-context.shared-runtime';
 import { NavigateOptions } from 'next/dist/shared/lib/app-router-context.shared-runtime';
+import { RedirectType } from 'next/navigation';
 
 type CookieRawOptions = {
     /** Completely disable cookie usage (no read, no write, no lookup by name) - default: false */
@@ -143,60 +144,102 @@ type TranslateHandlersProviderProps = {
 
 declare const TranslateHandlersProvider: ({ children, handlers, }: TranslateHandlersProviderProps) => React.JSX.Element;
 
-type PreKey<M> = NodeKeys<UnionLocaleMessages<M>> & string;
-interface SharedMethod<M> {
+declare const PREFIX_PLACEHOLDER = "{locale}";
+
+type IfGen<Then, Else = never> = IntorGeneratedTypes extends void ? Else : Then;
+type GenConfigKeys = IfGen<keyof IntorGeneratedTypes, string>;
+type GenConfig<C extends GenConfigKeys = "__default__"> = IntorGeneratedTypes extends void ? {
+    Locales: string;
+    Messages: LocaleNamespaceMessages;
+} : C extends keyof IntorGeneratedTypes ? {
+    Locales: IntorGeneratedTypes[C]["Locales"];
+    Messages: {
+        [K in IntorGeneratedTypes[C]["Locales"]]: IntorGeneratedTypes[C]["Messages"][typeof PREFIX_PLACEHOLDER];
+    };
+} : never;
+type GenMessages<C extends GenConfigKeys = "__default__"> = GenConfig<C>["Messages"];
+type GenLocaleFallback = Locale;
+type GenLocale<Config extends string = "__default__"> = Config extends keyof IntorGeneratedTypes ? IntorGeneratedTypes[Config]["Locales"] : GenLocaleFallback;
+
+type PreKey<C extends GenConfigKeys = "__default__"> = NodeKeys<UnionLocaleMessages<GenMessages<C>>>;
+interface TranslatorBaseProps<M> {
     messages: M;
     locale: LocaleKey<M>;
+}
+interface TranslatorClientProps<M> {
     isLoading: boolean;
     setLocale: (locale: LocaleKey<M>) => void;
 }
-type TranslatorMethods<M> = {
-    hasKey: (key?: InferTranslatorKey<M> & string, targetLocale?: LocaleKey<M>) => boolean;
-    t: (key?: InferTranslatorKey<M> & string, replacements?: Replacement | RichReplacement) => string;
-} & SharedMethod<M>;
-type ScopedTranslatorMethods<M, K extends string> = {
-    hasKey: (key?: M extends void ? string : ScopedLeafKeys<M, K> & string, targetLocale?: LocaleKey<M>) => boolean;
-    t: (key?: M extends void ? string : ScopedLeafKeys<M, K> & string, replacements?: Replacement | RichReplacement) => string;
-} & SharedMethod<M>;
-
-type IntorMessages = void;
-declare function useIntor<M = IntorMessages>(): TranslatorMethods<M>;
-declare function useIntor<M = IntorMessages, K extends PreKey<M> = PreKey<M>>(preKey: M extends void ? string : K): ScopedTranslatorMethods<M, K>;
+type TranslatorInstance<M> = {
+    hasKey: (key?: IfGen<InferTranslatorKey<M>, string>, targetLocale?: LocaleKey<M> | undefined) => boolean;
+    t: <Result = string>(key?: IfGen<InferTranslatorKey<M>, string>, replacements?: Replacement | RichReplacement) => Result;
+} & TranslatorBaseProps<M> & TranslatorClientProps<M>;
+type ScopedTranslatorInstance<M, K extends string> = {
+    hasKey: (key?: IfGen<ScopedLeafKeys<M, K> & string, string>, targetLocale?: LocaleKey<M>) => boolean;
+    t: (key?: IfGen<ScopedLeafKeys<M, K> & string, string>, replacements?: Replacement | RichReplacement) => string;
+} & TranslatorBaseProps<M> & TranslatorClientProps<M>;
+
+/**
+ * React hook to access a ready-to-use translator instance in the client.
+ *
+ * - Provides `t`, `hasKey`, `messages`, `locale`, `isLoading` and `setLocale`.
+ * - Supports optional `preKey` to create a scoped translator for nested keys.
+ * - Can accept a generic type parameter `M` to strongly type your messages.
+ */
+declare function useTranslator<C extends GenConfigKeys = "__default__">(): TranslatorInstance<GenMessages<C>>;
+declare function useTranslator<C extends GenConfigKeys = "__default__", K extends PreKey<C> = PreKey<C>>(preKey: IfGen<K, string>): ScopedTranslatorInstance<GenMessages<C>, K>;
 
 interface LinkProps extends Omit<LinkProps$1, "href">, Omit<React.AnchorHTMLAttributes<HTMLAnchorElement>, "href"> {
     href?: Url;
-    locale?: string;
+    locale?: GenLocale;
 }
 /**
- * Localized Link component wrapping Next.js Link.
+ * Localized Link component
  *
- * If loader type is "import", triggers a full page reload by setting window.location.href.
- * Otherwise, it updates the locale in context without a reload.
+ * - Wraps Next.js Link and handles locale switching.
+ * - Full reload occurs only if the locale changes and requires it; otherwise updates context.
  */
 declare const Link: ({ href, locale, children, onClick, ...props }: LinkProps) => React.JSX.Element;
 
 /**
- * Custom hook to get the localized pathname.
+ * usePathname hook
  *
- * It fetches the raw pathname from Next.js,
- * then prefixes it with the current locale
- * based on the app's configuration and locale context.
+ * Wraps Next.js usePathname and returns the current pathname prefixed with the active locale.
  */
 declare const usePathname: () => string;
 
+/**
+ * useRouter hook.
+ *
+ * Wraps Next.js useRouter and provides push/replace methods that automatically switch locale.
+ */
 declare const useRouter: () => {
     back(): void;
     forward(): void;
     refresh(): void;
     prefetch(href: string, options?: next_dist_shared_lib_app_router_context_shared_runtime.PrefetchOptions): void;
     push: (href: string, options?: NavigateOptions & {
-        locale?: Locale;
+        locale?: GenLocale;
     }) => void;
     replace: (href: string, options?: NavigateOptions & {
         locale?: Locale;
     }) => void;
 };
 
+/**
+ * redirect utility.
+ *
+ * - Wraps Next.js redirect and applies locale-aware navigation.
+ * - Automatically prefixes the pathname with the correct locale.
+ * - External URLs are redirected directly without modification.
+ */
+declare const redirect: ({ config, locale, url, type, }: {
+    config: IntorResolvedConfig;
+    locale?: GenLocale;
+    url: string;
+    type?: RedirectType | undefined;
+}) => Promise<never>;
+
 declare const PATHNAME_HEADER_NAME = "x-intor-pathname";
 
-export { IntorProvider, type IntorProviderProps, Link, PATHNAME_HEADER_NAME, TranslateHandlersProvider, type TranslateHandlersProviderProps, useIntor, usePathname, useRouter };
+export { IntorProvider, type IntorProviderProps, Link, PATHNAME_HEADER_NAME, TranslateHandlersProvider, type TranslateHandlersProviderProps, redirect, usePathname, useRouter, useTranslator };

package/dist/next/index.d.ts

@@ -5,6 +5,7 @@ import { LinkProps as LinkProps$1 } from 'next/link';
 import { Url } from 'next/dist/shared/lib/router/router';
 import * as next_dist_shared_lib_app_router_context_shared_runtime from 'next/dist/shared/lib/app-router-context.shared-runtime';
 import { NavigateOptions } from 'next/dist/shared/lib/app-router-context.shared-runtime';
+import { RedirectType } from 'next/navigation';
 
 type CookieRawOptions = {
     /** Completely disable cookie usage (no read, no write, no lookup by name) - default: false */
@@ -143,60 +144,102 @@ type TranslateHandlersProviderProps = {
 
 declare const TranslateHandlersProvider: ({ children, handlers, }: TranslateHandlersProviderProps) => React.JSX.Element;
 
-type PreKey<M> = NodeKeys<UnionLocaleMessages<M>> & string;
-interface SharedMethod<M> {
+declare const PREFIX_PLACEHOLDER = "{locale}";
+
+type IfGen<Then, Else = never> = IntorGeneratedTypes extends void ? Else : Then;
+type GenConfigKeys = IfGen<keyof IntorGeneratedTypes, string>;
+type GenConfig<C extends GenConfigKeys = "__default__"> = IntorGeneratedTypes extends void ? {
+    Locales: string;
+    Messages: LocaleNamespaceMessages;
+} : C extends keyof IntorGeneratedTypes ? {
+    Locales: IntorGeneratedTypes[C]["Locales"];
+    Messages: {
+        [K in IntorGeneratedTypes[C]["Locales"]]: IntorGeneratedTypes[C]["Messages"][typeof PREFIX_PLACEHOLDER];
+    };
+} : never;
+type GenMessages<C extends GenConfigKeys = "__default__"> = GenConfig<C>["Messages"];
+type GenLocaleFallback = Locale;
+type GenLocale<Config extends string = "__default__"> = Config extends keyof IntorGeneratedTypes ? IntorGeneratedTypes[Config]["Locales"] : GenLocaleFallback;
+
+type PreKey<C extends GenConfigKeys = "__default__"> = NodeKeys<UnionLocaleMessages<GenMessages<C>>>;
+interface TranslatorBaseProps<M> {
     messages: M;
     locale: LocaleKey<M>;
+}
+interface TranslatorClientProps<M> {
     isLoading: boolean;
     setLocale: (locale: LocaleKey<M>) => void;
 }
-type TranslatorMethods<M> = {
-    hasKey: (key?: InferTranslatorKey<M> & string, targetLocale?: LocaleKey<M>) => boolean;
-    t: (key?: InferTranslatorKey<M> & string, replacements?: Replacement | RichReplacement) => string;
-} & SharedMethod<M>;
-type ScopedTranslatorMethods<M, K extends string> = {
-    hasKey: (key?: M extends void ? string : ScopedLeafKeys<M, K> & string, targetLocale?: LocaleKey<M>) => boolean;
-    t: (key?: M extends void ? string : ScopedLeafKeys<M, K> & string, replacements?: Replacement | RichReplacement) => string;
-} & SharedMethod<M>;
-
-type IntorMessages = void;
-declare function useIntor<M = IntorMessages>(): TranslatorMethods<M>;
-declare function useIntor<M = IntorMessages, K extends PreKey<M> = PreKey<M>>(preKey: M extends void ? string : K): ScopedTranslatorMethods<M, K>;
+type TranslatorInstance<M> = {
+    hasKey: (key?: IfGen<InferTranslatorKey<M>, string>, targetLocale?: LocaleKey<M> | undefined) => boolean;
+    t: <Result = string>(key?: IfGen<InferTranslatorKey<M>, string>, replacements?: Replacement | RichReplacement) => Result;
+} & TranslatorBaseProps<M> & TranslatorClientProps<M>;
+type ScopedTranslatorInstance<M, K extends string> = {
+    hasKey: (key?: IfGen<ScopedLeafKeys<M, K> & string, string>, targetLocale?: LocaleKey<M>) => boolean;
+    t: (key?: IfGen<ScopedLeafKeys<M, K> & string, string>, replacements?: Replacement | RichReplacement) => string;
+} & TranslatorBaseProps<M> & TranslatorClientProps<M>;
+
+/**
+ * React hook to access a ready-to-use translator instance in the client.
+ *
+ * - Provides `t`, `hasKey`, `messages`, `locale`, `isLoading` and `setLocale`.
+ * - Supports optional `preKey` to create a scoped translator for nested keys.
+ * - Can accept a generic type parameter `M` to strongly type your messages.
+ */
+declare function useTranslator<C extends GenConfigKeys = "__default__">(): TranslatorInstance<GenMessages<C>>;
+declare function useTranslator<C extends GenConfigKeys = "__default__", K extends PreKey<C> = PreKey<C>>(preKey: IfGen<K, string>): ScopedTranslatorInstance<GenMessages<C>, K>;
 
 interface LinkProps extends Omit<LinkProps$1, "href">, Omit<React.AnchorHTMLAttributes<HTMLAnchorElement>, "href"> {
     href?: Url;
-    locale?: string;
+    locale?: GenLocale;
 }
 /**
- * Localized Link component wrapping Next.js Link.
+ * Localized Link component
  *
- * If loader type is "import", triggers a full page reload by setting window.location.href.
- * Otherwise, it updates the locale in context without a reload.
+ * - Wraps Next.js Link and handles locale switching.
+ * - Full reload occurs only if the locale changes and requires it; otherwise updates context.
  */
 declare const Link: ({ href, locale, children, onClick, ...props }: LinkProps) => React.JSX.Element;
 
 /**
- * Custom hook to get the localized pathname.
+ * usePathname hook
  *
- * It fetches the raw pathname from Next.js,
- * then prefixes it with the current locale
- * based on the app's configuration and locale context.
+ * Wraps Next.js usePathname and returns the current pathname prefixed with the active locale.
  */
 declare const usePathname: () => string;
 
+/**
+ * useRouter hook.
+ *
+ * Wraps Next.js useRouter and provides push/replace methods that automatically switch locale.
+ */
 declare const useRouter: () => {
     back(): void;
     forward(): void;
     refresh(): void;
     prefetch(href: string, options?: next_dist_shared_lib_app_router_context_shared_runtime.PrefetchOptions): void;
     push: (href: string, options?: NavigateOptions & {
-        locale?: Locale;
+        locale?: GenLocale;
     }) => void;
     replace: (href: string, options?: NavigateOptions & {
         locale?: Locale;
     }) => void;
 };
 
+/**
+ * redirect utility.
+ *
+ * - Wraps Next.js redirect and applies locale-aware navigation.
+ * - Automatically prefixes the pathname with the correct locale.
+ * - External URLs are redirected directly without modification.
+ */
+declare const redirect: ({ config, locale, url, type, }: {
+    config: IntorResolvedConfig;
+    locale?: GenLocale;
+    url: string;
+    type?: RedirectType | undefined;
+}) => Promise<never>;
+
 declare const PATHNAME_HEADER_NAME = "x-intor-pathname";
 
-export { IntorProvider, type IntorProviderProps, Link, PATHNAME_HEADER_NAME, TranslateHandlersProvider, type TranslateHandlersProviderProps, useIntor, usePathname, useRouter };
+export { IntorProvider, type IntorProviderProps, Link, PATHNAME_HEADER_NAME, TranslateHandlersProvider, type TranslateHandlersProviderProps, redirect, usePathname, useRouter, useTranslator };

package/dist/next/index.js

@@ -3,8 +3,9 @@ import { logry } from 'logry';
 import Keyv from 'keyv';
 import { Translator } from 'intor-translator';
 import NextLink from 'next/link';
-import { usePathname as usePathname$1, useRouter as useRouter$1 } from 'next/navigation';
 import { formatUrl } from 'next/dist/shared/lib/router/utils/format-url';
+import { usePathname as usePathname$1, useRouter as useRouter$1, redirect as redirect$1 } from 'next/navigation';
+import { cookies, headers } from 'next/headers';
 
 // src/adapters/next/contexts/intor-provider/intor-provider.tsx
 var ConfigContext = React7.createContext(void 0);
@@ -104,13 +105,19 @@ var DEFAULT_FORMATTER_CONFIG = {
 };
 function getLogger({
   id,
-  formatterConfig = DEFAULT_FORMATTER_CONFIG,
+  formatterConfig,
+  preset,
   ...options
 }) {
   const pool = getGlobalLoggerPool();
   let logger = pool.get(id);
   if (!logger) {
-    logger = logry({ id, formatterConfig, ...options });
+    logger = logry({
+      id,
+      formatterConfig: !formatterConfig && !preset ? DEFAULT_FORMATTER_CONFIG : formatterConfig,
+      preset,
+      ...options
+    });
     pool.set(id, logger);
     if (pool.size > 1e3) {
       const keys = Array.from(pool.keys());
@@ -211,6 +218,55 @@ var resolveNamespaces = ({
   }
 };
 
+// src/shared/utils/locale/normalize-locale.ts
+var normalizeLocale = (locale = "", supportedLocales = []) => {
+  if (!locale || supportedLocales.length === 0) return;
+  const toCanonical = (input) => {
+    try {
+      return Intl.getCanonicalLocales(input)[0]?.toLowerCase();
+    } catch {
+      return;
+    }
+  };
+  const canonicalLocale = toCanonical(locale);
+  if (!canonicalLocale) return;
+  const supportedCanonicalMap = /* @__PURE__ */ new Map();
+  for (const l of supportedLocales) {
+    const normalized = toCanonical(l);
+    if (normalized) {
+      supportedCanonicalMap.set(normalized, l);
+    }
+  }
+  if (supportedCanonicalMap.has(canonicalLocale)) {
+    return supportedCanonicalMap.get(canonicalLocale);
+  }
+  const baseLang = canonicalLocale.split("-")[0];
+  for (const [key, original] of supportedCanonicalMap) {
+    const supportedBase = key.split("-")[0];
+    if (supportedBase === baseLang) {
+      return original;
+    }
+  }
+  return;
+};
+
+// src/shared/utils/locale/resolve-preferred-locale.ts
+var resolvePreferredLocale = (acceptLanguageHeader, supportedLocales) => {
+  if (!acceptLanguageHeader || !supportedLocales || supportedLocales.length === 0) {
+    return;
+  }
+  const supportedLocalesSet = new Set(supportedLocales);
+  const preferred = acceptLanguageHeader.split(",").map((part) => {
+    const [lang, qValue] = part.split(";");
+    const q = qValue ? parseFloat(qValue.split("=")[1]) : 1;
+    if (isNaN(q)) {
+      return { lang: lang.trim(), q: 0 };
+    }
+    return { lang: lang.trim(), q };
+  }).sort((a, b) => b.q - a.q).find(({ lang }) => supportedLocalesSet.has(lang))?.lang;
+  return preferred;
+};
+
 // src/shared/utils/pathname/normalize-pathname.ts
 var normalizePathname = (rawPathname, options = {}) => {
   const length = rawPathname.length;
@@ -308,13 +364,13 @@ var fetchMessages = async ({
     const params = new URLSearchParams(searchParams);
     params.append("locale", locale);
     const url = `${apiUrl}?${params.toString()}`;
-    const headers = {
+    const headers2 = {
       "Content-Type": "application/json",
       ...apiHeaders
     };
     const response = await fetch(url, {
       method: "GET",
-      headers,
+      headers: headers2,
       cache: "no-store"
     });
     if (!response.ok) {
@@ -394,7 +450,10 @@ var loadApiMessages = async ({
     logger.warn("No apiUrl provided. Skipping fetch.");
     return;
   }
-  const pool = getGlobalMessagesPool();
+  let pool;
+  if (cache.enabled) {
+    pool = getGlobalMessagesPool();
+  }
   const key = normalizeCacheKey([
     loggerOptions.id,
     basePath,
@@ -403,7 +462,7 @@ var loadApiMessages = async ({
     [...namespaces ?? []].sort().join(",")
   ]);
   if (cache.enabled && key) {
-    const cached = await pool.get(key);
+    const cached = await pool?.get(key);
     if (cached) {
       logger.debug("Messages cache hit.", { key });
       return cached;
@@ -419,7 +478,7 @@ var loadApiMessages = async ({
   });
   if (messages) {
     if (cache.enabled && key) {
-      await pool.set(key, messages, cache.ttl);
+      await pool?.set(key, messages, cache.ttl);
     }
     return messages;
   }
@@ -437,7 +496,7 @@ var loadApiMessages = async ({
       searchParams: decodeURIComponent(searchParams.toString())
     });
     if (cache.enabled && key) {
-      await pool.set(key, fallbackResult.messages, cache.ttl);
+      await pool?.set(key, fallbackResult.messages, cache.ttl);
     }
     return fallbackResult.messages;
   }
@@ -543,8 +602,8 @@ var useInitLocaleCookie = ({
     if (typeof document === "undefined") return;
     const { cookie, routing } = config;
     const { firstVisit } = routing;
-    const cookies = document.cookie.split(";").map((c) => c.trim());
-    const isCookieExists = cookies.some((c) => c.startsWith(`${cookie.name}=`));
+    const cookies2 = document.cookie.split(";").map((c) => c.trim());
+    const isCookieExists = cookies2.some((c) => c.startsWith(`${cookie.name}=`));
     if (isCookieExists) return;
     if (!firstVisit.redirect) return;
     if (cookie.disabled || !cookie.autoSetCookie) return;
@@ -663,11 +722,11 @@ var IntorProvider = ({
   return /* @__PURE__ */ React7.createElement(ConfigProvider, { value: { config, pathname } }, /* @__PURE__ */ React7.createElement(MessagesProvider, { value: { messages } }, /* @__PURE__ */ React7.createElement(LocaleProvider, { value: { initialLocale } }, /* @__PURE__ */ React7.createElement(TranslatorProvider, null, children))));
 };
 
-// src/adapters/next/hooks/use-intor/use-intor.ts
-function useIntor(preKey) {
+// src/adapters/next/hooks/use-translator/use-translator.ts
+function useTranslator2(preKey) {
   const { translator } = useTranslator();
   const { setLocale } = useLocale();
-  const sharedMethod = {
+  const props = {
     messages: translator.messages,
     locale: translator.locale,
     isLoading: translator.isLoading,
@@ -675,10 +734,10 @@ function useIntor(preKey) {
   };
   if (preKey) {
     const { hasKey, t } = translator.scoped(preKey);
-    return { ...sharedMethod, hasKey, t };
+    return { ...props, hasKey, t };
   } else {
     const { hasKey, t } = translator;
-    return { ...sharedMethod, hasKey, t };
+    return { ...props, hasKey, t };
   }
 }
 
@@ -740,10 +799,7 @@ var localizePathname = ({
   };
 };
 
-// src/adapters/next/tools/utils/should-full-reload.ts
-var shouldFullReload = (loaderOptions) => {
-  return loaderOptions?.type === "import" || loaderOptions?.type === "api" && loaderOptions.fullReload === true;
-};
+// src/adapters/next/navigation/use-pathname.ts
 var usePathname = () => {
   const { config } = useConfig();
   const { locale } = useLocale();
@@ -755,75 +811,90 @@ var usePathname = () => {
   });
   return localePrefixedPathname;
 };
-var Link = ({
-  href,
+
+// src/adapters/next/navigation/utils/should-full-reload.ts
+var shouldFullReload = ({
+  config,
+  targetPathname,
   locale,
-  children,
-  onClick,
-  ...props
+  currentLocale
 }) => {
+  const loader = config.loader;
+  if (!loader || !loader.type) return false;
+  if (loader.type === "api" && !loader.fullReload) return false;
+  const { maybeLocale, isLocalePrefixed } = extractPathname({
+    config,
+    pathname: targetPathname
+  });
+  const isDifferentLocale = locale && locale !== currentLocale || isLocalePrefixed && maybeLocale !== currentLocale;
+  return isDifferentLocale ? true : false;
+};
+
+// src/adapters/next/navigation/utils/use-locale-switch.ts
+var useLocaleSwitch = () => {
   const { config } = useConfig();
   const { locale: currentLocale, setLocale } = useLocale();
-  const targetLocale = locale || currentLocale;
   const pathname = usePathname();
-  const formattedUrl = href ? typeof href === "string" ? href : formatUrl(href) : void 0;
-  const { localePrefixedPathname } = localizePathname({
-    config,
-    pathname: formattedUrl ?? pathname,
-    locale: targetLocale
-  });
-  const resolvedHref = localePrefixedPathname;
-  const handleClick = (e) => {
-    onClick?.(e);
-    if (shouldFullReload(config.loader)) {
+  const resolveHref = ({
+    href,
+    locale
+  }) => {
+    const isLocaleValid = locale && config.supportedLocales?.includes(locale);
+    const targetLocale = isLocaleValid ? locale : currentLocale;
+    const targetPathname = href ?? pathname;
+    const isExternal = targetPathname.startsWith("http");
+    const resolvedHref = !isExternal ? localizePathname({
+      config,
+      pathname: targetPathname,
+      locale: targetLocale
+    }).localePrefixedPathname : targetPathname;
+    return { resolvedHref, isExternal, targetLocale, targetPathname };
+  };
+  const switchLocale = ({
+    href,
+    locale
+  }) => {
+    const { resolvedHref, isExternal, targetLocale, targetPathname } = resolveHref({ href, locale });
+    if (isExternal) return;
+    if (shouldFullReload({ config, targetPathname, locale, currentLocale })) {
       setLocaleCookieBrowser({ cookie: config.cookie, locale: targetLocale });
       window.location.href = resolvedHref;
       return;
     } else {
       setLocale(targetLocale);
     }
+    return resolvedHref;
+  };
+  return { resolveHref, switchLocale };
+};
+
+// src/adapters/next/navigation/link.tsx
+var Link = ({
+  href,
+  locale,
+  children,
+  onClick,
+  ...props
+}) => {
+  const formatted = typeof href === "string" ? href : href ? formatUrl(href) : void 0;
+  const { resolveHref, switchLocale } = useLocaleSwitch();
+  const { resolvedHref } = resolveHref({ href: formatted, locale });
+  const handleClick = (e) => {
+    onClick?.(e);
+    switchLocale({ href: formatted, locale });
   };
   return /* @__PURE__ */ React7.createElement(NextLink, { href: resolvedHref, onClick: handleClick, ...props }, children);
 };
 var useRouter = () => {
-  const { config } = useConfig();
-  const { locale: currentLocale, setLocale } = useLocale();
   const { push, replace, ...rest } = useRouter$1();
+  const { switchLocale } = useLocaleSwitch();
   const pushWithLocale = (href, options) => {
-    const targetLocale = options?.locale || currentLocale;
-    if (options?.locale) {
-      const { localePrefixedPathname } = localizePathname({
-        config,
-        pathname: href,
-        locale: targetLocale
-      });
-      href = localePrefixedPathname;
-    }
-    if (shouldFullReload(config.loader)) {
-      window.location.href = href;
-      return;
-    } else {
-      setLocale(targetLocale);
-    }
-    push(href, options);
+    const resolvedHref = switchLocale({ href, locale: options?.locale });
+    if (resolvedHref) push(resolvedHref, options);
   };
   const replaceWithLocale = (href, options) => {
-    const targetLocale = options?.locale || currentLocale;
-    if (options?.locale) {
-      const { localePrefixedPathname } = localizePathname({
-        config,
-        pathname: href,
-        locale: targetLocale
-      });
-      href = localePrefixedPathname;
-    }
-    if (shouldFullReload(config.loader)) {
-      window.location.href = href;
-      return;
-    } else {
-      setLocale(targetLocale);
-    }
-    replace(href, options);
+    const resolvedHref = switchLocale({ href, locale: options?.locale });
+    if (resolvedHref) replace(resolvedHref, options);
   };
   return {
     push: pushWithLocale,
@@ -835,4 +906,55 @@ var useRouter = () => {
 // src/adapters/next/shared/constants/pathname-header-name.ts
 var PATHNAME_HEADER_NAME = "x-intor-pathname";
 
-export { IntorProvider, Link, PATHNAME_HEADER_NAME, TranslateHandlersProvider, useIntor, usePathname, useRouter };
+// src/adapters/next/server/get-i18n-context.ts
+var getI18nContext = async (config) => {
+  const baseLogger = getLogger({ id: config.id, ...config.logger });
+  const logger = baseLogger.child({ scope: "next-adapter" });
+  const cookiesStore = await cookies();
+  const headersStore = await headers();
+  const { defaultLocale, supportedLocales = [], cookie, routing } = config;
+  let locale;
+  if (!cookie.disabled) {
+    const localeFromCookie = cookiesStore.get(cookie.name)?.value;
+    locale = normalizeLocale(localeFromCookie, supportedLocales);
+    if (locale) {
+      logger.trace("Locale retrieved from cookie.", { locale });
+    }
+  }
+  if (!locale && routing.firstVisit.localeSource === "browser") {
+    const aLHeader = headersStore.get("accept-language") || void 0;
+    const preferredLocale = resolvePreferredLocale(aLHeader, supportedLocales);
+    locale = normalizeLocale(preferredLocale, supportedLocales);
+    logger.trace("Locale retrieved from header.", { locale });
+  }
+  const pathname = headersStore.get(PATHNAME_HEADER_NAME);
+  if (pathname) {
+    logger.trace("Pathname retrieved from header.", { pathname });
+  }
+  return {
+    locale: locale || defaultLocale,
+    pathname: pathname || ""
+  };
+};
+
+// src/adapters/next/navigation/redirect.ts
+var redirect = async ({
+  config,
+  locale,
+  url,
+  type
+}) => {
+  if (url.startsWith("http")) {
+    redirect$1(url);
+  }
+  const isLocaleValid = locale && config.supportedLocales?.includes(locale);
+  const { locale: detectedLocale } = await getI18nContext(config);
+  const { localePrefixedPathname } = localizePathname({
+    config,
+    pathname: url,
+    locale: isLocaleValid ? locale : detectedLocale
+  });
+  redirect$1(localePrefixedPathname, type);
+};
+
+export { IntorProvider, Link, PATHNAME_HEADER_NAME, TranslateHandlersProvider, redirect, usePathname, useRouter, useTranslator2 as useTranslator };

package/dist/next/middleware/index.cjs

@@ -266,7 +266,10 @@ var createResponse = ({
       override
     });
   }
-  const finalResponse = setPathnameHeader({ request, response });
+  const finalResponse = setPathnameHeader({
+    request,
+    response
+  });
   return finalResponse;
 };
 var determineInitialLocale = async (config) => {