next-intlayer 6.1.6 → 7.0.0-canary.2

package/dist/esm/client/useLocale.mjs

@@ -1,32 +1,36 @@
-"use client";
+'use client';
+
+
+import { useLocale as useLocale$1 } from "react-intlayer";
 import { getLocalizedUrl, getPathWithoutLocale } from "@intlayer/core";
 import { usePathname, useRouter } from "next/navigation.js";
 import { useCallback, useMemo } from "react";
-import { useLocale as useLocaleReact } from "react-intlayer";
-const useLocale = () => {
-  const { push, refresh } = useRouter();
-  const pathname = usePathname();
-  const pathWithoutLocale = useMemo(
-    () => getPathWithoutLocale(pathname),
-    [pathname]
-  );
-  const redirectionFunction = useCallback(
-    (locale) => {
-      const pathWithLocale = getLocalizedUrl(pathWithoutLocale, locale);
-      push(pathWithLocale);
-      return refresh();
-    },
-    [refresh, pathWithoutLocale]
-  );
-  const reactLocaleHook = useLocaleReact({
-    onLocaleChange: redirectionFunction
-  });
-  return {
-    ...reactLocaleHook,
-    pathWithoutLocale
-  };
-};
-export {
-  useLocale
+
+//#region src/client/useLocale.ts
+const useLocale = ({ onChange } = {}) => {
+	const { replace, push } = useRouter();
+	const pathname = usePathname();
+	const pathWithoutLocale = useMemo(() => getPathWithoutLocale(pathname), [pathname]);
+	return {
+		...useLocale$1({ onLocaleChange: useCallback((locale) => {
+			if (!onChange) return;
+			if (typeof onChange === "function") {
+				onChange(locale);
+				return;
+			}
+			const pathWithLocale = getLocalizedUrl(pathWithoutLocale, locale);
+			if (onChange === "replace") replace(pathWithLocale);
+			if (onChange === "push") push(pathWithLocale);
+		}, [
+			replace,
+			push,
+			pathWithoutLocale,
+			onChange
+		]) }),
+		pathWithoutLocale
+	};
 };
+
+//#endregion
+export { useLocale };
 //# sourceMappingURL=useLocale.mjs.map

package/dist/esm/client/useLocale.mjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/client/useLocale.ts"],"sourcesContent":["'use client';\n\nimport { type LocalesValues } from '@intlayer/config/client';\nimport { getLocalizedUrl, getPathWithoutLocale } from '@intlayer/core';\nimport { usePathname, useRouter } from 'next/navigation.js';\nimport { useCallback, useMemo } from 'react';\nimport { useLocale as useLocaleReact } from 'react-intlayer';\n\nexport const useLocale = () => {\n  const { push, refresh } = useRouter();\n  const pathname = usePathname();\n  const pathWithoutLocale = useMemo(\n    () => getPathWithoutLocale(pathname),\n    [pathname]\n  );\n\n  const redirectionFunction = useCallback(\n    (locale: LocalesValues) => {\n      const pathWithLocale = getLocalizedUrl(pathWithoutLocale, locale);\n\n      push(pathWithLocale);\n\n      return refresh();\n    },\n    [refresh, pathWithoutLocale]\n  );\n\n  const reactLocaleHook = useLocaleReact({\n    onLocaleChange: redirectionFunction,\n  });\n\n  return {\n    ...reactLocaleHook,\n    pathWithoutLocale,\n  };\n};\n"],"mappings":";AAGA,SAAS,iBAAiB,4BAA4B;AACtD,SAAS,aAAa,iBAAiB;AACvC,SAAS,aAAa,eAAe;AACrC,SAAS,aAAa,sBAAsB;AAErC,MAAM,YAAY,MAAM;AAC7B,QAAM,EAAE,MAAM,QAAQ,IAAI,UAAU;AACpC,QAAM,WAAW,YAAY;AAC7B,QAAM,oBAAoB;AAAA,IACxB,MAAM,qBAAqB,QAAQ;AAAA,IACnC,CAAC,QAAQ;AAAA,EACX;AAEA,QAAM,sBAAsB;AAAA,IAC1B,CAAC,WAA0B;AACzB,YAAM,iBAAiB,gBAAgB,mBAAmB,MAAM;AAEhE,WAAK,cAAc;AAEnB,aAAO,QAAQ;AAAA,IACjB;AAAA,IACA,CAAC,SAAS,iBAAiB;AAAA,EAC7B;AAEA,QAAM,kBAAkB,eAAe;AAAA,IACrC,gBAAgB;AAAA,EAClB,CAAC;AAED,SAAO;AAAA,IACL,GAAG;AAAA,IACH;AAAA,EACF;AACF;","names":[]}
+{"version":3,"file":"useLocale.mjs","names":["useLocaleReact"],"sources":["../../../src/client/useLocale.ts"],"sourcesContent":["'use client';\n\nimport { getLocalizedUrl, getPathWithoutLocale } from '@intlayer/core';\nimport type { LocalesValues } from '@intlayer/types';\nimport { usePathname, useRouter } from 'next/navigation.js';\nimport { useCallback, useMemo } from 'react';\nimport { useLocale as useLocaleReact } from 'react-intlayer';\n\ntype UseLocaleProps = {\n  onChange?: 'replace' | 'push' | ((locale: LocalesValues) => void);\n};\n\nexport const useLocale = ({ onChange }: UseLocaleProps = {}) => {\n  const { replace, push } = useRouter();\n  const pathname = usePathname();\n  const pathWithoutLocale = useMemo(\n    () => getPathWithoutLocale(pathname),\n    [pathname]\n  );\n\n  const redirectionFunction = useCallback(\n    (locale: LocalesValues) => {\n      if (!onChange) return;\n\n      if (typeof onChange === 'function') {\n        onChange(locale);\n        return;\n      }\n\n      const pathWithLocale = getLocalizedUrl(pathWithoutLocale, locale);\n\n      if (onChange === 'replace') {\n        replace(pathWithLocale);\n      }\n      if (onChange === 'push') {\n        push(pathWithLocale);\n      }\n    },\n    [replace, push, pathWithoutLocale, onChange]\n  );\n\n  const reactLocaleHook = useLocaleReact({\n    onLocaleChange: redirectionFunction,\n  });\n\n  return {\n    ...reactLocaleHook,\n    pathWithoutLocale,\n  };\n};\n"],"mappings":";;;;;;;;;AAYA,MAAa,aAAa,EAAE,aAA6B,EAAE,KAAK;CAC9D,MAAM,EAAE,SAAS,SAAS,WAAW;CACrC,MAAM,WAAW,aAAa;CAC9B,MAAM,oBAAoB,cAClB,qBAAqB,SAAS,EACpC,CAAC,SAAS,CACX;AA2BD,QAAO;EACL,GALsBA,YAAe,EACrC,gBAtB0B,aACzB,WAA0B;AACzB,OAAI,CAAC,SAAU;AAEf,OAAI,OAAO,aAAa,YAAY;AAClC,aAAS,OAAO;AAChB;;GAGF,MAAM,iBAAiB,gBAAgB,mBAAmB,OAAO;AAEjE,OAAI,aAAa,UACf,SAAQ,eAAe;AAEzB,OAAI,aAAa,OACf,MAAK,eAAe;KAGxB;GAAC;GAAS;GAAM;GAAmB;GAAS,CAC7C,EAIA,CAAC;EAIA;EACD"}

package/dist/esm/client/useLocalePageRouter.mjs

@@ -1,31 +1,24 @@
-"use client";
+'use client';
+
+
+import { useLocale } from "react-intlayer";
 import { getLocalizedUrl, getPathWithoutLocale } from "@intlayer/core";
-import { useRouter } from "next/router.js";
 import { useCallback, useMemo } from "react";
-import { useLocale as useLocaleReact } from "react-intlayer";
+import { useRouter } from "next/router.js";
+
+//#region src/client/useLocalePageRouter.ts
 const useLocalePageRouter = () => {
-  const { push, pathname, reload } = useRouter();
-  const pathWithoutLocale = useMemo(
-    () => getPathWithoutLocale(pathname),
-    [pathname]
-  );
-  const redirectionFunction = useCallback(
-    (locale) => {
-      const pathWithLocale = getLocalizedUrl(pathWithoutLocale, locale);
-      push(pathWithLocale);
-      return reload();
-    },
-    [pathWithoutLocale]
-  );
-  const reactLocaleHook = useLocaleReact({
-    onLocaleChange: redirectionFunction
-  });
-  return {
-    ...reactLocaleHook,
-    pathWithoutLocale
-  };
-};
-export {
-  useLocalePageRouter
+	const { push, pathname, reload } = useRouter();
+	const pathWithoutLocale = useMemo(() => getPathWithoutLocale(pathname), [pathname]);
+	return {
+		...useLocale({ onLocaleChange: useCallback((locale) => {
+			push(getLocalizedUrl(pathWithoutLocale, locale));
+			return reload();
+		}, [pathWithoutLocale]) }),
+		pathWithoutLocale
+	};
 };
+
+//#endregion
+export { useLocalePageRouter };
 //# sourceMappingURL=useLocalePageRouter.mjs.map

package/dist/esm/client/useLocalePageRouter.mjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/client/useLocalePageRouter.ts"],"sourcesContent":["'use client';\n\nimport { LocalesValues } from '@intlayer/config/client';\nimport { getLocalizedUrl, getPathWithoutLocale } from '@intlayer/core';\nimport { useRouter } from 'next/router.js';\nimport { useCallback, useMemo } from 'react';\nimport { useLocale as useLocaleReact } from 'react-intlayer';\n\nexport const useLocalePageRouter = () => {\n  const { push, pathname, reload } = useRouter();\n  const pathWithoutLocale = useMemo(\n    () => getPathWithoutLocale(pathname),\n    [pathname]\n  );\n\n  const redirectionFunction = useCallback(\n    (locale: LocalesValues) => {\n      const pathWithLocale = getLocalizedUrl(pathWithoutLocale, locale);\n\n      push(pathWithLocale);\n\n      return reload();\n    },\n    [pathWithoutLocale]\n  );\n\n  const reactLocaleHook = useLocaleReact({\n    onLocaleChange: redirectionFunction,\n  });\n\n  return {\n    ...reactLocaleHook,\n    pathWithoutLocale,\n  };\n};\n"],"mappings":";AAGA,SAAS,iBAAiB,4BAA4B;AACtD,SAAS,iBAAiB;AAC1B,SAAS,aAAa,eAAe;AACrC,SAAS,aAAa,sBAAsB;AAErC,MAAM,sBAAsB,MAAM;AACvC,QAAM,EAAE,MAAM,UAAU,OAAO,IAAI,UAAU;AAC7C,QAAM,oBAAoB;AAAA,IACxB,MAAM,qBAAqB,QAAQ;AAAA,IACnC,CAAC,QAAQ;AAAA,EACX;AAEA,QAAM,sBAAsB;AAAA,IAC1B,CAAC,WAA0B;AACzB,YAAM,iBAAiB,gBAAgB,mBAAmB,MAAM;AAEhE,WAAK,cAAc;AAEnB,aAAO,OAAO;AAAA,IAChB;AAAA,IACA,CAAC,iBAAiB;AAAA,EACpB;AAEA,QAAM,kBAAkB,eAAe;AAAA,IACrC,gBAAgB;AAAA,EAClB,CAAC;AAED,SAAO;AAAA,IACL,GAAG;AAAA,IACH;AAAA,EACF;AACF;","names":[]}
+{"version":3,"file":"useLocalePageRouter.mjs","names":["useLocaleReact"],"sources":["../../../src/client/useLocalePageRouter.ts"],"sourcesContent":["'use client';\n\nimport { getLocalizedUrl, getPathWithoutLocale } from '@intlayer/core';\nimport type { LocalesValues } from '@intlayer/types';\nimport { useRouter } from 'next/router.js';\nimport { useCallback, useMemo } from 'react';\nimport { useLocale as useLocaleReact } from 'react-intlayer';\n\nexport const useLocalePageRouter = () => {\n  const { push, pathname, reload } = useRouter();\n  const pathWithoutLocale = useMemo(\n    () => getPathWithoutLocale(pathname),\n    [pathname]\n  );\n\n  const redirectionFunction = useCallback(\n    (locale: LocalesValues) => {\n      const pathWithLocale = getLocalizedUrl(pathWithoutLocale, locale);\n\n      push(pathWithLocale);\n\n      return reload();\n    },\n    [pathWithoutLocale]\n  );\n\n  const reactLocaleHook = useLocaleReact({\n    onLocaleChange: redirectionFunction,\n  });\n\n  return {\n    ...reactLocaleHook,\n    pathWithoutLocale,\n  };\n};\n"],"mappings":";;;;;;;;;AAQA,MAAa,4BAA4B;CACvC,MAAM,EAAE,MAAM,UAAU,WAAW,WAAW;CAC9C,MAAM,oBAAoB,cAClB,qBAAqB,SAAS,EACpC,CAAC,SAAS,CACX;AAiBD,QAAO;EACL,GALsBA,UAAe,EACrC,gBAZ0B,aACzB,WAA0B;AAGzB,QAFuB,gBAAgB,mBAAmB,OAAO,CAE7C;AAEpB,UAAO,QAAQ;KAEjB,CAAC,kBAAkB,CACpB,EAIA,CAAC;EAIA;EACD"}

package/dist/esm/generateStaticParams.mjs

@@ -1,7 +1,9 @@
 import configuration from "@intlayer/config/built";
+
+//#region src/generateStaticParams.ts
 const { locales } = configuration.internationalization;
 const generateStaticParams = () => locales.map((locale) => ({ locale }));
-export {
-  generateStaticParams
-};
+
+//#endregion
+export { generateStaticParams };
 //# sourceMappingURL=generateStaticParams.mjs.map

package/dist/esm/generateStaticParams.mjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/generateStaticParams.ts"],"sourcesContent":["import configuration from '@intlayer/config/built';\n\nconst { locales } = configuration.internationalization;\n\nexport const generateStaticParams = () => locales.map((locale) => ({ locale }));\n"],"mappings":"AAAA,OAAO,mBAAmB;AAE1B,MAAM,EAAE,QAAQ,IAAI,cAAc;AAE3B,MAAM,uBAAuB,MAAM,QAAQ,IAAI,CAAC,YAAY,EAAE,OAAO,EAAE;","names":[]}
+{"version":3,"file":"generateStaticParams.mjs","names":[],"sources":["../../src/generateStaticParams.ts"],"sourcesContent":["import configuration from '@intlayer/config/built';\n\nconst { locales } = configuration.internationalization;\n\nexport const generateStaticParams = () => locales.map((locale) => ({ locale }));\n"],"mappings":";;;AAEA,MAAM,EAAE,YAAY,cAAc;AAElC,MAAa,6BAA6B,QAAQ,KAAK,YAAY,EAAE,QAAQ,EAAE"}

package/dist/esm/index.mjs

@@ -1,35 +1,7 @@
-import {
-  IntlayerClientContext,
-  MarkdownProvider,
-  t,
-  useDictionary,
-  useDictionaryAsync,
-  useDictionaryDynamic,
-  useI18n,
-  useIntlayer,
-  useLoadDynamic,
-  useLocaleCookie
-} from "react-intlayer";
-import {
-  IntlayerClientProvider,
-  useLocale,
-  useLocalePageRouter
-} from "./client/index.mjs";
 import { generateStaticParams } from "./generateStaticParams.mjs";
-export {
-  IntlayerClientContext,
-  IntlayerClientProvider,
-  MarkdownProvider,
-  generateStaticParams,
-  t,
-  useDictionary,
-  useDictionaryAsync,
-  useDictionaryDynamic,
-  useI18n,
-  useIntlayer,
-  useLoadDynamic,
-  useLocale,
-  useLocaleCookie,
-  useLocalePageRouter
-};
-//# sourceMappingURL=index.mjs.map
+import { useLocale } from "./client/useLocale.mjs";
+import { IntlayerClientProvider } from "./client/IntlayerClientProvider.mjs";
+import { useLocalePageRouter } from "./client/useLocalePageRouter.mjs";
+import { IntlayerClientContext, MarkdownProvider, localeCookie, localeInStorage, setLocaleCookie, setLocaleInStorage, t, useDictionary, useDictionaryAsync, useDictionaryDynamic, useI18n, useIntlayer, useLoadDynamic, useLocaleCookie, useLocaleStorage } from "react-intlayer";
+
+export { IntlayerClientContext, IntlayerClientProvider, MarkdownProvider, generateStaticParams, localeCookie, localeInStorage, setLocaleCookie, setLocaleInStorage, t, useDictionary, useDictionaryAsync, useDictionaryDynamic, useI18n, useIntlayer, useLoadDynamic, useLocale, useLocaleCookie, useLocalePageRouter, useLocaleStorage };

package/dist/esm/middleware/index.mjs

@@ -1,4 +1,5 @@
-export * from "./intlayerMiddleware.mjs";
-export * from "./localeDetector.mjs";
-export * from "./multipleMiddlewares.mjs";
-//# sourceMappingURL=index.mjs.map
+import { localeDetector } from "./localeDetector.mjs";
+import { intlayerMiddleware } from "./intlayerMiddleware.mjs";
+import { multipleMiddlewares } from "./multipleMiddlewares.mjs";
+
+export { intlayerMiddleware, localeDetector, multipleMiddlewares };

package/dist/esm/middleware/intlayerMiddleware.mjs

@@ -1,177 +1,223 @@
+import { localeDetector as localeDetector$1 } from "./localeDetector.mjs";
 import configuration from "@intlayer/config/built";
-import {
-  NextResponse
-} from "next/server";
-import { localeDetector } from "./localeDetector.mjs";
-const { internationalization, middleware } = configuration;
-const { locales, defaultLocale } = internationalization;
-const {
-  headerName,
-  cookieName,
-  prefixDefault,
-  basePath,
-  serverSetCookie,
-  noPrefix,
-  detectLocaleOnPrefetchNoPrefix
-} = middleware;
+import { getLocaleFromStorage } from "@intlayer/core";
+import { NextResponse } from "next/server";
+
+//#region src/middleware/intlayerMiddleware.ts
+const { internationalization, routing } = configuration ?? {};
+const { locales, defaultLocale } = internationalization ?? {};
+const { headerName, basePath, detectLocaleOnPrefetchNoPrefix, mode } = routing ?? {};
+const noPrefix = mode === "no-prefix" || mode === "search-params";
+const prefixDefault = mode === "prefix-all";
+/**
+* Detects if the request is a prefetch request from Next.js.
+*
+* Next.js prefetch requests can be identified by several headers:
+* - purpose: 'prefetch' (standard prefetch header)
+* - next-router-prefetch: '1' (Next.js router prefetch)
+* - next-url: present (Next.js internal navigation)
+*
+* During prefetch, we should ignore cookie-based locale detection
+* to prevent unwanted redirects when users are switching locales.
+*
+* @param request - The incoming Next.js request object.
+* @returns - True if the request is a prefetch request, false otherwise.
+*/
 const isPrefetchRequest = (request) => {
-  const purpose = request.headers.get("purpose");
-  const nextRouterPrefetch = request.headers.get("next-router-prefetch");
-  const nextUrl = request.headers.get("next-url");
-  const xNextjsData = request.headers.get("x-nextjs-data");
-  return purpose === "prefetch" || nextRouterPrefetch === "1" || !!nextUrl || !!xNextjsData;
+	const purpose = request.headers.get("purpose");
+	const nextRouterPrefetch = request.headers.get("next-router-prefetch");
+	const nextUrl = request.headers.get("next-url");
+	const xNextjsData = request.headers.get("x-nextjs-data");
+	return purpose === "prefetch" || nextRouterPrefetch === "1" || !!nextUrl || !!xNextjsData;
 };
-const intlayerMiddleware = (request, _event, _response) => {
-  const pathname = request.nextUrl.pathname;
-  const cookieLocale = getCookieLocale(request);
-  const basePathTrailingSlash = basePath.endsWith("/");
-  if (noPrefix) {
-    return handleNoPrefix(
-      request,
-      cookieLocale,
-      pathname,
-      basePathTrailingSlash
-    );
-  }
-  const pathLocale = getPathLocale(pathname);
-  return handlePrefix(
-    request,
-    cookieLocale,
-    pathLocale,
-    pathname,
-    basePathTrailingSlash
-  );
+const appendLocaleSearchIfNeeded = (search, locale) => {
+	if (mode !== "search-params") return search;
+	const params = new URLSearchParams(search ?? "");
+	params.set("locale", locale);
+	return `?${params.toString()}`;
 };
-const getCookieLocale = (request) => {
-  if (!cookieName) return void 0;
-  const cookieValue = request.cookies.get(cookieName)?.value;
-  if (cookieValue && locales.includes(cookieValue)) {
-    return cookieValue;
-  }
+/**
+* Middleware that handles the internationalization layer
+*
+* Usage:
+*
+* ```ts
+* // ./src/middleware.ts
+*
+* export { intlayerMiddleware as middleware } from '@intlayer/next/middleware';
+*
+* // applies this middleware only to files in the app directory
+* export const config = {
+*   matcher: '/((?!api|static|.*\\..*|_next).*)',
+* };
+* ```
+*
+* Main middleware function for handling internationalization.
+*
+* @param request - The incoming Next.js request object.
+* @param event - The Next.js fetch event (optional).
+* @param response - The Next.js response object (optional).
+* @returns - The response to be returned to the client.
+*/
+const intlayerMiddleware = (request, _event, _response) => {
+	const pathname = request.nextUrl.pathname;
+	const cookieLocale = getCookieLocale(request);
+	const basePathTrailingSlash = basePath.endsWith("/");
+	if (noPrefix) return handleNoPrefix(request, cookieLocale, pathname, basePathTrailingSlash);
+	return handlePrefix(request, cookieLocale, getPathLocale(pathname), pathname, basePathTrailingSlash);
 };
+/**
+* Retrieves the locale from the request cookies if available and valid.
+*
+* @param request - The incoming Next.js request object.
+* @returns - The locale found in the cookies, or undefined if not found or invalid.
+*/
+const getCookieLocale = (request) => getLocaleFromStorage({ getCookie: (name) => request.cookies.get(name)?.value ?? null });
+/**
+* Handles the case where URLs do not have locale prefixes.
+*
+* @param request - The incoming Next.js request object.
+* @param cookieLocale - The locale from the cookie.
+* @param pathname - The pathname from the request URL.
+* @param basePathTrailingSlash - Indicates if the basePath ends with a slash.
+* @returns - The rewritten response with the locale applied.
+*/
 const handleNoPrefix = (request, cookieLocale, pathname, basePathTrailingSlash) => {
-  const locale = cookieLocale ?? defaultLocale;
-  const newPath = constructPath(
-    locale,
-    pathname,
-    basePath,
-    basePathTrailingSlash,
-    request.nextUrl.search
-  );
-  return rewriteUrl(request, newPath, locale);
+	const locale = cookieLocale ?? defaultLocale;
+	return rewriteUrl(request, constructPath(locale, pathname, basePath, basePathTrailingSlash, appendLocaleSearchIfNeeded(request.nextUrl.search, locale)), locale);
 };
-const getPathLocale = (pathname) => locales.find(
-  (locale) => pathname.startsWith(`/${locale}/`) || pathname === `/${locale}`
-);
+/**
+* Extracts the locale from the URL pathname if present.
+*
+* @param pathname - The pathname from the request URL.
+* @returns - The locale found in the pathname, or undefined if not found.
+*/
+const getPathLocale = (pathname) => locales.find((locale) => pathname.startsWith(`/${locale}/`) || pathname === `/${locale}`);
+/**
+* Handles the case where URLs have locale prefixes.
+*
+* @param request - The incoming Next.js request object.
+* @param cookieLocale - The locale from the cookie.
+* @param pathLocale - The locale extracted from the pathname.
+* @param pathname - The pathname from the request URL.
+* @param basePathTrailingSlash - Indicates if the basePath ends with a slash.
+* @returns - The response to be returned to the client.
+*/
 const handlePrefix = (request, cookieLocale, pathLocale, pathname, basePathTrailingSlash) => {
-  if (!pathLocale) {
-    const isPrefetch = isPrefetchRequest(request);
-    if (isPrefetch && !detectLocaleOnPrefetchNoPrefix) {
-      return handleMissingPathLocale(
-        request,
-        defaultLocale,
-        pathname,
-        basePathTrailingSlash
-      );
-    }
-    return handleMissingPathLocale(
-      request,
-      cookieLocale,
-      pathname,
-      basePathTrailingSlash
-    );
-  }
-  return handleExistingPathLocale(
-    request,
-    cookieLocale,
-    pathLocale,
-    pathname,
-    basePathTrailingSlash
-  );
+	if (!pathLocale) {
+		if (isPrefetchRequest(request) && !detectLocaleOnPrefetchNoPrefix) return handleMissingPathLocale(request, defaultLocale, pathname, basePathTrailingSlash);
+		return handleMissingPathLocale(request, cookieLocale, pathname, basePathTrailingSlash);
+	}
+	return handleExistingPathLocale(request, cookieLocale, pathLocale, pathname, basePathTrailingSlash);
 };
+/**
+* Handles requests where the locale is missing from the URL pathname.
+*
+* @param request - The incoming Next.js request object.
+* @param cookieLocale - The locale from the cookie.
+* @param pathname - The pathname from the request URL.
+* @param basePathTrailingSlash - Indicates if the basePath ends with a slash.
+* @returns - The response to be returned to the client.
+*/
 const handleMissingPathLocale = (request, cookieLocale, pathname, basePathTrailingSlash) => {
-  let locale = cookieLocale ?? localeDetector?.(request) ?? defaultLocale;
-  if (!locales.includes(locale)) {
-    locale = defaultLocale;
-  }
-  const newPath = constructPath(
-    locale,
-    pathname,
-    basePath,
-    basePathTrailingSlash,
-    request.nextUrl.search
-  );
-  return prefixDefault || locale !== defaultLocale ? redirectUrl(request, newPath) : rewriteUrl(request, newPath, locale);
+	let locale = cookieLocale ?? localeDetector$1?.(request) ?? defaultLocale;
+	if (!locales.includes(locale)) locale = defaultLocale;
+	const newPath = constructPath(locale, pathname, basePath, basePathTrailingSlash, appendLocaleSearchIfNeeded(request.nextUrl.search, locale));
+	return prefixDefault || locale !== defaultLocale ? redirectUrl(request, newPath) : rewriteUrl(request, newPath, locale);
 };
+/**
+* Handles requests where the locale exists in the URL pathname.
+*
+* @param request - The incoming Next.js request object.
+* @param cookieLocale - The locale from the cookie.
+* @param pathLocale - The locale extracted from the pathname.
+* @param pathname - The pathname from the request URL.
+* @param basePathTrailingSlash - Indicates if the basePath ends with a slash.
+* @returns - The response to be returned to the client.
+*/
 const handleExistingPathLocale = (request, cookieLocale, pathLocale, pathname, basePathTrailingSlash) => {
-  if (
-    // If the cookie locale is set and differs from the locale in the URL, and server should not always set cookie
-    cookieLocale && cookieLocale !== pathLocale && serverSetCookie !== "always"
-  ) {
-    const newPath = handleCookieLocaleMismatch(
-      request,
-      pathname,
-      pathLocale,
-      cookieLocale,
-      basePath,
-      basePathTrailingSlash
-    );
-    return redirectUrl(request, newPath);
-  }
-  return handleDefaultLocaleRedirect(
-    request,
-    pathLocale,
-    pathname,
-    basePathTrailingSlash
-  );
+	if (cookieLocale && cookieLocale !== pathLocale) return redirectUrl(request, handleCookieLocaleMismatch(request, pathname, pathLocale, cookieLocale, basePath, basePathTrailingSlash));
+	return handleDefaultLocaleRedirect(request, pathLocale, pathname, basePathTrailingSlash);
 };
-const handleCookieLocaleMismatch = (request, pathname, pathLocale, cookieLocale, basePath2, basePathTrailingSlash) => {
-  const newPath = pathname.replace(`/${pathLocale}`, `/${cookieLocale}`);
-  return constructPath(
-    cookieLocale,
-    newPath,
-    basePath2,
-    basePathTrailingSlash,
-    request.nextUrl.search
-  );
+/**
+* Handles the scenario where the locale in the cookie does not match the locale in the URL pathname.
+*
+* @param request - The incoming Next.js request object.
+* @param pathname - The pathname from the request URL.
+* @param pathLocale - The locale extracted from the pathname.
+* @param cookieLocale - The locale from the cookie.
+* @param basePath - The base path of the application.
+* @param basePathTrailingSlash - Indicates if the basePath ends with a slash.
+* @returns - The new URL path with the correct locale.
+*/
+const handleCookieLocaleMismatch = (request, pathname, pathLocale, cookieLocale, basePath$1, basePathTrailingSlash) => {
+	return constructPath(cookieLocale, pathname.replace(`/${pathLocale}`, `/${cookieLocale}`), basePath$1, basePathTrailingSlash, appendLocaleSearchIfNeeded(request.nextUrl.search, cookieLocale));
 };
+/**
+* Handles redirection when the default locale is used and prefixing is not required.
+*
+* @param request - The incoming Next.js request object.
+* @param pathLocale - The locale extracted from the pathname.
+* @param pathname - The pathname from the request URL.
+* @param basePathTrailingSlash - Indicates if the basePath ends with a slash.
+* @returns - The rewritten response without the locale prefix.
+*/
 const handleDefaultLocaleRedirect = (request, pathLocale, pathname, basePathTrailingSlash) => {
-  if (
-    // If default locale should not be prefixed and the pathLocale is the defaultLocale
-    !prefixDefault && pathLocale === defaultLocale
-  ) {
-    let pathWithoutLocale = pathname.slice(`/${pathLocale}`.length) ?? "/";
-    if (basePathTrailingSlash) {
-      pathWithoutLocale = pathWithoutLocale.slice(1);
-    }
-    if (request.nextUrl.search) {
-      pathWithoutLocale += request.nextUrl.search;
-    }
-    return rewriteUrl(request, `${basePath}${pathWithoutLocale}`, pathLocale);
-  }
-  return rewriteUrl(request, pathname, pathLocale);
+	if (!prefixDefault && pathLocale === defaultLocale) {
+		let pathWithoutLocale = pathname.slice(`/${pathLocale}`.length) ?? "/";
+		if (basePathTrailingSlash) pathWithoutLocale = pathWithoutLocale.slice(1);
+		const searchWithLocale$1 = appendLocaleSearchIfNeeded(request.nextUrl.search, pathLocale);
+		if (searchWithLocale$1) pathWithoutLocale += searchWithLocale$1;
+		else if (request.nextUrl.search) pathWithoutLocale += request.nextUrl.search;
+		return rewriteUrl(request, `${basePath}${pathWithoutLocale}`, pathLocale);
+	}
+	const searchWithLocale = appendLocaleSearchIfNeeded(request.nextUrl.search, pathLocale);
+	return rewriteUrl(request, searchWithLocale ? `${pathname}${searchWithLocale}` : pathname, pathLocale);
 };
-const constructPath = (locale, path, basePath2, basePathTrailingSlash, search) => {
-  let newPath = `${locale}${path}`;
-  newPath = `${basePath2}${basePathTrailingSlash ? "" : "/"}${newPath}`;
-  if (search) {
-    newPath += search;
-  }
-  return newPath;
+/**
+* Constructs a new path by combining the locale, path, basePath, and search parameters.
+*
+* @param locale - The locale to include in the path.
+* @param path - The original path from the request.
+* @param basePath - The base path of the application.
+* @param basePathTrailingSlash - Indicates if the basePath ends with a slash.
+* @param [search] - The query string from the request URL (optional).
+* @returns - The constructed new path.
+*/
+const constructPath = (locale, path, basePath$1, basePathTrailingSlash, search) => {
+	const pathWithLocalePrefix = mode === "search-params" ? path : `${locale}${path}`;
+	let newPath = `${basePath$1}${basePathTrailingSlash ? "" : "/"}${pathWithLocalePrefix}`;
+	if (search) newPath += search;
+	return newPath;
 };
+/**
+* Rewrites the URL to the new path and sets the locale header.
+*
+* @param request - The incoming Next.js request object.
+* @param newPath - The new path to rewrite to.
+* @param locale - The locale to set in the response header.
+* @returns - The rewritten response.
+*/
 const rewriteUrl = (request, newPath, locale) => {
-  const search = request.nextUrl.search;
-  const pathWithSearch = search && !newPath.includes("?") ? `${newPath}${search}` : newPath;
-  const response = NextResponse.rewrite(new URL(pathWithSearch, request.url));
-  response.headers.set(headerName, locale);
-  return response;
+	const search = request.nextUrl.search;
+	const pathWithSearch = search && !newPath.includes("?") ? `${newPath}${search}` : newPath;
+	const response = NextResponse.rewrite(new URL(pathWithSearch, request.url));
+	response.headers.set(headerName, locale);
+	return response;
 };
+/**
+* Redirects the request to the new path.
+*
+* @param request - The incoming Next.js request object.
+* @param newPath - The new path to redirect to.
+* @returns - The redirect response.
+*/
 const redirectUrl = (request, newPath) => {
-  const search = request.nextUrl.search;
-  const pathWithSearch = search && !newPath.includes("?") ? `${newPath}${search}` : newPath;
-  return NextResponse.redirect(new URL(pathWithSearch, request.url));
-};
-export {
-  intlayerMiddleware
+	const search = request.nextUrl.search;
+	const pathWithSearch = search && !newPath.includes("?") ? `${newPath}${search}` : newPath;
+	return NextResponse.redirect(new URL(pathWithSearch, request.url));
 };
+
+//#endregion
+export { intlayerMiddleware };
 //# sourceMappingURL=intlayerMiddleware.mjs.map