nuxt-typed-router 3.2.0 → 3.2.1-beta.0

package/dist/module.json

@@ -5,5 +5,5 @@
     "nuxt": "^3.0.0",
     "bridge": false
   },
-  "version": "3.2.0"
+  "version": "3.2.1-beta.0"
 }

package/dist/module.mjs

@@ -1399,24 +1399,8 @@ const specialCharacterRegxp = /([^a-zA-Z0-9_])/gm;
 function is18Sibling(source, route) {
   const { i18n, i18nOptions, i18nLocales } = moduleOptionStore;
   if (i18n && i18nOptions && i18nOptions?.strategy !== "no_prefix") {
-    const separator = i18nOptions?.routesNameSeparator ?? "___";
     const i18LocalesRecognizer = i18nLocales?.map((m) => m.replace(specialCharacterRegxp, "\\$&")).join("|");
-    return source.some((rt) => {
-      return route.name?.match(
-        new RegExp(
-          `^(${rt.name?.replace(
-            specialCharacterRegxp,
-            "\\$&"
-          )})${separator}(${i18LocalesRecognizer})`,
-          "g"
-        )
-      ) || route.path?.match(
-        new RegExp(
-          `/?(${i18LocalesRecognizer})${rt.path.replace(specialCharacterRegxp, "\\$&")}${rt.path === "/" ? "?" : ""}`,
-          "g"
-        )
-      );
-    });
+    return !!route.path?.match(new RegExp(`/?(${i18LocalesRecognizer})(/.+)?`, "g"));
   }
   return false;
 }
@@ -1434,6 +1418,10 @@ function modifyRoutePrefixDefaultIfI18n(route) {
       if (match) {
         const [_, routeName] = match;
         route.name = routeName;
+        return {
+          ...route,
+          name: routeName
+        };
       }
     } else if (i18nOptions?.strategy === "prefix_except_default") {
       let defaultLocale = i18nLocales.find((f) => f === i18nOptions.defaultLocale) ? i18nOptions.defaultLocale?.replace(specialCharacterRegxp, "\\$&") : "";
@@ -1441,10 +1429,14 @@ function modifyRoutePrefixDefaultIfI18n(route) {
       const match = routeDefaultNameRegXp.exec(route.name);
       if (match) {
         const [_, routeName] = match;
-        route.name = routeName;
+        return {
+          ...route,
+          name: routeName
+        };
       }
     }
   }
+  return route;
 }
 
 function createKeyedName(route, parent) {
@@ -1467,7 +1459,7 @@ function createNameKeyFromFullName(route, level, parentName) {
   return keyName;
 }
 function walkThoughRoutes({
-  route,
+  route: _route,
   level,
   siblings,
   parent,
@@ -1476,9 +1468,9 @@ function walkThoughRoutes({
   isLast,
   isLocale
 }) {
-  modifyRoutePrefixDefaultIfI18n(route);
-  const newPath = `${parent?.path ?? ""}${route.path.startsWith("/") ? route.path : `/${route.path}`}`;
+  const route = modifyRoutePrefixDefaultIfI18n(_route);
   const isLocaleRoute = isLocale || is18Sibling(output.routesPaths, route);
+  const newPath = `${parent?.path ?? ""}${route.path.startsWith("/") ? route.path : `/${route.path}`}`;
   output.routesPaths.push({
     name: route.name,
     path: newPath,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nuxt-typed-router",
-  "version": "3.2.0",
+  "version": "3.2.1-beta.0",
   "description": "Provide autocompletion for routes paths, names and params in Nuxt apps",
   "type": "module",
   "main": "./dist/module.cjs",