intor 1.0.39 → 2.0.0

package/dist/next/middleware/index.js

@@ -1,9 +1,9 @@
 import { NextResponse } from 'next/server';
 import { headers } from 'next/headers';
 
-// src/adapters/next-client/routing/utils/create-response.ts
+// src/adapters/next/middleware/utils/create-response.ts
 
-// src/adapters/next-client/routing/utils/set-locale-cookie-edge.ts
+// src/adapters/next/middleware/utils/set-locale-cookie-edge.ts
 function setLocaleCookieEdge({
   request,
   response,
@@ -12,13 +12,9 @@ function setLocaleCookieEdge({
   override = false
   // Default to not override existed cookie
 }) {
-  if (cookie.disabled || !cookie.autoSetCookie) {
-    return;
-  }
+  if (cookie.disabled || !cookie.autoSetCookie) return;
   const isCookieExists = request.cookies.has(cookie.name);
-  if (isCookieExists && !override) {
-    return;
-  }
+  if (isCookieExists && !override) return;
   response.cookies.set(cookie.name, locale, {
     maxAge: cookie.maxAge,
     path: cookie.path,
@@ -29,49 +25,98 @@ function setLocaleCookieEdge({
   });
 }
 
-// src/adapters/next-client/constants/header-key-constants.ts
-var DEFAULT_PATHNAME_HEADER_NAME = "x-intor-pathname";
+// src/adapters/next/shared/constants/pathname-header-name.ts
+var PATHNAME_HEADER_NAME = "x-intor-pathname";
 
-// src/adapters/next-client/routing/utils/set-pathname-header.ts
+// src/adapters/next/middleware/utils/set-pathname-header.ts
 var setPathnameHeader = ({
   request,
   response,
-  key = DEFAULT_PATHNAME_HEADER_NAME
+  key = PATHNAME_HEADER_NAME
 }) => {
   const pathname = request.nextUrl.pathname;
   response.headers.set(key, pathname);
   return response;
 };
 
-// src/adapters/next-client/utils/locale-prefix-pathname.ts
+// src/shared/constants/prefix-placeholder.ts
+var PREFIX_PLACEHOLDER = "{locale}";
+
+// src/adapters/next/shared/utils/locale-prefix-pathname.ts
 var localePrefixPathname = ({
   config,
   pathname: standardizedPathname,
   locale
 }) => {
-  const { routing, prefixPlaceHolder } = config;
+  const { routing } = config;
   const { prefix } = routing;
   if (prefix !== "none" && !locale) {
     throw new Error('No locale when using prefix "all", "except-default"');
   }
   if (prefix === "all") {
-    return standardizedPathname.replace(prefixPlaceHolder, locale);
+    return standardizedPathname.replace(PREFIX_PLACEHOLDER, locale);
   }
   if (prefix === "except-default") {
     if (locale === config.defaultLocale) {
-      return standardizedPathname.replace(`/${prefixPlaceHolder}`, "");
+      return standardizedPathname.replace(`/${PREFIX_PLACEHOLDER}`, "");
     } else {
-      return standardizedPathname.replace(prefixPlaceHolder, locale);
+      return standardizedPathname.replace(PREFIX_PLACEHOLDER, locale);
+    }
+  }
+  return standardizedPathname.replace(`/${PREFIX_PLACEHOLDER}`, "");
+};
+
+// 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 standardizedPathname.replace(`/${prefixPlaceHolder}`, "");
+  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 = {}) => {
-  if (typeof rawPathname !== "string") {
-    throw new TypeError("Expected rawPathname to be a string");
-  }
   const length = rawPathname.length;
   let start = 0;
   let end = length - 1;
@@ -142,18 +187,18 @@ var standardizePathname = ({
   config,
   pathname
 }) => {
-  const { routing, prefixPlaceHolder } = config;
+  const { routing } = config;
   const { basePath } = routing;
   const parts = [
     normalizePathname(basePath),
-    normalizePathname(prefixPlaceHolder),
+    PREFIX_PLACEHOLDER,
     normalizePathname(pathname)
   ];
   const standardizedPathname = parts.join("/").replace(/\/{2,}/g, "/");
   return normalizePathname(standardizedPathname);
 };
 
-// src/adapters/next-client/utils/localize-pathname.ts
+// src/adapters/next/shared/utils/localize-pathname.ts
 var localizePathname = ({
   config,
   pathname: rawPathname,
@@ -179,7 +224,7 @@ var localizePathname = ({
   };
 };
 
-// src/adapters/next-client/routing/utils/create-response.ts
+// src/adapters/next/middleware/utils/create-response.ts
 var createResponse = ({
   request,
   config,
@@ -197,18 +242,10 @@ var createResponse = ({
   });
   url.pathname = localePrefixedPathname;
   let response;
-  switch (responseType) {
-    case "next": {
-      response = NextResponse.next();
-      break;
-    }
-    case "redirect": {
-      response = NextResponse.redirect(url);
-      break;
-    }
-    default: {
-      throw new Error(`Unsupported responseType: ${responseType}`);
-    }
+  if (responseType === "redirect") {
+    response = NextResponse.redirect(url);
+  } else {
+    response = NextResponse.next();
   }
   if (locale) {
     setLocaleCookieEdge({
@@ -222,57 +259,6 @@ var createResponse = ({
   const finalResponse = setPathnameHeader({ request, response });
   return finalResponse;
 };
-
-// src/shared/utils/locale/normalize-locale.ts
-var normalizeLocale = (locale = "", supportedLocales = []) => {
-  if (!locale || supportedLocales.length === 0) return void 0;
-  const toCanonical = (input) => {
-    try {
-      return Intl.getCanonicalLocales(input)[0]?.toLowerCase();
-    } catch {
-      return void 0;
-    }
-  };
-  const canonicalLocale = toCanonical(locale);
-  if (!canonicalLocale) return void 0;
-  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 void 0;
-};
-
-// 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/adapters/next-client/routing/utils/determine-initial-locale.ts
 var determineInitialLocale = async (config) => {
   const { defaultLocale, supportedLocales, routing } = config;
   let initialLocale = defaultLocale;
@@ -287,7 +273,7 @@ var determineInitialLocale = async (config) => {
   return initialLocale;
 };
 
-// src/adapters/next-client/routing/handle-prefix/handle-prefix-all.ts
+// src/adapters/next/middleware/handle-prefix/handle-prefix-all.ts
 var handlePrefixAll = async ({
   request,
   config
@@ -328,7 +314,7 @@ var handlePrefixAll = async ({
   });
 };
 
-// src/adapters/next-client/routing/handle-prefix/handle-prefix-except-default.ts
+// src/adapters/next/middleware/handle-prefix/handle-prefix-except-default.ts
 var handlePrefixExceptDefault = async ({
   request,
   config
@@ -381,7 +367,7 @@ var handlePrefixExceptDefault = async ({
   });
 };
 
-// src/adapters/next-client/routing/handle-prefix/handle-prefix-none.ts
+// src/adapters/next/middleware/handle-prefix/handle-prefix-none.ts
 var handlePrefixNone = async ({
   request,
   config
@@ -393,7 +379,7 @@ var handlePrefixNone = async ({
   return createResponse({ request, config, locale });
 };
 
-// src/adapters/next-client/routing/intor-middleware.ts
+// src/adapters/next/middleware/intor-middleware.ts
 async function intorMiddleware({
   request,
   config
@@ -408,4 +394,4 @@ async function intorMiddleware({
   return await handlePrefixAll({ request, config });
 }
 
-export { DEFAULT_PATHNAME_HEADER_NAME as PATHNAME_HEADER_NAME, intorMiddleware };
+export { PATHNAME_HEADER_NAME, intorMiddleware };