nuxt-typed-router 3.2.3 → 3.2.5

package/dist/module.json

@@ -5,5 +5,5 @@
     "nuxt": "^3.0.0",
     "bridge": false
   },
-  "version": "3.2.3"
+  "version": "3.2.5"
 }

package/dist/module.mjs

@@ -4,7 +4,6 @@ import logSymbols from 'log-symbols';
 import { defu } from 'defu';
 import { customAlphabet } from 'nanoid/non-secure';
 import { nanoid as nanoid$1 } from 'nanoid';
-import prettier from 'prettier';
 import fs, { existsSync } from 'fs';
 import { fileURLToPath } from 'url';
 import { dirname, resolve } from 'pathe';
@@ -240,9 +239,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;
@@ -885,7 +884,7 @@ function createi18nRouterFile() {
   );
 }
 
-const routeParamExtractRegxp = /(:(\w+)(\(.*[^(]\)[*+]?)?(\?)?)+/g;
+const routeParamExtractRegxp = /(:(\w+)(\(\.[^(]\)[*+]?)?(\?)?)+/g;
 function extractParamsFromPathDecl(path) {
   let params = [];
   let matches;
@@ -1029,7 +1028,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 (
@@ -1233,33 +1232,6 @@ async function handleAddPlugin() {
   });
 }
 
-const { resolveConfig, format } = prettier;
-const defaultPrettierOptions = {
-  printWidth: 100,
-  tabWidth: 2,
-  trailingComma: "es5",
-  singleQuote: true,
-  semi: true,
-  bracketSpacing: true,
-  htmlWhitespaceSensitivity: "strict"
-};
-async function formatOutputWithPrettier(template) {
-  try {
-    let prettierFoundOptions = await resolveConfig(process.cwd());
-    if (!prettierFoundOptions) {
-      prettierFoundOptions = defaultPrettierOptions;
-    }
-    const formatedTemplate = format(template, {
-      ...prettierFoundOptions,
-      parser: "typescript"
-    });
-    return formatedTemplate;
-  } catch (e) {
-    console.error(logSymbols.error, chalk.red("Error while formatting the output"), "\n" + e);
-    return Promise.reject(e);
-  }
-}
-
 dirname(fileURLToPath(import.meta.url));
 async function processPathAndWriteFile({
   content,
@@ -1271,15 +1243,14 @@ async function processPathAndWriteFile({
     const finalOutDir = outDir ?? `.nuxt/typed-router`;
     const processedOutDir = resolve(rootDir, finalOutDir);
     const outputFile = resolve(process.cwd(), `${processedOutDir}/${fileName}`);
-    const formatedContent = await formatOutputWithPrettier(content);
     if (fs.existsSync(outputFile)) {
-      await writeFile(outputFile, formatedContent);
+      await writeFile(outputFile, content);
     } else {
       let dirList = outputFile.split("/");
       dirList.pop();
       const dirPath = dirList.join("/");
       await mkdirp(dirPath);
-      await writeFile(outputFile, formatedContent);
+      await writeFile(outputFile, content);
     }
   } catch (e) {
     return Promise.reject(e);
@@ -1432,7 +1403,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) {
@@ -1457,12 +1428,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.3",
+  "version": "3.2.5",
   "description": "Provide autocompletion for routes paths, names and params in Nuxt apps",
   "type": "module",
   "main": "./dist/module.cjs",
@@ -60,44 +60,44 @@
     "url": "https://github.com/victorgarciaesgi/nuxt-typed-router/issues"
   },
   "dependencies": {
-    "@nuxt/kit": "^3.5.1",
-    "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",
     "mkdirp": "^3.0.1",
     "nanoid": "^4.0.2",
-    "pathe": "1.1.0",
-    "prettier": "2.8.8"
+    "pathe": "1.1.0"
   },
   "devDependencies": {
     "@nuxt/devtools": "^0.5.5",
     "@nuxt/module-builder": "^0.3.1",
-    "@nuxt/test-utils": "^3.5.1",
-    "@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.6",
     "@types/lodash-es": "^4.17.7",
-    "@types/node": "^20.2.3",
-    "@types/prettier": "^2.7.2",
-    "@typescript-eslint/eslint-plugin": "^5.59.7",
-    "@typescript-eslint/parser": "^5.59.7",
-    "@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.11",
     "cross-env": "^7.0.3",
     "eslint": "8.41.0",
     "eslint-config-prettier": "^8.8.0",
-    "eslint-plugin-vue": "^9.14.0",
+    "eslint-plugin-vue": "^9.15.1",
     "nuxt": "3.5.1",
     "nuxt-seo-kit": "1.3.8",
     "playwright": "1.34.3",
     "tsd": "^0.28.1",
-    "typescript": "^5.0.4",
-    "vitest": "^0.31.1",
-    "vue-eslint-parser": "^9.3.0",
-    "vue-router": "^4.2.1",
-    "vue-tsc": "^1.6.5"
+    "typescript": "^5.1.6",
+    "vitest": "^0.31.4",
+    "vue-eslint-parser": "^9.3.1",
+    "vue-router": "^4.2.2",
+    "vue-tsc": "^1.8.4",
+    "prettier": "2.8.8"
   }
 }