nuxt-typed-router 3.2.2 → 3.2.4

package/README.md

@@ -50,6 +50,11 @@
 
 Demo repo 🧪 : [nuxt-typed-router-demo](https://github.com/victorgarciaesgi/nuxt-typed-router-demo)
 
+## Cool video about it from LearnVue!
+
+[![Watch the video](https://img.youtube.com/vi/jiYoAiFb71Y/default.jpg)](https://www.youtube.com/watch?v=jiYoAiFb71Y&t)
+
+
 <br/>
 
 # Compatibility:

package/dist/module.json

@@ -5,5 +5,5 @@
     "nuxt": "^3.0.0",
     "bridge": false
   },
-  "version": "3.2.2"
+  "version": "3.2.4"
 }

package/dist/module.mjs

@@ -240,9 +240,9 @@ function createValidatePathTypes(pathElements, withLocale = false) {
 function createTypeValidatePathCondition(elements) {
   const typeName = `Validate${nanoid(7)}`;
   const params = /* @__PURE__ */ new Map();
-  const routeName = elements.flat()[0].routeName;
+  const routeName = elements.flat()[0]?.routeName ?? "index";
   elements.flat().every((elem) => elem.type === "name");
-  const isLocale = elements.flat()[0].isLocale;
+  const isLocale = elements.flat()[0]?.isLocale ?? false;
   const condition = `type ${typeName}<T> = T extends \`/${elements.map((elementArray, index) => {
     return elementArray.map((elem) => {
       const isLast = index === elements.flat().length - 1;
@@ -300,7 +300,6 @@ function createRoutesTypesFile({
     /* typescript */
     `
     ${createRoutesNamesListExport(routesList)}
-    export type WithoutBracket<T extends string> = T extends \`:\${string}\` ? never : T;
 
     ${createRoutesParamsRecordExport(routesParams)}
     
@@ -641,8 +640,6 @@ function createIndexFile() {
       RoutesNamesList,
       RoutesNamesListRecord,
       RoutesParamsRecord,
-      RoutePath,
-      RoutePathByName
     } from './__routes';
     export { useRoute } from './__useTypedRoute';
     export { useRouter } from './__useTypedRouter';
@@ -660,7 +657,7 @@ function createIndexFile() {
     ${returnIfTrue(
       i18n,
       `export {useLocalePath, useLocaleRoute} from './__i18n-router';
-      export type {TypedToLocalePath, TypedLocaleRoute} from './__i18n-router';`
+      export type {TypedToLocalePath, TypedLocaleRoute, I18nLocales} from './__i18n-router';`
     )}
 
     
@@ -888,7 +885,7 @@ function createi18nRouterFile() {
   );
 }
 
-const routeParamExtractRegxp = /(:(\w+)(\(.*[^(]\)[*+]?)?(\?)?)+/g;
+const routeParamExtractRegxp = /(:(\w+)(\(\.[^(]\)[*+]?)?(\?)?)+/g;
 function extractParamsFromPathDecl(path) {
   let params = [];
   let matches;
@@ -1032,7 +1029,7 @@ function createPathsFiles({ routesPaths }) {
   });
   const pathElements = filteredRoutesPaths.filter((f) => f.path && f.path !== "/").map((route) => {
     return route.path.split("/").filter((f) => f.length).map((m) => destructurePath(m, route));
-  });
+  }).filter((f) => f.length);
   const validatePathTypes = createValidatePathTypes(pathElements);
   const validateLocalePathTypes = createValidatePathTypes(pathElements, true);
   return (
@@ -1309,7 +1306,6 @@ const watermarkTemplate = `
 `;
 
 let previousGeneratedRoutes = "";
-let firstRun = false;
 async function saveGeneratedFiles({ outputData }) {
   const { i18n } = moduleOptionStore;
   const filesMap = [
@@ -1377,15 +1373,6 @@ async function saveGeneratedFiles({ outputData }) {
   if (previousGeneratedRoutes !== outputData.routesList.join(",")) {
     previousGeneratedRoutes = outputData.routesList.join(",");
     console.log(logSymbols.success, `Router autocompletions generated \u{1F6A6}`);
-    if (!firstRun) {
-      firstRun = true;
-      console.log(
-        logSymbols.warning,
-        chalk.yellow(
-          `Route path autocomplete is still experimental. You can disable it with the "nuxtTypedRouter.pathCheck: false" option`
-        )
-      );
-    }
   }
 }
 
@@ -1400,7 +1387,7 @@ function is18Sibling(source, route) {
   const { i18n, i18nOptions, i18nLocales } = moduleOptionStore;
   if (i18n && i18nOptions && i18nOptions?.strategy !== "no_prefix") {
     const i18LocalesRecognizer = i18nLocales?.map((m) => m.replace(specialCharacterRegxp, "\\$&")).join("|");
-    return !!route.path?.match(new RegExp(`/?(${i18LocalesRecognizer})(/.+)?`, "g"));
+    return !!route.path?.match(new RegExp(`^/?(${i18LocalesRecognizer})(/.*)?$`, "g"));
   }
   return false;
 }
@@ -1445,7 +1432,7 @@ function createKeyedName(route, parent) {
   if (parent) {
     return camelCase(parentPath || "index");
   } else {
-    return camelCase(route.path.split("/").join("-") || "index");
+    return camelCase(route.path.split("/").join("-")) || "index";
   }
 }
 function createNameKeyFromFullName(route, level, parentName) {
@@ -1470,12 +1457,14 @@ function walkThoughRoutes({
 }) {
   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,
-    isLocale: isLocaleRoute
-  });
+  const newPath = `${parent?.path ?? ""}${route.path.startsWith("/") || parent?.path === "/" ? route.path : `/${route.path}`}`;
+  if (parent?.path !== "/") {
+    output.routesPaths.push({
+      name: route.name,
+      path: newPath,
+      isLocale: isLocaleRoute
+    });
+  }
   if (route.children?.length) {
     let childrenChunks = route.children;
     let nameKey = createKeyedName(route, parent);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nuxt-typed-router",
-  "version": "3.2.2",
+  "version": "3.2.4",
   "description": "Provide autocompletion for routes paths, names and params in Nuxt apps",
   "type": "module",
   "main": "./dist/module.cjs",
@@ -28,7 +28,8 @@
     "test": "pnpm run dev:prepare && pnpm run test:types && pnpm run test:fixtures",
     "lint": "eslint --ext .ts --ext .vue .",
     "docs:dev": "cd docs && pnpm run dev",
-    "docs:build": "npm run dev:prepare && cd docs && nuxi generate",
+    "docs:prepare": "nuxt-module-build --stub && nuxi prepare playground",
+    "docs:build": "npm run docs:prepare && cd docs && nuxi generate",
     "typecheck": "tsc --noEmit",
     "release": "bumpp && npm publish && git push --follow-tags"
   },
@@ -59,8 +60,8 @@
     "url": "https://github.com/victorgarciaesgi/nuxt-typed-router/issues"
   },
   "dependencies": {
-    "@nuxt/kit": "^3.4.3",
-    "chalk": "^5.2.0",
+    "@nuxt/kit": "^3.6.1",
+    "chalk": "^5.3.0",
     "defu": "^6.1.2",
     "lodash-es": "^4.17.21",
     "log-symbols": "^5.1.0",
@@ -70,33 +71,33 @@
     "prettier": "2.8.8"
   },
   "devDependencies": {
-    "@nuxt/devtools": "^0.4.6",
+    "@nuxt/devtools": "^0.5.5",
     "@nuxt/module-builder": "^0.3.1",
-    "@nuxt/test-utils": "^3.4.3",
-    "@nuxt/types": "^2.16.3",
+    "@nuxt/test-utils": "^3.6.1",
+    "@nuxt/types": "^2.17.0",
     "@nuxtjs/eslint-config-typescript": "^12.0.0",
     "@nuxtjs/i18n": "8.0.0-beta.10",
-    "@nuxtjs/web-vitals": "^0.2.5",
+    "@nuxtjs/web-vitals": "^0.2.6",
     "@types/lodash-es": "^4.17.7",
-    "@types/node": "^20.1.2",
-    "@types/prettier": "^2.7.2",
-    "@typescript-eslint/eslint-plugin": "^5.59.5",
-    "@typescript-eslint/parser": "^5.59.5",
-    "@vue/test-utils": "^2.3.2",
+    "@types/node": "^20.3.3",
+    "@types/prettier": "^2.7.3",
+    "@typescript-eslint/eslint-plugin": "^5.61.0",
+    "@typescript-eslint/parser": "^5.61.0",
+    "@vue/test-utils": "^2.4.0",
     "bumpp": "9.1.0",
-    "changelogithub": "0.12.9",
+    "changelogithub": "0.12.11",
     "cross-env": "^7.0.3",
-    "eslint": "8.40.0",
+    "eslint": "8.41.0",
     "eslint-config-prettier": "^8.8.0",
-    "eslint-plugin-vue": "^9.12.0",
-    "nuxt": "3.4.3",
+    "eslint-plugin-vue": "^9.15.1",
+    "nuxt": "3.5.1",
     "nuxt-seo-kit": "1.3.8",
-    "playwright": "1.33.0",
+    "playwright": "1.34.3",
     "tsd": "^0.28.1",
-    "typescript": "^5.0.4",
-    "vitest": "^0.31.0",
-    "vue-eslint-parser": "^9.2.1",
-    "vue-router": "^4.1.6",
-    "vue-tsc": "^1.6.4"
+    "typescript": "^5.1.6",
+    "vitest": "^0.31.4",
+    "vue-eslint-parser": "^9.3.1",
+    "vue-router": "^4.2.2",
+    "vue-tsc": "^1.8.4"
   }
 }