npm - nuxt-i18n-micro - Versions diffs - 1.100.0 → 1.101.0 - Mend

nuxt-i18n-micro 1.100.0 → 1.101.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (13) hide show

package/dist/client/200.html +2 -2
package/dist/client/404.html +2 -2
package/dist/client/_nuxt/builds/latest.json +1 -1
package/dist/client/_nuxt/builds/meta/3c2f5e13-457a-416f-af4d-c74141ba3650.json +1 -0
package/dist/client/index.html +2 -2
package/dist/module.json +1 -1
package/dist/module.mjs +102 -75
package/dist/runtime/composables/useLocaleHead.js +2 -1
package/dist/runtime/plugins/06.redirect.js +3 -6
package/dist/runtime/utils/route-utils.d.ts +22 -0
package/dist/runtime/utils/route-utils.js +19 -0
package/package.json +3 -3
package/dist/client/_nuxt/builds/meta/23d9342b-133b-4d2e-909f-71dd66a693ec.json +0 -1

package/dist/client/200.html CHANGED Viewed

@@ -8,5 +8,5 @@
 <link rel="prefetch" as="script" crossorigin href="/__NUXT_DEVTOOLS_I18N_BASE__/_nuxt/T7szCJDf.js">
 <link rel="prefetch" as="style" crossorigin href="/__NUXT_DEVTOOLS_I18N_BASE__/_nuxt/error-500.DGwSTbEi.css">
 <link rel="prefetch" as="script" crossorigin href="/__NUXT_DEVTOOLS_I18N_BASE__/_nuxt/DTIY11lm.js">
-<script type="module" src="/__NUXT_DEVTOOLS_I18N_BASE__/_nuxt/s7GTWWQo.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__">[{"prerenderedAt":1,"serverRendered":2},1759906445724,false]</script>
-<script>window.__NUXT__={};window.__NUXT__.config={public:{},app:{baseURL:"/__NUXT_DEVTOOLS_I18N_BASE__/",buildId:"23d9342b-133b-4d2e-909f-71dd66a693ec",buildAssetsDir:"/_nuxt/",cdnURL:""}}</script></body></html>
+<script type="module" src="/__NUXT_DEVTOOLS_I18N_BASE__/_nuxt/s7GTWWQo.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__">[{"prerenderedAt":1,"serverRendered":2},1759936060690,false]</script>
+<script>window.__NUXT__={};window.__NUXT__.config={public:{},app:{baseURL:"/__NUXT_DEVTOOLS_I18N_BASE__/",buildId:"3c2f5e13-457a-416f-af4d-c74141ba3650",buildAssetsDir:"/_nuxt/",cdnURL:""}}</script></body></html>

package/dist/client/404.html CHANGED Viewed

@@ -8,5 +8,5 @@
 <link rel="prefetch" as="script" crossorigin href="/__NUXT_DEVTOOLS_I18N_BASE__/_nuxt/T7szCJDf.js">
 <link rel="prefetch" as="style" crossorigin href="/__NUXT_DEVTOOLS_I18N_BASE__/_nuxt/error-500.DGwSTbEi.css">
 <link rel="prefetch" as="script" crossorigin href="/__NUXT_DEVTOOLS_I18N_BASE__/_nuxt/DTIY11lm.js">
-<script type="module" src="/__NUXT_DEVTOOLS_I18N_BASE__/_nuxt/s7GTWWQo.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__">[{"prerenderedAt":1,"serverRendered":2},1759906445725,false]</script>
-<script>window.__NUXT__={};window.__NUXT__.config={public:{},app:{baseURL:"/__NUXT_DEVTOOLS_I18N_BASE__/",buildId:"23d9342b-133b-4d2e-909f-71dd66a693ec",buildAssetsDir:"/_nuxt/",cdnURL:""}}</script></body></html>
+<script type="module" src="/__NUXT_DEVTOOLS_I18N_BASE__/_nuxt/s7GTWWQo.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__">[{"prerenderedAt":1,"serverRendered":2},1759936060690,false]</script>
+<script>window.__NUXT__={};window.__NUXT__.config={public:{},app:{baseURL:"/__NUXT_DEVTOOLS_I18N_BASE__/",buildId:"3c2f5e13-457a-416f-af4d-c74141ba3650",buildAssetsDir:"/_nuxt/",cdnURL:""}}</script></body></html>

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

	@@ -1 +1 @@
1	- {"id":"~~23d9342b~~-~~133b~~-~~4d2e~~-~~909f~~-~~71dd66a693ec~~","timestamp":~~1759906439920~~}
1	+ {"id":"3c2f5e13-457a-416f-af4d-c74141ba3650","timestamp":1759936052722}

package/dist/client/_nuxt/builds/meta/3c2f5e13-457a-416f-af4d-c74141ba3650.json ADDED Viewed

	@@ -0,0 +1 @@
1	+ {"id":"3c2f5e13-457a-416f-af4d-c74141ba3650","timestamp":1759936052722,"matcher":{"static":{},"wildcard":{},"dynamic":{}},"prerendered":[]}

package/dist/client/index.html CHANGED Viewed

@@ -8,5 +8,5 @@
 <link rel="prefetch" as="script" crossorigin href="/__NUXT_DEVTOOLS_I18N_BASE__/_nuxt/T7szCJDf.js">
 <link rel="prefetch" as="style" crossorigin href="/__NUXT_DEVTOOLS_I18N_BASE__/_nuxt/error-500.DGwSTbEi.css">
 <link rel="prefetch" as="script" crossorigin href="/__NUXT_DEVTOOLS_I18N_BASE__/_nuxt/DTIY11lm.js">
-<script type="module" src="/__NUXT_DEVTOOLS_I18N_BASE__/_nuxt/s7GTWWQo.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__">[{"prerenderedAt":1,"serverRendered":2},1759906445725,false]</script>
-<script>window.__NUXT__={};window.__NUXT__.config={public:{},app:{baseURL:"/__NUXT_DEVTOOLS_I18N_BASE__/",buildId:"23d9342b-133b-4d2e-909f-71dd66a693ec",buildAssetsDir:"/_nuxt/",cdnURL:""}}</script></body></html>
+<script type="module" src="/__NUXT_DEVTOOLS_I18N_BASE__/_nuxt/s7GTWWQo.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__">[{"prerenderedAt":1,"serverRendered":2},1759936060691,false]</script>
+<script>window.__NUXT__={};window.__NUXT__.config={public:{},app:{baseURL:"/__NUXT_DEVTOOLS_I18N_BASE__/",buildId:"3c2f5e13-457a-416f-af4d-c74141ba3650",buildAssetsDir:"/_nuxt/",cdnURL:""}}</script></body></html>

package/dist/module.json CHANGED Viewed

@@ -1,7 +1,7 @@
 {
   "name": "nuxt-i18n-micro",
   "configKey": "i18n",
-  "version": "1.100.0",
+  "version": "1.101.0",
   "builder": {
     "@nuxt/module-builder": "1.0.2",
     "unbuild": "3.6.1"

package/dist/module.mjs CHANGED Viewed

@@ -110,92 +110,119 @@ function setupDevToolsUI(options, resolve2) {
   });
 }
-function extractDefineI18nRouteData(content, filePath) {
-  const defineMatch = content.match(/\$?\bdefineI18nRoute\s*\(\s*\{[\s\S]*?\}\s*\)/);
-  if (!defineMatch) {
-    return { locales: null, localeRoutes: null };
-  }
-  const defineContent = defineMatch[0];
-  let locales = null;
-  let localeRoutes = null;
-  let localesStr = "";
-  const localesStart = defineContent.indexOf("locales:");
-  if (localesStart !== -1) {
-    const afterLocales = defineContent.substring(localesStart + 8);
-    const trimmed = afterLocales.trim();
-    if (trimmed.startsWith("[")) {
-      let bracketCount = 0;
-      let i = 0;
-      for (; i < trimmed.length; i++) {
-        if (trimmed[i] === "[") bracketCount++;
-        if (trimmed[i] === "]") bracketCount--;
-        if (bracketCount === 0) break;
-      }
-      localesStr = trimmed.substring(0, i + 1);
-    } else if (trimmed.startsWith("{")) {
-      let braceCount = 0;
-      let i = 0;
-      for (; i < trimmed.length; i++) {
-        if (trimmed[i] === "{") braceCount++;
-        if (trimmed[i] === "}") braceCount--;
-        if (braceCount === 0) break;
+function extractScriptContent(content) {
+  const scriptMatch = content.match(/<script[^>]*>([\s\S]*?)<\/script>/);
+  return scriptMatch ? scriptMatch[1] : null;
+}
+function removeTypeScriptTypes(scriptContent) {
+  return scriptContent.replace(/\((\w+):[^)]*\)/g, "($1)");
+}
+function findDefineI18nRouteConfig(scriptContent) {
+  try {
+    const defineStart = scriptContent.indexOf("$defineI18nRoute(");
+    if (defineStart === -1) {
+      return null;
+    }
+    const openParen = scriptContent.indexOf("(", defineStart);
+    if (openParen === -1) {
+      return null;
+    }
+    let braceCount = 0;
+    let parenCount = 1;
+    let i = openParen + 1;
+    for (; i < scriptContent.length; i++) {
+      if (scriptContent[i] === "{") braceCount++;
+      if (scriptContent[i] === "}") braceCount--;
+      if (scriptContent[i] === "(") parenCount++;
+      if (scriptContent[i] === ")") {
+        parenCount--;
+        if (parenCount === 0 && braceCount === 0) break;
       }
-      localesStr = trimmed.substring(0, i + 1);
     }
-  }
-  if (localesStr) {
+    if (i >= scriptContent.length) {
+      return null;
+    }
+    const configStr = scriptContent.substring(openParen + 1, i);
     try {
-      const localesStrTrimmed = localesStr.trim();
-      if (localesStrTrimmed.startsWith("[") && localesStrTrimmed.endsWith("]")) {
-        const arrayMatch = localesStrTrimmed.match(/\[(.*?)\]/s);
-        if (arrayMatch && arrayMatch[1]) {
-          locales = arrayMatch[1].split(",").map((el) => el.trim().replace(/['"]/g, "")).filter((el) => el.length > 0);
+      const cleanConfigStr = removeTypeScriptTypes(configStr);
+      try {
+        const configObject = Function('"use strict";return (' + cleanConfigStr + ")")();
+        try {
+          const serialized = JSON.stringify(configObject);
+          return JSON.parse(serialized);
+        } catch {
+          return configObject;
         }
-      }
-      if (localesStrTrimmed.startsWith("{") && localesStrTrimmed.endsWith("}")) {
-        const topLevelKeyMatches = localesStrTrimmed.match(/^\s*(\[?['"]?([\w-]+)['"]?\]?)\s*:\s*\{/gm);
-        if (topLevelKeyMatches) {
-          locales = topLevelKeyMatches.map((match) => {
-            const keyMatch = match.match(/^\s*\[?['"]?([\w-]+)['"]?\]?\s*:/);
-            return keyMatch ? keyMatch[1] : "";
-          }).filter((key) => key.length > 0);
-        } else {
-          const fallbackMatches = localesStrTrimmed.match(/(\[?['"]?([\w-]+)['"]?\]?)\s*:\s*\{/g);
-          if (fallbackMatches) {
-            locales = fallbackMatches.map((match) => {
-              const keyMatch = match.match(/(\[?['"]?([\w-]+)['"]?\]?)\s*:/);
-              return keyMatch ? keyMatch[1] : "";
-            }).filter((key) => key.length > 0);
-          }
+      } catch {
+        const scriptWithoutImports = scriptContent.split("\n").filter((line) => !line.trim().startsWith("import ")).join("\n");
+        const cleanScript = removeTypeScriptTypes(scriptWithoutImports);
+        const safeScript = `
+          // Mock $defineI18nRoute to prevent errors
+          const $defineI18nRoute = () => {}
+          const defineI18nRoute = () => {}
+          // Mock process.env for conditional logic
+          const process = { env: { NODE_ENV: 'development' } }
+          // Execute the script content without imports and TypeScript types
+          ${cleanScript}
+          // Return the config object
+          return (${cleanConfigStr})
+        `;
+        const configObject = Function('"use strict";' + safeScript)();
+        try {
+          const serialized = JSON.stringify(configObject);
+          return JSON.parse(serialized);
+        } catch {
+          return configObject;
         }
       }
-    } catch (error) {
-      console.error("Failed to parse locales:", error, "in file:", filePath);
+    } catch {
+      return null;
     }
+  } catch {
+    return null;
   }
-  const localeRoutesMatch = defineContent.match(/localeRoutes:\s*(\{[\s\S]*?\})/);
-  if (localeRoutesMatch && localeRoutesMatch[1]) {
-    try {
-      const parsedLocaleRoutes = Function('"use strict";return (' + localeRoutesMatch[1] + ")")();
-      if (typeof parsedLocaleRoutes === "object" && parsedLocaleRoutes !== null) {
-        if (validateDefineI18nRouteConfig(parsedLocaleRoutes)) {
-          localeRoutes = parsedLocaleRoutes;
-        }
-      } else {
-        console.error("localeRoutes found but it is not a valid object in file:", filePath);
+}
+function extractDefineI18nRouteData(content, _filePath) {
+  try {
+    const scriptContent = extractScriptContent(content);
+    if (!scriptContent) {
+      return { locales: null, localeRoutes: null };
+    }
+    const configObject = findDefineI18nRouteConfig(scriptContent);
+    if (!configObject) {
+      return { locales: null, localeRoutes: null };
+    }
+    let locales = null;
+    if (configObject.locales) {
+      if (Array.isArray(configObject.locales)) {
+        locales = configObject.locales.map((item) => {
+          if (typeof item === "string") {
+            return item;
+          } else if (typeof item === "object" && item !== null && item.code) {
+            return item.code;
+          }
+          return null;
+        }).filter((item) => item !== null);
+      } else if (typeof configObject.locales === "object") {
+        locales = Object.keys(configObject.locales).filter(
+          (key) => key !== "meta" && key !== "path" && key !== "title" && key !== "description"
+        );
       }
-    } catch (error) {
-      console.error("Failed to parse localeRoutes:", error, "in file:", filePath);
     }
+    let localeRoutes = null;
+    if (configObject.localeRoutes && typeof configObject.localeRoutes === "object") {
+      const isValid = Object.values(configObject.localeRoutes).every((value) => typeof value === "string");
+      if (isValid) {
+        localeRoutes = configObject.localeRoutes;
+      }
+    }
+    return { locales, localeRoutes };
+  } catch {
+    return { locales: null, localeRoutes: null };
   }
-  return { locales, localeRoutes };
-}
-function validateDefineI18nRouteConfig(obj) {
-  if (typeof obj !== "object") return false;
-  for (const routeKey in obj.localeRoutes) {
-    if (typeof obj.localeRoutes[routeKey] !== "string") return false;
-  }
-  return true;
 }
 const normalizePath = (routePath) => {
   if (!routePath) {

package/dist/runtime/composables/useLocaleHead.js CHANGED Viewed

@@ -1,6 +1,7 @@
 import { joinURL, parseURL, withQuery } from "ufo";
 import { isPrefixExceptDefaultStrategy, isNoPrefixStrategy } from "nuxt-i18n-micro-core";
 import { unref, useRoute, useRuntimeConfig, watch, onUnmounted, ref, useNuxtApp } from "#imports";
+import { findAllowedLocalesForRoute } from "../utils/route-utils.js";
 export const useLocaleHead = async ({ addDirAttribute = true, identifierAttribute = "id", addSeoAttributes = true, baseUrl = "/" } = {}) => {
   const metaObject = ref({
     htmlAttrs: {},
@@ -28,7 +29,7 @@ export const useLocaleHead = async ({ addDirAttribute = true, identifierAttribut
     const routeName = (route.name ?? "").toString();
     const currentLocale = unref($getLocales().find((loc) => loc.code === locale));
     if (!currentLocale) return;
-    const currentRouteLocales = routeLocales?.[routeName] || routeLocales?.[route.path];
+    const currentRouteLocales = findAllowedLocalesForRoute(route, routeLocales);
     const locales = currentRouteLocales ? allLocales.filter((loc) => currentRouteLocales.includes(loc.code)) : allLocales;
     const currentIso = currentLocale.iso || locale;
     const currentDir = currentLocale.dir || "auto";

package/dist/runtime/plugins/06.redirect.js CHANGED Viewed

@@ -1,5 +1,6 @@
 import { isNoPrefixStrategy, isPrefixStrategy } from "nuxt-i18n-micro-core";
 import { defineNuxtPlugin, useRuntimeConfig, useRoute, useRouter, navigateTo, createError } from "#imports";
+import { findAllowedLocalesForRoute } from "../utils/route-utils.js";
 export default defineNuxtPlugin(async (nuxtApp) => {
   const config = useRuntimeConfig();
   const i18nConfig = config.public.i18nConfig;
@@ -7,15 +8,11 @@ export default defineNuxtPlugin(async (nuxtApp) => {
   const route = useRoute();
   const router = useRouter();
   const checkRouteLocales = (to) => {
-    const routePath = to.path;
-    const routeName = to.name?.toString();
-    const normalizedRouteName = routeName?.replace("localized-", "");
-    const normalizedRoutePath = normalizedRouteName ? `/${normalizedRouteName}` : void 0;
-    const allowedLocales = routeName && routeLocales?.[routeName] || normalizedRouteName && routeLocales?.[normalizedRouteName] || normalizedRoutePath && routeLocales?.[normalizedRoutePath] || routeLocales?.[routePath];
+    const allowedLocales = findAllowedLocalesForRoute(to, routeLocales);
     if (!allowedLocales || allowedLocales.length === 0) {
       return;
     }
-    const pathSegments = routePath.split("/").filter(Boolean);
+    const pathSegments = to.path.split("/").filter(Boolean);
     const firstSegment = pathSegments[0];
     const allLocales = i18nConfig.locales?.map((l) => l.code) || [];
     if (firstSegment && allLocales.includes(firstSegment) && !allowedLocales.includes(firstSegment)) {

package/dist/runtime/utils/route-utils.d.ts ADDED Viewed

@@ -0,0 +1,22 @@
+import type { RouteLocationNormalizedLoaded } from 'vue-router';
+/**
+ * Extracts the base route pattern from a matched route path
+ * Converts Vue Router dynamic route patterns to file-based route patterns
+ *
+ * @param matchedPath - The matched route path from route.matched[0].path
+ * @returns The base route pattern (e.g., "/test/[param]")
+ *
+ * @example
+ * extractBaseRoutePattern('/:locale(es)/test/:param()') // Returns '/test/[param]'
+ * extractBaseRoutePattern('/:locale(en)/static') // Returns '/static'
+ * extractBaseRoutePattern('/:locale(fr)/about/:id') // Returns '/about/[id]'
+ */
+export declare function extractBaseRoutePattern(matchedPath: string): string;
+/**
+ * Finds allowed locales for a route using various matching strategies
+ *
+ * @param route - The route object
+ * @param routeLocales - The routeLocales configuration object
+ * @returns Array of allowed locale codes or null if no restrictions
+ */
+export declare function findAllowedLocalesForRoute(route: RouteLocationNormalizedLoaded, routeLocales: Record<string, string[]> | undefined): string[] | null;

package/dist/runtime/utils/route-utils.js ADDED Viewed

@@ -0,0 +1,19 @@
+export function extractBaseRoutePattern(matchedPath) {
+  return matchedPath.replace(/\/:locale\([^)]+\)/g, "").replace(/\/:([^()]+)\(\)/g, "/[$1]").replace(/\/:([^()]+)/g, "/[$1]");
+}
+export function findAllowedLocalesForRoute(route, routeLocales) {
+  const routePath = route.path;
+  const routeName = route.name?.toString();
+  const normalizedRouteName = routeName?.replace("localized-", "");
+  const normalizedRoutePath = normalizedRouteName ? `/${normalizedRouteName}` : void 0;
+  let allowedLocales = routeName && routeLocales?.[routeName] || normalizedRouteName && routeLocales?.[normalizedRouteName] || normalizedRoutePath && routeLocales?.[normalizedRoutePath] || routeLocales?.[routePath];
+  if (!allowedLocales && route.matched && route.matched.length > 0) {
+    const matchedRoute = route.matched[0];
+    const matchedPath = matchedRoute.path;
+    const baseRoutePattern = extractBaseRoutePattern(matchedPath);
+    if (routeLocales?.[baseRoutePattern]) {
+      allowedLocales = routeLocales[baseRoutePattern];
+    }
+  }
+  return allowedLocales || null;
+}

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "nuxt-i18n-micro",
-  "version": "1.100.0",
+  "version": "1.101.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",
@@ -62,8 +62,8 @@
     "sirv": "^2.0.4",
     "ufo": "^1.5.4",
     "nuxt-i18n-micro-core": "1.0.18",
-    "nuxt-i18n-micro-test-utils": "1.0.6",
-    "nuxt-i18n-micro-types": "1.0.9"
+    "nuxt-i18n-micro-types": "1.0.9",
+    "nuxt-i18n-micro-test-utils": "1.0.6"
   },
   "devDependencies": {
     "@nuxt/devtools": "^2.6.3",

package/dist/client/_nuxt/builds/meta/23d9342b-133b-4d2e-909f-71dd66a693ec.json DELETED Viewed

	@@ -1 +0,0 @@
1	- {"id":"23d9342b-133b-4d2e-909f-71dd66a693ec","timestamp":1759906439920,"matcher":{"static":{},"wildcard":{},"dynamic":{}},"prerendered":[]}