@i18n-micro/core 1.0.28 → 1.1.0

package/dist/index.mjs

@@ -1,155 +1,107 @@
-const $ = {}, b = {}, L = [], T = {};
-function N(o) {
-  return Array.isArray(o) || typeof o == "object" && o !== null ? JSON.parse(JSON.stringify(o)) : o;
-}
-function v(o, e) {
-  let t = o;
-  if (o === null || typeof e != "string")
-    return null;
-  if (o[e])
-    t = o[e];
-  else {
-    const r = e.toString().split(".");
-    for (const n of r)
-      if (t && typeof t == "object" && n in t)
-        t = t[n];
-      else
-        return null;
-  }
-  return typeof t == "object" && t !== null ? N(t) : t ?? null;
-}
-function p(o) {
-  return typeof o == "object" && o !== null && "value" in o ? o.value : o;
-}
-function d(o, e, t) {
-  const r = p(o);
-  r[e] = t;
-}
-function g(o, e) {
-  return p(o)[e];
+function d(o, e) {
+  if (!o || typeof e != "string") return null;
+  if (e in o) {
+    const s = o[e];
+    return s;
+  }
+  const t = e.split(".");
+  let r = o;
+  for (const s of t)
+    if (r && typeof r == "object" && s in r)
+      r = r[s];
+    else
+      return null;
+  return r ?? null;
 }
-function w(o) {
-  const e = o?.generalLocaleCache ?? $, t = o?.routeLocaleCache ?? b, r = o?.dynamicTranslationsCaches ?? L, n = o?.serverTranslationCache ?? T;
+function C(o) {
+  const e = o?.translations ?? /* @__PURE__ */ new Map();
   return {
-    hasCache(s, i) {
-      const a = `${s}:${i}`;
-      return (g(n, a) ?? /* @__PURE__ */ new Map()).size > 0;
+    hasCache(t, r) {
+      const s = `${t}:${r}`;
+      return e.has(s) || e.has(t);
     },
-    getCache(s, i) {
-      const a = `${s}:${i}`;
-      return g(n, a);
+    getCache(t, r) {
+      const s = `${t}:${r}`;
+      return e.get(s);
     },
-    setCache(s, i, a) {
-      const l = `${s}:${i}`;
-      d(n, l, a);
+    setCache(t, r, s) {
     },
-    mergeTranslation(s, i, a, l = !1) {
-      const c = `${s}:${i}`, u = g(t, c);
-      (u || l) && d(t, c, {
-        ...u ?? {},
-        ...a
-      });
-      const h = process.env.NODE_ENV !== "production";
-      !u && h && console.warn(`[i18n] mergeTranslation called for '${c}' which was not pre-loaded. Skipping merge. Use force: true if this is intentional.`);
+    hasTranslation(t, r) {
+      for (const [s, n] of e)
+        if ((s === t || s.startsWith(`${t}:`)) && d(n, r) !== null)
+          return !0;
+      return !1;
     },
-    mergeGlobalTranslation(s, i, a = !1) {
-      const l = g(e, s);
-      !a && !l && console.error(`marge: route ${s} not loaded`), d(e, s, {
-        ...l ?? {},
-        ...i
-      });
+    hasGeneralTranslation(t) {
+      return e.has(t);
     },
-    hasGeneralTranslation(s) {
-      return !!g(e, s);
+    hasPageTranslation(t, r) {
+      return e.has(`${t}:${r}`);
     },
-    hasPageTranslation(s, i) {
-      const a = `${s}:${i}`;
-      return !!g(t, a);
+    getTranslation(t, r, s) {
+      const n = `${t}:${r}`, i = e.get(n), a = d(i, s);
+      if (a !== null) return a;
+      const l = e.get(t);
+      return d(l, s);
     },
-    hasTranslation: (s, i) => {
-      const a = p(r);
-      for (const c of a)
-        if (v(c[s] || null, i) !== null)
-          return !0;
-      const l = g(e, s);
-      return v(l || null, i) !== null;
+    loadTranslations(t, r) {
+      const s = e.get(t) ?? {};
+      e.set(t, { ...s, ...r });
     },
-    getTranslation: (s, i, a) => {
-      const l = `${s}:${i}`, c = g(n, l), u = c?.get(a);
-      if (u)
-        return u;
-      let h = null;
-      const C = p(r);
-      for (const m of C)
-        if (h = v(m[s] || null, a), h !== null) break;
-      if (!h) {
-        const m = g(t, l), R = g(e, s);
-        h = v(m || null, a) ?? v(R || null, a);
-      }
-      if (h) {
-        const m = c ?? /* @__PURE__ */ new Map();
-        m.set(a, h), d(n, l, m);
-      }
-      return h;
+    setTranslations(t, r) {
+      e.set(t, r);
+    },
+    loadPageTranslations(t, r, s) {
+      const n = `${t}:${r}`, i = e.get(n);
+      !i || Object.keys(i).length === 0 ? e.set(n, s) : e.set(n, { ...i, ...s });
     },
-    async loadPageTranslations(s, i, a) {
-      const l = `${s}:${i}`;
-      d(t, l, { ...a });
+    mergeTranslation(t, r, s, n = !1) {
+      const i = `${t}:${r}`, a = e.get(i) ?? {};
+      e.set(i, { ...a, ...s });
     },
-    async loadTranslations(s, i) {
-      d(e, s, { ...i });
+    mergeGlobalTranslation(t, r, s = !1) {
+      const n = e.get(t) ?? {};
+      e.set(t, { ...n, ...r });
     },
     clearCache() {
-      const s = p(e);
-      Object.keys(s).forEach((c) => {
-        d(e, c, {});
-      });
-      const i = p(t);
-      Object.keys(i).forEach((c) => {
-        d(t, c, {});
-      });
-      const a = p(r);
-      a.length = 0;
-      const l = p(n);
-      Object.keys(l).forEach((c) => {
-        g(n, c)?.clear();
-      });
+      e.clear();
     }
   };
 }
-function S(o, e) {
-  let t = o;
-  for (const r in e)
-    t = t.split(`{${r}}`).join(String(e[r]));
-  return t;
+const y = /\{(\w+)\}/g;
+function P(o, e) {
+  return e ? o.replace(y, (t, r) => {
+    const s = e[r];
+    return s !== void 0 ? String(s) : `{${r}}`;
+  }) : o;
 }
-function y(o) {
+function f(o) {
   return o === "prefix" || o === "prefix_and_default";
 }
-function f(o) {
+function c(o) {
   return o === "no_prefix";
 }
-function D(o) {
+function b(o) {
   return o === "prefix";
 }
-function F(o) {
+function R(o) {
   return o === "prefix_except_default";
 }
-function q(o) {
+function $(o) {
   return o === "prefix_and_default";
 }
-const x = (o, e, t, r, n) => {
-  const s = n(o, t);
-  if (!s)
+const L = (o, e, t, r, s) => {
+  const n = s(o, t);
+  if (!n)
     return null;
-  const i = s.toString().split("|");
+  const i = n.toString().split("|");
   if (i.length === 0) return null;
   const a = e < i.length ? i[e] : i[i.length - 1];
   return a ? a.trim().replace("{count}", e.toString()) : null;
 };
-class z {
-  constructor(e, t, r, n, s, i, a = null, l = null) {
-    this.i18nConfig = e, this.router = t, this.hashLocaleDefault = r, this.noPrefixDefault = n, this.navigateTo = s, this.setCookie = i, this.cookieLocaleDefault = a, this.cookieLocaleName = l;
+class w {
+  constructor(e, t, r, s, n, i) {
+    this.i18nConfig = e, this.router = t, this.hashLocaleDefault = r, this.noPrefixDefault = s, this.navigateTo = n, this.getDefaultLocale = i;
   }
   /**
    * Extracts locale from URL path by checking the first path segment
@@ -162,25 +114,41 @@ class z {
     const r = e.split("?")[0]?.split("#")[0];
     if (!r || r === "/")
       return null;
-    const n = r.split("/").filter(Boolean);
-    if (n.length === 0)
+    const s = r.split("/").filter(Boolean);
+    if (s.length === 0)
       return null;
-    const s = n[0];
-    return s && (this.i18nConfig.locales?.map((a) => a.code) || []).includes(s) ? s : null;
+    const n = s[0];
+    return n && (this.i18nConfig.locales?.map((a) => a.code) || []).includes(n) ? n : null;
   }
   getCurrentLocale(e) {
-    if (e = e ?? this.router.currentRoute.value, this.i18nConfig.hashMode && this.hashLocaleDefault)
-      return this.hashLocaleDefault;
-    if (f(this.i18nConfig.strategy) && this.noPrefixDefault)
-      return this.noPrefixDefault;
+    if (e = e ?? this.router.currentRoute.value, this.i18nConfig.hashMode) {
+      const n = this.getDefaultLocale?.();
+      if (n) return n;
+      if (this.hashLocaleDefault) return this.hashLocaleDefault;
+    }
+    if (c(this.i18nConfig.strategy)) {
+      const n = this.getDefaultLocale?.();
+      if (n) return n;
+      if (this.noPrefixDefault) return this.noPrefixDefault;
+    }
+    const t = e.path || e.fullPath || "";
+    if ($(this.i18nConfig.strategy) && (t === "/" || t === "")) {
+      const n = this.getDefaultLocale?.();
+      if (n) return n;
+    }
     if (e.params?.locale)
       return e.params.locale.toString();
-    const t = e.path || e.fullPath || "", r = this.extractLocaleFromPath(t);
-    return r || (this.cookieLocaleDefault ? this.cookieLocaleDefault : (this.i18nConfig.defaultLocale || "en").toString());
+    const r = this.extractLocaleFromPath(t);
+    if (r)
+      return r;
+    if (R(this.i18nConfig.strategy))
+      return (this.i18nConfig.defaultLocale || "en").toString();
+    const s = this.getDefaultLocale?.();
+    return s || (this.i18nConfig.defaultLocale || "en").toString();
   }
   getCurrentName(e) {
     const t = this.getCurrentLocale(e);
-    return this.i18nConfig.locales?.find((n) => n.code === t)?.displayName ?? null;
+    return this.i18nConfig.locales?.find((s) => s.code === t)?.displayName ?? null;
   }
   getRouteName(e, t) {
     return (e.name ?? "").toString().toString().replace("localized-", "").replace(new RegExp(`-${t}$`), "");
@@ -189,36 +157,36 @@ class z {
     return this.i18nConfig.disablePageLocales ? "general" : this.getRouteName(e, t);
   }
   getFullPathWithBaseUrl(e, t) {
-    let n = this.router.resolve(t).fullPath;
-    e?.baseDefault && (n = n.replace(new RegExp(`^/${e.code}`), ""));
-    let s = e.baseUrl;
-    return s || (s = ""), s?.endsWith("/") && (s = s.slice(0, -1)), s + n;
+    let s = this.router.resolve(t).fullPath;
+    e?.baseDefault && (s = s.replace(new RegExp(`^/${e.code}`), ""));
+    let n = e.baseUrl;
+    return n || (n = ""), n?.endsWith("/") && (n = n.slice(0, -1)), n + s;
   }
-  switchLocaleRoute(e, t, r, n) {
-    const s = this.i18nConfig.locales?.find((h) => h.code === t), i = this.getRouteName(r, e);
+  switchLocaleRoute(e, t, r, s) {
+    const n = this.i18nConfig.locales?.find((g) => g.code === t), i = this.getRouteName(r, e);
     if (this.router.hasRoute(`localized-${i}-${t}`)) {
-      const C = { ...n?.[t] ? { ...n[t] } : { ...r.params ?? {} } };
-      delete C.locale, f(this.i18nConfig.strategy) || (C.locale = t);
-      const m = {
+      const m = { ...s?.[t] ? { ...s[t] } : { ...r.params ?? {} } };
+      delete m.locale, c(this.i18nConfig.strategy) || (m.locale = t);
+      const p = {
         name: `localized-${i}-${t}`,
-        params: C,
+        params: m,
         query: r.query,
         hash: r.hash
       };
-      return s?.baseUrl ? this.getFullPathWithBaseUrl(s, m) : m;
+      return n?.baseUrl ? this.getFullPathWithBaseUrl(n, p) : p;
     }
     let a = i;
-    const c = { ...n?.[t] ? { ...n[t] } : { ...r.params ?? {} } };
-    delete c.locale, f(this.i18nConfig.strategy) || (i === "custom-fallback-route" ? a = i : a = t !== this.i18nConfig.defaultLocale || y(this.i18nConfig.strategy) ? `localized-${i}` : i, f(this.i18nConfig.strategy) || (t !== this.i18nConfig.defaultLocale || y(this.i18nConfig.strategy)) && (c.locale = t));
-    const u = {
+    const u = { ...s?.[t] ? { ...s[t] } : { ...r.params ?? {} } };
+    delete u.locale, c(this.i18nConfig.strategy) || (i === "custom-fallback-route" ? a = i : a = t !== this.i18nConfig.defaultLocale || f(this.i18nConfig.strategy) ? `localized-${i}` : i, c(this.i18nConfig.strategy) || (t !== this.i18nConfig.defaultLocale || f(this.i18nConfig.strategy)) && (u.locale = t));
+    const h = {
       name: a,
-      params: c,
+      params: u,
       query: r.query,
       hash: r.hash
     };
-    return f(this.i18nConfig.strategy) && this.i18nConfig.locales?.forEach((h, C) => {
-      u.name.endsWith(`-${h.code}`) && (u.name = u.name.slice(0, -h.code - 1));
-    }), s?.baseUrl ? this.getFullPathWithBaseUrl(s, u) : u;
+    return c(this.i18nConfig.strategy) && this.i18nConfig.locales?.forEach((g, m) => {
+      h.name.endsWith(`-${g.code}`) && (h.name = h.name.slice(0, -g.code - 1));
+    }), n?.baseUrl ? this.getFullPathWithBaseUrl(n, h) : h;
   }
   resolveParams(e) {
     const t = typeof e == "object" && "params" in e && typeof e.params == "object" ? { ...e.params } : {};
@@ -229,110 +197,106 @@ class z {
     return t;
   }
   handlePrefixStrategy(e) {
-    if (!y(this.i18nConfig.strategy))
+    if (!f(this.i18nConfig.strategy))
       return e;
     const t = this.i18nConfig.defaultLocale;
     let r = e;
     typeof e == "string" && (r = this.router.resolve("/" + t + e));
-    const n = this.getRouteName(r, t), s = this.resolveParams(r);
-    return f(this.i18nConfig.strategy) || (s.locale = t), this.router.hasRoute(`localized-${n}`) ? this.router.resolve({
-      name: `localized-${n}`,
+    const s = this.getRouteName(r, t), n = this.resolveParams(r);
+    return c(this.i18nConfig.strategy) || (n.locale = t), this.router.hasRoute(`localized-${s}`) ? this.router.resolve({
+      name: `localized-${s}`,
       query: r.query,
       hash: r.hash,
-      params: s
-    }) : this.router.hasRoute(`localized-${n}-${t}`) ? this.router.resolve({
-      name: `localized-${n}-${t}`,
+      params: n
+    }) : this.router.hasRoute(`localized-${s}-${t}`) ? this.router.resolve({
+      name: `localized-${s}-${t}`,
       query: r.query,
       hash: r.hash,
-      params: s
+      params: n
     }) : e;
   }
   createLocalizedRoute(e, t, r) {
-    const n = this.router.resolve(e), s = this.getRouteName(n, r).replace(new RegExp(`-${this.i18nConfig.defaultLocale}$`), "");
-    if (!f(this.i18nConfig.strategy) && (!s || s === "")) {
-      let c = this.router.resolve(e).path.replace(new RegExp(`^/${r}/`), "/");
-      return (r !== this.i18nConfig.defaultLocale || y(this.i18nConfig.strategy)) && (c = "/" + r + c), this.router.resolve({
-        path: c,
-        query: n.query,
-        hash: n.hash
+    const s = this.router.resolve(e), n = this.getRouteName(s, r).replace(new RegExp(`-${this.i18nConfig.defaultLocale}$`), "");
+    if (!c(this.i18nConfig.strategy) && (!n || n === "")) {
+      let u = this.router.resolve(e).path.replace(new RegExp(`^/${r}/`), "/");
+      return (r !== this.i18nConfig.defaultLocale || f(this.i18nConfig.strategy)) && (u = "/" + r + u), this.router.resolve({
+        path: u,
+        query: s.query,
+        hash: s.hash
       });
     }
-    if (this.router.hasRoute(`localized-${s}-${r}`)) {
-      const l = this.resolveParams(n);
-      return f(this.i18nConfig.strategy) || (l.locale = r), this.router.resolve({
-        name: `localized-${s}-${r}`,
+    if (this.router.hasRoute(`localized-${n}-${r}`)) {
+      const l = this.resolveParams(s);
+      return c(this.i18nConfig.strategy) || (l.locale = r), this.router.resolve({
+        name: `localized-${n}-${r}`,
         params: l,
-        query: n.query,
-        hash: n.hash
+        query: s.query,
+        hash: s.hash
       });
     }
-    const i = r !== this.i18nConfig.defaultLocale || y(this.i18nConfig.strategy) ? `localized-${s}` : s;
+    const i = r !== this.i18nConfig.defaultLocale || f(this.i18nConfig.strategy) ? `localized-${n}` : n;
     if (!this.router.hasRoute(i)) {
       const l = this.resolveParams(e);
-      return delete l.locale, this.router.hasRoute(s) ? this.router.resolve({
-        name: s,
+      return delete l.locale, this.router.hasRoute(n) ? this.router.resolve({
+        name: n,
         params: l,
-        query: n.query,
-        hash: n.hash
+        query: s.query,
+        hash: s.hash
       }) : this.router.resolve("/");
     }
     const a = this.resolveParams(e);
-    return delete a.locale, f(this.i18nConfig.strategy) || (r !== this.i18nConfig.defaultLocale || y(this.i18nConfig.strategy)) && (a.locale = r), this.router.resolve({
+    return delete a.locale, c(this.i18nConfig.strategy) || (r !== this.i18nConfig.defaultLocale || f(this.i18nConfig.strategy)) && (a.locale = r), this.router.resolve({
       name: i,
       params: a,
-      query: n.query,
-      hash: n.hash
+      query: s.query,
+      hash: s.hash
     });
   }
   getLocalizedRoute(e, t, r) {
-    const n = r || this.getCurrentLocale(t), s = this.handlePrefixStrategy(e);
-    return this.createLocalizedRoute(s, t, n);
-  }
-  updateCookies(e) {
-    const t = this.cookieLocaleName || this.i18nConfig.localeCookie || "user-locale";
-    this.i18nConfig.hashMode && (this.setCookie("hash-locale", e), this.hashLocaleDefault = e), f(this.i18nConfig.strategy) && (this.setCookie(t, e), this.noPrefixDefault = e), !this.i18nConfig.hashMode && !f(this.i18nConfig.strategy) && t && (this.setCookie(t, e), this.cookieLocaleDefault = e);
+    const s = r || this.getCurrentLocale(t), n = this.handlePrefixStrategy(e);
+    return this.createLocalizedRoute(n, t, s);
   }
   getCurrentRoute() {
     return this.router.currentRoute.value;
   }
   resolveRouteWithStrategy(e, t, r) {
-    return f(this.i18nConfig.strategy) ? this.router.resolve(e) : t !== this.i18nConfig.defaultLocale || y(this.i18nConfig.strategy) ? this.router.resolve(`/${r}${e}`) : this.router.resolve(e);
+    return c(this.i18nConfig.strategy) ? this.router.resolve(e) : t !== this.i18nConfig.defaultLocale || f(this.i18nConfig.strategy) ? this.router.resolve(`/${r}${e}`) : this.router.resolve(e);
   }
   switchLocaleLogic(e, t, r) {
-    const n = this.getCurrentLocale();
-    let s;
-    typeof r == "string" ? s = this.resolveRouteWithStrategy(r, e, n) : s = r ?? this.getCurrentRoute(), this.updateCookies(e);
-    const i = this.switchLocaleRoute(n, e, s, t);
-    return typeof i == "string" && i.startsWith("http") ? this.navigateTo(i, { redirectCode: 200, external: !0 }) : (f(this.i18nConfig.strategy) && (i.force = !0), this.router.push(i));
+    const s = this.getCurrentLocale();
+    let n;
+    typeof r == "string" ? n = this.resolveRouteWithStrategy(r, e, s) : n = r ?? this.getCurrentRoute();
+    const i = this.switchLocaleRoute(s, e, n, t);
+    return typeof i == "string" && i.startsWith("http") ? this.navigateTo(i, { redirectCode: 200, external: !0 }) : (c(this.i18nConfig.strategy) && (i.force = !0), this.router.push(i));
   }
   resolveLocalizedRoute(e, t) {
-    const r = this.getCurrentRoute(), n = this.getCurrentLocale(), s = t ?? n;
+    const r = this.getCurrentRoute(), s = this.getCurrentLocale(), n = t ?? s;
     let i;
     if (typeof e == "string")
       if (e.startsWith("/"))
-        i = this.resolveRouteWithStrategy(e, s, n);
+        i = this.resolveRouteWithStrategy(e, n, s);
       else {
         const a = e;
-        this.router.hasRoute(a) ? i = this.router.resolve({ name: a }) : (e = `/${e}`, i = this.resolveRouteWithStrategy(e, s, n));
+        this.router.hasRoute(a) ? i = this.router.resolve({ name: a }) : (e = `/${e}`, i = this.resolveRouteWithStrategy(e, n, s));
       }
     else
       i = e;
-    return this.getLocalizedRoute(i, r, s);
+    return this.getLocalizedRoute(i, r, n);
   }
 }
-class P {
+class v {
   formatNumber(e, t, r) {
     return new Intl.NumberFormat(t, r).format(e);
   }
   formatDate(e, t, r) {
-    const n = new Date(e);
-    return Number.isNaN(n.getTime()) ? "Invalid Date" : new Intl.DateTimeFormat(t, r).format(n);
+    const s = new Date(e);
+    return Number.isNaN(s.getTime()) ? "Invalid Date" : new Intl.DateTimeFormat(t, r).format(s);
   }
   formatRelativeTime(e, t, r) {
-    const n = new Date(e);
-    if (Number.isNaN(n.getTime()))
+    const s = new Date(e);
+    if (Number.isNaN(s.getTime()))
       return new Intl.RelativeTimeFormat(t, r).format(0, "second");
-    const i = Math.floor(((/* @__PURE__ */ new Date()).getTime() - n.getTime()) / 1e3), a = [
+    const i = Math.floor(((/* @__PURE__ */ new Date()).getTime() - s.getTime()) / 1e3), a = [
       { unit: "year", seconds: 31536e3 },
       { unit: "month", seconds: 2592e3 },
       { unit: "day", seconds: 86400 },
@@ -340,62 +304,62 @@ class P {
       { unit: "minute", seconds: 60 },
       { unit: "second", seconds: 1 }
     ];
-    for (const { unit: l, seconds: c } of a) {
-      const u = Math.floor(i / c);
-      if (u >= 1)
-        return new Intl.RelativeTimeFormat(t, r).format(-u, l);
+    for (const { unit: l, seconds: u } of a) {
+      const h = Math.floor(i / u);
+      if (h >= 1)
+        return new Intl.RelativeTimeFormat(t, r).format(-h, l);
     }
     return new Intl.RelativeTimeFormat(t, r).format(0, "second");
   }
 }
-class E {
+class T {
   constructor(e = {}) {
-    this.formatter = new P(), this.helper = w(e.cache), this.formatter = new P(), this.pluralFunc = e.plural || x, this.missingWarn = e.missingWarn ?? !0, this.missingHandler = e.missingHandler, this.getPreviousPageInfo = e.getPreviousPageInfo, this.getCustomMissingHandler = e.getCustomMissingHandler, this.enablePreviousPageFallback = e.enablePreviousPageFallback ?? !1;
+    this.formatter = new v(), this.helper = C(e.storage), this.formatter = new v(), this.pluralFunc = e.plural || L, this.missingWarn = e.missingWarn ?? !0, this.missingHandler = e.missingHandler, this.getPreviousPageInfo = e.getPreviousPageInfo, this.getCustomMissingHandler = e.getCustomMissingHandler, this.enablePreviousPageFallback = e.enablePreviousPageFallback ?? !1;
   }
   // --- Public methods (implemented in base class) ---
   /**
    * Get translation for a key
    * Based on logic from src/runtime/plugins/01.plugin.ts
    */
-  t(e, t, r, n) {
+  t(e, t, r, s) {
     if (!e) return "";
-    const s = this.getLocale(), i = n || this.getRoute();
-    let a = this.helper.getTranslation(s, i, e);
+    const n = this.getLocale(), i = s || this.getRoute();
+    let a = this.helper.getTranslation(n, i, e);
     if (!a && this.enablePreviousPageFallback && this.getPreviousPageInfo) {
       const l = this.getPreviousPageInfo();
       if (l) {
-        const c = this.helper.getTranslation(l.locale, l.routeName, e);
-        c && (a = c, process.env.NODE_ENV !== "production" && console.log(`Using fallback translation from previous route: ${l.routeName} -> ${e}`));
+        const u = this.helper.getTranslation(l.locale, l.routeName, e);
+        u && (a = u, process.env.NODE_ENV !== "production" && console.log(`Using fallback translation from previous route: ${l.routeName} -> ${e}`));
       }
     }
     if (!a) {
       const l = this.getFallbackLocale();
-      s !== l && (a = this.helper.getTranslation(l, i, e));
+      n !== l && (a = this.helper.getTranslation(l, i, e));
     }
     if (!a) {
       const l = this.getCustomMissingHandler?.();
-      l ? l(s, e, i) : this.missingHandler ? this.missingHandler(s, e, i) : this.missingWarn && process.env.NODE_ENV !== "production" && typeof window < "u" && console.warn(`Not found '${e}' key in '${s}' locale messages for route '${i}'.`), a = r === void 0 ? e : r || e;
+      l ? l(n, e, i) : this.missingHandler ? this.missingHandler(n, e, i) : this.missingWarn && process.env.NODE_ENV !== "production" && typeof window < "u" && console.warn(`Not found '${e}' key in '${n}' locale messages for route '${i}'.`), a = r === void 0 ? e : r || e;
     }
-    return typeof a == "string" && t ? S(a, t) : a;
+    return typeof a == "string" && t ? P(a, t) : a;
   }
   /**
    * Get translation as string
    */
-  ts(e, t, r, n) {
-    return this.t(e, t, r, n)?.toString() ?? r ?? e;
+  ts(e, t, r, s) {
+    return this.t(e, t, r, s)?.toString() ?? r ?? e;
   }
   /**
    * Plural translation
    */
   tc(e, t, r) {
-    const { count: n, ...s } = typeof t == "number" ? { count: t } : t;
-    if (n === void 0)
+    const { count: s, ...n } = typeof t == "number" ? { count: t } : t;
+    if (s === void 0)
       return r ?? e;
-    const i = (l, c, u) => this.t(l, c, u);
+    const i = (l, u, h) => this.t(l, u, h);
     return this.pluralFunc(
       e,
-      Number.parseInt(n.toString()),
-      s,
+      Number.parseInt(s.toString()),
+      n,
       this.getLocale(),
       i
     ) ?? r ?? e;
@@ -423,8 +387,8 @@ class E {
    * Based on logic from src/runtime/plugins/01.plugin.ts
    */
   has(e, t) {
-    const r = t || this.getRoute(), n = this.getLocale();
-    return !!this.helper.getTranslation(n, r, e);
+    const r = t || this.getRoute(), s = this.getLocale();
+    return !!this.helper.getTranslation(s, r, e);
   }
   /**
    * Clear cache
@@ -438,26 +402,26 @@ class E {
    * Subclasses can override addTranslations/addRouteTranslations to add reactivity
    */
   loadTranslationsCore(e, t, r) {
-    r ? this.helper.mergeGlobalTranslation(e, t, !0) : this.helper.loadTranslations(e, t);
+    r ? this.helper.mergeGlobalTranslation(e, t, !0) : this.helper.setTranslations(e, t);
   }
   /**
    * Core route translation loading logic (without reactivity)
    * Subclasses can override addRouteTranslations to add reactivity
    */
-  loadRouteTranslationsCore(e, t, r, n) {
-    n ? this.helper.mergeTranslation(e, t, r, !0) : this.helper.loadPageTranslations(e, t, r);
+  loadRouteTranslationsCore(e, t, r, s) {
+    s ? this.helper.mergeTranslation(e, t, r, !0) : this.helper.loadPageTranslations(e, t, r);
   }
 }
 export {
-  E as BaseI18n,
-  P as FormatService,
-  z as RouteService,
-  x as defaultPlural,
-  S as interpolate,
-  f as isNoPrefixStrategy,
-  q as isPrefixAndDefaultStrategy,
-  F as isPrefixExceptDefaultStrategy,
-  D as isPrefixStrategy,
-  w as useTranslationHelper,
-  y as withPrefixStrategy
+  T as BaseI18n,
+  v as FormatService,
+  w as RouteService,
+  L as defaultPlural,
+  P as interpolate,
+  c as isNoPrefixStrategy,
+  $ as isPrefixAndDefaultStrategy,
+  R as isPrefixExceptDefaultStrategy,
+  b as isPrefixStrategy,
+  C as useTranslationHelper,
+  f as withPrefixStrategy
 };