@i18n-micro/path-strategy 1.0.3 → 1.1.2

package/dist/prefix-except-default-strategy.mjs

@@ -1,194 +1,244 @@
-import { B as I, n as S, j as u, b as R, l as C, d as T, t as q, c as k, w as $, a as z, g as F, i as Q, e as j, p as g, f as O } from "./base-strategy-DVqe8ehd.js";
-class E extends I {
+import { B as K, n as R, j as m, b as F, l as C, d as I, t as T, c as b, w as z, a as k, g, i as U, e as j, p as B, f as D } from "./base-strategy-Cf39XK8k.js";
+class L extends K {
   /**
    * For this strategy a prefix is required for all non-default locales,
    * unless includeDefaultLocaleRoute is explicitly enabled.
    */
   shouldHavePrefix(t) {
-    return this.ctx.includeDefaultLocaleRoute ? !0 : t !== this.ctx.defaultLocale;
-  }
-  buildLocalizedPath(t, s, e) {
-    return this.shouldHavePrefix(s) ? u(s, S(t)) : S(t);
-  }
-  buildLocalizedRouteName(t, s) {
-    return this.shouldHavePrefix(s) ? this.buildLocalizedName(t, s) : t;
-  }
-  switchLocaleRoute(t, s, e, n) {
-    const a = this.getBaseRouteName(e, t);
-    if (!a) return e;
-    const h = this.shouldHavePrefix(s) ? this.buildLocalizedName(a, s) : a;
-    if (this.ctx.router.hasRoute(h)) {
-      const c = n.i18nRouteParams?.[s] || {}, p = { ...e.params || {}, ...c };
-      delete p.locale;
-      const v = {
-        name: h,
+    if (this.ctx.includeDefaultLocaleRoute) return !0;
+    if (t === this.ctx.defaultLocale) return !1;
+    const a = this.ctx.locales.find((e) => e.code === t);
+    return !(a?.baseUrl && a?.baseDefault);
+  }
+  buildLocalizedPath(t, a, e) {
+    return this.shouldHavePrefix(a) ? m(a, R(t)) : R(t);
+  }
+  buildLocalizedRouteName(t, a) {
+    return this.shouldHavePrefix(a) ? this.buildLocalizedName(t, a) : t;
+  }
+  switchLocaleRoute(t, a, e, h) {
+    const s = this.getBaseRouteName(e, t);
+    if (!s) return e;
+    let r;
+    if (this.shouldHavePrefix(a)) {
+      const i = this.buildLocalizedName(s, a), p = `${this.getLocalizedRouteNamePrefix()}${s}`;
+      r = this.ctx.router.hasRoute(i) ? i : p;
+    } else
+      r = s;
+    if (this.ctx.router.hasRoute(r)) {
+      const i = h.i18nRouteParams?.[a] || {}, p = { ...e.params || {}, ...i };
+      this.shouldHavePrefix(a) ? p.locale = a : delete p.locale;
+      const S = this.ctx.router.resolve({ name: r, params: p }), N = {
+        name: r,
         params: p,
+        path: S?.path,
+        fullPath: S?.fullPath,
         query: e.query,
         hash: e.hash
       };
-      return this.applyBaseUrl(s, v);
+      return this.applyBaseUrl(a, N);
     }
-    return { ...e, name: h };
-  }
-  resolveLocaleRoute(t, s, e) {
-    if (s.kind === "path") {
-      const o = this.resolvePathForLocale(s.path, t);
-      if (!this.shouldHavePrefix(t)) return this.applyBaseUrl(t, o);
-      const f = u(t, o);
-      return this.applyBaseUrl(t, f);
+    const o = e.path?.replace(new RegExp(`^/${t}`), "") || "/", P = this.buildLocalizedPath(o, a, !1);
+    return this.applyBaseUrl(a, { path: P, query: e.query, hash: e.hash });
+  }
+  resolveLocaleRoute(t, a, e) {
+    if (a.kind === "path") {
+      const l = this.resolvePathForLocale(a.path, t);
+      if (!this.shouldHavePrefix(t)) return this.applyBaseUrl(t, l);
+      const u = m(t, l);
+      return this.applyBaseUrl(t, u);
     }
-    const { inputName: n, sourceRoute: a, resolved: h } = s;
-    if (n) {
-      const o = this.getPathForUnlocalizedRouteByName(n);
-      if (o !== null) return this.preserveQueryAndHash(o, a);
-      const l = "/" + R(n), m = {
-        name: n,
-        path: l,
-        fullPath: l,
-        params: a.params ?? {}
-      }, i = this.getCustomPathSegment(m, t);
-      if (i !== null) {
-        const r = this.getNestedRouteInfo(n);
-        let y;
-        if (r) {
-          const d = this.getParentPathForTarget(r.parentKey, r.keyWithSlash, t, e), N = i.startsWith("/") ? i.slice(1) : i;
-          y = d ? u(d, N) : S(i);
+    const { inputName: h, sourceRoute: s, resolved: r } = a;
+    if (h) {
+      const l = this.getPathForUnlocalizedRouteByName(h);
+      if (l !== null) return this.preserveQueryAndHash(l, s);
+      const c = `/${F(h)}`, y = {
+        name: h,
+        path: c,
+        fullPath: c,
+        params: s.params ?? {}
+      }, n = this.getCustomPathSegment(y, t);
+      if (n !== null) {
+        const f = this.getNestedRouteInfo(h);
+        let d;
+        if (f) {
+          const v = this.getParentPathForTarget(f.parentKey, f.keyWithSlash, t, e), W = n.startsWith("/") ? n.slice(1) : n;
+          d = v ? m(v, W) : R(n);
         } else
-          y = S(i);
+          d = R(n);
         if (!this.shouldHavePrefix(t))
-          return this.preserveQueryAndHash(this.applyBaseUrl(t, y), a);
-        const P = u(t, y);
-        return this.preserveQueryAndHash(this.applyBaseUrl(t, P), a);
+          return this.preserveQueryAndHash(this.applyBaseUrl(t, d), s);
+        const x = m(t, d);
+        return this.preserveQueryAndHash(this.applyBaseUrl(t, x), s);
       }
     }
-    const c = a.params && Object.keys(a.params ?? {}).length > 0;
-    if (n && c) {
-      const o = this.tryResolveByLocalizedNameWithParams(
-        n,
-        t,
-        a.params ?? {},
-        a
-      );
-      if (o !== null) {
-        const f = this.applyBaseUrl(t, o);
-        return this.preserveQueryAndHash(f, a);
+    const o = s.params && Object.keys(s.params ?? {}).length > 0;
+    if (h && o) {
+      if (!this.shouldHavePrefix(t) && this.ctx.router.hasRoute(h)) {
+        const u = this.ctx.router.resolve({
+          name: h,
+          params: s.params,
+          query: s.query,
+          hash: s.hash
+        });
+        if (u?.path && u.path !== "/") {
+          const c = {
+            name: h,
+            path: u.path,
+            fullPath: u.fullPath,
+            params: u.params,
+            query: u.query ?? s.query,
+            hash: u.hash ?? s.hash
+          };
+          return this.preserveQueryAndHash(this.applyBaseUrl(t, c), s);
+        }
+      }
+      const l = this.tryResolveByLocalizedNameWithParams(h, t, s.params ?? {}, s);
+      if (l !== null) {
+        const u = this.applyBaseUrl(t, l);
+        return this.preserveQueryAndHash(u, s);
       }
     }
-    if (h.name != null) {
-      const o = this.getPathForUnlocalizedRoute(h);
-      if (o !== null)
-        return this.preserveQueryAndHash(this.applyBaseUrl(t, o), a);
-      const f = this.getCustomPathSegment(h, t);
-      if (f !== null) {
-        const l = h.name?.toString() ?? n ?? "", m = l ? this.getNestedRouteInfo(l) : null;
-        let i;
-        if (m) {
-          const y = this.getParentPathForTarget(m.parentKey, m.keyWithSlash, t, e), P = f.startsWith("/") ? f.slice(1) : f;
-          i = u(y, P);
+    if (r.name != null) {
+      const l = this.getPathForUnlocalizedRoute(r);
+      if (l !== null)
+        return this.preserveQueryAndHash(this.applyBaseUrl(t, l), s);
+      const u = this.getCustomPathSegment(r, t);
+      if (u !== null) {
+        const c = r.name?.toString() ?? h ?? "", y = c ? this.getNestedRouteInfo(c) : null;
+        let n;
+        if (y) {
+          const d = this.getParentPathForTarget(y.parentKey, y.keyWithSlash, t, e), x = u.startsWith("/") ? u.slice(1) : u;
+          n = m(d, x);
         } else
-          i = S(f);
+          n = R(u);
         if (!this.shouldHavePrefix(t))
-          return this.preserveQueryAndHash(this.applyBaseUrl(t, i), a);
-        const r = u(t, i);
-        return this.preserveQueryAndHash(this.applyBaseUrl(t, r), a);
+          return this.preserveQueryAndHash(this.applyBaseUrl(t, n), s);
+        const f = m(t, n);
+        return this.preserveQueryAndHash(this.applyBaseUrl(t, f), s);
       }
-      if (h.path && h.path !== "/" && h.name) {
-        const { pathWithoutLocale: l, baseRouteName: m } = this.getPathWithoutLocaleAndBaseName(h), i = this.getCustomPathSegment(h, t), r = m ? this.getNestedRouteInfo(m) : null, y = !!r;
-        let P;
-        if (i !== null && y && r) {
-          const d = this.getParentPathForTarget(r.parentKey, r.keyWithSlash, t, e), N = i.startsWith("/") ? i.slice(1) : i;
-          P = u(d, N);
-        } else if (y && i === null && l && l !== "/" && r) {
-          const d = this.getParentPathForTarget(r.parentKey, r.keyWithSlash, t, e), N = C(l);
-          P = d ? u(d, N) : l !== "/" ? l : null;
+      if (r.path && r.path !== "/" && r.name) {
+        const { pathWithoutLocale: c, baseRouteName: y } = this.getPathWithoutLocaleAndBaseName(r), n = this.getCustomPathSegment(r, t), f = y ? this.getNestedRouteInfo(y) : null, d = !!f;
+        let x;
+        if (n !== null && d && f) {
+          const v = this.getParentPathForTarget(f.parentKey, f.keyWithSlash, t, e), W = n.startsWith("/") ? n.slice(1) : n;
+          x = m(v, W);
+        } else if (d && n === null && c && c !== "/" && f) {
+          const v = this.getParentPathForTarget(f.parentKey, f.keyWithSlash, t, e), W = C(c);
+          x = v ? m(v, W) : c !== "/" ? c : null;
         } else
-          P = i !== null && !y ? S(i) : l && l !== "/" ? l : null;
-        if (P) {
-          const d = this.detectLocaleFromName(h.name), N = d ? this.getBaseRouteName(h, d) : h.name ? this.getRouteBaseName(h) : null, U = N ? this.shouldHavePrefix(t) ? this.buildLocalizedName(N, t) : N.toString() : void 0, A = this.shouldHavePrefix(t) ? u(t, P) : P, K = {
-            ...U ? { name: U } : {},
-            path: A,
-            fullPath: A,
-            params: { ...h.params, ...a.params },
-            query: { ...h.query, ...a.query },
-            hash: a.hash ?? h.hash
+          x = n !== null && !d ? R(n) : c && c !== "/" ? c : null;
+        if (x) {
+          const v = this.detectLocaleFromName(r.name), W = v ? this.getBaseRouteName(r, v) : r.name ? this.getRouteBaseName(r) : null, A = W ? this.shouldHavePrefix(t) ? this.buildLocalizedName(W, t) : W.toString() : void 0, $ = this.shouldHavePrefix(t) ? m(t, x) : x, w = {
+            ...A ? { name: A } : {},
+            path: $,
+            fullPath: $,
+            params: { ...r.params, ...s.params },
+            query: { ...r.query, ...s.query },
+            hash: s.hash ?? r.hash
           };
-          return this.preserveQueryAndHash(this.applyBaseUrl(t, K), a);
+          return this.preserveQueryAndHash(this.applyBaseUrl(t, w), s);
         }
       }
     }
-    if (n) {
-      const f = "/" + R(n), l = {
-        name: n,
-        path: f,
-        fullPath: f,
-        params: a.params ?? {}
-      }, m = this.getCustomPathSegment(l, t);
-      if (m !== null) {
-        const i = this.getNestedRouteInfo(n);
-        let r;
-        if (i) {
-          const P = this.getParentPathForTarget(i.parentKey, i.keyWithSlash, t, e), d = m.startsWith("/") ? m.slice(1) : m;
-          r = u(P || "/", d);
+    if (h) {
+      const u = `/${F(h)}`, c = {
+        name: h,
+        path: u,
+        fullPath: u,
+        params: s.params ?? {}
+      }, y = this.getCustomPathSegment(c, t);
+      if (y !== null) {
+        const n = this.getNestedRouteInfo(h);
+        let f;
+        if (n) {
+          const x = this.getParentPathForTarget(n.parentKey, n.keyWithSlash, t, e), v = y.startsWith("/") ? y.slice(1) : y;
+          f = m(x || "/", v);
         } else
-          r = S(m);
+          f = R(y);
         if (!this.shouldHavePrefix(t))
-          return this.preserveQueryAndHash(this.applyBaseUrl(t, r), a);
-        const y = u(t, r);
-        return this.preserveQueryAndHash(this.applyBaseUrl(t, y), a);
+          return this.preserveQueryAndHash(this.applyBaseUrl(t, f), s);
+        const d = m(t, f);
+        return this.preserveQueryAndHash(this.applyBaseUrl(t, d), s);
       }
     }
-    if (n && !c) {
-      const o = this.tryResolveByLocalizedName(n, t, a);
-      if (o !== null) return this.preserveQueryAndHash(this.applyBaseUrl(t, o), a);
+    if (h && !o) {
+      if (this.shouldHavePrefix(t)) {
+        const l = this.tryResolveByLocalizedName(h, t, s);
+        if (l !== null) return this.preserveQueryAndHash(this.applyBaseUrl(t, l), s);
+      } else if (this.ctx.router.hasRoute(h)) {
+        const l = this.ctx.router.resolve({
+          name: h,
+          params: s.params,
+          query: s.query,
+          hash: s.hash
+        });
+        if (l?.path)
+          return this.preserveQueryAndHash(
+            this.applyBaseUrl(t, {
+              name: h,
+              path: l.path,
+              fullPath: l.fullPath,
+              params: l.params,
+              query: l.query ?? s.query,
+              hash: l.hash ?? s.hash
+            }),
+            s
+          );
+      }
     }
-    const p = e ? this.detectLocaleFromName(e.name) : this.detectLocaleFromName(h.name), v = p ? this.getBaseRouteName(h, p) : h.name ?? null;
-    if (!v) return a;
-    const x = this.shouldHavePrefix(t) ? this.buildLocalizedName(v, t) : v.toString(), W = T(v) ? "/" : u("/", q(v)), H = this.shouldHavePrefix(t) ? u(t, W) : W, B = this.applyBaseUrl(t, H), b = typeof B == "string" ? B : B.path ?? H, w = {
-      name: x,
-      path: b,
-      fullPath: b,
-      params: { ...h.params, ...a.params },
-      query: { ...h.query, ...a.query },
-      hash: a.hash ?? h.hash
+    const P = e ? this.detectLocaleFromName(e.name) : this.detectLocaleFromName(r.name), i = P ? this.getBaseRouteName(r, P) : r.name ?? null;
+    if (!i) return s;
+    const p = this.shouldHavePrefix(t) ? this.buildLocalizedName(i, t) : i.toString(), S = I(i) ? "/" : m("/", T(i)), N = this.shouldHavePrefix(t) ? m(t, S) : S, H = this.applyBaseUrl(t, N), q = typeof H == "string" ? H : H.path ?? N, Q = {
+      name: p,
+      path: q,
+      fullPath: q,
+      params: { ...r.params, ...s.params },
+      query: { ...r.query, ...s.query },
+      hash: s.hash ?? r.hash
     };
-    return this.preserveQueryAndHash(this.applyBaseUrl(t, w), a);
+    return this.preserveQueryAndHash(this.applyBaseUrl(t, Q), s);
   }
-  getCanonicalPath(t, s) {
-    const e = this.getCustomPathSegment(t, s);
+  getCanonicalPath(t, a) {
+    const e = this.getCustomPathSegment(t, a);
     if (!e) return null;
-    const n = e.startsWith("/") ? e : `/${e}`;
-    return this.shouldHavePrefix(s) ? k(`/${s}${n}`) : k(n);
+    const h = e.startsWith("/") ? e : `/${e}`;
+    return this.shouldHavePrefix(a) ? b(`/${a}${h}`) : b(h);
   }
   resolveLocaleFromPath(t) {
-    const { localeFromPath: s } = this.getPathWithoutLocale(t);
-    return s || this.ctx.defaultLocale;
-  }
-  getRedirect(t, s) {
-    const { pathWithoutLocale: e, localeFromPath: n } = this.getPathWithoutLocale(t), a = this.shouldHavePrefix(s), h = this.ctx.globalLocaleRoutes;
-    if (h && n !== null) {
-      const x = e === "/" ? "/" : $(e);
-      if (h[e] === !1 || h[x] === !1)
-        return z(e);
+    const { localeFromPath: a } = this.getPathWithoutLocale(t);
+    return a || this.ctx.defaultLocale;
+  }
+  getRedirect(t, a) {
+    const { pathWithoutLocale: e, localeFromPath: h } = this.getPathWithoutLocale(t), s = this.shouldHavePrefix(a), r = this.ctx.globalLocaleRoutes;
+    if (r && h !== null) {
+      const p = e === "/" ? "/" : z(e);
+      if (r[e] === !1 || r[p] === !1)
+        return k(e);
     }
-    if (n !== null) {
-      if (n === this.ctx.defaultLocale)
-        return z(e);
-      if (n === s) {
-        const x = this.buildPathWithPrefix(e, s), W = F(t);
-        return Q(W, x) ? null : x;
+    if (h !== null) {
+      if (h === this.ctx.defaultLocale)
+        return k(e);
+      if (h === a) {
+        const p = this.buildPathWithPrefix(e, a), S = g(t);
+        return U(S, p) ? null : p;
       }
-      return this.buildPathWithPrefix(e, s);
+      return this.buildPathWithPrefix(e, a);
     }
-    if (a)
-      return this.buildPathWithPrefix(e, s);
-    const c = this.resolvePathForLocale(e, s), p = c.startsWith("/") ? c : `/${c}`, v = F(t);
-    return Q(v, p) ? null : p;
+    if (s)
+      return this.buildPathWithPrefix(e, a);
+    const o = this.resolvePathForLocale(e, a), P = o.startsWith("/") ? o : `/${o}`, i = g(t);
+    return U(i, P) ? null : P;
+  }
+  shouldReturn404(t) {
+    const { pathWithoutLocale: a, localeFromPath: e } = this.getPathWithoutLocale(t);
+    return e === null ? null : e === this.ctx.defaultLocale && a === "/" ? "Default locale should not have prefix" : super.shouldReturn404(t);
   }
   /** True if gr[key] is a locale rules object (Record<locale, path>). */
   isLocaleRules(t) {
-    const s = this.ctx.globalLocaleRoutes;
-    if (!s || !t) return !1;
-    const e = s[t];
+    const a = this.ctx.globalLocaleRoutes;
+    if (!a || !t) return !1;
+    const e = a[t];
     return typeof e == "object" && e !== null && !Array.isArray(e);
   }
   /**
@@ -197,34 +247,34 @@ class E extends I {
    */
   getNestedRouteInfo(t) {
     if (!this.ctx.globalLocaleRoutes) return null;
-    const e = R(t), n = j(t);
+    const e = F(t), h = j(t);
     if (e.includes("/") && this.isLocaleRules(e))
-      return { parentKey: g(e), keyWithSlash: e };
-    if (n.includes("/") && this.isLocaleRules(n))
-      return { parentKey: g(n), keyWithSlash: n };
-    const a = g(e);
-    if (e.includes("/") && a && this.isLocaleRules(a))
-      return { parentKey: a, keyWithSlash: e };
-    const h = g(n);
-    return n.includes("/") && h && this.isLocaleRules(h) ? { parentKey: h, keyWithSlash: n } : null;
+      return { parentKey: B(e), keyWithSlash: e };
+    if (h.includes("/") && this.isLocaleRules(h))
+      return { parentKey: B(h), keyWithSlash: h };
+    const s = B(e);
+    if (e.includes("/") && s && this.isLocaleRules(s))
+      return { parentKey: s, keyWithSlash: e };
+    const r = B(h);
+    return h.includes("/") && r && this.isLocaleRules(r) ? { parentKey: r, keyWithSlash: h } : null;
   }
   /** Parent path for target locale from gr or currentRoute. */
-  getParentPathForTarget(t, s, e, n) {
-    const a = this.ctx.globalLocaleRoutes, h = t && a?.[t] && typeof a[t] == "object" && !Array.isArray(a[t]) ? a[t] : null;
-    let c = h?.[e] ? S(h[e]) : "";
-    if (!c && n?.path) {
-      const p = F(n.path), { pathWithoutLocale: v } = this.getPathWithoutLocale(p);
-      c = S(v);
+  getParentPathForTarget(t, a, e, h) {
+    const s = this.ctx.globalLocaleRoutes, r = t && s?.[t] && typeof s[t] == "object" && !Array.isArray(s[t]) ? s[t] : null;
+    let o = r?.[e] ? R(r[e]) : "";
+    if (!o && h?.path) {
+      const P = g(h.path), { pathWithoutLocale: i } = this.getPathWithoutLocale(P);
+      o = R(i);
     }
-    if (!c) {
-      const p = O(s).slice(0, -1);
-      c = p.length ? u("/", ...p) : "";
+    if (!o) {
+      const P = D(a).slice(0, -1);
+      o = P.length ? m("/", ...P) : "";
     }
-    return c;
+    return o;
   }
-  buildPathWithPrefix(t, s) {
-    const e = this.resolvePathForLocale(t, s);
-    return e === "/" || e === "" ? `/${s}` : u(`/${s}`, e);
+  buildPathWithPrefix(t, a) {
+    const e = this.resolvePathForLocale(t, a);
+    return e === "/" || e === "" ? `/${a}` : m(`/${a}`, e);
   }
   /**
    * Simple locale detector based on route name suffix.
@@ -232,14 +282,35 @@ class E extends I {
    */
   detectLocaleFromName(t) {
     if (!t) return null;
-    for (const s of this.ctx.locales)
-      if (t.endsWith(`-${s.code}`))
-        return s.code;
+    for (const a of this.ctx.locales)
+      if (t.endsWith(`-${a.code}`))
+        return a.code;
     return null;
   }
+  /**
+   * Formats path for router.resolve.
+   * prefix_except_default: add prefix only for non-default locale.
+   */
+  formatPathForResolve(t, a, e) {
+    return e !== this.ctx.defaultLocale ? `/${a}${t}` : t;
+  }
+  /**
+   * prefix_except_default: redirect based on preferred locale.
+   * Uses shouldHavePrefix to determine if locale needs prefix.
+   * Also handles custom paths from globalLocaleRoutes.
+   */
+  getClientRedirect(t, a) {
+    const { pathWithoutLocale: e, localeFromPath: h } = this.getPathWithoutLocale(t), s = this.ctx.globalLocaleRoutes, r = e === "/" ? "/" : z(e);
+    if (s && (s[e] === !1 || s[r] === !1) || h !== null) return null;
+    const o = this.resolvePathForLocale(e, a), P = this.shouldHavePrefix(a);
+    let i;
+    P ? i = b(`/${a}${o.startsWith("/") ? o : `/${o}`}`) : i = o.startsWith("/") ? o : `/${o}`, i !== "/" && i.endsWith("/") && (i = i.slice(0, -1));
+    const p = g(t);
+    return U(p, i) ? null : i;
+  }
 }
 export {
-  E as PrefixExceptDefaultPathStrategy,
-  E as Strategy
+  L as PrefixExceptDefaultPathStrategy,
+  L as Strategy
 };
 //# sourceMappingURL=prefix-except-default-strategy.mjs.map