@i18n-micro/astro 1.1.0 → 1.2.0

package/dist/index.mjs

@@ -1,78 +1,55 @@
-import { BaseI18n as F } from "@i18n-micro/core";
-import { FormatService as le, defaultPlural as re, interpolate as ce } from "@i18n-micro/core";
-import { existsSync as C, readdirSync as I, statSync as _, readFileSync as N } from "node:fs";
-import { resolve as q, join as O } from "node:path";
-class T extends F {
+import { BaseI18n as I } from "@i18n-micro/core";
+import { FormatService as le, defaultPlural as re, interpolate as ie } from "@i18n-micro/core";
+import { existsSync as R, readdirSync as _, statSync as C, readFileSync as N } from "node:fs";
+import { resolve as O, join as q } from "node:path";
+class S extends I {
   constructor(e) {
-    const s = e._cache || {
-      generalLocaleCache: {},
-      routeLocaleCache: {},
-      dynamicTranslationsCaches: [],
-      serverTranslationCache: {}
+    const s = e._storage || {
+      translations: /* @__PURE__ */ new Map()
     };
     if (super({
-      cache: s,
+      storage: s,
       plural: e.plural,
       missingWarn: e.missingWarn,
       missingHandler: e.missingHandler
-    }), this.initialMessages = {}, this.cache = s, this._locale = e.locale, this._fallbackLocale = e.fallbackLocale || e.locale, this._currentRoute = "general", e.messages) {
+    }), this.initialMessages = {}, this.storage = s, this._locale = e.locale, this._fallbackLocale = e.fallbackLocale || e.locale, this._currentRoute = "general", e.messages) {
       this.initialMessages = { ...e.messages };
-      for (const [n, r] of Object.entries(e.messages))
-        this.helper.loadTranslations(n, r);
+      for (const [o, i] of Object.entries(e.messages))
+        this.helper.loadTranslations(o, i);
     }
   }
-  /**
-   * Clone cache with shallow copy to prevent memory leaks
-   * Each request-scoped instance gets its own cache structure,
-   * but can read from the global cache (read-only access to existing translations)
-   */
-  cloneCache(e) {
-    const s = (t) => typeof t == "object" && t !== null && "value" in t ? t.value : t, n = s(e.generalLocaleCache), r = s(e.routeLocaleCache), i = s(e.dynamicTranslationsCaches), f = s(e.serverTranslationCache);
-    return {
-      generalLocaleCache: { ...n },
-      routeLocaleCache: { ...r },
-      dynamicTranslationsCaches: [...i],
-      serverTranslationCache: { ...f }
-    };
+  cloneStorage(e) {
+    const s = /* @__PURE__ */ new Map();
+    for (const [o, i] of e.translations)
+      s.set(o, { ...i });
+    return { translations: s };
   }
-  /**
-   * Create a request-scoped instance with isolated cache
-   * Prevents memory leaks by isolating per-request translations from global cache
-   */
   clone(e) {
-    const s = this.cloneCache(this.cache);
-    return new T({
+    const s = this.cloneStorage(this.storage);
+    return new S({
       locale: e || this._locale,
       fallbackLocale: this._fallbackLocale,
       plural: this.pluralFunc,
       missingWarn: this.missingWarn,
       missingHandler: this.missingHandler,
-      _cache: s
-      // Изолированный кэш для предотвращения утечек памяти
+      _storage: s
     });
   }
-  // Геттер/Сеттер для локали
   get locale() {
     return this._locale;
   }
   set locale(e) {
     this._locale = e;
   }
-  // Геттер/Сеттер для fallback локали
   get fallbackLocale() {
     return this._fallbackLocale;
   }
   set fallbackLocale(e) {
     this._fallbackLocale = e;
   }
-  // Геттер/Сеттер для текущего роута
-  get currentRoute() {
-    return this._currentRoute;
-  }
   setRoute(e) {
     this._currentRoute = e;
   }
-  // --- Implementation of abstract methods ---
   getLocale() {
     return this._locale;
   }
@@ -82,24 +59,18 @@ class T extends F {
   getRoute() {
     return this._currentRoute;
   }
-  /**
-   * Get route-specific translations for a given locale and route
-   * This method encapsulates the cache key format, making it safe to use
-   * without direct cache access
-   */
   getRouteTranslations(e, s) {
-    const n = `${e}:${s}`, r = this.cache.routeLocaleCache;
-    return r && typeof r == "object" && !Array.isArray(r) && r[n] || null;
+    const o = `${e}:${s}`;
+    return this.storage.translations.get(o) ?? null;
   }
-  // Методы для добавления переводов
-  addTranslations(e, s, n = !0) {
-    super.loadTranslationsCore(e, s, n);
+  addTranslations(e, s, o = !0) {
+    super.loadTranslationsCore(e, s, o);
   }
-  addRouteTranslations(e, s, n, r = !0) {
-    super.loadRouteTranslationsCore(e, s, n, r);
+  addRouteTranslations(e, s, o, i = !0) {
+    super.loadRouteTranslationsCore(e, s, o, i);
   }
-  mergeTranslations(e, s, n) {
-    this.helper.mergeTranslation(e, s, n, !0);
+  mergeTranslations(e, s, o) {
+    this.helper.mergeTranslation(e, s, o, !0);
   }
   mergeGlobalTranslations(e, s) {
     this.helper.mergeGlobalTranslation(e, s, !0);
@@ -107,49 +78,49 @@ class T extends F {
   clearCache() {
     const e = { ...this.initialMessages };
     if (super.clearCache(), Object.keys(e).length > 0)
-      for (const [s, n] of Object.entries(e))
-        this.helper.loadTranslations(s, n);
+      for (const [s, o] of Object.entries(e))
+        this.helper.loadTranslations(s, o);
   }
 }
 let j = null;
 function v() {
   return j;
 }
-function U(a) {
+function U(n) {
   const {
     locale: e,
     fallbackLocale: s,
-    translationDir: n,
-    routingStrategy: r
-  } = a;
-  return j = r || null, {
+    translationDir: o,
+    routingStrategy: i
+  } = n;
+  return j = i || null, {
     name: "@i18n-micro/astro",
     hooks: {
       // 1. Настройка Vite (Виртуальный модуль) происходит здесь
-      "astro:config:setup": (i) => {
-        const { updateConfig: f } = i, t = "virtual:i18n-micro/config", l = "\0" + t, c = {
+      "astro:config:setup": (c) => {
+        const { updateConfig: f } = c, t = "virtual:i18n-micro/config", l = "\0" + t, r = {
           defaultLocale: e,
           fallbackLocale: s || e,
-          locales: a.locales || [],
-          localeCodes: (a.locales || []).map((o) => o.code),
-          translationDir: n || null,
-          autoDetect: a.autoDetect ?? !0,
-          redirectToDefault: a.redirectToDefault ?? !1,
-          localeCookie: a.localeCookie || "i18n-locale",
-          missingWarn: a.missingWarn ?? !1
+          locales: n.locales || [],
+          localeCodes: (n.locales || []).map((a) => a.code),
+          translationDir: o || null,
+          autoDetect: n.autoDetect ?? !0,
+          redirectToDefault: n.redirectToDefault ?? !1,
+          localeCookie: n.localeCookie === null ? null : n.localeCookie || "i18n-locale",
+          missingWarn: n.missingWarn ?? !1
         };
         f({
           vite: {
             plugins: [
               {
                 name: "vite-plugin-i18n-micro-config",
-                resolveId(o) {
-                  if (o === t)
+                resolveId(a) {
+                  if (a === t)
                     return l;
                 },
-                load(o) {
-                  if (o === l)
-                    return `export const config = ${JSON.stringify(c)}`;
+                load(a) {
+                  if (a === l)
+                    return `export const config = ${JSON.stringify(r)}`;
                 }
               }
             ]
@@ -157,8 +128,8 @@ function U(a) {
         });
       },
       // 2. Инъекция типов происходит здесь (согласно документации Astro)
-      "astro:config:done": (i) => {
-        const { injectTypes: f } = i;
+      "astro:config:done": (c) => {
+        const { injectTypes: f } = c;
         f({
           filename: "i18n-micro-env.d.ts",
           content: `
@@ -173,8 +144,8 @@ function U(a) {
                 translationDir: string | null;
                 autoDetect: boolean;
                 redirectToDefault: boolean;
-                localeCookie: string;
-                missingWarn: boolean;
+                localeCookie: string | null;
+                missingWarn: boolean | null;
               }
             }
           `
@@ -183,74 +154,74 @@ function U(a) {
     }
   };
 }
-function E(a) {
-  return new T(a);
+function E(n) {
+  return new S(n);
 }
-function J(a) {
+function J(n) {
   const {
     i18n: e,
     // Это глобальный синглтон с кэшем
     defaultLocale: s,
-    locales: n,
-    localeObjects: r,
-    autoDetect: i = !0,
+    locales: o,
+    localeObjects: i,
+    autoDetect: c = !0,
     redirectToDefault: f = !1,
     routingStrategy: t
-  } = a, l = t || v();
-  return async (c, o) => {
-    if (c.locals.locale && c.locals.i18n)
-      return o();
-    const u = c.url, g = u.pathname;
+  } = n, l = t || v();
+  return async (r, a) => {
+    if (r.locals.locale && r.locals.i18n)
+      return a();
+    const u = r.url, h = u.pathname;
     if (!l) {
-      const b = e.clone(s), D = g === "/" || g === "" ? "index" : g.split("/").filter(Boolean).join("-");
-      return b.setRoute(D), c.locals.i18n = b, c.locals.locale = s, c.locals.defaultLocale = s, c.locals.locales = r || n.map((B) => ({ code: B })), c.locals.currentUrl = u, o();
+      const y = e.clone(s), B = h === "/" || h === "" ? "index" : h.split("/").filter(Boolean).join("-");
+      return y.setRoute(B), r.locals.i18n = y, r.locals.locale = s, r.locals.defaultLocale = s, r.locals.locales = i || o.map((F) => ({ code: F })), r.locals.currentUrl = u, a();
     }
     const d = {
       ...l,
-      getCurrentPath: () => g,
+      getCurrentPath: () => h,
       getRoute: () => ({
         fullPath: u.pathname + u.search,
         query: Object.fromEntries(u.searchParams)
       })
-    }, h = g.split("/").filter(Boolean)[0], p = h !== void 0 && n.includes(h);
-    let L;
-    p && h ? L = h : d.getLocaleFromPath ? L = d.getLocaleFromPath(g, s, n) : L = s;
-    const y = e.clone(L), P = d.getRouteName ? d.getRouteName(g, n) : "general";
-    return y.setRoute(P), c.locals.i18n = y, c.locals.locale = L, c.locals.defaultLocale = s, c.locals.locales = r || n.map((b) => ({ code: b })), c.locals.currentUrl = u, c.locals.routingStrategy = d, o();
+    }, g = h.split("/").filter(Boolean)[0], p = g !== void 0 && o.includes(g);
+    let P;
+    p && g ? P = g : d.getLocaleFromPath ? P = d.getLocaleFromPath(h, s, o) : P = s;
+    const L = e.clone(P), b = d.getRouteName ? d.getRouteName(h, o) : "general";
+    return L.setRoute(b), r.locals.i18n = L, r.locals.locale = P, r.locals.defaultLocale = s, r.locals.locales = i || o.map((y) => ({ code: y })), r.locals.currentUrl = u, r.locals.routingStrategy = d, a();
   };
 }
-function A(a) {
-  const e = [], s = a.split(",");
-  for (const n of s) {
-    const [r, i = "1.0"] = n.trim().split(";q=");
-    if (Number.parseFloat(i) > 0 && r) {
-      const t = r.split("-")[0]?.toLowerCase();
-      t && (e.push(t), r !== t && e.push(r.toLowerCase()));
+function M(n) {
+  const e = [], s = n.split(",");
+  for (const o of s) {
+    const [i, c = "1.0"] = o.trim().split(";q=");
+    if (Number.parseFloat(c) > 0 && i) {
+      const t = i.split("-")[0]?.toLowerCase();
+      t && (e.push(t), i !== t && e.push(i.toLowerCase()));
     }
   }
   return e;
 }
-function K(a, e, s, n, r, i = "i18n-locale") {
+function V(n, e, s, o, i, c = "i18n-locale") {
   const f = v();
-  let t = n;
+  let t = o;
   if (f?.getLocaleFromPath)
-    t = f.getLocaleFromPath(a, n, r);
+    t = f.getLocaleFromPath(n, o, i);
   else {
-    const c = a.split("/").filter(Boolean)[0];
-    c && r.includes(c) && (t = c);
+    const r = n.split("/").filter(Boolean)[0];
+    r && i.includes(r) && (t = r);
   }
-  if (t === n && e.get(i)) {
-    const l = e.get(i)?.value;
-    l && r.includes(l) && (t = l);
+  if (c !== null && t === o && e.get(c)) {
+    const l = e.get(c)?.value;
+    l && i.includes(l) && (t = l);
   }
-  if (t === n)
+  if (t === o)
     try {
       const l = s.get("accept-language");
       if (l) {
-        const c = A(l);
-        for (const o of c)
-          if (r.includes(o)) {
-            t = o;
+        const r = M(l);
+        for (const a of r)
+          if (i.includes(a)) {
+            t = a;
             break;
           }
       }
@@ -258,35 +229,35 @@ function K(a, e, s, n, r, i = "i18n-locale") {
     }
   return t;
 }
-function w(a) {
-  const e = a.locals.i18n;
+function k(n) {
+  const e = n.locals.i18n;
   if (!e)
     throw new Error("i18n instance not found. Make sure i18n middleware is configured.");
   return e;
 }
-function S(a) {
-  return a.locals.locale || "en";
+function T(n) {
+  return n.locals.locale || "en";
 }
-function R(a) {
-  return a.locals.defaultLocale || "en";
+function w(n) {
+  return n.locals.defaultLocale || "en";
 }
-function k(a) {
-  return a.locals.locales || [];
+function $(n) {
+  return n.locals.locales || [];
 }
-function $(a) {
-  return a.locals.routingStrategy || null;
+function D(n) {
+  return n.locals.routingStrategy || null;
 }
-function Q(a) {
-  const e = w(a), s = S(a), n = R(a), r = k(a), i = r.map((t) => t.code), f = $(a);
+function K(n) {
+  const e = k(n), s = T(n), o = w(n), i = $(n), c = i.map((t) => t.code), f = D(n);
   return {
     // Current locale
     locale: s,
-    defaultLocale: n,
-    locales: r,
+    defaultLocale: o,
+    locales: i,
     // Translation methods
-    t: (t, l, c, o) => e.t(t, l, c, o),
-    ts: (t, l, c, o) => e.ts(t, l, c, o),
-    tc: (t, l, c) => e.tc(t, l, c),
+    t: (t, l, r, a) => e.t(t, l, r, a),
+    ts: (t, l, r, a) => e.ts(t, l, r, a),
+    tc: (t, l, r) => e.tc(t, l, r),
     tn: (t, l) => e.tn(t, l),
     td: (t, l) => e.td(t, l),
     tdr: (t, l) => e.tdr(t, l),
@@ -294,50 +265,50 @@ function Q(a) {
     // Route management
     getRoute: () => e.getRoute(),
     getRouteName: (t) => {
-      const l = t || a.url.pathname;
+      const l = t || n.url.pathname;
       if (f?.getRouteName)
-        return f.getRouteName(l, i);
-      const c = l.replace(/^\//, "").replace(/\/$/, "");
-      if (!c) return "index";
-      const o = c.split("/").filter(Boolean), u = o[0];
-      return u && i.includes(u) && o.shift(), o.length === 0 ? "index" : o.join("-");
+        return f.getRouteName(l, c);
+      const r = l.replace(/^\//, "").replace(/\/$/, "");
+      if (!r) return "index";
+      const a = r.split("/").filter(Boolean), u = a[0];
+      return u && c.includes(u) && a.shift(), a.length === 0 ? "index" : a.join("-");
     },
     getLocaleFromPath: (t) => {
-      const l = t || a.url.pathname;
+      const l = t || n.url.pathname;
       if (f?.getLocaleFromPath)
-        return f.getLocaleFromPath(l, n, i);
-      const o = l.split("/").filter(Boolean)[0];
-      return o && i.includes(o) ? o : n;
+        return f.getLocaleFromPath(l, o, c);
+      const a = l.split("/").filter(Boolean)[0];
+      return a && c.includes(a) ? a : o;
     },
     // Path utilities
     switchLocalePath: (t) => {
       if (f?.switchLocalePath)
-        return f.switchLocalePath(a.url.pathname, t, i, n);
-      const l = a.url.pathname.split("/").filter(Boolean), c = l[0];
-      return c && i.includes(c) && l.shift(), t !== n && l.unshift(t), `/${l.join("/")}`;
+        return f.switchLocalePath(n.url.pathname, t, c, o);
+      const l = n.url.pathname.split("/").filter(Boolean), r = l[0];
+      return r && c.includes(r) && l.shift(), t !== o && l.unshift(t), `/${l.join("/")}`;
     },
     localizePath: (t, l) => {
       if (f?.localizePath)
-        return f.localizePath(t, l || s, i, n);
-      const o = (t.replace(/^\//, "").replace(/\/$/, "") || "").split("/").filter(Boolean), u = o[0];
-      return u && i.includes(u) && o.shift(), l && l !== n && o.unshift(l), `/${o.join("/")}`;
+        return f.localizePath(t, l || s, c, o);
+      const a = (t.replace(/^\//, "").replace(/\/$/, "") || "").split("/").filter(Boolean), u = a[0];
+      return u && c.includes(u) && a.shift(), l && l !== o && a.unshift(l), `/${a.join("/")}`;
     },
     // Get i18n instance
     getI18n: () => e,
     // Get base path without locale (for rewrite)
     getBasePath: (t) => {
-      const o = (t || a.url).pathname.split("/").filter(Boolean), u = o[0];
-      return u && i.includes(u) && o.shift(), o.length > 0 ? `/${o.join("/")}` : "/";
+      const a = (t || n.url).pathname.split("/").filter(Boolean), u = a[0];
+      return u && c.includes(u) && a.shift(), a.length > 0 ? `/${a.join("/")}` : "/";
     },
     // Translation management
-    addTranslations: (t, l, c = !0) => {
-      e.addTranslations(t, l, c);
+    addTranslations: (t, l, r = !0) => {
+      e.addTranslations(t, l, r);
     },
-    addRouteTranslations: (t, l, c, o = !0) => {
-      e.addRouteTranslations(t, l, c, o);
+    addRouteTranslations: (t, l, r, a = !0) => {
+      e.addRouteTranslations(t, l, r, a);
     },
-    mergeTranslations: (t, l, c) => {
-      e.mergeTranslations(t, l, c);
+    mergeTranslations: (t, l, r) => {
+      e.mergeTranslations(t, l, r);
     },
     mergeGlobalTranslations: (t, l) => {
       e.mergeGlobalTranslations(t, l);
@@ -347,135 +318,138 @@ function Q(a) {
     }
   };
 }
-function X(a, e = {}) {
+function Q(n, e = {}) {
   const {
     baseUrl: s = "/",
-    addDirAttribute: n = !0,
-    addSeoAttributes: r = !0
-  } = e, i = S(a), f = R(a), t = k(a), l = t.find((h) => h.code === i);
+    addDirAttribute: o = !0,
+    addSeoAttributes: i = !0
+  } = e, c = T(n), f = w(n), t = $(n), l = t.find((g) => g.code === c);
   if (!l)
     return { htmlAttrs: {}, link: [], meta: [] };
-  const c = l.iso || i, o = l.dir || "auto", u = {
+  const r = l.iso || c, a = l.dir || "auto", u = {
     htmlAttrs: {
-      lang: c,
-      ...n ? { dir: o } : {}
+      lang: r,
+      ...o ? { dir: a } : {}
     },
     link: [],
     meta: []
   };
-  if (!r)
+  if (!i)
     return u;
-  const g = `${s}${a.url.pathname}`;
+  const h = `${s}${n.url.pathname}`;
   u.link.push({
     rel: "canonical",
-    href: g
+    href: h
   });
-  const d = $(a), m = t.map((h) => h.code);
-  for (const h of t) {
-    if (h.code === i) continue;
-    let p = a.url.pathname;
+  const d = D(n), m = t.map((g) => g.code);
+  for (const g of t) {
+    if (g.code === c) continue;
+    let p = n.url.pathname;
     if (d?.switchLocalePath)
-      p = d.switchLocalePath(a.url.pathname, h.code, m, f);
+      p = d.switchLocalePath(n.url.pathname, g.code, m, f);
     else {
-      const y = a.url.pathname.split("/").filter(Boolean), P = y[0];
-      P && m.includes(P) && y.shift(), h.code !== f && y.unshift(h.code), p = `/${y.join("/")}`;
+      const L = n.url.pathname.split("/").filter(Boolean), b = L[0];
+      b && m.includes(b) && L.shift(), g.code !== f && L.unshift(g.code), p = `/${L.join("/")}`;
     }
-    const L = `${s}${p}`;
+    const P = `${s}${p}`;
     u.link.push({
       rel: "alternate",
-      href: L,
-      hreflang: h.code
-    }), h.iso && h.iso !== h.code && u.link.push({
+      href: P,
+      hreflang: g.code
+    }), g.iso && g.iso !== g.code && u.link.push({
       rel: "alternate",
-      href: L,
-      hreflang: h.iso
+      href: P,
+      hreflang: g.iso
     });
   }
   u.meta.push({
     property: "og:locale",
-    content: c
+    content: r
   }), u.meta.push({
     property: "og:url",
-    content: g
+    content: h
   });
-  for (const h of t)
-    h.code !== i && u.meta.push({
+  for (const g of t)
+    g.code !== c && u.meta.push({
       property: "og:locale:alternate",
-      content: h.iso || h.code
+      content: g.iso || g.code
     });
   return u;
 }
-function M(a, e, s) {
-  const n = e.split(".");
-  let r = a;
-  for (let i = 0; i < n.length - 1; i++)
-    r[n[i]] || (r[n[i]] = {}), r = r[n[i]];
-  r[n[n.length - 1]] = s;
+function W(n, e, s) {
+  const o = e.split(".");
+  let i = n;
+  for (let f = 0; f < o.length - 1; f++) {
+    const t = o[f];
+    i[t] || (i[t] = {}), i = i[t];
+  }
+  const c = o[o.length - 1];
+  c !== void 0 && (i[c] = s);
 }
-function Y(a, e) {
-  const s = w(a), n = S(a), r = R(a), i = s.getRoute(), f = {};
+function X(n, e) {
+  const s = k(n), o = T(n), i = w(n), c = s.getRoute(), f = {};
   if (e && e.length > 0) {
     const t = {};
     for (const l of e) {
-      const c = s.t(l, void 0, void 0, i);
-      c != null && c !== l && M(t, l, c);
+      const r = s.t(l, void 0, void 0, c);
+      r != null && r !== l && W(t, l, r);
     }
-    Object.keys(t).length > 0 && (f[i] = t);
+    Object.keys(t).length > 0 && (f[c] = t);
   } else {
-    const t = s.getRouteTranslations(n, i);
-    t && (f[i] = t);
+    const t = s.getRouteTranslations(o, c);
+    t && (f[c] = t);
   }
   return {
-    locale: n,
-    fallbackLocale: r,
-    currentRoute: i,
+    locale: o,
+    fallbackLocale: i,
+    currentRoute: c,
     translations: f
   };
 }
-function Z(a, e, s) {
-  const n = a.map((o) => o.code), r = (o, u = []) => {
-    const g = o.replace(/^\//, "").replace(/\/$/, "");
-    if (!g)
+function Y(n, e, s) {
+  const o = n.map((a) => a.code), i = (a, u = []) => {
+    const h = a.replace(/^\//, "").replace(/\/$/, "");
+    if (!h)
       return "index";
-    const d = g.split("/").filter(Boolean), m = d[0];
+    const d = h.split("/").filter(Boolean), m = d[0];
     return m && u.includes(m) && d.shift(), d.length === 0 ? "index" : d.join("-");
-  }, i = (o, u = "en", g = []) => {
-    const m = o.split("/").filter(Boolean)[0];
-    return m && g.includes(m) ? m : u;
-  }, f = (o, u, g = [], d) => {
-    const m = o.split("/").filter(Boolean), h = m[0];
-    return h && g.includes(h) && m.shift(), (u !== d || d === void 0) && m.unshift(u), `/${m.join("/")}`;
-  }, t = (o, u, g = [], d) => {
-    const h = (o.replace(/^\//, "").replace(/\/$/, "") || "").split("/").filter(Boolean), p = h[0];
-    return p && g.includes(p) && h.shift(), (u !== d || d === void 0) && h.unshift(u), `/${h.join("/")}`;
+  }, c = (a, u = "en", h = []) => {
+    const m = a.split("/").filter(Boolean)[0];
+    return m && h.includes(m) ? m : u;
+  }, f = (a, u, h = [], d) => {
+    const m = a.split("/").filter(Boolean), g = m[0];
+    return g && h.includes(g) && m.shift(), (u !== d || d === void 0) && m.unshift(u), `/${m.join("/")}`;
+  }, t = (a, u, h = [], d) => {
+    const g = (a.replace(/^\//, "").replace(/\/$/, "") || "").split("/").filter(Boolean), p = g[0];
+    return p && h.includes(p) && g.shift(), (u !== d || d === void 0) && g.unshift(u), `/${g.join("/")}`;
   };
   return {
     getCurrentPath: () => s ? s().pathname : typeof window < "u" ? window.location.pathname : "/",
-    getRouteName: r,
-    getLocaleFromPath: i,
+    getRouteName: i,
+    getLocaleFromPath: c,
     switchLocalePath: f,
     localizePath: t,
-    removeLocaleFromPath: (o, u = []) => {
-      const g = o.split("/").filter(Boolean), d = g[0];
-      return d && u.includes(d) && g.shift(), `/${g.join("/")}`;
+    removeLocaleFromPath: (a, u = []) => {
+      const h = a.split("/").filter(Boolean), d = h[0];
+      return d && u.includes(d) && h.shift(), `/${h.join("/")}`;
     },
-    resolvePath: (o, u) => {
-      const g = typeof o == "string" ? o : o.path || "/";
-      return t(g, u, n, e);
+    resolvePath: (a, u) => {
+      const h = typeof a == "string" ? a : a.path || "/";
+      return t(h, u, o, e);
     },
     getRoute: () => {
       if (s) {
-        const o = s();
+        const a = s();
         return {
-          fullPath: o.pathname + o.search,
-          query: Object.fromEntries(o.searchParams)
+          fullPath: a.pathname + a.search,
+          query: Object.fromEntries(a.searchParams)
         };
       }
       if (typeof window < "u") {
-        const o = new URL(window.location.href);
+        const a = new URL(window.location.href);
         return {
-          fullPath: o.pathname + o.search,
-          query: Object.fromEntries(o.searchParams)
+          fullPath: a.pathname + a.search,
+          query: Object.fromEntries(a.searchParams)
         };
       }
       return {
@@ -484,91 +458,91 @@ function Z(a, e, s) {
       };
     },
     // Optional: client-side navigation for islands
-    push: (o) => {
-      typeof window < "u" && (window.location.href = o.path);
+    push: (a) => {
+      typeof window < "u" && (window.location.href = a.path);
     },
-    replace: (o) => {
-      typeof window < "u" && window.location.replace(o.path);
+    replace: (a) => {
+      typeof window < "u" && window.location.replace(a.path);
     }
   };
 }
-function V(a, e = []) {
-  const s = a.replace(/^\//, "").replace(/\/$/, "");
+function Z(n, e = []) {
+  const s = n.replace(/^\//, "").replace(/\/$/, "");
   if (!s)
     return "index";
-  const n = s.split("/").filter(Boolean), r = n[0];
-  return r && e.includes(r) && n.shift(), n.length === 0 ? "index" : n.join("-");
+  const o = s.split("/").filter(Boolean), i = o[0];
+  return i && e.includes(i) && o.shift(), o.length === 0 ? "index" : o.join("-");
 }
-function x(a, e = "en", s = []) {
-  const r = a.split("/").filter(Boolean)[0];
-  return r && s.includes(r) ? r : e;
+function x(n, e = "en", s = []) {
+  const i = n.split("/").filter(Boolean)[0];
+  return i && s.includes(i) ? i : e;
 }
-function ee(a, e, s = [], n) {
-  const r = a.split("/").filter(Boolean), i = r[0];
-  return i && s.includes(i) && r.shift(), (e !== n || n === void 0) && r.unshift(e), `/${r.join("/")}`;
+function ee(n, e, s = [], o) {
+  const i = n.split("/").filter(Boolean), c = i[0];
+  return c && s.includes(c) && i.shift(), (e !== o || o === void 0) && i.unshift(e), `/${i.join("/")}`;
 }
-function te(a, e, s = [], n) {
-  const i = (a.replace(/^\//, "").replace(/\/$/, "") || "").split("/").filter(Boolean), f = i[0];
-  return f && s.includes(f) && i.shift(), (e !== n || n === void 0) && i.unshift(e), `/${i.join("/")}`;
+function te(n, e, s = [], o) {
+  const c = (n.replace(/^\//, "").replace(/\/$/, "") || "").split("/").filter(Boolean), f = c[0];
+  return f && s.includes(f) && c.shift(), (e !== o || o === void 0) && c.unshift(e), `/${c.join("/")}`;
 }
-function ne(a, e = []) {
-  const s = a.split("/").filter(Boolean), n = s[0];
-  return n && e.includes(n) && s.shift(), `/${s.join("/")}`;
+function ne(n, e = []) {
+  const s = n.split("/").filter(Boolean), o = s[0];
+  return o && e.includes(o) && s.shift(), `/${s.join("/")}`;
 }
-function W(a) {
-  const { translationDir: e, rootDir: s = process.cwd(), disablePageLocales: n = !1 } = a, r = q(s, e);
-  if (!C(r))
-    return console.warn(`[i18n] Translation directory not found: ${r}`), { general: {}, routes: {} };
-  const i = {}, f = {}, t = (l, c = "") => {
-    if (!C(l)) return;
-    const o = I(l);
-    for (const u of o) {
-      const g = O(l, u);
-      if (_(g).isDirectory())
-        u === "pages" && !n ? t(g, "") : c || n ? t(g, c) : t(g, u);
+function A(n) {
+  const { translationDir: e, rootDir: s = process.cwd(), disablePageLocales: o = !1 } = n, i = O(s, e);
+  if (!R(i))
+    return console.warn(`[i18n] Translation directory not found: ${i}`), { general: {}, routes: {} };
+  const c = {}, f = {}, t = (l, r = "") => {
+    if (!R(l)) return;
+    const a = _(l);
+    for (const u of a) {
+      const h = q(l, u);
+      if (C(h).isDirectory())
+        u === "pages" && !o ? t(h, "") : r || o ? t(h, r) : t(h, u);
       else if (u.endsWith(".json")) {
         const m = u.replace(".json", "");
         try {
-          const h = N(g, "utf-8"), p = JSON.parse(h);
-          c && !n ? (f[c] || (f[c] = {}), f[c][m] = p) : i[m] = p;
-        } catch (h) {
-          console.error(`[i18n] Failed to load translation file: ${g}`, h);
+          const g = N(h, "utf-8"), p = JSON.parse(g);
+          r && !o ? (f[r] || (f[r] = {}), f[r][m] = p) : c[m] = p;
+        } catch (g) {
+          console.error(`[i18n] Failed to load translation file: ${h}`, g);
         }
       }
     }
   };
-  return t(r), { general: i, routes: f };
+  return t(i), { general: c, routes: f };
 }
-function ae(a, e) {
-  const { general: s, routes: n } = W(e);
-  for (const [r, i] of Object.entries(s))
-    a.addTranslations(r, i, !1);
-  for (const [r, i] of Object.entries(n))
-    for (const [f, t] of Object.entries(i))
-      a.addRouteTranslations(f, r, t, !1);
+function oe(n, e) {
+  const { general: s, routes: o } = A(e);
+  for (const [i, c] of Object.entries(s))
+    n.addTranslations(i, c, !1);
+  for (const [i, c] of Object.entries(o))
+    for (const [f, t] of Object.entries(c))
+      n.addRouteTranslations(f, i, t, !1);
 }
 export {
-  T as AstroI18n,
+  S as AstroI18n,
   le as FormatService,
-  Z as createAstroRouterAdapter,
+  Y as createAstroRouterAdapter,
   E as createI18n,
   J as createI18nMiddleware,
   re as defaultPlural,
-  K as detectLocale,
-  R as getDefaultLocale,
-  w as getI18n,
-  Y as getI18nProps,
-  S as getLocale,
+  V as detectLocale,
+  w as getDefaultLocale,
+  k as getI18n,
+  X as getI18nProps,
+  T as getLocale,
   x as getLocaleFromPath,
-  k as getLocales,
-  V as getRouteName,
+  $ as getLocales,
+  Z as getRouteName,
   U as i18nIntegration,
-  ce as interpolate,
-  W as loadTranslationsFromDir,
-  ae as loadTranslationsIntoI18n,
+  ie as interpolate,
+  A as loadTranslationsFromDir,
+  oe as loadTranslationsIntoI18n,
   te as localizePath,
   ne as removeLocaleFromPath,
   ee as switchLocalePath,
-  Q as useI18n,
-  X as useLocaleHead
+  K as useI18n,
+  Q as useLocaleHead
 };