nuxt-i18n-micro 1.15.4 → 1.16.1

package/dist/client/_nuxt/{C-3exr1n.js → DaLmbeLo.js}

@@ -1 +1 @@
-import{i as f,r as u,f as o,g as d,h as v,j as l,k as i,l as h,m}from"./DLyXNYo2.js";function U(t,a={}){const e=a.head||f();if(e)return e.ssr?e.push(t,a):p(e,t,a)}function p(t,a,e={}){const s=u(!1),n=u({});o(()=>{n.value=s.value?{}:d(a)});const r=t.push(n.value,e);return v(n,c=>{r.patch(c)}),m()&&(l(()=>{r.dispose()}),i(()=>{s.value=!0}),h(()=>{s.value=!1})),r}export{U as u};
+import{i as f,r as u,f as o,g as d,h as v,j as l,k as i,l as h,m}from"./C9hrmmtp.js";function U(t,a={}){const e=a.head||f();if(e)return e.ssr?e.push(t,a):p(e,t,a)}function p(t,a,e={}){const s=u(!1),n=u({});o(()=>{n.value=s.value?{}:d(a)});const r=t.push(n.value,e);return v(n,c=>{r.patch(c)}),m()&&(l(()=>{r.dispose()}),i(()=>{s.value=!0}),h(()=>{s.value=!1})),r}export{U as u};

package/dist/client/_nuxt/{CtWyte3o.js → Dvj3Ou8K.js}

@@ -1 +1 @@
-import{u as a}from"./C-3exr1n.js";import{_ as s,o as i,c as u,a as t,t as o}from"./DLyXNYo2.js";const l={class:"font-sans antialiased bg-white dark:bg-black text-black dark:text-white grid min-h-screen place-content-center overflow-hidden"},c={class:"max-w-520px text-center"},d=["textContent"],p=["textContent"],g={__name:"error-500",props:{appName:{type:String,default:"Nuxt"},version:{type:String,default:""},statusCode:{type:Number,default:500},statusMessage:{type:String,default:"Server error"},description:{type:String,default:"This page is temporarily unavailable."}},setup(e){const n=e;return a({title:`${n.statusCode} - ${n.statusMessage} | ${n.appName}`,script:[],style:[{children:'*,:before,:after{box-sizing:border-box;border-width:0;border-style:solid;border-color:var(--un-default-border-color, #e5e7eb)}:before,:after{--un-content:""}html{line-height:1.5;-webkit-text-size-adjust:100%;-moz-tab-size:4;tab-size:4;font-family:ui-sans-serif,system-ui,sans-serif,"Apple Color Emoji","Segoe UI Emoji",Segoe UI Symbol,"Noto Color Emoji";font-feature-settings:normal;font-variation-settings:normal;-webkit-tap-highlight-color:transparent}body{margin:0;line-height:inherit}h1{font-size:inherit;font-weight:inherit}h1,p{margin:0}*,:before,:after{--un-rotate:0;--un-rotate-x:0;--un-rotate-y:0;--un-rotate-z:0;--un-scale-x:1;--un-scale-y:1;--un-scale-z:1;--un-skew-x:0;--un-skew-y:0;--un-translate-x:0;--un-translate-y:0;--un-translate-z:0;--un-pan-x: ;--un-pan-y: ;--un-pinch-zoom: ;--un-scroll-snap-strictness:proximity;--un-ordinal: ;--un-slashed-zero: ;--un-numeric-figure: ;--un-numeric-spacing: ;--un-numeric-fraction: ;--un-border-spacing-x:0;--un-border-spacing-y:0;--un-ring-offset-shadow:0 0 rgb(0 0 0 / 0);--un-ring-shadow:0 0 rgb(0 0 0 / 0);--un-shadow-inset: ;--un-shadow:0 0 rgb(0 0 0 / 0);--un-ring-inset: ;--un-ring-offset-width:0px;--un-ring-offset-color:#fff;--un-ring-width:0px;--un-ring-color:rgb(147 197 253 / .5);--un-blur: ;--un-brightness: ;--un-contrast: ;--un-drop-shadow: ;--un-grayscale: ;--un-hue-rotate: ;--un-invert: ;--un-saturate: ;--un-sepia: ;--un-backdrop-blur: ;--un-backdrop-brightness: ;--un-backdrop-contrast: ;--un-backdrop-grayscale: ;--un-backdrop-hue-rotate: ;--un-backdrop-invert: ;--un-backdrop-opacity: ;--un-backdrop-saturate: ;--un-backdrop-sepia: }'}]}),(b,r)=>(i(),u("div",l,[r[0]||(r[0]=t("div",{class:"fixed -bottom-1/2 left-0 right-0 h-1/2 spotlight"},null,-1)),t("div",c,[t("h1",{class:"text-8xl sm:text-10xl font-medium mb-8",textContent:o(e.statusCode)},null,8,d),t("p",{class:"text-xl px-8 sm:px-0 sm:text-4xl font-light mb-16 leading-tight",textContent:o(e.description)},null,8,p)])]))}},m=s(g,[["__scopeId","data-v-b63e9691"]]);export{m as default};
+import{u as a}from"./DaLmbeLo.js";import{_ as s,o as i,c as u,a as t,t as o}from"./C9hrmmtp.js";const l={class:"font-sans antialiased bg-white dark:bg-black text-black dark:text-white grid min-h-screen place-content-center overflow-hidden"},c={class:"max-w-520px text-center"},d=["textContent"],p=["textContent"],g={__name:"error-500",props:{appName:{type:String,default:"Nuxt"},version:{type:String,default:""},statusCode:{type:Number,default:500},statusMessage:{type:String,default:"Server error"},description:{type:String,default:"This page is temporarily unavailable."}},setup(e){const n=e;return a({title:`${n.statusCode} - ${n.statusMessage} | ${n.appName}`,script:[],style:[{children:'*,:before,:after{box-sizing:border-box;border-width:0;border-style:solid;border-color:var(--un-default-border-color, #e5e7eb)}:before,:after{--un-content:""}html{line-height:1.5;-webkit-text-size-adjust:100%;-moz-tab-size:4;tab-size:4;font-family:ui-sans-serif,system-ui,sans-serif,"Apple Color Emoji","Segoe UI Emoji",Segoe UI Symbol,"Noto Color Emoji";font-feature-settings:normal;font-variation-settings:normal;-webkit-tap-highlight-color:transparent}body{margin:0;line-height:inherit}h1{font-size:inherit;font-weight:inherit}h1,p{margin:0}*,:before,:after{--un-rotate:0;--un-rotate-x:0;--un-rotate-y:0;--un-rotate-z:0;--un-scale-x:1;--un-scale-y:1;--un-scale-z:1;--un-skew-x:0;--un-skew-y:0;--un-translate-x:0;--un-translate-y:0;--un-translate-z:0;--un-pan-x: ;--un-pan-y: ;--un-pinch-zoom: ;--un-scroll-snap-strictness:proximity;--un-ordinal: ;--un-slashed-zero: ;--un-numeric-figure: ;--un-numeric-spacing: ;--un-numeric-fraction: ;--un-border-spacing-x:0;--un-border-spacing-y:0;--un-ring-offset-shadow:0 0 rgb(0 0 0 / 0);--un-ring-shadow:0 0 rgb(0 0 0 / 0);--un-shadow-inset: ;--un-shadow:0 0 rgb(0 0 0 / 0);--un-ring-inset: ;--un-ring-offset-width:0px;--un-ring-offset-color:#fff;--un-ring-width:0px;--un-ring-color:rgb(147 197 253 / .5);--un-blur: ;--un-brightness: ;--un-contrast: ;--un-drop-shadow: ;--un-grayscale: ;--un-hue-rotate: ;--un-invert: ;--un-saturate: ;--un-sepia: ;--un-backdrop-blur: ;--un-backdrop-brightness: ;--un-backdrop-contrast: ;--un-backdrop-grayscale: ;--un-backdrop-hue-rotate: ;--un-backdrop-invert: ;--un-backdrop-opacity: ;--un-backdrop-saturate: ;--un-backdrop-sepia: }'}]}),(b,r)=>(i(),u("div",l,[r[0]||(r[0]=t("div",{class:"fixed -bottom-1/2 left-0 right-0 h-1/2 spotlight"},null,-1)),t("div",c,[t("h1",{class:"text-8xl sm:text-10xl font-medium mb-8",textContent:o(e.statusCode)},null,8,d),t("p",{class:"text-xl px-8 sm:px-0 sm:text-4xl font-light mb-16 leading-tight",textContent:o(e.description)},null,8,p)])]))}},m=s(g,[["__scopeId","data-v-b63e9691"]]);export{m as default};

package/dist/client/_nuxt/builds/latest.json

@@ -1 +1 @@
-{"id":"3a47c997-53fe-4d2e-b6ee-2d642c8aae98","timestamp":1726291818338}
+{"id":"b6e0dab7-be9e-4ee6-8148-cf61da244e79","timestamp":1726666526425}

package/dist/client/_nuxt/builds/meta/b6e0dab7-be9e-4ee6-8148-cf61da244e79.json

@@ -0,0 +1 @@
+{"id":"b6e0dab7-be9e-4ee6-8148-cf61da244e79","timestamp":1726666526425,"matcher":{"static":{},"wildcard":{},"dynamic":{}},"prerendered":[]}

package/dist/client/index.html

@@ -1,12 +1,12 @@
 <!DOCTYPE html><html  data-capo=""><head><meta charset="utf-8">
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <link rel="stylesheet" href="/__nuxt-i18n-micro/_nuxt/entry.DjxsrOxm.css">
-<link rel="modulepreload" as="script" crossorigin href="/__nuxt-i18n-micro/_nuxt/DLyXNYo2.js">
+<link rel="modulepreload" as="script" crossorigin href="/__nuxt-i18n-micro/_nuxt/C9hrmmtp.js">
 <link rel="prefetch" as="script" crossorigin href="/__nuxt-i18n-micro/_nuxt/B6E6ObS_.js">
 <link rel="prefetch" as="style" href="/__nuxt-i18n-micro/_nuxt/error-404.D-AvUzLt.css">
-<link rel="prefetch" as="script" crossorigin href="/__nuxt-i18n-micro/_nuxt/C1JBbjFJ.js">
-<link rel="prefetch" as="script" crossorigin href="/__nuxt-i18n-micro/_nuxt/C-3exr1n.js">
+<link rel="prefetch" as="script" crossorigin href="/__nuxt-i18n-micro/_nuxt/Bii0Cy7X.js">
+<link rel="prefetch" as="script" crossorigin href="/__nuxt-i18n-micro/_nuxt/DaLmbeLo.js">
 <link rel="prefetch" as="style" href="/__nuxt-i18n-micro/_nuxt/error-500.21ZDxC33.css">
-<link rel="prefetch" as="script" crossorigin href="/__nuxt-i18n-micro/_nuxt/CtWyte3o.js">
-<script type="module" src="/__nuxt-i18n-micro/_nuxt/DLyXNYo2.js" crossorigin></script></head><body><div id="__nuxt"></div><div id="teleports"></div><script type="application/json" data-nuxt-data="nuxt-app" data-ssr="false" id="__NUXT_DATA__">[{"serverRendered":1},false]</script>
-<script>window.__NUXT__={};window.__NUXT__.config={public:{},app:{baseURL:"/__nuxt-i18n-micro",buildId:"3a47c997-53fe-4d2e-b6ee-2d642c8aae98",buildAssetsDir:"/_nuxt/",cdnURL:""}}</script></body></html>
+<link rel="prefetch" as="script" crossorigin href="/__nuxt-i18n-micro/_nuxt/Dvj3Ou8K.js">
+<script type="module" src="/__nuxt-i18n-micro/_nuxt/C9hrmmtp.js" crossorigin></script></head><body><div id="__nuxt"></div><div id="teleports"></div><script type="application/json" data-nuxt-data="nuxt-app" data-ssr="false" id="__NUXT_DATA__">[{"serverRendered":1},false]</script>
+<script>window.__NUXT__={};window.__NUXT__.config={public:{},app:{baseURL:"/__nuxt-i18n-micro",buildId:"b6e0dab7-be9e-4ee6-8148-cf61da244e79",buildAssetsDir:"/_nuxt/",cdnURL:""}}</script></body></html>

package/dist/module.d.mts

@@ -7,7 +7,8 @@ interface Locale {
     iso?: string;
     dir?: 'ltr' | 'rtl' | 'auto';
 }
-type PluralFunc = (translation: unknown, count: number, locale: string) => string;
+type Getter = (key: string, params?: Record<string, string | number | boolean>, defaultValue?: string) => unknown;
+type PluralFunc = (key: string, count: number, locale: string, getter: Getter) => string | null;
 interface ModuleOptions {
     locales?: Locale[];
     meta?: boolean;

package/dist/module.d.ts

@@ -7,7 +7,8 @@ interface Locale {
     iso?: string;
     dir?: 'ltr' | 'rtl' | 'auto';
 }
-type PluralFunc = (translation: unknown, count: number, locale: string) => string;
+type Getter = (key: string, params?: Record<string, string | number | boolean>, defaultValue?: string) => unknown;
+type PluralFunc = (key: string, count: number, locale: string, getter: Getter) => string | null;
 interface ModuleOptions {
     locales?: Locale[];
     meta?: boolean;

package/dist/module.json

@@ -1,7 +1,7 @@
 {
   "name": "nuxt-i18n-micro",
   "configKey": "i18n",
-  "version": "1.15.4",
+  "version": "1.16.1",
   "builder": {
     "@nuxt/module-builder": "0.8.4",
     "unbuild": "2.0.0"

package/dist/module.mjs

@@ -1,5 +1,5 @@
 import path from 'node:path';
-import { useNuxt, defineNuxtModule, createResolver, addPlugin, addImportsDir, addServerHandler, addComponentsDir, extendPages, addPrerenderRoutes } from '@nuxt/kit';
+import { useNuxt, defineNuxtModule, useLogger, createResolver, addPlugin, addImportsDir, addServerHandler, addComponentsDir, extendPages, addPrerenderRoutes } from '@nuxt/kit';
 import { watch } from 'chokidar';
 import * as fs from 'node:fs';
 import { readFileSync, existsSync, mkdirSync, writeFileSync } from 'node:fs';
@@ -149,12 +149,15 @@ class PageManager {
   activeLocaleCodes;
   constructor(locales, defaultLocaleCode, includeDefaultLocaleRoute) {
     this.locales = locales;
-    this.defaultLocale = this.findDefaultLocale(defaultLocaleCode);
+    this.defaultLocale = this.findLocaleByCode(defaultLocaleCode) || { code: defaultLocaleCode };
     this.includeDefaultLocaleRoute = includeDefaultLocaleRoute;
-    this.activeLocaleCodes = this.calculateActiveLocaleCodes();
+    this.activeLocaleCodes = this.computeActiveLocaleCodes();
   }
-  findDefaultLocale(defaultLocaleCode) {
-    return this.locales.find((locale) => locale.code === defaultLocaleCode) || { code: defaultLocaleCode };
+  findLocaleByCode(code) {
+    return this.locales.find((locale) => locale.code === code);
+  }
+  computeActiveLocaleCodes() {
+    return this.locales.filter((locale) => locale.code !== this.defaultLocale.code || this.includeDefaultLocaleRoute).map((locale) => locale.code);
   }
   extendPages(pages, rootDir) {
     this.localizedPaths = this.extractLocalizedPaths(pages, rootDir);
@@ -162,9 +165,6 @@ class PageManager {
     pages.forEach((page) => this.localizePage(page, additionalRoutes));
     pages.push(...additionalRoutes);
   }
-  calculateActiveLocaleCodes() {
-    return this.locales.filter((locale) => locale.code !== this.defaultLocale.code || this.includeDefaultLocaleRoute).map((locale) => locale.code);
-  }
   extractLocalizedPaths(pages, rootDir, parentPath = "") {
     const localizedPaths = {};
     pages.forEach((page) => {
@@ -350,18 +350,23 @@ const module = defineNuxtModule({
     fallbackLocale: void 0,
     localeCookie: "user-locale",
     routesLocaleLinks: {},
-    plural: `function (translation, count, _locale) {
-      const forms = translation.toString().split('|')
+    plural: (key, count, _locale, getTranslation) => {
+      const translation = getTranslation(key, {});
+      if (!translation) {
+        return null;
+      }
+      const forms = translation.toString().split("|");
       if (count === 0 && forms.length > 2) {
-        return forms[0].trim() // Case for "no apples"
+        return forms[0].trim();
       }
       if (count === 1 && forms.length > 1) {
-        return forms[1].trim() // Case for "one apple"
+        return forms[1].trim();
       }
-      return (forms.length > 2 ? forms[2].trim() : forms[forms.length - 1].trim()).replace('{count}', count.toString())
-    }`
+      return (forms.length > 2 ? forms[2].trim() : forms[forms.length - 1].trim()).replace("{count}", count.toString());
+    }
   },
   async setup(options, nuxt) {
+    const logger = useLogger("nuxt-i18n-micro");
     const resolver = createResolver(import.meta.url);
     const rootDirs = nuxt.options._layers.map((layer) => layer.config.rootDir).reverse();
     const localeManager = new LocaleManager(options, rootDirs);
@@ -464,10 +469,10 @@ const module = defineNuxtModule({
       const isProd = nuxt.options.dev === false;
       if (!isProd) {
         const translationPath = path.resolve(nuxt.options.rootDir, options.translationDir);
-        console.log("\u2139 add file watcher", translationPath);
+        logger.log("\u2139 add file watcher: " + translationPath);
         const watcherEvent = async (path2) => {
           watcher.close();
-          console.log("\u21BB update store item", path2);
+          logger.log("\u21BB update store item: " + path2);
           nuxt.callHook("restart");
         };
         const watcher = watch(translationPath, { depth: 1, persistent: true }).on("change", watcherEvent);

package/dist/runtime/components/i18n-t.vue

@@ -41,13 +41,14 @@ export default defineComponent({
       const options = {};
       if (props.plural !== void 0) {
         if (props.customPluralRule) {
-          return props.customPluralRule(
-            useNuxtApp().$t(props.keypath, { ...props.params, ...options }),
-            props.plural,
-            useNuxtApp().$getLocale()
-          );
+          return h(props.tag, { ...attrs, innerHTML: props.customPluralRule(
+            props.keypath,
+            Number.parseInt(props.plural.toString()),
+            useNuxtApp().$getLocale(),
+            useNuxtApp().$t
+          ) });
         } else {
-          return useNuxtApp().$tc(props.keypath, Number.parseInt(props.plural.toString()));
+          return h(props.tag, { ...attrs, innerHTML: useNuxtApp().$tc(props.keypath, Number.parseInt(props.plural.toString())) });
         }
       }
       const translation = (useNuxtApp().$t(props.keypath, { ...props.params, ...options }) ?? "").toString();

package/dist/runtime/components/i18n-t.vue.d.ts

@@ -1,73 +1,77 @@
+import type { VNode, PropType } from 'vue';
+import type { PluralFunc } from '../../types.js';
 declare const _default: import("vue").DefineComponent<import("vue").ExtractPropTypes<{
     keypath: {
-        type: StringConstructor;
+        type: PropType<string>;
         required: true;
     };
     plural: {
-        type: (StringConstructor | NumberConstructor)[];
+        type: PropType<number | string>;
     };
     tag: {
-        type: StringConstructor;
+        type: PropType<string>;
         default: string;
     };
     params: {
-        type: ObjectConstructor;
+        type: PropType<Record<string, string | number | boolean>>;
         default: () => {};
     };
     defaultValue: {
-        type: StringConstructor;
+        type: PropType<string>;
         default: string;
     };
     html: {
-        type: BooleanConstructor;
+        type: PropType<boolean>;
         default: boolean;
     };
     hideIfEmpty: {
-        type: BooleanConstructor;
+        type: PropType<boolean>;
         default: boolean;
     };
     customPluralRule: {
-        type: FunctionConstructor;
+        type: PropType<PluralFunc>;
         default: null;
     };
-}>, () => any, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
+}>, () => string | VNode<import("vue").RendererNode, import("vue").RendererElement, {
+    [key: string]: any;
+}>, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
     keypath: {
-        type: StringConstructor;
+        type: PropType<string>;
         required: true;
     };
     plural: {
-        type: (StringConstructor | NumberConstructor)[];
+        type: PropType<number | string>;
     };
     tag: {
-        type: StringConstructor;
+        type: PropType<string>;
         default: string;
     };
     params: {
-        type: ObjectConstructor;
+        type: PropType<Record<string, string | number | boolean>>;
         default: () => {};
     };
     defaultValue: {
-        type: StringConstructor;
+        type: PropType<string>;
         default: string;
     };
     html: {
-        type: BooleanConstructor;
+        type: PropType<boolean>;
         default: boolean;
     };
     hideIfEmpty: {
-        type: BooleanConstructor;
+        type: PropType<boolean>;
         default: boolean;
     };
     customPluralRule: {
-        type: FunctionConstructor;
+        type: PropType<PluralFunc>;
         default: null;
     };
 }>> & Readonly<{}>, {
     tag: string;
-    params: Record<string, any>;
+    params: Record<string, string | number | boolean>;
     defaultValue: string;
     html: boolean;
     hideIfEmpty: boolean;
-    customPluralRule: Function;
+    customPluralRule: PluralFunc;
 }, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
 export default _default;

package/dist/runtime/plugins/01.plugin.js

@@ -1,5 +1,5 @@
 import { useTranslationHelper } from "../translationHelper.js";
-import { defineNuxtPlugin, useRuntimeConfig } from "#app";
+import { defineNuxtPlugin, navigateTo, useRuntimeConfig } from "#app";
 import { useRoute, useRouter } from "#imports";
 const i18nHelper = useTranslationHelper();
 const isDev = process.env.NODE_ENV !== "production";
@@ -23,9 +23,16 @@ function switchLocale(fromLocale, toLocale, route, router, i18nConfig) {
     return Promise.reject(`Locale ${toLocale} is not available`);
   }
   const routeName = getRouteName(route, fromLocale);
+  const isHashMode = router.options?.hashMode;
   if (router.hasRoute(`localized-${routeName}-${toLocale}`)) {
     const newParams2 = { ...route.params };
     newParams2.locale = toLocale;
+    if (isHashMode) {
+      return navigateTo(
+        toLocale !== i18nConfig.defaultLocale ? `/${toLocale}/#/${toLocale}${route.fullPath.split("#")[1] || ""}` : `/#/${route.fullPath.split("#")[1] || ""}`,
+        { redirectCode: 200, external: true }
+      );
+    }
     return router.push({
       params: newParams2,
       name: `localized-${routeName}-${toLocale}`
@@ -37,6 +44,12 @@ function switchLocale(fromLocale, toLocale, route, router, i18nConfig) {
   if (toLocale !== i18nConfig.defaultLocale || i18nConfig.includeDefaultLocaleRoute) {
     newParams.locale = toLocale;
   }
+  if (isHashMode) {
+    return navigateTo(
+      toLocale !== i18nConfig.defaultLocale ? `/${toLocale}/#/${toLocale}${route.fullPath.split("#")[1] || ""}` : `/#/${route.fullPath.split("#")[1] || ""}`,
+      { redirectCode: 200, external: true }
+    );
+  }
   return router.push({ name: newRouteName, params: newParams });
 }
 function getLocalizedRoute(to, router, route, i18nConfig, locale) {
@@ -132,8 +145,8 @@ export default defineNuxtPlugin(async (nuxtApp) => {
       },
       t: getTranslation,
       tc: (key, count, defaultValue) => {
-        const translation = getTranslation(key, {}, defaultValue);
-        return plural(translation?.toString(), count, getCurrentLocale(useRoute(), i18nConfig));
+        const currentLocale = getCurrentLocale(useRoute(), i18nConfig);
+        return plural(key, count, currentLocale, getTranslation) ?? defaultValue ?? key;
       },
       tn: (value, options) => {
         const locale = getCurrentLocale(useRoute(), i18nConfig);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nuxt-i18n-micro",
-  "version": "1.15.4",
+  "version": "1.16.1",
   "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",