nuxt-i18n-micro 1.102.0 → 2.0.0

package/dist/runtime/server/plugins/watcher.dev.js

@@ -0,0 +1,60 @@
+import path from "node:path";
+import { watch } from "chokidar";
+import { useStorage, useRuntimeConfig, defineNitroPlugin } from "#imports";
+let watcherInstance = null;
+export default defineNitroPlugin((nitroApp) => {
+  if (watcherInstance) {
+    return;
+  }
+  const config = useRuntimeConfig();
+  const i18nConfig = config.i18nConfig;
+  if (!i18nConfig || i18nConfig.disableUpdater || process.env.NODE_ENV !== "development") {
+    return;
+  }
+  const log = (...args) => i18nConfig.debug && console.log("[i18n-hmr]", ...args);
+  const warn = (...args) => i18nConfig.debug && console.warn("[i18n-hmr]", ...args);
+  const translationsRoot = path.resolve(i18nConfig.rootDir, i18nConfig.translationDir);
+  log(`Watching for translation changes in: ${translationsRoot}`);
+  const storage = useStorage("assets:server");
+  const invalidateCache = async (filePath) => {
+    if (!filePath.endsWith(".json")) return;
+    const relativePath = path.relative(translationsRoot, filePath).replace(/\\/g, "/");
+    const isPageTranslation = relativePath.startsWith("pages/");
+    try {
+      const allKeys = await storage.getKeys("_locales:merged:");
+      if (isPageTranslation) {
+        const match = relativePath.match(/^pages\/([^/]+)\/(.+)\.json$/);
+        if (!match) return;
+        const pageName = match[1];
+        const locale = match[2];
+        const keyToRemove = `_locales:merged:${pageName}:${locale}`;
+        if (allKeys.includes(keyToRemove)) {
+          await storage.removeItem(keyToRemove);
+          log(`Invalidated page cache: ${keyToRemove}`);
+        }
+      } else {
+        const match = relativePath.match(/^([^/]+)\.json$/);
+        if (!match) return;
+        const locale = match[1];
+        const keysToRemove = allKeys.filter((key) => key.endsWith(`:${locale}`));
+        if (keysToRemove.length > 0) {
+          await Promise.all(keysToRemove.map((key) => storage.removeItem(key)));
+          log(`Invalidated ALL page caches for locale '${locale}'. Removed ${keysToRemove.length} entries.`);
+        }
+      }
+    } catch (e) {
+      warn("Failed to invalidate server cache for", filePath, e);
+    }
+  };
+  const watcher = watch(translationsRoot, { persistent: true, ignoreInitial: true, depth: 5 });
+  watcher.on("add", invalidateCache);
+  watcher.on("change", invalidateCache);
+  watcher.on("unlink", invalidateCache);
+  watcherInstance = watcher;
+  nitroApp.hooks.hook("close", async () => {
+    if (watcherInstance) {
+      await watcherInstance.close();
+      watcherInstance = null;
+    }
+  });
+});

package/dist/runtime/server/routes/get.js

@@ -1,63 +1,88 @@
-import { resolve, join } from "node:path";
+import { resolve } from "node:path";
 import { readFile } from "node:fs/promises";
-import { defineEventHandler } from "h3";
+import { defineEventHandler, setResponseHeader } from "h3";
 import { useRuntimeConfig, createError, useStorage } from "#imports";
 let storageInit = false;
 function deepMerge(target, source) {
+  const output = { ...target };
   for (const key in source) {
     if (key === "__proto__" || key === "constructor") continue;
-    if (Array.isArray(source[key])) {
-      target[key] = source[key];
-    } else if (source[key] instanceof Object) {
-      target[key] = target[key] instanceof Object ? deepMerge(target[key], source[key]) : source[key];
+    const src = source[key];
+    const dst = output[key];
+    if (src && typeof src === "object" && !Array.isArray(src) && dst && typeof dst === "object" && !Array.isArray(dst)) {
+      output[key] = deepMerge(dst, src);
     } else {
-      target[key] = source[key];
+      output[key] = src;
     }
   }
-  return target;
+  return output;
+}
+async function readTranslationFile(filePath, debug) {
+  try {
+    const content = await readFile(filePath, "utf-8");
+    return JSON.parse(content);
+  } catch (e) {
+    if (debug && e?.code !== "ENOENT") {
+      console.error(`[i18n] Error loading locale file: ${filePath}`, e);
+    }
+    return null;
+  }
 }
 export default defineEventHandler(async (event) => {
+  setResponseHeader(event, "Content-Type", "application/json");
   const { page, locale } = event.context.params;
   const config = useRuntimeConfig();
-  const { rootDirs, debug, translationDir, fallbackLocale, customRegexMatcher } = config.i18nConfig;
+  const { rootDirs, debug, translationDir, fallbackLocale, routesLocaleLinks } = config.i18nConfig;
   const { locales } = config.public.i18nConfig;
-  if (customRegexMatcher && locales && !locales.map((l) => l.code).includes(locale)) {
+  if (locales && !locales.map((l) => l.code).includes(locale)) {
     throw createError({ statusCode: 404 });
   }
-  const currentLocaleConfig = locales?.find((l) => l.code === locale) ?? null;
-  const getTranslationPath = (locale2, page2) => page2 === "general" ? `${locale2}.json` : `pages/${page2}/${locale2}.json`;
-  let translations = {};
+  let fileLookupPage = page;
+  if (routesLocaleLinks && routesLocaleLinks[page]) {
+    fileLookupPage = routesLocaleLinks[page];
+    if (debug) {
+      console.log(`[i18n] Route link found: '${page}' -> '${fileLookupPage}'. Using linked translations.`);
+    }
+  }
   const serverStorage = useStorage("assets:server");
+  const cacheKey = `_locales:merged:${page}:${locale}`;
   if (!storageInit) {
     if (debug) console.log("[nuxt-i18n-micro] clear storage cache");
     await Promise.all((await serverStorage.getKeys("_locales")).map((key) => serverStorage.removeItem(key)));
     storageInit = true;
   }
-  const cacheName = join("_locales", getTranslationPath(locale, page));
-  const isThereAsset = await serverStorage.hasItem(cacheName);
-  if (isThereAsset) {
-    const rawContent = await serverStorage.getItemRaw(cacheName) ?? {};
-    return typeof rawContent === "string" ? JSON.parse(rawContent) : rawContent;
+  const cachedMerged = await serverStorage.getItem(cacheKey);
+  if (cachedMerged) {
+    return cachedMerged;
   }
-  const createPaths = (locale2) => rootDirs.map((dir) => ({
-    translationPath: resolve(dir, translationDir, getTranslationPath(locale2, page)),
-    name: `_locales/${getTranslationPath(locale2, page)}`
-  }));
-  const paths = [
-    ...fallbackLocale && fallbackLocale !== locale ? createPaths(fallbackLocale) : [],
-    ...currentLocaleConfig && currentLocaleConfig.fallbackLocale ? createPaths(currentLocaleConfig.fallbackLocale) : [],
-    ...createPaths(locale)
-  ];
-  for (const { translationPath, name } of paths) {
-    try {
-      if (debug) console.log("[nuxt-i18n-micro] load locale", translationPath, name);
-      const content = await readFile(translationPath, "utf-8");
-      const fileContent = JSON.parse(content);
-      translations = deepMerge(translations, fileContent);
-    } catch (e) {
-      if (debug) console.error("[nuxt-i18n-micro] load locale error", e);
+  const getPathsFor = (targetLocale, targetPage) => rootDirs.map((dir) => resolve(dir, translationDir, targetPage === "general" ? `${targetLocale}.json` : `pages/${targetPage}/${targetLocale}.json`));
+  let finalTranslations = {};
+  const currentLocaleConfig = locales?.find((l) => l.code === locale) ?? null;
+  const loadAndMerge = async (targetLocale) => {
+    let globalTranslations = {};
+    let pageTranslations = {};
+    for (const p of getPathsFor(targetLocale, "general")) {
+      const content = await readTranslationFile(p, debug);
+      if (content) globalTranslations = deepMerge(globalTranslations, content);
+    }
+    if (page !== "general") {
+      for (const p of getPathsFor(targetLocale, fileLookupPage)) {
+        const content = await readTranslationFile(p, debug);
+        if (content) pageTranslations = deepMerge(pageTranslations, content);
+      }
     }
+    return deepMerge(globalTranslations, pageTranslations);
+  };
+  const fallbackLocalesList = [
+    fallbackLocale,
+    currentLocaleConfig?.fallbackLocale
+  ].filter((l) => !!l && l !== locale);
+  for (const fb of [...new Set(fallbackLocalesList)]) {
+    const fbTranslations = await loadAndMerge(fb);
+    finalTranslations = deepMerge(finalTranslations, fbTranslations);
   }
-  await serverStorage.setItem(cacheName, translations);
-  return translations;
+  const mainTranslations = await loadAndMerge(locale);
+  finalTranslations = deepMerge(finalTranslations, mainTranslations);
+  await serverStorage.setItem(cacheKey, finalTranslations);
+  return finalTranslations;
 });

package/dist/runtime/translation-server-middleware.js

@@ -1,6 +1,7 @@
 import { interpolate, useTranslationHelper } from "nuxt-i18n-micro-core";
 import { detectCurrentLocale } from "./utils/locale-detector.js";
 import { useRuntimeConfig } from "#imports";
+const I18N_CONTEXT_KEY = "__i18n_cache__";
 async function fetchTranslations(locale) {
   try {
     const translations = await $fetch(`/_locales/general/${locale}/data.json`);
@@ -11,7 +12,16 @@ async function fetchTranslations(locale) {
   }
 }
 export const useTranslationServerMiddleware = async (event, defaultLocale, currentLocale) => {
-  const { getTranslation, loadTranslations, hasGeneralTranslation } = useTranslationHelper();
+  if (!event.context[I18N_CONTEXT_KEY]) {
+    event.context[I18N_CONTEXT_KEY] = {
+      generalLocaleCache: {},
+      routeLocaleCache: {},
+      dynamicTranslationsCaches: [],
+      serverTranslationCache: {}
+    };
+  }
+  const requestScopedCache = event.context[I18N_CONTEXT_KEY];
+  const { getTranslation, loadTranslations, hasGeneralTranslation } = useTranslationHelper(requestScopedCache);
   const config = useRuntimeConfig(event).i18nConfig;
   const locale = currentLocale || detectCurrentLocale(event, config, defaultLocale);
   if (!hasGeneralTranslation(locale)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nuxt-i18n-micro",
-  "version": "1.102.0",
+  "version": "2.0.0",
   "description": "Nuxt I18n Micro is a lightweight, high-performance internationalization module for Nuxt, designed to handle multi-language support with minimal overhead, fast build times, and efficient runtime performance.",
   "repository": "s00d/nuxt-i18n-micro",
   "license": "MIT",
@@ -61,9 +61,9 @@
     "globby": "^14.1.0",
     "sirv": "^2.0.4",
     "ufo": "^1.5.4",
-    "nuxt-i18n-micro-types": "1.0.10",
-    "nuxt-i18n-micro-core": "1.0.18",
-    "nuxt-i18n-micro-test-utils": "1.0.6"
+    "nuxt-i18n-micro-test-utils": "1.0.7",
+    "nuxt-i18n-micro-types": "1.0.11",
+    "nuxt-i18n-micro-core": "1.0.20"
   },
   "devDependencies": {
     "@nuxt/devtools": "^2.6.3",

package/dist/client/_nuxt/builds/meta/3b71a52e-40e0-4913-a13a-e722e382d06d.json

@@ -1 +0,0 @@
-{"id":"3b71a52e-40e0-4913-a13a-e722e382d06d","timestamp":1760083211792,"matcher":{"static":{},"wildcard":{},"dynamic":{}},"prerendered":[]}

package/dist/client/_nuxt/error-404.B2VbLYbY.css

@@ -1 +0,0 @@
-.spotlight[data-v-ed876d78]{background:linear-gradient(45deg,#00dc82,#36e4da 50%,#0047e1);bottom:-30vh;filter:blur(20vh);height:40vh}.gradient-border[data-v-ed876d78]{-webkit-backdrop-filter:blur(10px);backdrop-filter:blur(10px);border-radius:.5rem;position:relative}@media (prefers-color-scheme:light){.gradient-border[data-v-ed876d78]{background-color:#ffffff4d}.gradient-border[data-v-ed876d78]:before{background:linear-gradient(90deg,#e2e2e2,#e2e2e2 25%,#00dc82,#36e4da 75%,#0047e1)}}@media (prefers-color-scheme:dark){.gradient-border[data-v-ed876d78]{background-color:#1414144d}.gradient-border[data-v-ed876d78]:before{background:linear-gradient(90deg,#303030,#303030 25%,#00dc82,#36e4da 75%,#0047e1)}}.gradient-border[data-v-ed876d78]:before{background-size:400% auto;border-radius:.5rem;content:"";inset:0;-webkit-mask:linear-gradient(#fff 0 0) content-box,linear-gradient(#fff 0 0);mask:linear-gradient(#fff 0 0) content-box,linear-gradient(#fff 0 0);-webkit-mask-composite:xor;mask-composite:exclude;opacity:.5;padding:2px;position:absolute;transition:background-position .3s ease-in-out,opacity .2s ease-in-out;width:100%}.gradient-border[data-v-ed876d78]:hover:before{background-position:-50% 0;opacity:1}.fixed[data-v-ed876d78]{position:fixed}.left-0[data-v-ed876d78]{left:0}.right-0[data-v-ed876d78]{right:0}.z-10[data-v-ed876d78]{z-index:10}.z-20[data-v-ed876d78]{z-index:20}.grid[data-v-ed876d78]{display:grid}.mb-16[data-v-ed876d78]{margin-bottom:4rem}.mb-8[data-v-ed876d78]{margin-bottom:2rem}.max-w-520px[data-v-ed876d78]{max-width:520px}.min-h-screen[data-v-ed876d78]{min-height:100vh}.w-full[data-v-ed876d78]{width:100%}.flex[data-v-ed876d78]{display:flex}.cursor-pointer[data-v-ed876d78]{cursor:pointer}.place-content-center[data-v-ed876d78]{place-content:center}.items-center[data-v-ed876d78]{align-items:center}.justify-center[data-v-ed876d78]{justify-content:center}.overflow-hidden[data-v-ed876d78]{overflow:hidden}.bg-white[data-v-ed876d78]{--un-bg-opacity:1;background-color:rgb(255 255 255/var(--un-bg-opacity))}.px-4[data-v-ed876d78]{padding-left:1rem;padding-right:1rem}.px-8[data-v-ed876d78]{padding-left:2rem;padding-right:2rem}.py-2[data-v-ed876d78]{padding-bottom:.5rem;padding-top:.5rem}.text-center[data-v-ed876d78]{text-align:center}.text-8xl[data-v-ed876d78]{font-size:6rem;line-height:1}.text-xl[data-v-ed876d78]{font-size:1.25rem;line-height:1.75rem}.text-black[data-v-ed876d78]{--un-text-opacity:1;color:rgb(0 0 0/var(--un-text-opacity))}.font-light[data-v-ed876d78]{font-weight:300}.font-medium[data-v-ed876d78]{font-weight:500}.leading-tight[data-v-ed876d78]{line-height:1.25}.font-sans[data-v-ed876d78]{font-family:ui-sans-serif,system-ui,-apple-system,BlinkMacSystemFont,Segoe UI,Roboto,Helvetica Neue,Arial,Noto Sans,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol,Noto Color Emoji}.antialiased[data-v-ed876d78]{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}@media (prefers-color-scheme:dark){.dark\:bg-black[data-v-ed876d78]{--un-bg-opacity:1;background-color:rgb(0 0 0/var(--un-bg-opacity))}.dark\:text-white[data-v-ed876d78]{--un-text-opacity:1;color:rgb(255 255 255/var(--un-text-opacity))}}@media (min-width:640px){.sm\:px-0[data-v-ed876d78]{padding-left:0;padding-right:0}.sm\:px-6[data-v-ed876d78]{padding-left:1.5rem;padding-right:1.5rem}.sm\:py-3[data-v-ed876d78]{padding-bottom:.75rem;padding-top:.75rem}.sm\:text-4xl[data-v-ed876d78]{font-size:2.25rem;line-height:2.5rem}.sm\:text-xl[data-v-ed876d78]{font-size:1.25rem;line-height:1.75rem}}

package/dist/client/_nuxt/error-500.DGwSTbEi.css

@@ -1 +0,0 @@
-.spotlight[data-v-09b9ec2d]{background:linear-gradient(45deg,#00dc82,#36e4da 50%,#0047e1);filter:blur(20vh)}.fixed[data-v-09b9ec2d]{position:fixed}.-bottom-1\/2[data-v-09b9ec2d]{bottom:-50%}.left-0[data-v-09b9ec2d]{left:0}.right-0[data-v-09b9ec2d]{right:0}.grid[data-v-09b9ec2d]{display:grid}.mb-16[data-v-09b9ec2d]{margin-bottom:4rem}.mb-8[data-v-09b9ec2d]{margin-bottom:2rem}.h-1\/2[data-v-09b9ec2d]{height:50%}.max-w-520px[data-v-09b9ec2d]{max-width:520px}.min-h-screen[data-v-09b9ec2d]{min-height:100vh}.place-content-center[data-v-09b9ec2d]{place-content:center}.overflow-hidden[data-v-09b9ec2d]{overflow:hidden}.bg-white[data-v-09b9ec2d]{--un-bg-opacity:1;background-color:rgb(255 255 255/var(--un-bg-opacity))}.px-8[data-v-09b9ec2d]{padding-left:2rem;padding-right:2rem}.text-center[data-v-09b9ec2d]{text-align:center}.text-8xl[data-v-09b9ec2d]{font-size:6rem;line-height:1}.text-xl[data-v-09b9ec2d]{font-size:1.25rem;line-height:1.75rem}.text-black[data-v-09b9ec2d]{--un-text-opacity:1;color:rgb(0 0 0/var(--un-text-opacity))}.font-light[data-v-09b9ec2d]{font-weight:300}.font-medium[data-v-09b9ec2d]{font-weight:500}.leading-tight[data-v-09b9ec2d]{line-height:1.25}.font-sans[data-v-09b9ec2d]{font-family:ui-sans-serif,system-ui,-apple-system,BlinkMacSystemFont,Segoe UI,Roboto,Helvetica Neue,Arial,Noto Sans,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol,Noto Color Emoji}.antialiased[data-v-09b9ec2d]{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}@media (prefers-color-scheme:dark){.dark\:bg-black[data-v-09b9ec2d]{--un-bg-opacity:1;background-color:rgb(0 0 0/var(--un-bg-opacity))}.dark\:text-white[data-v-09b9ec2d]{--un-text-opacity:1;color:rgb(255 255 255/var(--un-text-opacity))}}@media (min-width:640px){.sm\:px-0[data-v-09b9ec2d]{padding-left:0;padding-right:0}.sm\:text-4xl[data-v-09b9ec2d]{font-size:2.25rem;line-height:2.5rem}}