nuxt-typed-router 3.0.3 → 3.0.5

package/dist/module.json

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

package/dist/module.mjs

@@ -235,12 +235,12 @@ function createTypeValidatePathCondition(elements) {
   const typeName = `Validate${nanoid(7)}`;
   const params = /* @__PURE__ */ new Map();
   const routeName = elements.flat()[0].routeName;
-  const hasOnlyNames = elements.flat().every((elem) => elem.type === "name");
+  elements.flat().every((elem) => elem.type === "name");
   const isLocale = elements.flat()[0].isLocale;
   const condition = `type ${typeName}<T> = T extends \`/${elements.map((elementArray, index) => {
     return elementArray.map((elem) => {
       const isLast = index === elements.flat().length - 1;
-      if (elem.type === "name" && isLast && !hasOnlyNames) {
+      if (elem.type === "name" && isLast) {
         const id = nanoid(6);
         params.set(elem.id, id);
         return `${elem.content}\${infer ${id}}`;
@@ -255,7 +255,7 @@ function createTypeValidatePathCondition(elements) {
       }
     }).join("");
   }).join("/")}\`
-    ? ${hasOnlyNames ? `true :` : elements.flat().map((elem, index) => {
+    ? ${elements.flat().map((elem, index) => {
     let output = "";
     const isLast = index === elements.flat().length - 1;
     const isName = elem.type === "name";
@@ -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,38 +1384,43 @@ 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(new RegExp(`/?[${i18nLocales?.join("|")}]${rt.path}`, "g"));
+      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 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);
@@ -1432,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) {
@@ -1474,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,
@@ -1543,7 +1540,7 @@ function constructRouteMap(routesConfig) {
     });
     return output;
   } catch (e) {
-    throw new Error("Generation failed", e);
+    throw new Error(`Generation failed: ${e}`);
   }
 }
 function startGenerator({ output, routesConfig }) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nuxt-typed-router",
-  "version": "3.0.3",
+  "version": "3.0.5",
   "description": "Provide autocompletion for routes paths, names and params in Nuxt apps",
   "type": "module",
   "main": "./dist/module.cjs",
@@ -65,13 +65,13 @@
     "defu": "^6.1.2",
     "lodash-es": "^4.17.21",
     "log-symbols": "^5.1.0",
-    "mkdirp": "^2.1.3",
+    "mkdirp": "^2.1.5",
     "nanoid": "^4.0.1",
     "pathe": "1.1.0",
     "prettier": "2.8.4"
   },
   "devDependencies": {
-    "@nuxt/devtools": "^0.2.4",
+    "@nuxt/devtools": "^0.2.5",
     "@nuxt/module-builder": "^0.2.1",
     "@nuxt/test-utils": "^3.2.2",
     "@nuxt/types": "^2.16.0",
@@ -79,23 +79,22 @@
     "@nuxtjs/i18n": "8.0.0-beta.9",
     "@nuxtjs/web-vitals": "^0.2.2",
     "@types/lodash-es": "^4.17.6",
-    "@types/mkdirp": "^2.0.0",
-    "@types/node": "^18.14.0",
+    "@types/node": "^18.14.6",
     "@types/prettier": "^2.7.2",
-    "@typescript-eslint/eslint-plugin": "^5.53.0",
-    "@typescript-eslint/parser": "^5.53.0",
+    "@typescript-eslint/eslint-plugin": "^5.54.1",
+    "@typescript-eslint/parser": "^5.54.1",
     "@vue/test-utils": "^2.3.0",
     "bumpp": "9.0.0",
     "changelogithub": "0.12.7",
     "cross-env": "^7.0.3",
     "eslint": "8.35.0",
-    "eslint-config-prettier": "^8.6.0",
+    "eslint-config-prettier": "^8.7.0",
     "eslint-plugin-vue": "^9.9.0",
     "nuxt": "3.2.3",
-    "playwright": "1.31.1",
-    "tsd": "^0.25.0",
+    "playwright": "1.31.2",
+    "tsd": "^0.26.0",
     "typescript": "^4.9.5",
-    "vitest": "^0.29.1",
+    "vitest": "^0.29.2",
     "vue-eslint-parser": "^9.1.0",
     "vue-router": "^4.1.6",
     "vue-tsc": "^1.1.7"