@i18n-micro/core 1.1.0 → 1.1.2

package/dist/base.d.ts

@@ -1,6 +1,6 @@
-import { useTranslationHelper, TranslationStorage } from './translation';
+import { CleanTranslation, MissingHandler, Params, PluralFunc, TranslationKey, Translations } from '@i18n-micro/types';
 import { FormatService } from './format-service';
-import { Translations, Params, PluralFunc, CleanTranslation, TranslationKey, MissingHandler } from '@i18n-micro/types';
+import { TranslationStorage, useTranslationHelper } from './translation';
 export interface BaseI18nOptions {
     storage?: TranslationStorage;
     plural?: PluralFunc;

package/dist/helpers.d.ts

@@ -1,4 +1,4 @@
-import { Params, Strategies, PluralFunc } from '@i18n-micro/types';
+import { Params, PluralFunc, Strategies } from '@i18n-micro/types';
 export declare function interpolate(template: string, params: Params): string;
 export declare function withPrefixStrategy(strategy: Strategies): strategy is "prefix" | "prefix_and_default";
 export declare function isNoPrefixStrategy(strategy: Strategies): strategy is "no_prefix";

package/dist/index.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});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 y(o){const e=o?.translations??new Map;return{hasCache(t,r){const s=`${t}:${r}`;return e.has(s)||e.has(t)},getCache(t,r){const s=`${t}:${r}`;return e.get(s)},setCache(t,r,s){},hasTranslation(t,r){for(const[s,i]of e)if((s===t||s.startsWith(`${t}:`))&&d(i,r)!==null)return!0;return!1},hasGeneralTranslation(t){return e.has(t)},hasPageTranslation(t,r){return e.has(`${t}:${r}`)},getTranslation(t,r,s){const i=`${t}:${r}`,n=e.get(i),a=d(n,s);if(a!==null)return a;const l=e.get(t);return d(l,s)},loadTranslations(t,r){const s=e.get(t)??{};e.set(t,{...s,...r})},setTranslations(t,r){e.set(t,r)},loadPageTranslations(t,r,s){const i=`${t}:${r}`,n=e.get(i);!n||Object.keys(n).length===0?e.set(i,s):e.set(i,{...n,...s})},mergeTranslation(t,r,s,i=!1){const n=`${t}:${r}`,a=e.get(n)??{};e.set(n,{...a,...s})},mergeGlobalTranslation(t,r,s=!1){const i=e.get(t)??{};e.set(t,{...i,...r})},clearCache(){e.clear()}}}const L=/\{(\w+)\}/g;function C(o,e){return e?o.replace(L,(t,r)=>{const s=e[r];return s!==void 0?String(s):`{${r}}`}):o}function f(o){return o==="prefix"||o==="prefix_and_default"}function h(o){return o==="no_prefix"}function b(o){return o==="prefix"}function P(o){return o==="prefix_except_default"}function R(o){return o==="prefix_and_default"}const $=(o,e,t,r,s)=>{const i=s(o,t);if(!i)return null;const n=i.toString().split("|");if(n.length===0)return null;const a=e<n.length?n[e]:n[n.length-1];return a?a.trim().replace("{count}",e.toString()):null};class w{constructor(e,t,r,s,i,n){this.i18nConfig=e,this.router=t,this.hashLocaleDefault=r,this.noPrefixDefault=s,this.navigateTo=i,this.getDefaultLocale=n}extractLocaleFromPath(e){if(!e)return null;const r=e.split("?")[0]?.split("#")[0];if(!r||r==="/")return null;const s=r.split("/").filter(Boolean);if(s.length===0)return null;const i=s[0];return i&&(this.i18nConfig.locales?.map(a=>a.code)||[]).includes(i)?i:null}getCurrentLocale(e){if(e=e??this.router.currentRoute.value,this.i18nConfig.hashMode){const i=this.getDefaultLocale?.();if(i)return i;if(this.hashLocaleDefault)return this.hashLocaleDefault}if(h(this.i18nConfig.strategy)){const i=this.getDefaultLocale?.();if(i)return i;if(this.noPrefixDefault)return this.noPrefixDefault}const t=e.path||e.fullPath||"";if(R(this.i18nConfig.strategy)&&(t==="/"||t==="")){const i=this.getDefaultLocale?.();if(i)return i}if(e.params?.locale)return e.params.locale.toString();const r=this.extractLocaleFromPath(t);if(r)return r;if(P(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(s=>s.code===t)?.displayName??null}getRouteName(e,t){return(e.name??"").toString().toString().replace("localized-","").replace(new RegExp(`-${t}$`),"")}getPluginRouteName(e,t){return this.i18nConfig.disablePageLocales?"general":this.getRouteName(e,t)}getFullPathWithBaseUrl(e,t){let s=this.router.resolve(t).fullPath;e?.baseDefault&&(s=s.replace(new RegExp(`^/${e.code}`),""));let i=e.baseUrl;return i||(i=""),i?.endsWith("/")&&(i=i.slice(0,-1)),i+s}switchLocaleRoute(e,t,r,s){const i=this.i18nConfig.locales?.find(g=>g.code===t),n=this.getRouteName(r,e);if(this.router.hasRoute(`localized-${n}-${t}`)){const m={...s?.[t]?{...s[t]}:{...r.params??{}}};delete m.locale,h(this.i18nConfig.strategy)||(m.locale=t);const v={name:`localized-${n}-${t}`,params:m,query:r.query,hash:r.hash};return i?.baseUrl?this.getFullPathWithBaseUrl(i,v):v}let a=n;const u={...s?.[t]?{...s[t]}:{...r.params??{}}};delete u.locale,h(this.i18nConfig.strategy)||(n==="custom-fallback-route"?a=n:a=t!==this.i18nConfig.defaultLocale||f(this.i18nConfig.strategy)?`localized-${n}`:n,h(this.i18nConfig.strategy)||(t!==this.i18nConfig.defaultLocale||f(this.i18nConfig.strategy))&&(u.locale=t));const c={name:a,params:u,query:r.query,hash:r.hash};return h(this.i18nConfig.strategy)&&this.i18nConfig.locales?.forEach((g,m)=>{c.name.endsWith(`-${g.code}`)&&(c.name=c.name.slice(0,-g.code-1))}),i?.baseUrl?this.getFullPathWithBaseUrl(i,c):c}resolveParams(e){const t=typeof e=="object"&&"params"in e&&typeof e.params=="object"?{...e.params}:{};if(typeof e=="string"){const r=this.router.resolve(e);r&&r.params&&Object.assign(t,r.params)}return t}handlePrefixStrategy(e){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 s=this.getRouteName(r,t),i=this.resolveParams(r);return h(this.i18nConfig.strategy)||(i.locale=t),this.router.hasRoute(`localized-${s}`)?this.router.resolve({name:`localized-${s}`,query:r.query,hash:r.hash,params:i}):this.router.hasRoute(`localized-${s}-${t}`)?this.router.resolve({name:`localized-${s}-${t}`,query:r.query,hash:r.hash,params:i}):e}createLocalizedRoute(e,t,r){const s=this.router.resolve(e),i=this.getRouteName(s,r).replace(new RegExp(`-${this.i18nConfig.defaultLocale}$`),"");if(!h(this.i18nConfig.strategy)&&(!i||i==="")){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-${i}-${r}`)){const l=this.resolveParams(s);return h(this.i18nConfig.strategy)||(l.locale=r),this.router.resolve({name:`localized-${i}-${r}`,params:l,query:s.query,hash:s.hash})}const n=r!==this.i18nConfig.defaultLocale||f(this.i18nConfig.strategy)?`localized-${i}`:i;if(!this.router.hasRoute(n)){const l=this.resolveParams(e);return delete l.locale,this.router.hasRoute(i)?this.router.resolve({name:i,params:l,query:s.query,hash:s.hash}):this.router.resolve("/")}const a=this.resolveParams(e);return delete a.locale,h(this.i18nConfig.strategy)||(r!==this.i18nConfig.defaultLocale||f(this.i18nConfig.strategy))&&(a.locale=r),this.router.resolve({name:n,params:a,query:s.query,hash:s.hash})}getLocalizedRoute(e,t,r){const s=r||this.getCurrentLocale(t),i=this.handlePrefixStrategy(e);return this.createLocalizedRoute(i,t,s)}getCurrentRoute(){return this.router.currentRoute.value}resolveRouteWithStrategy(e,t,r){return h(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 s=this.getCurrentLocale();let i;typeof r=="string"?i=this.resolveRouteWithStrategy(r,e,s):i=r??this.getCurrentRoute();const n=this.switchLocaleRoute(s,e,i,t);return typeof n=="string"&&n.startsWith("http")?this.navigateTo(n,{redirectCode:200,external:!0}):(h(this.i18nConfig.strategy)&&(n.force=!0),this.router.push(n))}resolveLocalizedRoute(e,t){const r=this.getCurrentRoute(),s=this.getCurrentLocale(),i=t??s;let n;if(typeof e=="string")if(e.startsWith("/"))n=this.resolveRouteWithStrategy(e,i,s);else{const a=e;this.router.hasRoute(a)?n=this.router.resolve({name:a}):(e=`/${e}`,n=this.resolveRouteWithStrategy(e,i,s))}else n=e;return this.getLocalizedRoute(n,r,i)}}class p{formatNumber(e,t,r){return new Intl.NumberFormat(t,r).format(e)}formatDate(e,t,r){const s=new Date(e);return Number.isNaN(s.getTime())?"Invalid Date":new Intl.DateTimeFormat(t,r).format(s)}formatRelativeTime(e,t,r){const s=new Date(e);if(Number.isNaN(s.getTime()))return new Intl.RelativeTimeFormat(t,r).format(0,"second");const n=Math.floor((new Date().getTime()-s.getTime())/1e3),a=[{unit:"year",seconds:31536e3},{unit:"month",seconds:2592e3},{unit:"day",seconds:86400},{unit:"hour",seconds:3600},{unit:"minute",seconds:60},{unit:"second",seconds:1}];for(const{unit:l,seconds:u}of a){const c=Math.floor(n/u);if(c>=1)return new Intl.RelativeTimeFormat(t,r).format(-c,l)}return new Intl.RelativeTimeFormat(t,r).format(0,"second")}}class S{constructor(e={}){this.formatter=new p,this.helper=y(e.storage),this.formatter=new p,this.pluralFunc=e.plural||$,this.missingWarn=e.missingWarn??!0,this.missingHandler=e.missingHandler,this.getPreviousPageInfo=e.getPreviousPageInfo,this.getCustomMissingHandler=e.getCustomMissingHandler,this.enablePreviousPageFallback=e.enablePreviousPageFallback??!1}t(e,t,r,s){if(!e)return"";const i=this.getLocale(),n=s||this.getRoute();let a=this.helper.getTranslation(i,n,e);if(!a&&this.enablePreviousPageFallback&&this.getPreviousPageInfo){const l=this.getPreviousPageInfo();if(l){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();i!==l&&(a=this.helper.getTranslation(l,n,e))}if(!a){const l=this.getCustomMissingHandler?.();l?l(i,e,n):this.missingHandler?this.missingHandler(i,e,n):this.missingWarn&&process.env.NODE_ENV!=="production"&&typeof window<"u"&&console.warn(`Not found '${e}' key in '${i}' locale messages for route '${n}'.`),a=r===void 0?e:r||e}return typeof a=="string"&&t?C(a,t):a}ts(e,t,r,s){return this.t(e,t,r,s)?.toString()??r??e}tc(e,t,r){const{count:s,...i}=typeof t=="number"?{count:t}:t;if(s===void 0)return r??e;const n=(l,u,c)=>this.t(l,u,c);return this.pluralFunc(e,Number.parseInt(s.toString()),i,this.getLocale(),n)??r??e}tn(e,t){return this.formatter.formatNumber(e,this.getLocale(),t)}td(e,t){return this.formatter.formatDate(e,this.getLocale(),t)}tdr(e,t){return this.formatter.formatRelativeTime(e,this.getLocale(),t)}has(e,t){const r=t||this.getRoute(),s=this.getLocale();return!!this.helper.getTranslation(s,r,e)}clearCache(){this.helper.clearCache()}loadTranslationsCore(e,t,r){r?this.helper.mergeGlobalTranslation(e,t,!0):this.helper.setTranslations(e,t)}loadRouteTranslationsCore(e,t,r,s){s?this.helper.mergeTranslation(e,t,r,!0):this.helper.loadPageTranslations(e,t,r)}}exports.BaseI18n=S;exports.FormatService=p;exports.RouteService=w;exports.defaultPlural=$;exports.interpolate=C;exports.isNoPrefixStrategy=h;exports.isPrefixAndDefaultStrategy=R;exports.isPrefixExceptDefaultStrategy=P;exports.isPrefixStrategy=b;exports.useTranslationHelper=y;exports.withPrefixStrategy=f;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});class g{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)}formatRelativeTime(e,t,r){const n=new Date(e);if(Number.isNaN(n.getTime()))return new Intl.RelativeTimeFormat(t,r).format(0,"second");const i=Math.floor((new Date().getTime()-n.getTime())/1e3),o=[{unit:"year",seconds:31536e3},{unit:"month",seconds:2592e3},{unit:"day",seconds:86400},{unit:"hour",seconds:3600},{unit:"minute",seconds:60},{unit:"second",seconds:1}];for(const{unit:l,seconds:u}of o){const c=Math.floor(i/u);if(c>=1)return new Intl.RelativeTimeFormat(t,r).format(-c,l)}return new Intl.RelativeTimeFormat(t,r).format(0,"second")}}const p=/\{(\w+)\}/g;function h(s,e){return e?s.replace(p,(t,r)=>{const n=e[r];return n!==void 0?String(n):`{${r}}`}):s}function v(s){return s==="prefix"||s==="prefix_and_default"}function T(s){return s==="no_prefix"}function P(s){return s==="prefix"}function b(s){return s==="prefix_except_default"}function x(s){return s==="prefix_and_default"}const m=(s,e,t,r,n)=>{const a=n(s,t);if(!a)return null;const i=a.toString().split("|");if(i.length===0)return null;const o=e<i.length?i[e]:i[i.length-1];return o?o.trim().replace("{count}",e.toString()):null};function f(s,e){if(!s||typeof e!="string")return null;if(e in s){const n=s[e];return n}const t=e.split(".");let r=s;for(const n of t)if(r&&typeof r=="object"&&n in r)r=r[n];else return null;return r??null}function d(s){const e=s?.translations??new Map;return{hasCache(t,r){const n=`${t}:${r}`;return e.has(n)||e.has(t)},getCache(t,r){const n=`${t}:${r}`;return e.get(n)},setCache(t,r,n){},hasTranslation(t,r){for(const[n,a]of e)if((n===t||n.startsWith(`${t}:`))&&f(a,r)!==null)return!0;return!1},hasGeneralTranslation(t){return e.has(t)},hasPageTranslation(t,r){return e.has(`${t}:${r}`)},getTranslation(t,r,n){const a=`${t}:${r}`,i=e.get(a),o=f(i,n);if(o!==null)return o;const l=e.get(t);return f(l,n)},loadTranslations(t,r){const n=e.get(t)??{};e.set(t,{...n,...r})},setTranslations(t,r){e.set(t,r)},loadPageTranslations(t,r,n){const a=`${t}:${r}`,i=e.get(a);!i||Object.keys(i).length===0?e.set(a,n):e.set(a,{...i,...n})},mergeTranslation(t,r,n,a=!1){const i=`${t}:${r}`,o=e.get(i)??{};e.set(i,{...o,...n})},mergeGlobalTranslation(t,r,n=!1){const a=e.get(t)??{};e.set(t,{...a,...r})},clearCache(){e.clear()}}}class N{constructor(e={}){this.formatter=new g,this.helper=d(e.storage),this.formatter=new g,this.pluralFunc=e.plural||m,this.missingWarn=e.missingWarn??!0,this.missingHandler=e.missingHandler,this.getPreviousPageInfo=e.getPreviousPageInfo,this.getCustomMissingHandler=e.getCustomMissingHandler,this.enablePreviousPageFallback=e.enablePreviousPageFallback??!1}t(e,t,r,n){if(!e)return"";const a=this.getLocale(),i=n||this.getRoute();let o=this.helper.getTranslation(a,i,e);if(!o&&this.enablePreviousPageFallback&&this.getPreviousPageInfo){const l=this.getPreviousPageInfo();if(l){const u=this.helper.getTranslation(l.locale,l.routeName,e);u&&(o=u,process.env.NODE_ENV!=="production"&&console.log(`Using fallback translation from previous route: ${l.routeName} -> ${e}`))}}if(!o){const l=this.getFallbackLocale();a!==l&&(o=this.helper.getTranslation(l,i,e))}if(!o){const l=this.getCustomMissingHandler?.();l?l(a,e,i):this.missingHandler?this.missingHandler(a,e,i):this.missingWarn&&process.env.NODE_ENV!=="production"&&typeof window<"u"&&console.warn(`Not found '${e}' key in '${a}' locale messages for route '${i}'.`),o=r===void 0?e:r||e}return typeof o=="string"&&t?h(o,t):o}ts(e,t,r,n){return this.t(e,t,r,n)?.toString()??r??e}tc(e,t,r){const{count:n,...a}=typeof t=="number"?{count:t}:t;if(n===void 0)return r??e;const i=(l,u,c)=>this.t(l,u,c);return this.pluralFunc(e,Number.parseInt(n.toString(),10),a,this.getLocale(),i)??r??e}tn(e,t){return this.formatter.formatNumber(e,this.getLocale(),t)}td(e,t){return this.formatter.formatDate(e,this.getLocale(),t)}tdr(e,t){return this.formatter.formatRelativeTime(e,this.getLocale(),t)}has(e,t){const r=t||this.getRoute(),n=this.getLocale();return!!this.helper.getTranslation(n,r,e)}clearCache(){this.helper.clearCache()}loadTranslationsCore(e,t,r){r?this.helper.mergeGlobalTranslation(e,t,!0):this.helper.setTranslations(e,t)}loadRouteTranslationsCore(e,t,r,n){n?this.helper.mergeTranslation(e,t,r,!0):this.helper.loadPageTranslations(e,t,r)}}exports.BaseI18n=N;exports.FormatService=g;exports.defaultPlural=m;exports.interpolate=h;exports.isNoPrefixStrategy=T;exports.isPrefixAndDefaultStrategy=x;exports.isPrefixExceptDefaultStrategy=b;exports.isPrefixStrategy=P;exports.useTranslationHelper=d;exports.withPrefixStrategy=v;

package/dist/index.d.ts

@@ -1,6 +1,5 @@
-import { useTranslationHelper, TranslationStorage } from './translation';
-import { RouteService } from './route-service';
-import { FormatService } from './format-service';
-import { interpolate, withPrefixStrategy, isNoPrefixStrategy, isPrefixStrategy, isPrefixExceptDefaultStrategy, isPrefixAndDefaultStrategy, defaultPlural } from './helpers';
 import { BaseI18n, BaseI18nOptions } from './base';
-export { useTranslationHelper, interpolate, withPrefixStrategy, isNoPrefixStrategy, isPrefixStrategy, isPrefixExceptDefaultStrategy, isPrefixAndDefaultStrategy, defaultPlural, RouteService, FormatService, BaseI18n, type TranslationStorage, type BaseI18nOptions, };
+import { FormatService } from './format-service';
+import { defaultPlural, interpolate, isNoPrefixStrategy, isPrefixAndDefaultStrategy, isPrefixExceptDefaultStrategy, isPrefixStrategy, withPrefixStrategy } from './helpers';
+import { TranslationStorage, useTranslationHelper } from './translation';
+export { useTranslationHelper, interpolate, withPrefixStrategy, isNoPrefixStrategy, isPrefixStrategy, isPrefixExceptDefaultStrategy, isPrefixAndDefaultStrategy, defaultPlural, FormatService, BaseI18n, type TranslationStorage, type BaseI18nOptions, };

package/dist/index.mjs

@@ -1,368 +1,177 @@
-function d(o, e) {
-  if (!o || typeof e != "string") return null;
-  if (e in o) {
-    const s = o[e];
-    return s;
+class g {
+  formatNumber(e, t, n) {
+    return new Intl.NumberFormat(t, n).format(e);
+  }
+  formatDate(e, t, n) {
+    const r = new Date(e);
+    return Number.isNaN(r.getTime()) ? "Invalid Date" : new Intl.DateTimeFormat(t, n).format(r);
+  }
+  formatRelativeTime(e, t, n) {
+    const r = new Date(e);
+    if (Number.isNaN(r.getTime()))
+      return new Intl.RelativeTimeFormat(t, n).format(0, "second");
+    const i = Math.floor(((/* @__PURE__ */ new Date()).getTime() - r.getTime()) / 1e3), o = [
+      { unit: "year", seconds: 31536e3 },
+      { unit: "month", seconds: 2592e3 },
+      { unit: "day", seconds: 86400 },
+      { unit: "hour", seconds: 3600 },
+      { unit: "minute", seconds: 60 },
+      { unit: "second", seconds: 1 }
+    ];
+    for (const { unit: l, seconds: u } of o) {
+      const c = Math.floor(i / u);
+      if (c >= 1)
+        return new Intl.RelativeTimeFormat(t, n).format(-c, l);
+    }
+    return new Intl.RelativeTimeFormat(t, n).format(0, "second");
+  }
+}
+const h = /\{(\w+)\}/g;
+function m(s, e) {
+  return e ? s.replace(h, (t, n) => {
+    const r = e[n];
+    return r !== void 0 ? String(r) : `{${n}}`;
+  }) : s;
+}
+function v(s) {
+  return s === "prefix" || s === "prefix_and_default";
+}
+function T(s) {
+  return s === "no_prefix";
+}
+function P(s) {
+  return s === "prefix";
+}
+function b(s) {
+  return s === "prefix_except_default";
+}
+function N(s) {
+  return s === "prefix_and_default";
+}
+const d = (s, e, t, n, r) => {
+  const a = r(s, t);
+  if (!a)
+    return null;
+  const i = a.toString().split("|");
+  if (i.length === 0) return null;
+  const o = e < i.length ? i[e] : i[i.length - 1];
+  return o ? o.trim().replace("{count}", e.toString()) : null;
+};
+function f(s, e) {
+  if (!s || typeof e != "string") return null;
+  if (e in s) {
+    const r = s[e];
+    return r;
   }
   const t = e.split(".");
-  let r = o;
-  for (const s of t)
-    if (r && typeof r == "object" && s in r)
-      r = r[s];
+  let n = s;
+  for (const r of t)
+    if (n && typeof n == "object" && r in n)
+      n = n[r];
     else
       return null;
-  return r ?? null;
+  return n ?? null;
 }
-function C(o) {
-  const e = o?.translations ?? /* @__PURE__ */ new Map();
+function p(s) {
+  const e = s?.translations ?? /* @__PURE__ */ new Map();
   return {
-    hasCache(t, r) {
-      const s = `${t}:${r}`;
-      return e.has(s) || e.has(t);
+    hasCache(t, n) {
+      const r = `${t}:${n}`;
+      return e.has(r) || e.has(t);
     },
-    getCache(t, r) {
-      const s = `${t}:${r}`;
-      return e.get(s);
+    getCache(t, n) {
+      const r = `${t}:${n}`;
+      return e.get(r);
     },
-    setCache(t, r, s) {
+    setCache(t, n, r) {
     },
-    hasTranslation(t, r) {
-      for (const [s, n] of e)
-        if ((s === t || s.startsWith(`${t}:`)) && d(n, r) !== null)
+    hasTranslation(t, n) {
+      for (const [r, a] of e)
+        if ((r === t || r.startsWith(`${t}:`)) && f(a, n) !== null)
           return !0;
       return !1;
     },
     hasGeneralTranslation(t) {
       return e.has(t);
     },
-    hasPageTranslation(t, r) {
-      return e.has(`${t}:${r}`);
+    hasPageTranslation(t, n) {
+      return e.has(`${t}:${n}`);
     },
-    getTranslation(t, r, s) {
-      const n = `${t}:${r}`, i = e.get(n), a = d(i, s);
-      if (a !== null) return a;
+    getTranslation(t, n, r) {
+      const a = `${t}:${n}`, i = e.get(a), o = f(i, r);
+      if (o !== null) return o;
       const l = e.get(t);
-      return d(l, s);
+      return f(l, r);
     },
-    loadTranslations(t, r) {
-      const s = e.get(t) ?? {};
-      e.set(t, { ...s, ...r });
+    loadTranslations(t, n) {
+      const r = e.get(t) ?? {};
+      e.set(t, { ...r, ...n });
     },
-    setTranslations(t, r) {
-      e.set(t, r);
+    setTranslations(t, n) {
+      e.set(t, n);
     },
-    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 });
+    loadPageTranslations(t, n, r) {
+      const a = `${t}:${n}`, i = e.get(a);
+      !i || Object.keys(i).length === 0 ? e.set(a, r) : e.set(a, { ...i, ...r });
     },
-    mergeTranslation(t, r, s, n = !1) {
-      const i = `${t}:${r}`, a = e.get(i) ?? {};
-      e.set(i, { ...a, ...s });
+    mergeTranslation(t, n, r, a = !1) {
+      const i = `${t}:${n}`, o = e.get(i) ?? {};
+      e.set(i, { ...o, ...r });
     },
-    mergeGlobalTranslation(t, r, s = !1) {
-      const n = e.get(t) ?? {};
-      e.set(t, { ...n, ...r });
+    mergeGlobalTranslation(t, n, r = !1) {
+      const a = e.get(t) ?? {};
+      e.set(t, { ...a, ...n });
     },
     clearCache() {
       e.clear();
     }
   };
 }
-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 f(o) {
-  return o === "prefix" || o === "prefix_and_default";
-}
-function c(o) {
-  return o === "no_prefix";
-}
-function b(o) {
-  return o === "prefix";
-}
-function R(o) {
-  return o === "prefix_except_default";
-}
-function $(o) {
-  return o === "prefix_and_default";
-}
-const L = (o, e, t, r, s) => {
-  const n = s(o, t);
-  if (!n)
-    return null;
-  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 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
-   * @param path - URL path (e.g., '/ru/sdfsdf' or '/en/about')
-   * @returns Locale code or null if not found
-   */
-  extractLocaleFromPath(e) {
-    if (!e)
-      return null;
-    const r = e.split("?")[0]?.split("#")[0];
-    if (!r || r === "/")
-      return null;
-    const s = r.split("/").filter(Boolean);
-    if (s.length === 0)
-      return 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) {
-      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 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((s) => s.code === t)?.displayName ?? null;
-  }
-  getRouteName(e, t) {
-    return (e.name ?? "").toString().toString().replace("localized-", "").replace(new RegExp(`-${t}$`), "");
-  }
-  getPluginRouteName(e, t) {
-    return this.i18nConfig.disablePageLocales ? "general" : this.getRouteName(e, t);
-  }
-  getFullPathWithBaseUrl(e, t) {
-    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, s) {
-    const n = this.i18nConfig.locales?.find((g) => g.code === t), i = this.getRouteName(r, e);
-    if (this.router.hasRoute(`localized-${i}-${t}`)) {
-      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: m,
-        query: r.query,
-        hash: r.hash
-      };
-      return n?.baseUrl ? this.getFullPathWithBaseUrl(n, p) : p;
-    }
-    let a = i;
-    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: u,
-      query: r.query,
-      hash: r.hash
-    };
-    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 } : {};
-    if (typeof e == "string") {
-      const r = this.router.resolve(e);
-      r && r.params && Object.assign(t, r.params);
-    }
-    return t;
-  }
-  handlePrefixStrategy(e) {
-    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 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: n
-    }) : this.router.hasRoute(`localized-${s}-${t}`) ? this.router.resolve({
-      name: `localized-${s}-${t}`,
-      query: r.query,
-      hash: r.hash,
-      params: n
-    }) : e;
-  }
-  createLocalizedRoute(e, t, r) {
-    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-${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: s.query,
-        hash: s.hash
-      });
-    }
-    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(n) ? this.router.resolve({
-        name: n,
-        params: l,
-        query: s.query,
-        hash: s.hash
-      }) : this.router.resolve("/");
-    }
-    const a = this.resolveParams(e);
-    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: s.query,
-      hash: s.hash
-    });
-  }
-  getLocalizedRoute(e, t, r) {
-    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 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 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(), s = this.getCurrentLocale(), n = t ?? s;
-    let i;
-    if (typeof e == "string")
-      if (e.startsWith("/"))
-        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, n, s));
-      }
-    else
-      i = e;
-    return this.getLocalizedRoute(i, r, n);
-  }
-}
-class v {
-  formatNumber(e, t, r) {
-    return new Intl.NumberFormat(t, r).format(e);
-  }
-  formatDate(e, t, r) {
-    const s = new Date(e);
-    return Number.isNaN(s.getTime()) ? "Invalid Date" : new Intl.DateTimeFormat(t, r).format(s);
-  }
-  formatRelativeTime(e, t, r) {
-    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() - s.getTime()) / 1e3), a = [
-      { unit: "year", seconds: 31536e3 },
-      { unit: "month", seconds: 2592e3 },
-      { unit: "day", seconds: 86400 },
-      { unit: "hour", seconds: 3600 },
-      { unit: "minute", seconds: 60 },
-      { unit: "second", seconds: 1 }
-    ];
-    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 T {
+class $ {
   constructor(e = {}) {
-    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;
+    this.formatter = new g(), this.helper = p(e.storage), this.formatter = new g(), this.pluralFunc = e.plural || d, 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, s) {
+  t(e, t, n, r) {
     if (!e) return "";
-    const n = this.getLocale(), i = s || this.getRoute();
-    let a = this.helper.getTranslation(n, i, e);
-    if (!a && this.enablePreviousPageFallback && this.getPreviousPageInfo) {
+    const a = this.getLocale(), i = r || this.getRoute();
+    let o = this.helper.getTranslation(a, i, e);
+    if (!o && this.enablePreviousPageFallback && this.getPreviousPageInfo) {
       const l = this.getPreviousPageInfo();
       if (l) {
         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}`));
+        u && (o = u, process.env.NODE_ENV !== "production" && console.log(`Using fallback translation from previous route: ${l.routeName} -> ${e}`));
       }
     }
-    if (!a) {
+    if (!o) {
       const l = this.getFallbackLocale();
-      n !== l && (a = this.helper.getTranslation(l, i, e));
+      a !== l && (o = this.helper.getTranslation(l, i, e));
     }
-    if (!a) {
+    if (!o) {
       const l = this.getCustomMissingHandler?.();
-      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;
+      l ? l(a, e, i) : this.missingHandler ? this.missingHandler(a, e, i) : this.missingWarn && process.env.NODE_ENV !== "production" && typeof window < "u" && console.warn(`Not found '${e}' key in '${a}' locale messages for route '${i}'.`), o = n === void 0 ? e : n || e;
     }
-    return typeof a == "string" && t ? P(a, t) : a;
+    return typeof o == "string" && t ? m(o, t) : o;
   }
   /**
    * Get translation as string
    */
-  ts(e, t, r, s) {
-    return this.t(e, t, r, s)?.toString() ?? r ?? e;
+  ts(e, t, n, r) {
+    return this.t(e, t, n, r)?.toString() ?? n ?? e;
   }
   /**
    * Plural translation
    */
-  tc(e, t, r) {
-    const { count: s, ...n } = typeof t == "number" ? { count: t } : t;
-    if (s === void 0)
-      return r ?? e;
-    const i = (l, u, h) => this.t(l, u, h);
-    return this.pluralFunc(
-      e,
-      Number.parseInt(s.toString()),
-      n,
-      this.getLocale(),
-      i
-    ) ?? r ?? e;
+  tc(e, t, n) {
+    const { count: r, ...a } = typeof t == "number" ? { count: t } : t;
+    if (r === void 0)
+      return n ?? e;
+    const i = (l, u, c) => this.t(l, u, c);
+    return this.pluralFunc(e, Number.parseInt(r.toString(), 10), a, this.getLocale(), i) ?? n ?? e;
   }
   /**
    * Format number
@@ -387,8 +196,8 @@ class T {
    * Based on logic from src/runtime/plugins/01.plugin.ts
    */
   has(e, t) {
-    const r = t || this.getRoute(), s = this.getLocale();
-    return !!this.helper.getTranslation(s, r, e);
+    const n = t || this.getRoute(), r = this.getLocale();
+    return !!this.helper.getTranslation(r, n, e);
   }
   /**
    * Clear cache
@@ -401,27 +210,26 @@ class T {
    * Core translation loading logic (without reactivity)
    * Subclasses can override addTranslations/addRouteTranslations to add reactivity
    */
-  loadTranslationsCore(e, t, r) {
-    r ? this.helper.mergeGlobalTranslation(e, t, !0) : this.helper.setTranslations(e, t);
+  loadTranslationsCore(e, t, n) {
+    n ? 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, s) {
-    s ? this.helper.mergeTranslation(e, t, r, !0) : this.helper.loadPageTranslations(e, t, r);
+  loadRouteTranslationsCore(e, t, n, r) {
+    r ? this.helper.mergeTranslation(e, t, n, !0) : this.helper.loadPageTranslations(e, t, n);
   }
 }
 export {
-  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
+  $ as BaseI18n,
+  g as FormatService,
+  d as defaultPlural,
+  m as interpolate,
+  T as isNoPrefixStrategy,
+  N as isPrefixAndDefaultStrategy,
+  b as isPrefixExceptDefaultStrategy,
+  P as isPrefixStrategy,
+  p as useTranslationHelper,
+  v as withPrefixStrategy
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@i18n-micro/core",
-  "version": "1.1.0",
+  "version": "1.1.2",
   "description": "",
   "repository": "s00d/nuxt-i18n-micro",
   "license": "MIT",
@@ -22,7 +22,7 @@
   },
   "keywords": [],
   "dependencies": {
-    "@i18n-micro/types": "1.1.0"
+    "@i18n-micro/types": "1.1.1"
   },
   "devDependencies": {
     "vite": "^7.3.1",