@i18n-micro/astro 1.3.6 → 1.3.8

package/dist/composer.d.ts

@@ -1,4 +1,4 @@
-import { BaseI18n, TranslationStorage } from '@i18n-micro/core';
+import { BaseI18n, DateTimeFormatsConfig, NumberFormatsConfig, TranslationStorage } from '@i18n-micro/core';
 import { PluralFunc, Translations } from '@i18n-micro/types';
 export interface AstroI18nOptions {
     locale: string;
@@ -7,6 +7,8 @@ export interface AstroI18nOptions {
     plural?: PluralFunc;
     missingWarn?: boolean;
     missingHandler?: (locale: string, key: string, routeName: string) => void;
+    numberFormats?: NumberFormatsConfig;
+    datetimeFormats?: DateTimeFormatsConfig;
     _storage?: TranslationStorage;
 }
 export declare class AstroI18n extends BaseI18n {

package/dist/index.cjs

@@ -1,4 +1,4 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const j=require("@i18n-micro/core"),T=require("node:fs"),R=require("node:path"),F=require("@i18n-micro/utils/parse-path"),N=require("@i18n-micro/utils/accept-language");class v extends j.BaseI18n{constructor(e){const l=e._storage||{translations:new Map};if(super({storage:l,plural:e.plural,missingWarn:e.missingWarn,missingHandler:e.missingHandler}),this.initialMessages={},this.storage=l,this._locale=e.locale,this._fallbackLocale=e.fallbackLocale||e.locale,this._currentRoute="index",e.messages){this.initialMessages={...e.messages};for(const[r,c]of Object.entries(e.messages))this.helper.loadTranslations(r,c)}}cloneStorage(e){const l=new Map;for(const[r,c]of e.translations)l.set(r,{...c});return{translations:l}}clone(e){const l=this.cloneStorage(this.storage);return new v({locale:e||this._locale,fallbackLocale:this._fallbackLocale,plural:this.pluralFunc,missingWarn:this.missingWarn,missingHandler:this.missingHandler,_storage:l})}get locale(){return this._locale}set locale(e){this._locale=e}get fallbackLocale(){return this._fallbackLocale}set fallbackLocale(e){this._fallbackLocale=e}setRoute(e){this._currentRoute=e}getLocale(){return this._locale}getFallbackLocale(){return this._fallbackLocale}getRoute(){return this._currentRoute}getRouteTranslations(e,l){const r=`${e}:${l}`;return this.storage.translations.get(r)??null}addTranslations(e,l,r=!0){super.loadTranslationsCore(e,l,r)}addRouteTranslations(e,l,r,c=!0){super.loadRouteTranslationsCore(e,l,r,c)}mergeTranslations(e,l,r){this.helper.mergeTranslation(e,l,r,!0)}clearCache(){const e={...this.initialMessages};if(super.clearCache(),Object.keys(e).length>0)for(const[l,r]of Object.entries(e))this.helper.loadTranslations(l,r)}}let O=null;function _(){return O}function q(a){const{locale:e,fallbackLocale:l,translationDir:r,routingStrategy:c}=a;return O=c||null,{name:"@i18n-micro/astro",hooks:{"astro:config:setup":i=>{const{updateConfig:u}=i,t="virtual:i18n-micro/config",o=`\0${t}`,s={defaultLocale:e,fallbackLocale:l||e,locales:a.locales||[],localeCodes:(a.locales||[]).map(n=>n.code),translationDir:r||null,autoDetect:a.autoDetect??!0,redirectToDefault:a.redirectToDefault??!1,localeCookie:a.localeCookie===null?null:a.localeCookie||"i18n-locale",missingWarn:a.missingWarn??!1};u({vite:{plugins:[{name:"vite-plugin-i18n-micro-config",resolveId(n){if(n===t)return o},load(n){if(n===o)return`export const config = ${JSON.stringify(s)}`}}]}})},"astro:config:done":i=>{const{injectTypes:u}=i;u({filename:"i18n-micro-env.d.ts",content:`
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const T=require("@i18n-micro/core"),E=require("node:async_hooks"),w=require("node:fs"),R=require("node:path"),B=require("@i18n-micro/utils/parse-path"),z=require("@i18n-micro/utils/accept-language");class j extends T.BaseI18n{constructor(e){const o=e._storage||{translations:new Map};if(super({storage:o,plural:e.plural,missingWarn:e.missingWarn,missingHandler:e.missingHandler,numberFormats:e.numberFormats,datetimeFormats:e.datetimeFormats}),this.initialMessages={},this.storage=o,this._locale=e.locale,this._fallbackLocale=e.fallbackLocale||e.locale,this._currentRoute="index",e.messages){this.initialMessages={...e.messages};for(const[a,i]of Object.entries(e.messages))this.helper.loadTranslations(a,i)}}cloneStorage(e){const o=new Map;for(const[a,i]of e.translations)o.set(a,{...i});return{translations:o}}clone(e){const o=this.cloneStorage(this.storage);return new j({locale:e||this._locale,fallbackLocale:this._fallbackLocale,plural:this.pluralFunc,missingWarn:this.missingWarn,missingHandler:this.missingHandler,numberFormats:this.formatter.getNumberFormats(),datetimeFormats:this.formatter.getDateTimeFormats(),_storage:o})}get locale(){return this._locale}set locale(e){this._locale=e}get fallbackLocale(){return this._fallbackLocale}set fallbackLocale(e){this._fallbackLocale=e}setRoute(e){this._currentRoute=e}getLocale(){return this._locale}getFallbackLocale(){return this._fallbackLocale}getRoute(){return this._currentRoute}getRouteTranslations(e,o){const a=`${e}:${o}`;return this.storage.translations.get(a)??null}addTranslations(e,o,a=!0){super.loadTranslationsCore(e,o,a)}addRouteTranslations(e,o,a,i=!0){super.loadRouteTranslationsCore(e,o,a,i)}mergeTranslations(e,o,a){this.helper.mergeTranslation(e,o,a,!0)}clearCache(){const e={...this.initialMessages};if(super.clearCache(),Object.keys(e).length>0)for(const[o,a]of Object.entries(e))this.helper.loadTranslations(o,a)}}let N=null;const q=new E.AsyncLocalStorage;function D(){const t=q.getStore();return t!==void 0?t:N}function A(t){N=t}function M(t,e){return q.run(t,e)}function x(t){const{locale:e,fallbackLocale:o,translationDir:a,routingStrategy:i}=t;return A(i||null),{name:"@i18n-micro/astro",hooks:{"astro:config:setup":c=>{const{updateConfig:u}=c,s="virtual:i18n-micro/config",r=`\0${s}`,l={defaultLocale:e,fallbackLocale:o||e,locales:t.locales||[],localeCodes:(t.locales||[]).map(n=>n.code),translationDir:a||null,autoDetect:t.autoDetect??!0,redirectToDefault:t.redirectToDefault??!1,localeCookie:t.localeCookie===null?null:t.localeCookie||"i18n-locale",missingWarn:t.missingWarn??!1};u({vite:{plugins:[{name:"vite-plugin-i18n-micro-config",resolveId(n){if(n===s)return r},load(n){if(n===r)return`export const config = ${JSON.stringify(l)}`}}]}})},"astro:config:done":c=>{const{injectTypes:u}=c;u({filename:"i18n-micro-env.d.ts",content:`
             /// <reference types="@i18n-micro/astro/env" />
 
             declare module 'virtual:i18n-micro/config' {
@@ -14,4 +14,4 @@
                 missingWarn: boolean | null;
               }
             }
-          `})}}}}function A(a){return new v(a)}function B(a,e){if(T.existsSync(a))for(const l of T.readdirSync(a)){const r=R.join(a,l);if(T.statSync(r).isDirectory()){B(r,e);continue}l.endsWith(".json")&&e(r)}}function C(a){const{translationDir:e,rootDir:l=process.cwd(),disablePageLocales:r=!1}=a,c=R.resolve(l,e);if(!T.existsSync(c))return console.warn(`[i18n] Translation directory not found: ${c}`),{root:{},routes:{}};const i={root:{},routes:{}};return B(c,u=>{const t=R.relative(c,u).split(R.sep).join("/");try{const o=T.readFileSync(u,"utf-8"),s=JSON.parse(o);F.storeLoadedTranslationFile(i,t,s,r)}catch(o){console.error(`[i18n] Failed to load translation file: ${u}`,o)}}),i}function W(a,e){const{root:l,routes:r}=C(e);for(const[c,i]of Object.entries(l))a.addTranslations(c,i,!1);for(const[c,i]of Object.entries(r))for(const[u,t]of Object.entries(i))a.addRouteTranslations(u,c,F.mergeRouteTranslationsWithRoot(l[u],t),!1)}function H(a){const{i18n:e,defaultLocale:l,locales:r,localeObjects:c,autoDetect:i=!0,redirectToDefault:u=!1,routingStrategy:t}=a,o=t||_();return async(s,n)=>{if(s.locals.locale&&s.locals.i18n)return n();const f=s.url,h=f.pathname;if(!o){const P=e.clone(l),S=h==="/"||h===""?"index":h.split("/").filter(Boolean).join("-");return P.setRoute(S),s.locals.i18n=P,s.locals.locale=l,s.locals.defaultLocale=l,s.locals.locales=c||r.map(w=>({code:w})),s.locals.currentUrl=f,n()}const g={...o,getCurrentPath:()=>h,getRoute:()=>({fullPath:f.pathname+f.search,query:Object.fromEntries(f.searchParams)})},m=h.split("/").filter(Boolean)[0],L=m!==void 0&&r.includes(m);let y;L&&m?y=m:g.getLocaleFromPath?y=g.getLocaleFromPath(h,l,r):y=l;const d=e.clone(y),b=g.getRouteName?g.getRouteName(h,r):"index";return d.setRoute(b),s.locals.i18n=d,s.locals.locale=y,s.locals.defaultLocale=l,s.locals.locales=c||r.map(P=>({code:P})),s.locals.currentUrl=f,s.locals.routingStrategy=g,n()}}function U(a,e,l,r,c,i="i18n-locale"){const u=_();let t=r;if(u?.getLocaleFromPath)t=u.getLocaleFromPath(a,r,c);else{const s=a.split("/").filter(Boolean)[0];s&&c.includes(s)&&(t=s)}if(i!==null&&t===r&&e.get(i)){const o=e.get(i)?.value;o&&c.includes(o)&&(t=o)}if(t===r)try{const o=N.detectLocaleFromAcceptLanguage(l.get("accept-language")??void 0,c);o&&(t=o)}catch{}return t}function z(a,e,l){const r=a.map(n=>n.code),c=(n,f=[])=>{const h=n.replace(/^\//,"").replace(/\/$/,"");if(!h)return"index";const g=h.split("/").filter(Boolean),p=g[0];return p&&f.includes(p)&&g.shift(),g.length===0?"index":g.join("-")},i=(n,f="en",h=[])=>{const p=n.split("/").filter(Boolean)[0];return p&&h.includes(p)?p:f},u=(n,f,h=[],g)=>{const p=n.split("/").filter(Boolean),m=p[0];return m&&h.includes(m)&&p.shift(),(f!==g||g===void 0)&&p.unshift(f),`/${p.join("/")}`},t=(n,f,h=[],g)=>{const m=(n.replace(/^\//,"").replace(/\/$/,"")||"").split("/").filter(Boolean),L=m[0];return L&&h.includes(L)&&m.shift(),(f!==g||g===void 0)&&m.unshift(f),`/${m.join("/")}`};return{getCurrentPath:()=>l?l().pathname:typeof window<"u"?window.location.pathname:"/",getRouteName:c,getLocaleFromPath:i,switchLocalePath:u,localizePath:t,removeLocaleFromPath:(n,f=[])=>{const h=n.split("/").filter(Boolean),g=h[0];return g&&f.includes(g)&&h.shift(),`/${h.join("/")}`},resolvePath:(n,f)=>{const h=typeof n=="string"?n:n.path||"/";return t(h,f,r,e)},getRoute:()=>{if(l){const n=l();return{fullPath:n.pathname+n.search,query:Object.fromEntries(n.searchParams)}}if(typeof window<"u"){const n=new URL(window.location.href);return{fullPath:n.pathname+n.search,query:Object.fromEntries(n.searchParams)}}return{fullPath:"/",query:{}}},push:n=>{typeof window<"u"&&(window.location.href=n.path)},replace:n=>{typeof window<"u"&&window.location.replace(n.path)}}}function D(a){const e=a.locals.i18n;if(!e)throw new Error("i18n instance not found. Make sure i18n middleware is configured.");return e}function k(a){return a.locals.locale||"en"}function I(a){return a.locals.defaultLocale||"en"}function $(a){return a.locals.locales||[]}function M(a){return a.locals.routingStrategy||null}function E(a){const e=D(a),l=k(a),r=I(a),c=$(a),i=c.map(t=>t.code),u=M(a);return{locale:l,defaultLocale:r,locales:c,t:(t,o,s,n)=>e.t(t,o,s,n),ts:(t,o,s,n)=>e.ts(t,o,s,n),tc:(t,o,s)=>e.tc(t,o,s),tn:(t,o)=>e.tn(t,o),td:(t,o)=>e.td(t,o),tdr:(t,o)=>e.tdr(t,o),has:(t,o)=>e.has(t,o),getRoute:()=>e.getRoute(),getRouteName:t=>{const o=t||a.url.pathname;if(u?.getRouteName)return u.getRouteName(o,i);const s=o.replace(/^\//,"").replace(/\/$/,"");if(!s)return"index";const n=s.split("/").filter(Boolean),f=n[0];return f&&i.includes(f)&&n.shift(),n.length===0?"index":n.join("-")},getLocaleFromPath:t=>{const o=t||a.url.pathname;if(u?.getLocaleFromPath)return u.getLocaleFromPath(o,r,i);const n=o.split("/").filter(Boolean)[0];return n&&i.includes(n)?n:r},switchLocalePath:t=>{if(u?.switchLocalePath)return u.switchLocalePath(a.url.pathname,t,i,r);const o=a.url.pathname.split("/").filter(Boolean),s=o[0];return s&&i.includes(s)&&o.shift(),t!==r&&o.unshift(t),`/${o.join("/")}`},localizePath:(t,o)=>{if(u?.localizePath)return u.localizePath(t,o||l,i,r);const n=(t.replace(/^\//,"").replace(/\/$/,"")||"").split("/").filter(Boolean),f=n[0];return f&&i.includes(f)&&n.shift(),o&&o!==r&&n.unshift(o),`/${n.join("/")}`},getI18n:()=>e,getBasePath:t=>{const n=(t||a.url).pathname.split("/").filter(Boolean),f=n[0];return f&&i.includes(f)&&n.shift(),n.length>0?`/${n.join("/")}`:"/"},addTranslations:(t,o,s=!0)=>{e.addTranslations(t,o,s)},addRouteTranslations:(t,o,s,n=!0)=>{e.addRouteTranslations(t,o,s,n)},mergeTranslations:(t,o,s)=>{e.mergeTranslations(t,o,s)},clearCache:()=>{e.clearCache()}}}function x(a,e={}){const{baseUrl:l="/",addDirAttribute:r=!0,addSeoAttributes:c=!0}=e,i=k(a),u=I(a),o=$(a).filter(d=>!d.disabled),s=o.filter(d=>d.seo!==!1),n=o.find(d=>d.code===i);if(!n)return{htmlAttrs:{},link:[],meta:[]};const f=n.iso||i,h=n.dir||"auto",g={htmlAttrs:{lang:f,...r?{dir:h}:{}},link:[],meta:[]};if(!c)return g;const p=`${l}${a.url.pathname}`;g.link.push({rel:"canonical",href:p});const m=M(a),L=o.map(d=>d.code);for(const d of s){let b=a.url.pathname;if(m?.switchLocalePath)b=m.switchLocalePath(a.url.pathname,d.code,L,u);else{const S=a.url.pathname.split("/").filter(Boolean),w=S[0];w&&L.includes(w)&&S.shift(),d.code!==u&&S.unshift(d.code),b=`/${S.join("/")}`}const P=`${l}${b}`;g.link.push({rel:"alternate",href:P,hreflang:d.code}),d.iso&&d.iso!==d.code&&g.link.push({rel:"alternate",href:P,hreflang:d.iso})}if(o.find(d=>d.code===u)?.seo!==!1){let d=a.url.pathname;if(m?.switchLocalePath)d=m.switchLocalePath(a.url.pathname,u,L,u);else{const b=a.url.pathname.split("/").filter(Boolean),P=b[0];P&&L.includes(P)&&b.shift(),d=`/${b.join("/")}`}g.link.push({rel:"alternate",href:`${l}${d}`,hreflang:"x-default"})}g.meta.push({property:"og:locale",content:f}),g.meta.push({property:"og:url",content:p});for(const d of s)d.code!==i&&g.meta.push({property:"og:locale:alternate",content:d.og||d.iso||d.code});return g}function J(a,e,l){const r=e.split(".");let c=a;for(let u=0;u<r.length-1;u++){const t=r[u];c[t]||(c[t]={}),c=c[t]}const i=r[r.length-1];i!==void 0&&(c[i]=l)}function V(a,e){const l=D(a),r=k(a),c=I(a),i=l.getRoute(),u={};if(e&&e.length>0){const t={};for(const o of e){const s=l.t(o,void 0,void 0,i);s!=null&&s!==o&&J(t,o,s)}Object.keys(t).length>0&&(u[i]=t)}else{const t=l.getRouteTranslations(r,i);t&&(u[i]=t)}return{locale:r,fallbackLocale:c,currentRoute:i,translations:u}}Object.defineProperty(exports,"FormatService",{enumerable:!0,get:()=>j.FormatService});Object.defineProperty(exports,"defaultPlural",{enumerable:!0,get:()=>j.defaultPlural});Object.defineProperty(exports,"interpolate",{enumerable:!0,get:()=>j.interpolate});exports.AstroI18n=v;exports.createAstroRouterAdapter=z;exports.createI18n=A;exports.createI18nMiddleware=H;exports.detectLocale=U;exports.getDefaultLocale=I;exports.getI18n=D;exports.getI18nProps=V;exports.getLocale=k;exports.getLocales=$;exports.i18nIntegration=q;exports.loadTranslationsFromDir=C;exports.loadTranslationsIntoI18n=W;exports.useI18n=E;exports.useLocaleHead=x;
+          `})}}}}function G(t){return new j(t)}function W(t,e){if(w.existsSync(t))for(const o of w.readdirSync(t)){const a=R.join(t,o);if(w.statSync(a).isDirectory()){W(a,e);continue}o.endsWith(".json")&&e(a)}}function U(t){const{translationDir:e,rootDir:o=process.cwd(),disablePageLocales:a=!1}=t,i=R.resolve(o,e);if(!w.existsSync(i))return console.warn(`[i18n] Translation directory not found: ${i}`),{root:{},routes:{}};const c={root:{},routes:{}};return W(i,u=>{const s=R.relative(i,u).split(R.sep).join("/");try{const r=w.readFileSync(u,"utf-8"),l=JSON.parse(r);B.storeLoadedTranslationFile(c,s,l,a)}catch(r){console.error(`[i18n] Failed to load translation file: ${u}`,r)}}),c}function V(t,e){const{root:o,routes:a}=U(e);for(const[i,c]of Object.entries(o))t.addTranslations(i,c,!1);for(const[i,c]of Object.entries(a))for(const[u,s]of Object.entries(c))t.addRouteTranslations(u,i,B.mergeRouteTranslationsWithRoot(o[u],s),!1)}function J(t){const{i18n:e,defaultLocale:o,locales:a,localeObjects:i,autoDetect:c=!0,redirectToDefault:u=!1,routingStrategy:s}=t,r=s||D();return async(l,n)=>{if(l.locals.locale&&l.locals.i18n)return n();const f=l.url,d=f.pathname;if(!r){const b=e.clone(o),y=d==="/"||d===""?"index":d.split("/").filter(Boolean).join("-");return b.setRoute(y),l.locals.i18n=b,l.locals.locale=o,l.locals.defaultLocale=o,l.locals.locales=i||a.map(S=>({code:S})),l.locals.currentUrl=f,n()}const h={...r,getCurrentPath:()=>d,getRoute:()=>({fullPath:f.pathname+f.search,query:Object.fromEntries(f.searchParams)})},p=d.split("/").filter(Boolean)[0],P=p!==void 0&&a.includes(p);let L;P&&p?L=p:h.getLocaleFromPath?L=h.getLocaleFromPath(d,o,a):L=o;const k=e.clone(L),g=h.getRouteName?h.getRouteName(d,a):"index";return k.setRoute(g),l.locals.i18n=k,l.locals.locale=L,l.locals.defaultLocale=o,l.locals.locales=i||a.map(b=>({code:b})),l.locals.currentUrl=f,l.locals.routingStrategy=h,M(h,()=>n())}}function K(t,e,o,a,i,c="i18n-locale",u){const s=u??D();let r=a;if(s?.getLocaleFromPath)r=s.getLocaleFromPath(t,a,i);else{const n=t.split("/").filter(Boolean)[0];n&&i.includes(n)&&(r=n)}if(c!==null&&r===a&&e.get(c)){const l=e.get(c)?.value;l&&i.includes(l)&&(r=l)}if(r===a)try{const l=z.detectLocaleFromAcceptLanguage(o.get("accept-language")??void 0,i);l&&(r=l)}catch{}return r}function Z(t,e,o){const a=t.map(n=>n.code),i=(n,f=[])=>{const d=n.replace(/^\//,"").replace(/\/$/,"");if(!d)return"index";const h=d.split("/").filter(Boolean),m=h[0];return m&&f.includes(m)&&h.shift(),h.length===0?"index":h.join("-")},c=(n,f="en",d=[])=>{const m=n.split("/").filter(Boolean)[0];return m&&d.includes(m)?m:f},u=(n,f,d=[],h)=>{const m=n.split("/").filter(Boolean),p=m[0];return p&&d.includes(p)&&m.shift(),(f!==h||h===void 0)&&m.unshift(f),`/${m.join("/")}`},s=(n,f,d=[],h)=>{const p=(n.replace(/^\//,"").replace(/\/$/,"")||"").split("/").filter(Boolean),P=p[0];return P&&d.includes(P)&&p.shift(),(f!==h||h===void 0)&&p.unshift(f),`/${p.join("/")}`};return{getCurrentPath:()=>o?o().pathname:typeof window<"u"?window.location.pathname:"/",getRouteName:i,getLocaleFromPath:c,switchLocalePath:u,localizePath:s,removeLocaleFromPath:(n,f=[])=>{const d=n.split("/").filter(Boolean),h=d[0];return h&&f.includes(h)&&d.shift(),`/${d.join("/")}`},resolvePath:(n,f)=>{const d=typeof n=="string"?n:n.path||"/";return s(d,f,a,e)},getRoute:()=>{if(o){const n=o();return{fullPath:n.pathname+n.search,query:Object.fromEntries(n.searchParams)}}if(typeof window<"u"){const n=new URL(window.location.href);return{fullPath:n.pathname+n.search,query:Object.fromEntries(n.searchParams)}}return{fullPath:"/",query:{}}},push:n=>{typeof window<"u"&&(window.location.href=n.path)},replace:n=>{typeof window<"u"&&window.location.replace(n.path)}}}function F(t){const e=t.og?.trim();if(e)return e;const o=t.iso?.trim();if(!o)return null;const a=o.indexOf("_");if(a>0){const c=o.slice(0,a),u=o.slice(a+1);if(c.length>=2&&u.length===2)return`${c.toLowerCase()}_${u.toUpperCase()}`}const i=o.indexOf("-");if(i>0){const c=o.slice(0,i),u=o.slice(i+1);if(c.length>=2&&u.length===2&&/^[A-Za-z]{2}$/.test(u))return`${c.toLowerCase()}_${u.toUpperCase()}`}return null}function C(t,e={}){if(F(t)!==null||e.missingWarn===!1||process.env.NODE_ENV==="production")return;const o=e.tag??"og:locale",a=String(t.code??"unknown"),i=t.iso?`, iso: '${t.iso}'`:"";console.warn(`[i18n] Cannot derive ${o} for locale '${a}'${i}. Set locale.og (e.g. 'en_US') or use iso with a 2-letter region (e.g. 'en-US').`)}function I(t){const e=t.locals.i18n;if(!e)throw new Error("i18n instance not found. Make sure i18n middleware is configured.");return e}function v(t){return t.locals.locale||"en"}function $(t){return t.locals.defaultLocale||"en"}function _(t){return t.locals.locales||[]}function H(t){return t.locals.routingStrategy||null}function Q(t){const e=I(t),o=v(t),a=$(t),i=_(t),c=i.map(s=>s.code),u=H(t);return{locale:o,defaultLocale:a,locales:i,t:(s,r,l,n)=>e.t(s,r,l,n),ts:(s,r,l,n)=>e.ts(s,r,l,n),tc:(s,r,l)=>e.tc(s,r,l),tn:e.tn.bind(e),td:e.td.bind(e),tdr:e.tdr.bind(e),has:(s,r)=>e.has(s,r),getRoute:()=>e.getRoute(),getRouteName:s=>{const r=s||t.url.pathname;if(u?.getRouteName)return u.getRouteName(r,c);const l=r.replace(/^\//,"").replace(/\/$/,"");if(!l)return"index";const n=l.split("/").filter(Boolean),f=n[0];return f&&c.includes(f)&&n.shift(),n.length===0?"index":n.join("-")},getLocaleFromPath:s=>{const r=s||t.url.pathname;if(u?.getLocaleFromPath)return u.getLocaleFromPath(r,a,c);const n=r.split("/").filter(Boolean)[0];return n&&c.includes(n)?n:a},switchLocalePath:s=>{if(u?.switchLocalePath)return u.switchLocalePath(t.url.pathname,s,c,a);const r=t.url.pathname.split("/").filter(Boolean),l=r[0];return l&&c.includes(l)&&r.shift(),s!==a&&r.unshift(s),`/${r.join("/")}`},localizePath:(s,r)=>{if(u?.localizePath)return u.localizePath(s,r||o,c,a);const n=(s.replace(/^\//,"").replace(/\/$/,"")||"").split("/").filter(Boolean),f=n[0];return f&&c.includes(f)&&n.shift(),r&&r!==a&&n.unshift(r),`/${n.join("/")}`},getI18n:()=>e,getBasePath:s=>{const n=(s||t.url).pathname.split("/").filter(Boolean),f=n[0];return f&&c.includes(f)&&n.shift(),n.length>0?`/${n.join("/")}`:"/"},addTranslations:(s,r,l=!0)=>{e.addTranslations(s,r,l)},addRouteTranslations:(s,r,l,n=!0)=>{e.addRouteTranslations(s,r,l,n)},mergeTranslations:(s,r,l)=>{e.mergeTranslations(s,r,l)},clearCache:()=>{e.clearCache()}}}function X(t,e={}){const{baseUrl:o="/",addDirAttribute:a=!0,addSeoAttributes:i=!0}=e,c=v(t),u=$(t),r=_(t).filter(g=>!g.disabled),l=r.filter(g=>g.seo!==!1),n=r.find(g=>g.code===c);if(!n)return{htmlAttrs:{},link:[],meta:[]};const f=n.iso||c,d=F(n),h=n.dir||"auto",m={htmlAttrs:{lang:f,...a?{dir:h}:{}},link:[],meta:[]};if(!i)return m;const p=`${o}${t.url.pathname}`;m.link.push({rel:"canonical",href:p});const P=H(t),L=r.map(g=>g.code);for(const g of l){let b=t.url.pathname;if(P?.switchLocalePath)b=P.switchLocalePath(t.url.pathname,g.code,L,u);else{const S=t.url.pathname.split("/").filter(Boolean),O=S[0];O&&L.includes(O)&&S.shift(),g.code!==u&&S.unshift(g.code),b=`/${S.join("/")}`}const y=`${o}${b}`;m.link.push({rel:"alternate",href:y,hreflang:g.code}),g.iso&&g.iso!==g.code&&m.link.push({rel:"alternate",href:y,hreflang:g.iso})}if(r.find(g=>g.code===u)?.seo!==!1){let g=t.url.pathname;if(P?.switchLocalePath)g=P.switchLocalePath(t.url.pathname,u,L,u);else{const b=t.url.pathname.split("/").filter(Boolean),y=b[0];y&&L.includes(y)&&b.shift(),g=`/${b.join("/")}`}m.link.push({rel:"alternate",href:`${o}${g}`,hreflang:"x-default"})}d?m.meta.push({property:"og:locale",content:d}):C(n,{tag:"og:locale"}),m.meta.push({property:"og:url",content:p});for(const g of l){if(g.code===c)continue;const b=F(g);if(!b){C(g,{tag:"og:locale:alternate"});continue}m.meta.push({property:"og:locale:alternate",content:b})}return m}function Y(t,e,o){const a=e.split(".");let i=t;for(let u=0;u<a.length-1;u++){const s=a[u];i[s]||(i[s]={}),i=i[s]}const c=a[a.length-1];c!==void 0&&(i[c]=o)}function ee(t,e){const o=I(t),a=v(t),i=$(t),c=o.getRoute(),u={};if(e&&e.length>0){const s={};for(const r of e){const l=o.t(r,void 0,void 0,c);l!=null&&l!==r&&Y(s,r,l)}Object.keys(s).length>0&&(u[c]=s)}else{const s=o.getRouteTranslations(a,c);s&&(u[c]=s)}return{locale:a,fallbackLocale:i,currentRoute:c,translations:u}}Object.defineProperty(exports,"FormatService",{enumerable:!0,get:()=>T.FormatService});Object.defineProperty(exports,"defaultPlural",{enumerable:!0,get:()=>T.defaultPlural});Object.defineProperty(exports,"interpolate",{enumerable:!0,get:()=>T.interpolate});exports.AstroI18n=j;exports.createAstroRouterAdapter=Z;exports.createI18n=G;exports.createI18nMiddleware=J;exports.detectLocale=K;exports.getDefaultLocale=$;exports.getGlobalRoutingStrategy=D;exports.getI18n=I;exports.getI18nProps=ee;exports.getLocale=v;exports.getLocales=_;exports.i18nIntegration=x;exports.loadTranslationsFromDir=U;exports.loadTranslationsIntoI18n=V;exports.runWithRoutingStrategy=M;exports.setGlobalRoutingStrategy=A;exports.useI18n=Q;exports.useLocaleHead=X;

package/dist/index.d.cts

@@ -3,6 +3,7 @@ export type { CleanTranslation, Getter, Locale, LocaleCode, Params, PluralFunc,
 export { AstroI18n, type AstroI18nOptions } from './composer';
 export type { I18nIntegrationOptions } from './integration';
 export { createI18n, i18nIntegration } from './integration';
+export { getGlobalRoutingStrategy, runWithRoutingStrategy, setGlobalRoutingStrategy } from './routing-context';
 export type { LoadedTranslations, LoadTranslationsOptions } from './load-translations';
 export { loadTranslationsFromDir, loadTranslationsIntoI18n } from './load-translations';
 export type { I18nMiddlewareOptions } from './middleware';

package/dist/index.d.ts

@@ -3,6 +3,7 @@ export type { CleanTranslation, Getter, Locale, LocaleCode, Params, PluralFunc,
 export { AstroI18n, type AstroI18nOptions } from './composer';
 export type { I18nIntegrationOptions } from './integration';
 export { createI18n, i18nIntegration } from './integration';
+export { getGlobalRoutingStrategy, runWithRoutingStrategy, setGlobalRoutingStrategy } from './routing-context';
 export type { LoadedTranslations, LoadTranslationsOptions } from './load-translations';
 export { loadTranslationsFromDir, loadTranslationsIntoI18n } from './load-translations';
 export type { I18nMiddlewareOptions } from './middleware';

package/dist/index.mjs

@@ -1,40 +1,45 @@
-import { BaseI18n as O } from "@i18n-micro/core";
-import { FormatService as ie, defaultPlural as ce, interpolate as ue } from "@i18n-micro/core";
-import { existsSync as k, readdirSync as _, statSync as C, readFileSync as N } from "node:fs";
-import { resolve as M, join as W, relative as A, sep as q } from "node:path";
-import { mergeRouteTranslationsWithRoot as H, storeLoadedTranslationFile as U } from "@i18n-micro/utils/parse-path";
-import { detectLocaleFromAcceptLanguage as z } from "@i18n-micro/utils/accept-language";
-class R extends O {
+import { BaseI18n as W } from "@i18n-micro/core";
+import { FormatService as pe, defaultPlural as Le, interpolate as Pe } from "@i18n-micro/core";
+import { AsyncLocalStorage as A } from "node:async_hooks";
+import { existsSync as F, readdirSync as M, statSync as U, readFileSync as q } from "node:fs";
+import { resolve as E, join as H, relative as x, sep as z } from "node:path";
+import { mergeRouteTranslationsWithRoot as V, storeLoadedTranslationFile as G } from "@i18n-micro/utils/parse-path";
+import { detectLocaleFromAcceptLanguage as J } from "@i18n-micro/utils/accept-language";
+class T extends W {
   constructor(e) {
-    const l = e._storage || {
+    const o = e._storage || {
       translations: /* @__PURE__ */ new Map()
     };
     if (super({
-      storage: l,
+      storage: o,
       plural: e.plural,
       missingWarn: e.missingWarn,
-      missingHandler: e.missingHandler
-    }), this.initialMessages = {}, this.storage = l, this._locale = e.locale, this._fallbackLocale = e.fallbackLocale || e.locale, this._currentRoute = "index", e.messages) {
+      missingHandler: e.missingHandler,
+      numberFormats: e.numberFormats,
+      datetimeFormats: e.datetimeFormats
+    }), this.initialMessages = {}, this.storage = o, this._locale = e.locale, this._fallbackLocale = e.fallbackLocale || e.locale, this._currentRoute = "index", e.messages) {
       this.initialMessages = { ...e.messages };
-      for (const [r, i] of Object.entries(e.messages))
-        this.helper.loadTranslations(r, i);
+      for (const [a, i] of Object.entries(e.messages))
+        this.helper.loadTranslations(a, i);
     }
   }
   cloneStorage(e) {
-    const l = /* @__PURE__ */ new Map();
-    for (const [r, i] of e.translations)
-      l.set(r, { ...i });
-    return { translations: l };
+    const o = /* @__PURE__ */ new Map();
+    for (const [a, i] of e.translations)
+      o.set(a, { ...i });
+    return { translations: o };
   }
   clone(e) {
-    const l = this.cloneStorage(this.storage);
-    return new R({
+    const o = this.cloneStorage(this.storage);
+    return new T({
       locale: e || this._locale,
       fallbackLocale: this._fallbackLocale,
       plural: this.pluralFunc,
       missingWarn: this.missingWarn,
       missingHandler: this.missingHandler,
-      _storage: l
+      numberFormats: this.formatter.getNumberFormats(),
+      datetimeFormats: this.formatter.getDateTimeFormats(),
+      _storage: o
     });
   }
   get locale() {
@@ -61,47 +66,55 @@ class R extends O {
   getRoute() {
     return this._currentRoute;
   }
-  getRouteTranslations(e, l) {
-    const r = `${e}:${l}`;
-    return this.storage.translations.get(r) ?? null;
+  getRouteTranslations(e, o) {
+    const a = `${e}:${o}`;
+    return this.storage.translations.get(a) ?? null;
   }
-  addTranslations(e, l, r = !0) {
-    super.loadTranslationsCore(e, l, r);
+  addTranslations(e, o, a = !0) {
+    super.loadTranslationsCore(e, o, a);
   }
-  addRouteTranslations(e, l, r, i = !0) {
-    super.loadRouteTranslationsCore(e, l, r, i);
+  addRouteTranslations(e, o, a, i = !0) {
+    super.loadRouteTranslationsCore(e, o, a, i);
   }
-  mergeTranslations(e, l, r) {
-    this.helper.mergeTranslation(e, l, r, !0);
+  mergeTranslations(e, o, a) {
+    this.helper.mergeTranslation(e, o, a, !0);
   }
   clearCache() {
     const e = { ...this.initialMessages };
     if (super.clearCache(), Object.keys(e).length > 0)
-      for (const [l, r] of Object.entries(e))
-        this.helper.loadTranslations(l, r);
+      for (const [o, a] of Object.entries(e))
+        this.helper.loadTranslations(o, a);
   }
 }
-let v = null;
-function $() {
-  return v;
+let D = null;
+const _ = new A();
+function O() {
+  const t = _.getStore();
+  return t !== void 0 ? t : D;
 }
-function X(o) {
-  const { locale: e, fallbackLocale: l, translationDir: r, routingStrategy: i } = o;
-  return v = i || null, {
+function K(t) {
+  D = t;
+}
+function Z(t, e) {
+  return _.run(t, e);
+}
+function le(t) {
+  const { locale: e, fallbackLocale: o, translationDir: a, routingStrategy: i } = t;
+  return K(i || null), {
     name: "@i18n-micro/astro",
     hooks: {
       // 1. Vite setup (virtual module) happens here
       "astro:config:setup": (c) => {
-        const { updateConfig: u } = c, t = "virtual:i18n-micro/config", a = `\0${t}`, s = {
+        const { updateConfig: u } = c, s = "virtual:i18n-micro/config", l = `\0${s}`, r = {
           defaultLocale: e,
-          fallbackLocale: l || e,
-          locales: o.locales || [],
-          localeCodes: (o.locales || []).map((n) => n.code),
-          translationDir: r || null,
-          autoDetect: o.autoDetect ?? !0,
-          redirectToDefault: o.redirectToDefault ?? !1,
-          localeCookie: o.localeCookie === null ? null : o.localeCookie || "i18n-locale",
-          missingWarn: o.missingWarn ?? !1
+          fallbackLocale: o || e,
+          locales: t.locales || [],
+          localeCodes: (t.locales || []).map((n) => n.code),
+          translationDir: a || null,
+          autoDetect: t.autoDetect ?? !0,
+          redirectToDefault: t.redirectToDefault ?? !1,
+          localeCookie: t.localeCookie === null ? null : t.localeCookie || "i18n-locale",
+          missingWarn: t.missingWarn ?? !1
         };
         u({
           vite: {
@@ -109,12 +122,12 @@ function X(o) {
               {
                 name: "vite-plugin-i18n-micro-config",
                 resolveId(n) {
-                  if (n === t)
-                    return a;
+                  if (n === s)
+                    return l;
                 },
                 load(n) {
-                  if (n === a)
-                    return `export const config = ${JSON.stringify(s)}`;
+                  if (n === l)
+                    return `export const config = ${JSON.stringify(r)}`;
                 }
               }
             ]
@@ -148,131 +161,131 @@ function X(o) {
     }
   };
 }
-function Y(o) {
-  return new R(o);
+function re(t) {
+  return new T(t);
 }
-function D(o, e) {
-  if (k(o))
-    for (const l of _(o)) {
-      const r = W(o, l);
-      if (C(r).isDirectory()) {
-        D(r, e);
+function C(t, e) {
+  if (F(t))
+    for (const o of M(t)) {
+      const a = H(t, o);
+      if (U(a).isDirectory()) {
+        C(a, e);
         continue;
       }
-      l.endsWith(".json") && e(r);
+      o.endsWith(".json") && e(a);
     }
 }
-function E(o) {
-  const { translationDir: e, rootDir: l = process.cwd(), disablePageLocales: r = !1 } = o, i = M(l, e);
-  if (!k(i))
+function Q(t) {
+  const { translationDir: e, rootDir: o = process.cwd(), disablePageLocales: a = !1 } = t, i = E(o, e);
+  if (!F(i))
     return console.warn(`[i18n] Translation directory not found: ${i}`), { root: {}, routes: {} };
   const c = { root: {}, routes: {} };
-  return D(i, (u) => {
-    const t = A(i, u).split(q).join("/");
+  return C(i, (u) => {
+    const s = x(i, u).split(z).join("/");
     try {
-      const a = N(u, "utf-8"), s = JSON.parse(a);
-      U(c, t, s, r);
-    } catch (a) {
-      console.error(`[i18n] Failed to load translation file: ${u}`, a);
+      const l = q(u, "utf-8"), r = JSON.parse(l);
+      G(c, s, r, a);
+    } catch (l) {
+      console.error(`[i18n] Failed to load translation file: ${u}`, l);
     }
   }), c;
 }
-function Z(o, e) {
-  const { root: l, routes: r } = E(e);
-  for (const [i, c] of Object.entries(l))
-    o.addTranslations(i, c, !1);
-  for (const [i, c] of Object.entries(r))
-    for (const [u, t] of Object.entries(c))
-      o.addRouteTranslations(u, i, H(l[u], t), !1);
+function se(t, e) {
+  const { root: o, routes: a } = Q(e);
+  for (const [i, c] of Object.entries(o))
+    t.addTranslations(i, c, !1);
+  for (const [i, c] of Object.entries(a))
+    for (const [u, s] of Object.entries(c))
+      t.addRouteTranslations(u, i, V(o[u], s), !1);
 }
-function ee(o) {
+function ie(t) {
   const {
     i18n: e,
     // This is the global singleton with cache
-    defaultLocale: l,
-    locales: r,
+    defaultLocale: o,
+    locales: a,
     localeObjects: i,
     autoDetect: c = !0,
     redirectToDefault: u = !1,
-    routingStrategy: t
-  } = o, a = t || $();
-  return async (s, n) => {
-    if (s.locals.locale && s.locals.i18n)
+    routingStrategy: s
+  } = t, l = s || O();
+  return async (r, n) => {
+    if (r.locals.locale && r.locals.i18n)
       return n();
-    const f = s.url, d = f.pathname;
-    if (!a) {
-      const L = e.clone(l), S = d === "/" || d === "" ? "index" : d.split("/").filter(Boolean).join("-");
-      return L.setRoute(S), s.locals.i18n = L, s.locals.locale = l, s.locals.defaultLocale = l, s.locals.locales = i || r.map((w) => ({ code: w })), s.locals.currentUrl = f, n();
+    const f = r.url, h = f.pathname;
+    if (!l) {
+      const L = e.clone(o), S = h === "/" || h === "" ? "index" : h.split("/").filter(Boolean).join("-");
+      return L.setRoute(S), r.locals.i18n = L, r.locals.locale = o, r.locals.defaultLocale = o, r.locals.locales = i || a.map((y) => ({ code: y })), r.locals.currentUrl = f, n();
     }
-    const g = {
-      ...a,
-      getCurrentPath: () => d,
+    const d = {
+      ...l,
+      getCurrentPath: () => h,
       getRoute: () => ({
         fullPath: f.pathname + f.search,
         query: Object.fromEntries(f.searchParams)
       })
-    }, m = d.split("/").filter(Boolean)[0], P = m !== void 0 && r.includes(m);
-    let y;
-    P && m ? y = m : g.getLocaleFromPath ? y = g.getLocaleFromPath(d, l, r) : y = l;
-    const h = e.clone(y), b = g.getRouteName ? g.getRouteName(d, r) : "index";
-    return h.setRoute(b), s.locals.i18n = h, s.locals.locale = y, s.locals.defaultLocale = l, s.locals.locales = i || r.map((L) => ({ code: L })), s.locals.currentUrl = f, s.locals.routingStrategy = g, n();
+    }, p = h.split("/").filter(Boolean)[0], b = p !== void 0 && a.includes(p);
+    let P;
+    b && p ? P = p : d.getLocaleFromPath ? P = d.getLocaleFromPath(h, o, a) : P = o;
+    const w = e.clone(P), g = d.getRouteName ? d.getRouteName(h, a) : "index";
+    return w.setRoute(g), r.locals.i18n = w, r.locals.locale = P, r.locals.defaultLocale = o, r.locals.locales = i || a.map((L) => ({ code: L })), r.locals.currentUrl = f, r.locals.routingStrategy = d, Z(d, () => n());
   };
 }
-function te(o, e, l, r, i, c = "i18n-locale") {
-  const u = $();
-  let t = r;
-  if (u?.getLocaleFromPath)
-    t = u.getLocaleFromPath(o, r, i);
+function ce(t, e, o, a, i, c = "i18n-locale", u) {
+  const s = u ?? O();
+  let l = a;
+  if (s?.getLocaleFromPath)
+    l = s.getLocaleFromPath(t, a, i);
   else {
-    const s = o.split("/").filter(Boolean)[0];
-    s && i.includes(s) && (t = s);
+    const n = t.split("/").filter(Boolean)[0];
+    n && i.includes(n) && (l = n);
   }
-  if (c !== null && t === r && e.get(c)) {
-    const a = e.get(c)?.value;
-    a && i.includes(a) && (t = a);
+  if (c !== null && l === a && e.get(c)) {
+    const r = e.get(c)?.value;
+    r && i.includes(r) && (l = r);
   }
-  if (t === r)
+  if (l === a)
     try {
-      const a = z(l.get("accept-language") ?? void 0, i);
-      a && (t = a);
+      const r = J(o.get("accept-language") ?? void 0, i);
+      r && (l = r);
     } catch {
     }
-  return t;
+  return l;
 }
-function ne(o, e, l) {
-  const r = o.map((n) => n.code), i = (n, f = []) => {
-    const d = n.replace(/^\//, "").replace(/\/$/, "");
-    if (!d)
+function ue(t, e, o) {
+  const a = t.map((n) => n.code), i = (n, f = []) => {
+    const h = n.replace(/^\//, "").replace(/\/$/, "");
+    if (!h)
       return "index";
-    const g = d.split("/").filter(Boolean), p = g[0];
-    return p && f.includes(p) && g.shift(), g.length === 0 ? "index" : g.join("-");
-  }, c = (n, f = "en", d = []) => {
-    const p = n.split("/").filter(Boolean)[0];
-    return p && d.includes(p) ? p : f;
-  }, u = (n, f, d = [], g) => {
-    const p = n.split("/").filter(Boolean), m = p[0];
-    return m && d.includes(m) && p.shift(), (f !== g || g === void 0) && p.unshift(f), `/${p.join("/")}`;
-  }, t = (n, f, d = [], g) => {
-    const m = (n.replace(/^\//, "").replace(/\/$/, "") || "").split("/").filter(Boolean), P = m[0];
-    return P && d.includes(P) && m.shift(), (f !== g || g === void 0) && m.unshift(f), `/${m.join("/")}`;
+    const d = h.split("/").filter(Boolean), m = d[0];
+    return m && f.includes(m) && d.shift(), d.length === 0 ? "index" : d.join("-");
+  }, c = (n, f = "en", h = []) => {
+    const m = n.split("/").filter(Boolean)[0];
+    return m && h.includes(m) ? m : f;
+  }, u = (n, f, h = [], d) => {
+    const m = n.split("/").filter(Boolean), p = m[0];
+    return p && h.includes(p) && m.shift(), (f !== d || d === void 0) && m.unshift(f), `/${m.join("/")}`;
+  }, s = (n, f, h = [], d) => {
+    const p = (n.replace(/^\//, "").replace(/\/$/, "") || "").split("/").filter(Boolean), b = p[0];
+    return b && h.includes(b) && p.shift(), (f !== d || d === void 0) && p.unshift(f), `/${p.join("/")}`;
   };
   return {
-    getCurrentPath: () => l ? l().pathname : typeof window < "u" ? window.location.pathname : "/",
+    getCurrentPath: () => o ? o().pathname : typeof window < "u" ? window.location.pathname : "/",
     getRouteName: i,
     getLocaleFromPath: c,
     switchLocalePath: u,
-    localizePath: t,
+    localizePath: s,
     removeLocaleFromPath: (n, f = []) => {
-      const d = n.split("/").filter(Boolean), g = d[0];
-      return g && f.includes(g) && d.shift(), `/${d.join("/")}`;
+      const h = n.split("/").filter(Boolean), d = h[0];
+      return d && f.includes(d) && h.shift(), `/${h.join("/")}`;
     },
     resolvePath: (n, f) => {
-      const d = typeof n == "string" ? n : n.path || "/";
-      return t(d, f, r, e);
+      const h = typeof n == "string" ? n : n.path || "/";
+      return s(h, f, a, e);
     },
     getRoute: () => {
-      if (l) {
-        const n = l();
+      if (o) {
+        const n = o();
         return {
           fullPath: n.pathname + n.search,
           query: Object.fromEntries(n.searchParams)
@@ -299,206 +312,242 @@ function ne(o, e, l) {
     }
   };
 }
-function F(o) {
-  const e = o.locals.i18n;
+function R(t) {
+  const e = t.og?.trim();
+  if (e) return e;
+  const o = t.iso?.trim();
+  if (!o) return null;
+  const a = o.indexOf("_");
+  if (a > 0) {
+    const c = o.slice(0, a), u = o.slice(a + 1);
+    if (c.length >= 2 && u.length === 2)
+      return `${c.toLowerCase()}_${u.toUpperCase()}`;
+  }
+  const i = o.indexOf("-");
+  if (i > 0) {
+    const c = o.slice(0, i), u = o.slice(i + 1);
+    if (c.length >= 2 && u.length === 2 && /^[A-Za-z]{2}$/.test(u))
+      return `${c.toLowerCase()}_${u.toUpperCase()}`;
+  }
+  return null;
+}
+function k(t, e = {}) {
+  if (R(t) !== null || e.missingWarn === !1 || process.env.NODE_ENV === "production") return;
+  const o = e.tag ?? "og:locale", a = String(t.code ?? "unknown"), i = t.iso ? `, iso: '${t.iso}'` : "";
+  console.warn(
+    `[i18n] Cannot derive ${o} for locale '${a}'${i}. Set locale.og (e.g. 'en_US') or use iso with a 2-letter region (e.g. 'en-US').`
+  );
+}
+function B(t) {
+  const e = t.locals.i18n;
   if (!e)
     throw new Error("i18n instance not found. Make sure i18n middleware is configured.");
   return e;
 }
-function T(o) {
-  return o.locals.locale || "en";
+function $(t) {
+  return t.locals.locale || "en";
 }
-function j(o) {
-  return o.locals.defaultLocale || "en";
+function v(t) {
+  return t.locals.defaultLocale || "en";
 }
-function B(o) {
-  return o.locals.locales || [];
+function I(t) {
+  return t.locals.locales || [];
 }
-function I(o) {
-  return o.locals.routingStrategy || null;
+function N(t) {
+  return t.locals.routingStrategy || null;
 }
-function oe(o) {
-  const e = F(o), l = T(o), r = j(o), i = B(o), c = i.map((t) => t.code), u = I(o);
+function fe(t) {
+  const e = B(t), o = $(t), a = v(t), i = I(t), c = i.map((s) => s.code), u = N(t);
   return {
     // Current locale
-    locale: l,
-    defaultLocale: r,
+    locale: o,
+    defaultLocale: a,
     locales: i,
     // Translation methods
-    t: (t, a, s, n) => e.t(t, a, s, n),
-    ts: (t, a, s, n) => e.ts(t, a, s, n),
-    tc: (t, a, s) => e.tc(t, a, s),
-    tn: (t, a) => e.tn(t, a),
-    td: (t, a) => e.td(t, a),
-    tdr: (t, a) => e.tdr(t, a),
-    has: (t, a) => e.has(t, a),
+    t: (s, l, r, n) => e.t(s, l, r, n),
+    ts: (s, l, r, n) => e.ts(s, l, r, n),
+    tc: (s, l, r) => e.tc(s, l, r),
+    tn: e.tn.bind(e),
+    td: e.td.bind(e),
+    tdr: e.tdr.bind(e),
+    has: (s, l) => e.has(s, l),
     // Route management
     getRoute: () => e.getRoute(),
-    getRouteName: (t) => {
-      const a = t || o.url.pathname;
+    getRouteName: (s) => {
+      const l = s || t.url.pathname;
       if (u?.getRouteName)
-        return u.getRouteName(a, c);
-      const s = a.replace(/^\//, "").replace(/\/$/, "");
-      if (!s) return "index";
-      const n = s.split("/").filter(Boolean), f = n[0];
+        return u.getRouteName(l, c);
+      const r = l.replace(/^\//, "").replace(/\/$/, "");
+      if (!r) return "index";
+      const n = r.split("/").filter(Boolean), f = n[0];
       return f && c.includes(f) && n.shift(), n.length === 0 ? "index" : n.join("-");
     },
-    getLocaleFromPath: (t) => {
-      const a = t || o.url.pathname;
+    getLocaleFromPath: (s) => {
+      const l = s || t.url.pathname;
       if (u?.getLocaleFromPath)
-        return u.getLocaleFromPath(a, r, c);
-      const n = a.split("/").filter(Boolean)[0];
-      return n && c.includes(n) ? n : r;
+        return u.getLocaleFromPath(l, a, c);
+      const n = l.split("/").filter(Boolean)[0];
+      return n && c.includes(n) ? n : a;
     },
     // Path utilities
-    switchLocalePath: (t) => {
+    switchLocalePath: (s) => {
       if (u?.switchLocalePath)
-        return u.switchLocalePath(o.url.pathname, t, c, r);
-      const a = o.url.pathname.split("/").filter(Boolean), s = a[0];
-      return s && c.includes(s) && a.shift(), t !== r && a.unshift(t), `/${a.join("/")}`;
+        return u.switchLocalePath(t.url.pathname, s, c, a);
+      const l = t.url.pathname.split("/").filter(Boolean), r = l[0];
+      return r && c.includes(r) && l.shift(), s !== a && l.unshift(s), `/${l.join("/")}`;
     },
-    localizePath: (t, a) => {
+    localizePath: (s, l) => {
       if (u?.localizePath)
-        return u.localizePath(t, a || l, c, r);
-      const n = (t.replace(/^\//, "").replace(/\/$/, "") || "").split("/").filter(Boolean), f = n[0];
-      return f && c.includes(f) && n.shift(), a && a !== r && n.unshift(a), `/${n.join("/")}`;
+        return u.localizePath(s, l || o, c, a);
+      const n = (s.replace(/^\//, "").replace(/\/$/, "") || "").split("/").filter(Boolean), f = n[0];
+      return f && c.includes(f) && n.shift(), l && l !== a && n.unshift(l), `/${n.join("/")}`;
     },
     // Get i18n instance
     getI18n: () => e,
     // Get base path without locale (for rewrite)
-    getBasePath: (t) => {
-      const n = (t || o.url).pathname.split("/").filter(Boolean), f = n[0];
+    getBasePath: (s) => {
+      const n = (s || t.url).pathname.split("/").filter(Boolean), f = n[0];
       return f && c.includes(f) && n.shift(), n.length > 0 ? `/${n.join("/")}` : "/";
     },
     // Translation management
-    addTranslations: (t, a, s = !0) => {
-      e.addTranslations(t, a, s);
+    addTranslations: (s, l, r = !0) => {
+      e.addTranslations(s, l, r);
     },
-    addRouteTranslations: (t, a, s, n = !0) => {
-      e.addRouteTranslations(t, a, s, n);
+    addRouteTranslations: (s, l, r, n = !0) => {
+      e.addRouteTranslations(s, l, r, n);
     },
-    mergeTranslations: (t, a, s) => {
-      e.mergeTranslations(t, a, s);
+    mergeTranslations: (s, l, r) => {
+      e.mergeTranslations(s, l, r);
     },
     clearCache: () => {
       e.clearCache();
     }
   };
 }
-function ae(o, e = {}) {
-  const { baseUrl: l = "/", addDirAttribute: r = !0, addSeoAttributes: i = !0 } = e, c = T(o), u = j(o), a = B(o).filter((h) => !h.disabled), s = a.filter((h) => h.seo !== !1), n = a.find((h) => h.code === c);
+function ge(t, e = {}) {
+  const { baseUrl: o = "/", addDirAttribute: a = !0, addSeoAttributes: i = !0 } = e, c = $(t), u = v(t), l = I(t).filter((g) => !g.disabled), r = l.filter((g) => g.seo !== !1), n = l.find((g) => g.code === c);
   if (!n)
     return { htmlAttrs: {}, link: [], meta: [] };
-  const f = n.iso || c, d = n.dir || "auto", g = {
+  const f = n.iso || c, h = R(n), d = n.dir || "auto", m = {
     htmlAttrs: {
       lang: f,
-      ...r ? { dir: d } : {}
+      ...a ? { dir: d } : {}
     },
     link: [],
     meta: []
   };
   if (!i)
-    return g;
-  const p = `${l}${o.url.pathname}`;
-  g.link.push({
+    return m;
+  const p = `${o}${t.url.pathname}`;
+  m.link.push({
     rel: "canonical",
     href: p
   });
-  const m = I(o), P = a.map((h) => h.code);
-  for (const h of s) {
-    let b = o.url.pathname;
-    if (m?.switchLocalePath)
-      b = m.switchLocalePath(o.url.pathname, h.code, P, u);
+  const b = N(t), P = l.map((g) => g.code);
+  for (const g of r) {
+    let L = t.url.pathname;
+    if (b?.switchLocalePath)
+      L = b.switchLocalePath(t.url.pathname, g.code, P, u);
     else {
-      const S = o.url.pathname.split("/").filter(Boolean), w = S[0];
-      w && P.includes(w) && S.shift(), h.code !== u && S.unshift(h.code), b = `/${S.join("/")}`;
+      const y = t.url.pathname.split("/").filter(Boolean), j = y[0];
+      j && P.includes(j) && y.shift(), g.code !== u && y.unshift(g.code), L = `/${y.join("/")}`;
     }
-    const L = `${l}${b}`;
-    g.link.push({
+    const S = `${o}${L}`;
+    m.link.push({
       rel: "alternate",
-      href: L,
-      hreflang: h.code
-    }), h.iso && h.iso !== h.code && g.link.push({
+      href: S,
+      hreflang: g.code
+    }), g.iso && g.iso !== g.code && m.link.push({
       rel: "alternate",
-      href: L,
-      hreflang: h.iso
+      href: S,
+      hreflang: g.iso
     });
   }
-  if (a.find((h) => h.code === u)?.seo !== !1) {
-    let h = o.url.pathname;
-    if (m?.switchLocalePath)
-      h = m.switchLocalePath(o.url.pathname, u, P, u);
+  if (l.find((g) => g.code === u)?.seo !== !1) {
+    let g = t.url.pathname;
+    if (b?.switchLocalePath)
+      g = b.switchLocalePath(t.url.pathname, u, P, u);
     else {
-      const b = o.url.pathname.split("/").filter(Boolean), L = b[0];
-      L && P.includes(L) && b.shift(), h = `/${b.join("/")}`;
+      const L = t.url.pathname.split("/").filter(Boolean), S = L[0];
+      S && P.includes(S) && L.shift(), g = `/${L.join("/")}`;
     }
-    g.link.push({
+    m.link.push({
       rel: "alternate",
-      href: `${l}${h}`,
+      href: `${o}${g}`,
       hreflang: "x-default"
     });
   }
-  g.meta.push({
+  h ? m.meta.push({
     property: "og:locale",
-    content: f
-  }), g.meta.push({
+    content: h
+  }) : k(n, { tag: "og:locale" }), m.meta.push({
     property: "og:url",
     content: p
   });
-  for (const h of s)
-    h.code !== c && g.meta.push({
+  for (const g of r) {
+    if (g.code === c) continue;
+    const L = R(g);
+    if (!L) {
+      k(g, { tag: "og:locale:alternate" });
+      continue;
+    }
+    m.meta.push({
       property: "og:locale:alternate",
-      content: h.og || h.iso || h.code
+      content: L
     });
-  return g;
+  }
+  return m;
 }
-function x(o, e, l) {
-  const r = e.split(".");
-  let i = o;
-  for (let u = 0; u < r.length - 1; u++) {
-    const t = r[u];
-    i[t] || (i[t] = {}), i = i[t];
+function X(t, e, o) {
+  const a = e.split(".");
+  let i = t;
+  for (let u = 0; u < a.length - 1; u++) {
+    const s = a[u];
+    i[s] || (i[s] = {}), i = i[s];
   }
-  const c = r[r.length - 1];
-  c !== void 0 && (i[c] = l);
+  const c = a[a.length - 1];
+  c !== void 0 && (i[c] = o);
 }
-function le(o, e) {
-  const l = F(o), r = T(o), i = j(o), c = l.getRoute(), u = {};
+function he(t, e) {
+  const o = B(t), a = $(t), i = v(t), c = o.getRoute(), u = {};
   if (e && e.length > 0) {
-    const t = {};
-    for (const a of e) {
-      const s = l.t(a, void 0, void 0, c);
-      s != null && s !== a && x(t, a, s);
+    const s = {};
+    for (const l of e) {
+      const r = o.t(l, void 0, void 0, c);
+      r != null && r !== l && X(s, l, r);
     }
-    Object.keys(t).length > 0 && (u[c] = t);
+    Object.keys(s).length > 0 && (u[c] = s);
   } else {
-    const t = l.getRouteTranslations(r, c);
-    t && (u[c] = t);
+    const s = o.getRouteTranslations(a, c);
+    s && (u[c] = s);
   }
   return {
-    locale: r,
+    locale: a,
     fallbackLocale: i,
     currentRoute: c,
     translations: u
   };
 }
 export {
-  R as AstroI18n,
-  ie as FormatService,
-  ne as createAstroRouterAdapter,
-  Y as createI18n,
-  ee as createI18nMiddleware,
-  ce as defaultPlural,
-  te as detectLocale,
-  j as getDefaultLocale,
-  F as getI18n,
-  le as getI18nProps,
-  T as getLocale,
-  B as getLocales,
-  X as i18nIntegration,
-  ue as interpolate,
-  E as loadTranslationsFromDir,
-  Z as loadTranslationsIntoI18n,
-  oe as useI18n,
-  ae as useLocaleHead
+  T as AstroI18n,
+  pe as FormatService,
+  ue as createAstroRouterAdapter,
+  re as createI18n,
+  ie as createI18nMiddleware,
+  Le as defaultPlural,
+  ce as detectLocale,
+  v as getDefaultLocale,
+  O as getGlobalRoutingStrategy,
+  B as getI18n,
+  he as getI18nProps,
+  $ as getLocale,
+  I as getLocales,
+  le as i18nIntegration,
+  Pe as interpolate,
+  Q as loadTranslationsFromDir,
+  se as loadTranslationsIntoI18n,
+  Z as runWithRoutingStrategy,
+  K as setGlobalRoutingStrategy,
+  fe as useI18n,
+  ge as useLocaleHead
 };

package/dist/integration.d.ts

@@ -16,8 +16,7 @@ export interface I18nIntegrationOptions extends Omit<ModuleOptions, 'plural'> {
     translationDir?: string;
     routingStrategy?: I18nRoutingStrategy;
 }
-export declare function getGlobalRoutingStrategy(): I18nRoutingStrategy | null;
-export declare function setGlobalRoutingStrategy(strategy: I18nRoutingStrategy | null): void;
+export { getGlobalRoutingStrategy, runWithRoutingStrategy, setGlobalRoutingStrategy } from './routing-context';
 /**
  * Astro Integration for i18n-micro
  */

package/dist/middleware.d.ts

@@ -22,4 +22,4 @@ export declare function detectLocale(pathname: string, cookies: {
     get: (name: string) => {
         value: string;
     } | undefined;
-}, headers: Headers, defaultLocale: string, locales: string[], localeCookie?: string | null): string;
+}, headers: Headers, defaultLocale: string, locales: string[], localeCookie?: string | null, routingStrategy?: I18nRoutingStrategy | null): string;

package/dist/routing-context.d.ts

@@ -0,0 +1,4 @@
+import { I18nRoutingStrategy } from './router/types';
+export declare function getGlobalRoutingStrategy(): I18nRoutingStrategy | null;
+export declare function setGlobalRoutingStrategy(strategy: I18nRoutingStrategy | null): void;
+export declare function runWithRoutingStrategy<T>(strategy: I18nRoutingStrategy | null, fn: () => T): T;

package/dist/utils.d.ts

@@ -28,8 +28,16 @@ export declare function useI18n(astro: AstroGlobal): {
     t: (key: TranslationKey, params?: Params, defaultValue?: string | null, routeName?: string) => CleanTranslation;
     ts: (key: TranslationKey, params?: Params, defaultValue?: string, routeName?: string) => string;
     tc: (key: TranslationKey, count: number | Params, defaultValue?: string) => string;
-    tn: (value: number, options?: Intl.NumberFormatOptions) => string;
-    td: (value: Date | number | string, options?: Intl.DateTimeFormatOptions) => string;
+    tn: {
+        (value: number, options?: Intl.NumberFormatOptions): string;
+        (value: number, key: string, overrides?: Intl.NumberFormatOptions): string;
+        (value: number, key: string, locale: string, overrides?: Intl.NumberFormatOptions): string;
+    };
+    td: {
+        (value: Date | number | string, options?: Intl.DateTimeFormatOptions): string;
+        (value: Date | number | string, key: string, overrides?: Intl.DateTimeFormatOptions): string;
+        (value: Date | number | string, key: string, locale: string, overrides?: Intl.DateTimeFormatOptions): string;
+    };
     tdr: (value: Date | number | string, options?: Intl.RelativeTimeFormatOptions) => string;
     has: (key: TranslationKey, routeName?: string) => boolean;
     getRoute: () => string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@i18n-micro/astro",
-  "version": "1.3.6",
+  "version": "1.3.8",
   "description": "Astro integration for i18n-micro — translations, routing, and islands.",
   "keywords": [
     "astro",
@@ -77,27 +77,24 @@
     "access": "public"
   },
   "dependencies": {
-    "@i18n-micro/utils": "1.0.1",
-    "@i18n-micro/core": "1.3.2",
-    "@i18n-micro/node": "1.2.3",
-    "@i18n-micro/types": "1.2.4"
+    "@i18n-micro/types": "1.2.7",
+    "@i18n-micro/core": "1.3.8",
+    "@i18n-micro/utils": "1.0.8",
+    "@i18n-micro/node": "1.2.4"
   },
   "devDependencies": {
-    "@types/jest": "^29.5.14",
-    "astro": "^5.16.5",
-    "jest": "^29.7.0",
+    "astro": "^5.0.0 || ^6.0.0 || ^7.0.0",
     "preact": "^10.0.0",
     "publint": "^0.3.17",
     "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0",
     "svelte": "^4.0.0 || ^5.0.0",
-    "ts-jest": "^29.4.6",
-    "vite": "^7.3.1",
+    "vite": "^7.3.6",
     "vite-plugin-dts": "^4.5.4",
-    "vitest": "^3.2.4",
+    "vitest": "^4.1.10",
     "vue": "^3.5.25"
   },
   "peerDependencies": {
-    "astro": "^5.16.5",
+    "astro": "^5.0.0 || ^6.0.0 || ^7.0.0",
     "preact": "^10.0.0",
     "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0",
     "svelte": "^4.0.0 || ^5.0.0",
@@ -124,7 +121,7 @@
     "build": "vite build",
     "check:package": "publint",
     "dev": "cd playground && astro dev",
-    "test": "jest",
+    "test": "vitest run",
     "test:dist": "vitest run --config vitest.dist.config.ts",
     "typecheck": "tsc --noEmit"
   }

package/src/composer.ts

@@ -1,4 +1,4 @@
-import { BaseI18n, type TranslationStorage } from '@i18n-micro/core'
+import { BaseI18n, type DateTimeFormatsConfig, type NumberFormatsConfig, type TranslationStorage } from '@i18n-micro/core'
 import type { PluralFunc, Translations } from '@i18n-micro/types'
 
 export interface AstroI18nOptions {
@@ -8,6 +8,8 @@ export interface AstroI18nOptions {
   plural?: PluralFunc
   missingWarn?: boolean
   missingHandler?: (locale: string, key: string, routeName: string) => void
+  numberFormats?: NumberFormatsConfig
+  datetimeFormats?: DateTimeFormatsConfig
   _storage?: TranslationStorage
 }
 
@@ -30,6 +32,8 @@ export class AstroI18n extends BaseI18n {
       plural: options.plural,
       missingWarn: options.missingWarn,
       missingHandler: options.missingHandler,
+      numberFormats: options.numberFormats,
+      datetimeFormats: options.datetimeFormats,
     })
 
     this.storage = storage
@@ -62,6 +66,8 @@ export class AstroI18n extends BaseI18n {
       plural: this.pluralFunc,
       missingWarn: this.missingWarn,
       missingHandler: this.missingHandler,
+      numberFormats: this.formatter.getNumberFormats(),
+      datetimeFormats: this.formatter.getDateTimeFormats(),
       _storage: isolatedStorage,
     })
   }

package/src/index.ts

@@ -8,8 +8,8 @@ export type { CleanTranslation, Getter, Locale, LocaleCode, Params, PluralFunc,
 export { AstroI18n, type AstroI18nOptions } from './composer'
 // Export integration options type
 export type { I18nIntegrationOptions } from './integration'
-// Main exports
 export { createI18n, i18nIntegration } from './integration'
+export { getGlobalRoutingStrategy, runWithRoutingStrategy, setGlobalRoutingStrategy } from './routing-context'
 export type { LoadedTranslations, LoadTranslationsOptions } from './load-translations'
 // Export translation loading utilities
 export { loadTranslationsFromDir, loadTranslationsIntoI18n } from './load-translations'

package/src/integration.ts

@@ -1,6 +1,7 @@
 import type { Locale, ModuleOptions, PluralFunc } from '@i18n-micro/types'
 import type { AstroIntegration, HookParameters } from 'astro'
 import { AstroI18n, type AstroI18nOptions } from './composer'
+import { setGlobalRoutingStrategy } from './routing-context'
 import type { I18nRoutingStrategy } from './router/types'
 
 export interface I18nIntegrationOptions extends Omit<ModuleOptions, 'plural'> {
@@ -18,15 +19,7 @@ export interface I18nIntegrationOptions extends Omit<ModuleOptions, 'plural'> {
   routingStrategy?: I18nRoutingStrategy
 }
 
-let globalRoutingStrategy: I18nRoutingStrategy | null = null
-
-export function getGlobalRoutingStrategy(): I18nRoutingStrategy | null {
-  return globalRoutingStrategy
-}
-
-export function setGlobalRoutingStrategy(strategy: I18nRoutingStrategy | null): void {
-  globalRoutingStrategy = strategy
-}
+export { getGlobalRoutingStrategy, runWithRoutingStrategy, setGlobalRoutingStrategy } from './routing-context'
 
 /**
  * Astro Integration for i18n-micro
@@ -34,7 +27,7 @@ export function setGlobalRoutingStrategy(strategy: I18nRoutingStrategy | null):
 export function i18nIntegration(options: I18nIntegrationOptions): AstroIntegration {
   const { locale: defaultLocale, fallbackLocale, translationDir, routingStrategy } = options
 
-  globalRoutingStrategy = routingStrategy || null
+  setGlobalRoutingStrategy(routingStrategy || null)
 
   return {
     name: '@i18n-micro/astro',

package/src/middleware.ts

@@ -2,7 +2,7 @@ import type { Locale } from '@i18n-micro/types'
 import { detectLocaleFromAcceptLanguage } from '@i18n-micro/utils/accept-language'
 import type { MiddlewareHandler } from 'astro'
 import type { AstroI18n } from './composer'
-import { getGlobalRoutingStrategy } from './integration'
+import { getGlobalRoutingStrategy, runWithRoutingStrategy } from './routing-context'
 import type { I18nRoutingStrategy } from './router/types'
 // Import shim to ensure App.Locals is available
 import './env.d'
@@ -106,7 +106,7 @@ export function createI18nMiddleware(options: I18nMiddlewareOptions): Middleware
     context.locals.currentUrl = url
     context.locals.routingStrategy = contextStrategy
 
-    return next()
+    return runWithRoutingStrategy(contextStrategy, () => next())
   }
 }
 
@@ -120,9 +120,9 @@ export function detectLocale(
   defaultLocale: string,
   locales: string[],
   localeCookie: string | null = 'i18n-locale',
+  routingStrategy?: I18nRoutingStrategy | null,
 ): string {
-  // Get routing strategy
-  const strategy = getGlobalRoutingStrategy()
+  const strategy = routingStrategy ?? getGlobalRoutingStrategy()
 
   // 1. Try path
   let locale = defaultLocale

package/src/routing-context.ts

@@ -0,0 +1,23 @@
+import { AsyncLocalStorage } from 'node:async_hooks'
+import type { I18nRoutingStrategy } from './router/types'
+
+/** Integration-time default strategy (immutable after setup). */
+let installedRoutingStrategy: I18nRoutingStrategy | null = null
+
+/** Per-request strategy override for concurrent SSR. */
+const requestRoutingStrategy = new AsyncLocalStorage<I18nRoutingStrategy | null>()
+
+export function getGlobalRoutingStrategy(): I18nRoutingStrategy | null {
+  const store = requestRoutingStrategy.getStore()
+  // Distinguish an explicit per-request override (including `null`, i.e. routing
+  // disabled for this request) from "no request context" (`undefined`).
+  return store !== undefined ? store : installedRoutingStrategy
+}
+
+export function setGlobalRoutingStrategy(strategy: I18nRoutingStrategy | null): void {
+  installedRoutingStrategy = strategy
+}
+
+export function runWithRoutingStrategy<T>(strategy: I18nRoutingStrategy | null, fn: () => T): T {
+  return requestRoutingStrategy.run(strategy, fn)
+}

package/src/utils.ts

@@ -1,4 +1,5 @@
 import type { CleanTranslation, Locale, Params, TranslationKey, Translations } from '@i18n-micro/types'
+import { resolveOgLocale, warnUnresolvedOgLocale } from '@i18n-micro/utils/resolve-og-locale'
 import type { AstroGlobal } from 'astro'
 import type { AstroI18n } from './composer'
 import type { I18nRoutingStrategy } from './router/types'
@@ -72,15 +73,9 @@ export function useI18n(astro: AstroGlobal) {
     tc: (key: TranslationKey, count: number | Params, defaultValue?: string): string => {
       return i18n.tc(key, count, defaultValue)
     },
-    tn: (value: number, options?: Intl.NumberFormatOptions): string => {
-      return i18n.tn(value, options)
-    },
-    td: (value: Date | number | string, options?: Intl.DateTimeFormatOptions): string => {
-      return i18n.td(value, options)
-    },
-    tdr: (value: Date | number | string, options?: Intl.RelativeTimeFormatOptions): string => {
-      return i18n.tdr(value, options)
-    },
+    tn: i18n.tn.bind(i18n),
+    td: i18n.td.bind(i18n),
+    tdr: i18n.tdr.bind(i18n),
     has: (key: TranslationKey, routeName?: string): boolean => {
       return i18n.has(key, routeName)
     },
@@ -225,6 +220,7 @@ export function useLocaleHead(astro: AstroGlobal, options: LocaleHeadOptions = {
   }
 
   const currentIso = currentLocaleObj.iso || locale
+  const currentOg = resolveOgLocale(currentLocaleObj)
   const currentDir = currentLocaleObj.dir || 'auto'
 
   const result: LocaleHeadResult = {
@@ -309,10 +305,14 @@ export function useLocaleHead(astro: AstroGlobal, options: LocaleHeadOptions = {
   }
 
   // Open Graph locale
-  result.meta.push({
-    property: 'og:locale',
-    content: currentIso,
-  })
+  if (currentOg) {
+    result.meta.push({
+      property: 'og:locale',
+      content: currentOg,
+    })
+  } else {
+    warnUnresolvedOgLocale(currentLocaleObj, { tag: 'og:locale' })
+  }
 
   result.meta.push({
     property: 'og:url',
@@ -322,9 +322,14 @@ export function useLocaleHead(astro: AstroGlobal, options: LocaleHeadOptions = {
   // Alternate OG locales
   for (const loc of localesForSeo) {
     if (loc.code === locale) continue
+    const ogAlt = resolveOgLocale(loc)
+    if (!ogAlt) {
+      warnUnresolvedOgLocale(loc, { tag: 'og:locale:alternate' })
+      continue
+    }
     result.meta.push({
       property: 'og:locale:alternate',
-      content: loc.og || loc.iso || loc.code,
+      content: ogAlt,
     })
   }