astro-intl 2.0.2 → 2.1.0

package/dist/__tests__/config-messages.test.js

@@ -75,9 +75,10 @@ describe("Config-based messages (simple approach)", () => {
         await setRequestLocale(new URL("https://example.com/fr/page"));
         expect(getTranslations()("greeting")).toBe("Bonjour");
     });
-    it("should throw when no config or messages are provided", async () => {
+    it("should return false when no config or messages are provided", async () => {
         const url = new URL("https://example.com/en/page");
-        await expect(setRequestLocale(url)).rejects.toThrow(/No getRequestConfig or messages provided/);
+        const result = await setRequestLocale(url);
+        expect(result).toBe(false);
     });
 });
 describe("defineRequestConfig (next-intl style)", () => {

package/dist/__tests__/fallback-routes.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/__tests__/fallback-routes.test.js

@@ -0,0 +1,48 @@
+import { describe, it, expect, beforeEach } from "vitest";
+import { __resetRequestConfig } from "../core.js";
+import { setFallbackRoutes, getFallbackRoutes } from "../store.js";
+describe("Fallback Routes (Astro 6.1+)", () => {
+    beforeEach(() => {
+        __resetRequestConfig();
+    });
+    it("returns empty array by default", () => {
+        expect(getFallbackRoutes()).toEqual([]);
+    });
+    it("stores and retrieves fallback routes", () => {
+        const routes = [
+            { pattern: "/fr/about", pathname: "/fr/about/", locale: "fr" },
+            { pattern: "/de/about", pathname: "/de/about/", locale: "de" },
+        ];
+        setFallbackRoutes(routes);
+        expect(getFallbackRoutes()).toEqual(routes);
+    });
+    it("overwrites previous fallback routes on re-set", () => {
+        setFallbackRoutes([
+            { pattern: "/fr/about", pathname: "/fr/about/", locale: "fr" },
+        ]);
+        const newRoutes = [
+            { pattern: "/de/contact", pathname: "/de/contact/", locale: "de" },
+        ];
+        setFallbackRoutes(newRoutes);
+        expect(getFallbackRoutes()).toEqual(newRoutes);
+    });
+    it("clears fallback routes on reset", () => {
+        setFallbackRoutes([
+            { pattern: "/fr/about", pathname: "/fr/about/", locale: "fr" },
+        ]);
+        __resetRequestConfig();
+        expect(getFallbackRoutes()).toEqual([]);
+    });
+    it("handles routes without pathname (pattern-only)", () => {
+        const routes = [
+            { pattern: "/fr/blog/[...slug]", locale: "fr" },
+        ];
+        setFallbackRoutes(routes);
+        expect(getFallbackRoutes()).toEqual(routes);
+        expect(getFallbackRoutes()[0].pathname).toBeUndefined();
+    });
+    it("handles empty array without errors", () => {
+        setFallbackRoutes([]);
+        expect(getFallbackRoutes()).toEqual([]);
+    });
+});

package/dist/core.d.ts

@@ -1,4 +1,4 @@
-export { setRequestLocale, runWithLocale, getLocale, getLocales, isValidLocale, getMessages, getDefaultLocale, defineRequestConfig, __setConfigMessages, __resetRequestConfig, __setIntlConfig, } from "./store.js";
+export { setRequestLocale, runWithLocale, getLocale, getLocales, isValidLocale, getMessages, getDefaultLocale, defineRequestConfig, getFallbackRoutes, setFallbackRoutes, __setConfigMessages, __resetRequestConfig, __setIntlConfig, } from "./store.js";
 export { getTranslations } from "./translations.js";
 export { getNestedValue, type DotPaths } from "./interpolation.js";
 export { sanitizeLocale, sanitizeHtml, escapeRegExp } from "./sanitize.js";

package/dist/core.js

@@ -1,5 +1,5 @@
 // ─── Store (request lifecycle) ──────────────────────────────────────
-export { setRequestLocale, runWithLocale, getLocale, getLocales, isValidLocale, getMessages, getDefaultLocale, defineRequestConfig, __setConfigMessages, __resetRequestConfig, __setIntlConfig, } from "./store.js";
+export { setRequestLocale, runWithLocale, getLocale, getLocales, isValidLocale, getMessages, getDefaultLocale, defineRequestConfig, getFallbackRoutes, setFallbackRoutes, __setConfigMessages, __resetRequestConfig, __setIntlConfig, } from "./store.js";
 // ─── Translations ───────────────────────────────────────────────────
 export { getTranslations } from "./translations.js";
 // ─── Interpolation utilities ────────────────────────────────────────

package/dist/index.d.ts

@@ -1,6 +1,7 @@
 import type { AstroIntegration } from "astro";
 import type { MessagesConfig, RoutesMap } from "./types/index.js";
-import { setRequestLocale as _setRequestLocale, runWithLocale as _runWithLocale, getLocale as _getLocale, getLocales as _getLocales, isValidLocale as _isValidLocale, getMessages as _getMessages, getTranslations as _getTranslations, defineRequestConfig as _defineRequestConfig, __resetRequestConfig as _resetRequestConfig, path as _path, switchLocalePath as _switchLocalePath } from "./core.js";
+import { setRequestLocale as _setRequestLocale, runWithLocale as _runWithLocale, getLocale as _getLocale, getLocales as _getLocales, isValidLocale as _isValidLocale, getMessages as _getMessages, getTranslations as _getTranslations, defineRequestConfig as _defineRequestConfig, getFallbackRoutes as _getFallbackRoutes, __resetRequestConfig as _resetRequestConfig } from "./core.js";
+import { path as _path, switchLocalePath as _switchLocalePath } from "./core.js";
 export type AstroIntlOptions = {
     enabled?: boolean;
     defaultLocale?: string;
@@ -18,7 +19,8 @@ export declare const getMessages: typeof _getMessages;
 export declare const getTranslations: typeof _getTranslations;
 export declare const defineRequestConfig: typeof _defineRequestConfig;
 export declare const __resetRequestConfig: typeof _resetRequestConfig;
+export declare const getFallbackRoutes: typeof _getFallbackRoutes;
 export declare const path: typeof _path;
 export declare const switchLocalePath: typeof _switchLocalePath;
-export type { RequestConfig, Primitive, GetRequestConfigFn, MessagesConfig, IntlConfig, RoutesMap, ExtractParams, ParamsForRoute, } from "./types/index.js";
+export type { RequestConfig, Primitive, GetRequestConfigFn, MessagesConfig, IntlConfig, RoutesMap, ExtractParams, ParamsForRoute, FallbackRouteInfo, } from "./types/index.js";
 export type { DotPaths } from "./core.js";

package/dist/index.js

@@ -1,4 +1,5 @@
-import { setRequestLocale as _setRequestLocale, runWithLocale as _runWithLocale, getLocale as _getLocale, getLocales as _getLocales, isValidLocale as _isValidLocale, getMessages as _getMessages, getTranslations as _getTranslations, defineRequestConfig as _defineRequestConfig, __resetRequestConfig as _resetRequestConfig, __setConfigMessages, __setIntlConfig, path as _path, switchLocalePath as _switchLocalePath, } from "./core.js";
+import { setRequestLocale as _setRequestLocale, runWithLocale as _runWithLocale, getLocale as _getLocale, getLocales as _getLocales, isValidLocale as _isValidLocale, getMessages as _getMessages, getTranslations as _getTranslations, defineRequestConfig as _defineRequestConfig, getFallbackRoutes as _getFallbackRoutes, setFallbackRoutes as _setFallbackRoutes, __resetRequestConfig as _resetRequestConfig, __setConfigMessages, __setIntlConfig, } from "./core.js";
+import { path as _path, switchLocalePath as _switchLocalePath } from "./core.js";
 export default function astroIntl(options = {}) {
     const { enabled = true, defaultLocale, locales, messages, routes } = options;
     if (defaultLocale || locales || routes) {
@@ -27,6 +28,32 @@ export default function astroIntl(options = {}) {
                     },
                 });
             },
+            "astro:routes:resolved": ({ routes }) => {
+                if (!enabled)
+                    return;
+                const collected = [];
+                for (const route of routes) {
+                    // fallbackRoutes is available in Astro 6.1+
+                    const fallbacks = route.fallbackRoutes;
+                    if (!fallbacks)
+                        continue;
+                    for (const fb of fallbacks) {
+                        // Extract locale from the pattern (first segment after /)
+                        const segments = (fb.pathname ?? fb.pattern).split("/");
+                        const locale = segments[1] || "";
+                        if (locale) {
+                            collected.push({
+                                pattern: fb.pattern,
+                                pathname: fb.pathname,
+                                locale,
+                            });
+                        }
+                    }
+                }
+                if (collected.length > 0) {
+                    _setFallbackRoutes(collected);
+                }
+            },
         },
     };
 }
@@ -40,5 +67,6 @@ export const getMessages = _getMessages;
 export const getTranslations = _getTranslations;
 export const defineRequestConfig = _defineRequestConfig;
 export const __resetRequestConfig = _resetRequestConfig;
+export const getFallbackRoutes = _getFallbackRoutes;
 export const path = _path;
 export const switchLocalePath = _switchLocalePath;

package/dist/middleware.js

@@ -44,7 +44,9 @@ export function createIntlMiddleware(options) {
         if (!lang || !locales.includes(lang)) {
             return next();
         }
-        await setRequestLocale(context.url);
+        const ok = await setRequestLocale(context.url);
+        if (!ok)
+            return next();
         // Rewrite translated routes to their canonical filesystem paths
         if (routes) {
             const rewrittenPath = resolveTranslatedRoute(context.url.pathname, lang, routes, resolvedDefaultLocale);

package/dist/store.d.ts

@@ -1,4 +1,4 @@
-import type { GetRequestConfigFn, MessagesConfig, IntlConfig, RequestConfig, RoutesMap } from "./types/index.js";
+import type { GetRequestConfigFn, MessagesConfig, IntlConfig, RequestConfig, RoutesMap, FallbackRouteInfo } from "./types/index.js";
 export declare function __setIntlConfig(config: Partial<IntlConfig>): void;
 export declare function getDefaultLocale(): string;
 export declare function getRoutes(): RoutesMap | undefined;
@@ -7,6 +7,8 @@ export declare function isValidLocale(locale: string): boolean;
 export declare function defineRequestConfig(fn: (locale: string) => Promise<RequestConfig> | RequestConfig): GetRequestConfigFn;
 export declare function __setConfigMessages(messages: MessagesConfig): void;
 export declare function __resetRequestConfig(): void;
+export declare function setFallbackRoutes(routes: FallbackRouteInfo[]): void;
+export declare function getFallbackRoutes(): FallbackRouteInfo[];
 export declare function setRequestLocale(url: URL, getConfig?: GetRequestConfigFn): Promise<boolean>;
 export declare function runWithLocale<R>(url: URL, fn: () => R | Promise<R>, getConfig?: GetRequestConfigFn): Promise<R>;
 export declare function getLocale(): string;

package/dist/store.js

@@ -1,73 +1,91 @@
 import { sanitizeLocale } from "./sanitize.js";
-// ─── Configuration (set once at startup) ────────────────────────────
-let registeredGetRequestConfig = null;
-let configMessages = null;
-let intlConfig = { defaultLocale: "en", locales: [] };
-let als = null;
-let alsInitialized = false;
+const GLOBAL_KEY = Symbol.for("__astro_intl_store__");
+const g = globalThis;
+function getGlobalState() {
+    const existing = g[GLOBAL_KEY];
+    if (existing)
+        return existing;
+    const fresh = {
+        registeredGetRequestConfig: null,
+        configMessages: null,
+        intlConfig: { defaultLocale: "en", locales: [] },
+        als: null,
+        alsInitialized: false,
+        fallbackState: null,
+    };
+    g[GLOBAL_KEY] = fresh;
+    return fresh;
+}
+const $ = getGlobalState();
+// ─── AsyncLocalStorage detection ────────────────────────────────────
 function ensureAls() {
-    if (alsInitialized)
+    if ($.alsInitialized)
         return;
-    alsInitialized = true;
+    $.alsInitialized = true;
     try {
         const g = globalThis;
         if (typeof g.AsyncLocalStorage === "function") {
-            als = new g.AsyncLocalStorage();
+            $.als = new g.AsyncLocalStorage();
         }
     }
     catch {
         // Not available — fallback mode
     }
 }
-// ─── Fallback global variable (for runtimes without ALS) ────────────
-let fallbackState = null;
 // ─── Internal getters/setters ───────────────────────────────────────
 function getRequestState() {
     ensureAls();
-    if (als) {
-        return als.getStore() ?? null;
+    if ($.als) {
+        return $.als.getStore() ?? null;
     }
-    return fallbackState;
+    return $.fallbackState;
 }
 // ─── Public API ─────────────────────────────────────────────────────
 export function __setIntlConfig(config) {
     if (config.defaultLocale) {
-        intlConfig = { ...intlConfig, defaultLocale: config.defaultLocale };
+        $.intlConfig = { ...$.intlConfig, defaultLocale: config.defaultLocale };
     }
     if (config.locales) {
-        intlConfig = { ...intlConfig, locales: config.locales };
+        $.intlConfig = { ...$.intlConfig, locales: config.locales };
     }
     if (config.routes) {
-        intlConfig = { ...intlConfig, routes: config.routes };
+        $.intlConfig = { ...$.intlConfig, routes: config.routes };
         detectRouteConflicts(config.routes);
     }
 }
 export function getDefaultLocale() {
-    return intlConfig.defaultLocale;
+    return $.intlConfig.defaultLocale;
 }
 export function getRoutes() {
-    return intlConfig.routes;
+    return $.intlConfig.routes;
 }
 export function getLocales() {
-    return intlConfig.locales;
+    return $.intlConfig.locales;
 }
 export function isValidLocale(locale) {
-    if (intlConfig.locales.length === 0)
+    if ($.intlConfig.locales.length === 0)
         return true;
-    return intlConfig.locales.includes(locale);
+    return $.intlConfig.locales.includes(locale);
 }
 export function defineRequestConfig(fn) {
-    registeredGetRequestConfig = fn;
+    $.registeredGetRequestConfig = fn;
     return fn;
 }
 export function __setConfigMessages(messages) {
-    configMessages = messages;
+    $.configMessages = messages;
 }
 export function __resetRequestConfig() {
-    registeredGetRequestConfig = null;
-    configMessages = null;
-    fallbackState = null;
-    intlConfig = { defaultLocale: "en", locales: [], routes: undefined };
+    $.registeredGetRequestConfig = null;
+    $.configMessages = null;
+    $.fallbackState = null;
+    $.intlConfig = { defaultLocale: "en", locales: [], routes: undefined, fallbackRoutes: [] };
+}
+// ─── Fallback routes (Astro 6.1+ astro:routes:resolved) ─────────────
+export function setFallbackRoutes(routes) {
+    $.intlConfig = { ...$.intlConfig, fallbackRoutes: routes };
+}
+export function getFallbackRoutes() {
+    return $.intlConfig.fallbackRoutes ?? [];
 }
 // ─── Route conflict detection ────────────────────────────────────────
 function normalizeTemplate(template) {
@@ -113,11 +131,11 @@ async function resolveMessages(locale, source) {
 // ─── setRequestLocale ───────────────────────────────────────────────
 export async function setRequestLocale(url, getConfig) {
     const [, lang] = url.pathname.split("/");
-    if (lang && intlConfig.locales.length > 0 && !intlConfig.locales.includes(lang)) {
+    if (lang && $.intlConfig.locales.length > 0 && !$.intlConfig.locales.includes(lang)) {
         return false;
     }
-    const locale = sanitizeLocale(lang || intlConfig.defaultLocale);
-    const resolvedGetConfig = getConfig ?? registeredGetRequestConfig;
+    const locale = sanitizeLocale(lang || $.intlConfig.defaultLocale);
+    const resolvedGetConfig = getConfig ?? $.registeredGetRequestConfig;
     let state;
     if (resolvedGetConfig) {
         const config = await resolvedGetConfig(locale);
@@ -126,42 +144,44 @@ export async function setRequestLocale(url, getConfig) {
             messages: config.messages,
         };
     }
-    else if (configMessages) {
-        const messages = await resolveMessages(locale, configMessages);
+    else if ($.configMessages) {
+        const messages = await resolveMessages(locale, $.configMessages);
         state = { locale, messages };
     }
     else {
-        throw new Error("[astro-intl] No getRequestConfig or messages provided. " +
-            "Either pass getConfig to setRequestLocale(), use defineRequestConfig(), or add messages to the integration options.");
+        // No config available — this can happen when Astro 6's built-in i18n
+        // router triggers internal reroutes before the user middleware runs.
+        // Return false so the caller can decide what to do.
+        return false;
     }
-    fallbackState = state;
+    $.fallbackState = state;
     return true;
 }
 // ─── runWithLocale (concurrency-safe via AsyncLocalStorage) ─────────
 export async function runWithLocale(url, fn, getConfig) {
     const [, lang] = url.pathname.split("/");
-    const locale = sanitizeLocale(lang || intlConfig.defaultLocale);
-    const resolvedGetConfig = getConfig ?? registeredGetRequestConfig;
+    const locale = sanitizeLocale(lang || $.intlConfig.defaultLocale);
+    const resolvedGetConfig = getConfig ?? $.registeredGetRequestConfig;
     let state;
     if (resolvedGetConfig) {
         const config = await resolvedGetConfig(locale);
         state = { locale: config.locale, messages: config.messages };
     }
-    else if (configMessages) {
-        const messages = await resolveMessages(locale, configMessages);
+    else if ($.configMessages) {
+        const messages = await resolveMessages(locale, $.configMessages);
         state = { locale, messages };
     }
     else {
         throw new Error("[astro-intl] No getRequestConfig or messages provided. " +
             "Either pass getConfig to setRequestLocale(), use defineRequestConfig(), or add messages to the integration options.");
     }
-    if (als) {
-        return als.run(state, () => {
-            fallbackState = state;
+    if ($.als) {
+        return $.als.run(state, () => {
+            $.fallbackState = state;
             return fn();
         });
     }
-    fallbackState = state;
+    $.fallbackState = state;
     return fn();
 }
 // ─── Read current state ─────────────────────────────────────────────

package/dist/types/index.d.ts

@@ -14,8 +14,14 @@ export type RoutesMap = {
 };
 export type ExtractParams<T extends string> = T extends `${string}[${infer P}]${infer Rest}` ? P | ExtractParams<Rest> : never;
 export type ParamsForRoute<Template extends string> = [ExtractParams<Template>] extends [never] ? Record<string, never> : Record<ExtractParams<Template>, string>;
+export type FallbackRouteInfo = {
+    pattern: string;
+    pathname?: string;
+    locale: string;
+};
 export type IntlConfig = {
     defaultLocale: string;
     locales: string[];
     routes?: RoutesMap;
+    fallbackRoutes?: FallbackRouteInfo[];
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro-intl",
-  "version": "2.0.2",
+  "version": "2.1.0",
   "type": "module",
   "description": "Sistema de internacionalización simple y type-safe para Astro.",
   "keywords": [
@@ -58,7 +58,7 @@
     }
   },
   "peerDependencies": {
-    "astro": "^4 || ^5"
+    "astro": "^4 || ^5 || ^6"
   },
   "peerDependenciesMeta": {
     "react": {
@@ -80,20 +80,20 @@
     "access": "public"
   },
   "devDependencies": {
-    "@eslint/js": "^9.17.0",
+    "@eslint/js": "^9.39.4",
     "@testing-library/jest-dom": "^6.9.1",
     "@testing-library/react": "^16.3.2",
-    "@types/react": "^18.3.18",
-    "@vitest/ui": "^4.0.18",
-    "astro": "^5.17.3",
-    "eslint": "^9.17.0",
-    "happy-dom": "^20.7.0",
-    "prettier": "^3.4.2",
+    "@types/react": "^18.3.28",
+    "@vitest/ui": "^4.1.2",
+    "astro": "^6.1.2",
+    "eslint": "^9.39.4",
+    "happy-dom": "^20.8.9",
+    "prettier": "^3.8.1",
     "react": "^19.2.4",
     "react-dom": "^19.2.4",
+    "svelte": "^5.55.1",
     "typescript": "^5.9.3",
-    "typescript-eslint": "^8.19.1",
-    "svelte": "^5.0.0",
-    "vitest": "^4.0.18"
+    "typescript-eslint": "^8.58.0",
+    "vitest": "^4.1.2"
   }
 }

package/dist/react.d.ts

@@ -1,5 +0,0 @@
-import type { ReactNode } from "react";
-import { type DotPaths } from "./interpolation.js";
-export declare function createGetTranslationsReact<UI extends Record<string, Record<string, unknown>>, DefaultLocale extends keyof UI>(ui: UI, defaultLocale: DefaultLocale): <N extends keyof UI[DefaultLocale]>(lang: string | undefined, namespace: N) => ((key: DotPaths<UI[DefaultLocale][N]>) => string) & {
-    rich: (key: DotPaths<UI[DefaultLocale][N]>, tags: Record<string, (chunks: string) => ReactNode>) => ReactNode[];
-};

package/dist/react.js

@@ -1,42 +0,0 @@
-import { getNestedValue } from "./interpolation.js";
-import { escapeRegExp } from "./sanitize.js";
-export function createGetTranslationsReact(ui, defaultLocale) {
-    return function getTranslationsReact(lang, namespace) {
-        const resolvedLang = lang && lang in ui ? lang : defaultLocale;
-        const messages = ui[resolvedLang][namespace];
-        function t(key) {
-            const value = getNestedValue(messages, key);
-            return typeof value === "string" ? value : key;
-        }
-        const rich = function (key, tags) {
-            const str = t(key);
-            // Función recursiva para procesar tags anidados
-            function processString(input) {
-                const tagNames = Object.keys(tags).map(escapeRegExp);
-                const regex = new RegExp(`<(${tagNames.join("|")})>(.*?)<\\/(\\1)>`, "g");
-                const result = [];
-                let lastIndex = 0;
-                let match;
-                while ((match = regex.exec(input)) !== null) {
-                    if (match.index > lastIndex) {
-                        result.push(input.slice(lastIndex, match.index));
-                    }
-                    const [, tag, chunks] = match;
-                    // Procesar recursivamente el contenido del tag
-                    const processedChunks = processString(chunks);
-                    const chunksAsString = processedChunks
-                        .map((chunk) => (typeof chunk === "string" ? chunk : ""))
-                        .join("");
-                    result.push(tags[tag](chunksAsString));
-                    lastIndex = match.index + match[0].length;
-                }
-                if (lastIndex < input.length)
-                    result.push(input.slice(lastIndex));
-                return result;
-            }
-            return processString(str);
-        };
-        Object.assign(t, { rich });
-        return t;
-    };
-}