nuxt-typed-router 3.0.2 → 3.0.4

package/dist/module.json

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

package/dist/module.mjs

@@ -20,6 +20,7 @@ class ModuleOptionsStore {
     this.rootDir = "";
     this.i18n = false;
     this.i18nOptions = null;
+    this.i18nLocales = [];
   }
   updateOptions(options) {
     if (options.plugin != null)
@@ -32,10 +33,21 @@ class ModuleOptionsStore {
       this.rootDir = options.rootDir;
     if (options.i18n != null)
       this.i18n = options.i18n;
-    if (options.i18nOptions != null)
+    if (options.i18nOptions != null) {
       this.i18nOptions = options.i18nOptions;
-    if (options.experimentalPathCheck != null)
+      if (options.i18nOptions.locales) {
+        this.i18nLocales = options.i18nOptions.locales.map((l) => {
+          if (typeof l === "string") {
+            return l;
+          } else {
+            return l.code;
+          }
+        });
+      }
+    }
+    if (options.experimentalPathCheck != null) {
       this.experimentalPathCheck = options.experimentalPathCheck;
+    }
   }
   getResolvedStrictOptions() {
     let resolved;
@@ -223,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}}`;
@@ -243,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";
@@ -785,7 +797,7 @@ function createTypeUtilsRuntimeFile() {
 
 function createi18nRouterFile() {
   const { router } = moduleOptionStore.getResolvedStrictOptions();
-  const { i18nOptions, experimentalPathCheck } = moduleOptionStore;
+  const { i18nOptions, experimentalPathCheck, i18nLocales } = moduleOptionStore;
   return (
     /* typescript */
     `
@@ -798,7 +810,7 @@ function createi18nRouterFile() {
       `import type {TypedLocalePathParameter, RouteNameFromLocalePath} from './__paths';`
     )}
 
-  export type I18nLocales = ${i18nOptions?.locales?.length ? i18nOptions.locales.map((loc) => `"${loc}"`).join("|") : "string"};
+  export type I18nLocales = ${i18nLocales?.length ? i18nLocales.map((loc) => `"${loc}"`).join("|") : "string"};
 
   export interface TypedToLocalePath {
     <T extends RoutesNamesList, P extends string>(
@@ -1396,11 +1408,16 @@ function extractChunkMain(chunkName) {
 }
 
 function hasi18nSibling(source, route) {
-  const { i18n, i18nOptions } = moduleOptionStore;
+  const { i18n, i18nOptions, i18nLocales } = moduleOptionStore;
   if (i18n && i18nOptions?.strategy !== "no_prefix") {
     const separator = i18nOptions?.routesNameSeparator ?? "___";
     return source.some((rt) => {
-      return route.name?.match(new RegExp(`^(${rt.name})${separator}[a-zA-Z]+`, "g")) || rt.path !== "/" && route.path?.match(new RegExp(`/?[${i18nOptions?.locales?.join("|")}]${rt.path}`, "g"));
+      return route.name?.match(new RegExp(`^(${rt.name})${separator}[a-zA-Z]+`, "g")) || rt.path !== "/" && route.path?.match(
+        new RegExp(
+          `/?[${i18nLocales?.map((m) => m.replace(/[^a-zA-Z0-9_]/gm, "\\$&")).join("|")}]${rt.path}`,
+          "g"
+        )
+      );
     });
   }
   return false;
@@ -1531,7 +1548,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.2",
+  "version": "3.0.4",
   "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"