nuxt-typed-router 3.0.4 → 3.0.5

package/dist/module.json

@@ -5,5 +5,5 @@
     "nuxt": "^3.0.0",
     "bridge": false
   },
-  "version": "3.0.4"
+  "version": "3.0.5"
 }

package/dist/module.mjs

@@ -290,25 +290,19 @@ function createRoutesTypesFile({
   routesParams,
   routesPaths
 }) {
-  const filteredRoutesList = routesList.filter(
-    (routeName, index) => routesList.indexOf(routeName) === index
-  );
-  const filteredRoutesParams = routesParams.filter(
-    (route, index) => routesParams.findIndex((r) => route.name === r.name) === index
-  );
   return (
     /* typescript */
     `
-    ${createRoutesNamesListExport(filteredRoutesList)}
+    ${createRoutesNamesListExport(routesList)}
     export type WithoutBracket<T extends string> = T extends \`:\${string}\` ? never : T;
 
-    ${createRoutesParamsRecordExport(filteredRoutesParams)}
+    ${createRoutesParamsRecordExport(routesParams)}
     
-    ${createRoutesParamsRecordResolvedExport(filteredRoutesParams)}
+    ${createRoutesParamsRecordResolvedExport(routesParams)}
 
-    ${createRoutesNamedLocationsExport(filteredRoutesParams)}
+    ${createRoutesNamedLocationsExport(routesParams)}
 
-    ${createRoutesNamedLocationsResolvedExport(filteredRoutesParams)}
+    ${createRoutesNamedLocationsResolvedExport(routesParams)}
 
     export type RoutesNamesListRecord = ${routesDeclTemplate};
 
@@ -949,9 +943,7 @@ function extractPathElements(partOfPath, route) {
 function createPathsFiles({ routesPaths }) {
   const { i18n, i18nOptions } = moduleOptionStore;
   const hasPrefixStrategy = i18n && i18nOptions?.strategy !== "no_prefix";
-  const filteredRoutesPaths = routesPaths.filter(
-    (route, index) => routesPaths.findIndex((r) => route.name === r.name) === index && !routesPaths.find((r) => `${route.path}/` === r.path)
-  ).sort((a, b) => {
+  const filteredRoutesPaths = routesPaths.filter((route) => !routesPaths.find((r) => `${route.path}/` === r.path)).sort((a, b) => {
     const pathCountA = a.path.split("/");
     const pathCountB = b.path.split("/");
     pathCountA.splice(0, 1);
@@ -1392,29 +1384,28 @@ async function saveGeneratedFiles({ outputData }) {
 
 function extractUnMatchingSiblings(mainRoute, siblingRoutes) {
   return siblingRoutes?.filter((s) => {
-    const chunkName = extractChunkMain(mainRoute.file);
-    if (chunkName) {
-      const siblingChunkName = extractChunkMain(s.file);
-      if (!siblingChunkName)
-        return false;
-      return chunkName !== siblingChunkName;
-    }
-    return false;
+    return s.name !== mainRoute.name;
   });
 }
-function extractChunkMain(chunkName) {
-  let chunkArray = chunkName?.split("/");
-  return chunkArray?.join("/");
-}
 
-function hasi18nSibling(source, route) {
+const specialCharacterRegxp = /([^a-zA-Z0-9_])/gm;
+function is18Sibling(source, route) {
   const { i18n, i18nOptions, i18nLocales } = moduleOptionStore;
   if (i18n && 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})${separator}[a-zA-Z]+`, "g")) || rt.path !== "/" && route.path?.match(
+      return route.name?.match(
         new RegExp(
-          `/?[${i18nLocales?.map((m) => m.replace(/[^a-zA-Z0-9_]/gm, "\\$&")).join("|")}]${rt.path}`,
+          `^(${rt.name?.replace(
+            specialCharacterRegxp,
+            "\\$&"
+          )})${separator}(${i18LocalesRecognizer})`,
+          "g"
+        )
+      ) || route.path?.match(
+        new RegExp(
+          `/?(${i18LocalesRecognizer})${rt.path.replace(specialCharacterRegxp, "\\$&")}${rt.path === "/" ? "?" : ""}`,
           "g"
         )
       );
@@ -1423,12 +1414,13 @@ function hasi18nSibling(source, route) {
   return false;
 }
 function modifyRoutePrefixDefaultIfI18n(route) {
-  const { i18n, i18nOptions } = moduleOptionStore;
+  const { i18n, i18nOptions, i18nLocales } = moduleOptionStore;
   if (i18n && route.name) {
     const separator = i18nOptions?.routesNameSeparator ?? "___";
+    const i18LocalesRecognizer = i18nLocales?.map((m) => m.replace(specialCharacterRegxp, "\\$&")).join("|");
     if (i18nOptions?.strategy === "prefix_and_default") {
       const routeDefaultRegXp = new RegExp(
-        `([a-zA-Z-]+)${separator}[a-zA-Z]+${separator}default`,
+        `([a-zA-Z-]+)${separator}(${i18LocalesRecognizer})${separator}default`,
         "g"
       );
       const match = routeDefaultRegXp.exec(route.name);
@@ -1437,7 +1429,7 @@ function modifyRoutePrefixDefaultIfI18n(route) {
         route.name = routeName;
       }
     } else if (i18nOptions?.strategy === "prefix_except_default") {
-      const defaultLocale = i18nOptions.defaultLocale;
+      let defaultLocale = i18nLocales.find((f) => f === i18nOptions.defaultLocale) ? i18nOptions.defaultLocale?.replace(specialCharacterRegxp, "\\$&") : "";
       const routeDefaultNameRegXp = new RegExp(`^([a-zA-Z-]+)${separator}${defaultLocale}`, "g");
       const match = routeDefaultNameRegXp.exec(route.name);
       if (match) {
@@ -1479,7 +1471,7 @@ function walkThoughRoutes({
 }) {
   modifyRoutePrefixDefaultIfI18n(route);
   const newPath = `${parent?.path ?? ""}${route.path.startsWith("/") ? route.path : `/${route.path}`}`;
-  const isLocaleRoute = isLocale || hasi18nSibling(output.routesPaths, route);
+  const isLocaleRoute = isLocale || is18Sibling(output.routesPaths, route);
   output.routesPaths.push({
     name: route.name,
     path: newPath,

package/package.json

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