@i18n-micro/astro 1.3.4 → 1.3.6

package/dist/load-translations.d.ts

@@ -1,4 +1,5 @@
 import { Translations } from '@i18n-micro/types';
+import { TranslationFileBuckets } from '@i18n-micro/utils/parse-path';
 /**
  * WARNING: Node.js-only functions
  *
@@ -20,9 +21,7 @@ export interface LoadTranslationsOptions {
     rootDir?: string;
     disablePageLocales?: boolean;
 }
-export interface LoadedTranslations {
-    root: Record<string, Translations>;
-    routes: Record<string, Record<string, Translations>>;
+export interface LoadedTranslations extends TranslationFileBuckets<Translations> {
 }
 /**
  * Load all translations from a directory

package/package.json

@@ -1,22 +1,31 @@
 {
   "name": "@i18n-micro/astro",
-  "version": "1.3.4",
+  "version": "1.3.6",
   "description": "Astro integration for i18n-micro — translations, routing, and islands.",
-  "type": "module",
+  "keywords": [
+    "astro",
+    "i18n",
+    "internationalization",
+    "translations"
+  ],
+  "homepage": "https://github.com/s00d/nuxt-i18n-micro/tree/main/packages/astro#readme",
+  "bugs": {
+    "url": "https://github.com/s00d/nuxt-i18n-micro/issues"
+  },
   "license": "MIT",
-  "sideEffects": false,
   "repository": {
     "type": "git",
     "url": "git+https://github.com/s00d/nuxt-i18n-micro.git",
     "directory": "packages/astro"
   },
-  "homepage": "https://github.com/s00d/nuxt-i18n-micro/tree/main/packages/astro#readme",
-  "bugs": {
-    "url": "https://github.com/s00d/nuxt-i18n-micro/issues"
-  },
-  "engines": {
-    "node": ">=18"
-  },
+  "files": [
+    "dist",
+    "src",
+    "README.md",
+    "LICENSE"
+  ],
+  "type": "module",
+  "sideEffects": false,
   "main": "./dist/index.cjs",
   "types": "./dist/index.d.ts",
   "exports": {
@@ -64,32 +73,35 @@
     },
     "./package.json": "./package.json"
   },
-  "files": [
-    "dist",
-    "src",
-    "README.md",
-    "LICENSE"
-  ],
   "publishConfig": {
     "access": "public"
   },
-  "keywords": [
-    "astro",
-    "i18n",
-    "internationalization",
-    "translations"
-  ],
   "dependencies": {
-    "@i18n-micro/core": "1.3.1",
-    "@i18n-micro/node": "1.2.1",
-    "@i18n-micro/types": "1.2.2"
+    "@i18n-micro/utils": "1.0.1",
+    "@i18n-micro/core": "1.3.2",
+    "@i18n-micro/node": "1.2.3",
+    "@i18n-micro/types": "1.2.4"
   },
-  "peerDependencies": {
+  "devDependencies": {
+    "@types/jest": "^29.5.14",
     "astro": "^5.16.5",
+    "jest": "^29.7.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",
-    "vue": "^3.5.25",
+    "ts-jest": "^29.4.6",
+    "vite": "^7.3.1",
+    "vite-plugin-dts": "^4.5.4",
+    "vitest": "^3.2.4",
+    "vue": "^3.5.25"
+  },
+  "peerDependencies": {
+    "astro": "^5.16.5",
+    "preact": "^10.0.0",
     "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0",
-    "preact": "^10.0.0"
+    "svelte": "^4.0.0 || ^5.0.0",
+    "vue": "^3.5.25"
   },
   "peerDependenciesMeta": {
     "svelte": {
@@ -105,19 +117,8 @@
       "optional": true
     }
   },
-  "devDependencies": {
-    "astro": "^5.16.5",
-    "vite": "^7.3.1",
-    "vite-plugin-dts": "^4.5.4",
-    "jest": "^29.7.0",
-    "ts-jest": "^29.4.6",
-    "@types/jest": "^29.5.14",
-    "svelte": "^4.0.0 || ^5.0.0",
-    "vue": "^3.5.25",
-    "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0",
-    "preact": "^10.0.0",
-    "publint": "^0.3.17",
-    "vitest": "^3.2.4"
+  "engines": {
+    "node": ">=18"
   },
   "scripts": {
     "build": "vite build",

package/src/index.ts

@@ -4,15 +4,7 @@ import './env.d'
 // Re-export utilities from core
 export { defaultPlural, FormatService, interpolate } from '@i18n-micro/core'
 // Re-export types from @i18n-micro/types
-export type {
-  CleanTranslation,
-  Getter,
-  Locale,
-  LocaleCode,
-  Params,
-  PluralFunc,
-  Translations,
-} from '@i18n-micro/types'
+export type { CleanTranslation, Getter, Locale, LocaleCode, Params, PluralFunc, Translations } from '@i18n-micro/types'
 export { AstroI18n, type AstroI18nOptions } from './composer'
 // Export integration options type
 export type { I18nIntegrationOptions } from './integration'
@@ -20,33 +12,13 @@ export type { I18nIntegrationOptions } from './integration'
 export { createI18n, i18nIntegration } from './integration'
 export type { LoadedTranslations, LoadTranslationsOptions } from './load-translations'
 // Export translation loading utilities
-export {
-  loadTranslationsFromDir,
-  loadTranslationsIntoI18n,
-} from './load-translations'
+export { loadTranslationsFromDir, loadTranslationsIntoI18n } from './load-translations'
 export type { I18nMiddlewareOptions } from './middleware'
 export { createI18nMiddleware, detectLocale } from './middleware'
 export { createAstroRouterAdapter } from './router/adapter'
 // Router abstraction
 export type { I18nRoutingStrategy } from './router/types'
-// Legacy routing utilities (deprecated, use routingStrategy instead)
-// Kept for backward compatibility
-export {
-  getLocaleFromPath,
-  getRouteName,
-  localizePath,
-  removeLocaleFromPath,
-  switchLocalePath,
-} from './routing'
 export type { I18nClientProps, LocaleHeadOptions, LocaleHeadResult } from './utils'
 // Utilities
-export {
-  getDefaultLocale,
-  getI18n,
-  getI18nProps,
-  getLocale,
-  getLocales,
-  useI18n,
-  useLocaleHead,
-} from './utils'
+export { getDefaultLocale, getI18n, getI18nProps, getLocale, getLocales, useI18n, useLocaleHead } from './utils'
 // It's loaded directly by Astro via entrypoint in integration config

package/src/load-translations.ts

@@ -1,6 +1,7 @@
 import { existsSync, readdirSync, readFileSync, statSync } from 'node:fs'
-import { join, resolve } from 'node:path'
+import { join, relative, resolve, sep } from 'node:path'
 import type { Translations } from '@i18n-micro/types'
+import { mergeRouteTranslationsWithRoot, storeLoadedTranslationFile, type TranslationFileBuckets } from '@i18n-micro/utils/parse-path'
 
 /**
  * WARNING: Node.js-only functions
@@ -25,9 +26,24 @@ export interface LoadTranslationsOptions {
   disablePageLocales?: boolean
 }
 
-export interface LoadedTranslations {
-  root: Record<string, Translations>
-  routes: Record<string, Record<string, Translations>>
+export interface LoadedTranslations extends TranslationFileBuckets<Translations> {}
+
+function walkTranslationFiles(dir: string, onFile: (fullPath: string) => void): void {
+  if (!existsSync(dir)) return
+
+  for (const entry of readdirSync(dir)) {
+    const fullPath = join(dir, entry)
+    const stat = statSync(fullPath)
+
+    if (stat.isDirectory()) {
+      walkTranslationFiles(fullPath, onFile)
+      continue
+    }
+
+    if (entry.endsWith('.json')) {
+      onFile(fullPath)
+    }
+  }
 }
 
 /**
@@ -46,56 +62,21 @@ export function loadTranslationsFromDir(options: LoadTranslationsOptions): Loade
     return { root: {}, routes: {} }
   }
 
-  const root: Record<string, Translations> = {}
-  const routes: Record<string, Record<string, Translations>> = {}
-
-  /**
-   * Recursively load translation files
-   */
-  const loadFiles = (dir: string, routePrefix = ''): void => {
-    if (!existsSync(dir)) return
-
-    const entries = readdirSync(dir)
-    for (const entry of entries) {
-      const fullPath = join(dir, entry)
-      const stat = statSync(fullPath)
-
-      if (stat.isDirectory()) {
-        // If it's a 'pages' directory and page locales are enabled, treat as route-specific
-        if (entry === 'pages' && !disablePageLocales) {
-          loadFiles(fullPath, '')
-        } else if (routePrefix || disablePageLocales) {
-          loadFiles(fullPath, routePrefix)
-        } else {
-          // This is a route directory (e.g., pages/home/)
-          loadFiles(fullPath, entry)
-        }
-      } else if (entry.endsWith('.json')) {
-        const locale = entry.replace('.json', '')
-        try {
-          const content = readFileSync(fullPath, 'utf-8')
-          const translations = JSON.parse(content) as Translations
-
-          if (routePrefix && !disablePageLocales) {
-            // Route-specific translation
-            if (!routes[routePrefix]) {
-              routes[routePrefix] = {}
-            }
-            routes[routePrefix][locale] = translations
-          } else {
-            // Root-level translation
-            root[locale] = translations
-          }
-        } catch (error) {
-          console.error(`[i18n] Failed to load translation file: ${fullPath}`, error)
-        }
-      }
-    }
-  }
+  const buckets: LoadedTranslations = { root: {}, routes: {} }
 
-  loadFiles(fullTranslationDir)
+  walkTranslationFiles(fullTranslationDir, (fullPath) => {
+    const relativePath = relative(fullTranslationDir, fullPath).split(sep).join('/')
+
+    try {
+      const content = readFileSync(fullPath, 'utf-8')
+      const translations = JSON.parse(content) as Translations
+      storeLoadedTranslationFile(buckets, relativePath, translations, disablePageLocales)
+    } catch (error) {
+      console.error(`[i18n] Failed to load translation file: ${fullPath}`, error)
+    }
+  })
 
-  return { root, routes }
+  return buckets
 }
 
 /**
@@ -113,16 +94,13 @@ export function loadTranslationsIntoI18n(
 ): void {
   const { root, routes } = loadTranslationsFromDir(options)
 
-  // Load root-level translations as index
   for (const [locale, translations] of Object.entries(root)) {
     i18n.addTranslations(locale, translations, false)
   }
 
-  // Load route-specific translations (with root baked in)
   for (const [routeName, routeTranslations] of Object.entries(routes)) {
     for (const [locale, translations] of Object.entries(routeTranslations)) {
-      const base = root[locale] || {}
-      i18n.addRouteTranslations(locale, routeName, { ...base, ...translations }, false)
+      i18n.addRouteTranslations(locale, routeName, mergeRouteTranslationsWithRoot(root[locale], translations), false)
     }
   }
 }

package/src/middleware.ts

@@ -1,4 +1,5 @@
 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'
@@ -109,32 +110,6 @@ export function createI18nMiddleware(options: I18nMiddlewareOptions): Middleware
   }
 }
 
-/**
- * Parse Accept-Language header
- */
-function parseAcceptLanguage(acceptLanguage: string): string[] {
-  const languages: string[] = []
-  const parts = acceptLanguage.split(',')
-
-  for (const part of parts) {
-    const [lang, q = '1.0'] = part.trim().split(';q=')
-    const quality = Number.parseFloat(q)
-    if (quality > 0 && lang) {
-      // Extract base language (e.g., 'en-US' -> 'en')
-      const baseLang = lang.split('-')[0]?.toLowerCase()
-      if (baseLang) {
-        languages.push(baseLang)
-        // Also add full locale if different
-        if (lang !== baseLang) {
-          languages.push(lang.toLowerCase())
-        }
-      }
-    }
-  }
-
-  return languages
-}
-
 /**
  * Detect locale from request
  */
@@ -173,15 +148,9 @@ export function detectLocale(
   // 3. Try Accept-Language
   if (locale === defaultLocale) {
     try {
-      const acceptLanguage = headers.get('accept-language')
-      if (acceptLanguage) {
-        const preferredLocales = parseAcceptLanguage(acceptLanguage)
-        for (const preferred of preferredLocales) {
-          if (locales.includes(preferred)) {
-            locale = preferred
-            break
-          }
-        }
+      const detectedFromHeader = detectLocaleFromAcceptLanguage(headers.get('accept-language') ?? undefined, locales)
+      if (detectedFromHeader) {
+        locale = detectedFromHeader
       }
     } catch {
       // Headers may be unavailable in static mode

package/dist/routing.d.ts

@@ -1,23 +0,0 @@
-/**
- * Get route name from Astro path
- * Extracts route name from path (e.g., /en/about -> about)
- */
-export declare function getRouteName(path: string, locales?: string[]): string;
-/**
- * Get locale from path
- * Checks if first segment is a locale code
- */
-export declare function getLocaleFromPath(path: string, defaultLocale?: string, locales?: string[]): string;
-/**
- * Switch locale in path
- * Replaces or adds locale prefix to path
- */
-export declare function switchLocalePath(path: string, newLocale: string, locales?: string[], defaultLocale?: string): string;
-/**
- * Localize path with locale prefix
- */
-export declare function localizePath(path: string, locale: string, locales?: string[], defaultLocale?: string): string;
-/**
- * Remove locale from path
- */
-export declare function removeLocaleFromPath(path: string, locales?: string[]): string;

package/src/routing.ts

@@ -1,94 +0,0 @@
-/**
- * Get route name from Astro path
- * Extracts route name from path (e.g., /en/about -> about)
- */
-export function getRouteName(path: string, locales: string[] = []): string {
-  // Normalize the path
-  const cleanPath = path.replace(/^\//, '').replace(/\/$/, '')
-
-  if (!cleanPath) {
-    return 'index'
-  }
-
-  const segments = cleanPath.split('/').filter(Boolean)
-
-  // Remove locale from path if present
-  const firstSegment = segments[0]
-  if (firstSegment && locales.includes(firstSegment)) {
-    segments.shift()
-  }
-
-  if (segments.length === 0) {
-    return 'index'
-  }
-
-  return segments.join('-')
-}
-
-/**
- * Get locale from path
- * Checks if first segment is a locale code
- */
-export function getLocaleFromPath(path: string, defaultLocale: string = 'en', locales: string[] = []): string {
-  const segments = path.split('/').filter(Boolean)
-  const firstSegment = segments[0]
-  if (firstSegment && locales.includes(firstSegment)) {
-    return firstSegment
-  }
-
-  return defaultLocale
-}
-
-/**
- * Switch locale in path
- * Replaces or adds locale prefix to path
- */
-export function switchLocalePath(path: string, newLocale: string, locales: string[] = [], defaultLocale?: string): string {
-  const segments = path.split('/').filter(Boolean)
-
-  // Remove existing locale if present
-  const firstSegment = segments[0]
-  if (firstSegment && locales.includes(firstSegment)) {
-    segments.shift()
-  }
-
-  // Add new locale if not default or if default should be included
-  if (newLocale !== defaultLocale || defaultLocale === undefined) {
-    segments.unshift(newLocale)
-  }
-
-  return `/${segments.join('/')}`
-}
-
-/**
- * Localize path with locale prefix
- */
-export function localizePath(path: string, locale: string, locales: string[] = [], defaultLocale?: string): string {
-  const cleanPath = path.replace(/^\//, '').replace(/\/$/, '') || ''
-  const segments = cleanPath.split('/').filter(Boolean)
-
-  // Remove existing locale if present
-  const firstSegment = segments[0]
-  if (firstSegment && locales.includes(firstSegment)) {
-    segments.shift()
-  }
-
-  // Add locale if not default or if default should be included
-  if (locale !== defaultLocale || defaultLocale === undefined) {
-    segments.unshift(locale)
-  }
-
-  return `/${segments.join('/')}`
-}
-
-/**
- * Remove locale from path
- */
-export function removeLocaleFromPath(path: string, locales: string[] = []): string {
-  const segments = path.split('/').filter(Boolean)
-  const firstSegment = segments[0]
-  if (firstSegment && locales.includes(firstSegment)) {
-    segments.shift()
-  }
-  return `/${segments.join('/')}`
-}