diff --git a/package.json b/package.json index 02a798e..5bf4d04 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "nuxt-typed-router", - "version": "3.4.0", + "version": "3.5.0-beta.0", "description": "Provide autocompletion for routes paths, names and params in Nuxt apps", "type": "module", "main": "./dist/module.cjs", @@ -60,7 +60,7 @@ "url": "https://github.com/victorgarciaesgi/nuxt-typed-router/issues" }, "peerDependencies": { - "prettier": "^2.8.5 || 3.x" + "prettier": "^2.5.x || 3.x" }, "dependencies": { "@nuxt/kit": "3.8.2", diff --git a/playground/src/pages/admin/[id]/[...languages].vue b/playground/src/pages/admin/[444]/[...languages].vue similarity index 100% rename from playground/src/pages/admin/[id]/[...languages].vue rename to playground/src/pages/admin/[444]/[...languages].vue diff --git a/playground/src/pages/admin/[id]/index.vue b/playground/src/pages/admin/[444]/index.vue similarity index 100% rename from playground/src/pages/admin/[id]/index.vue rename to playground/src/pages/admin/[444]/index.vue diff --git a/src/core/output/generators/blocks/routes/routes-paths.block.ts b/src/core/output/generators/blocks/routes/routes-paths.block.ts index c94fd53..4048f78 100644 --- a/src/core/output/generators/blocks/routes/routes-paths.block.ts +++ b/src/core/output/generators/blocks/routes/routes-paths.block.ts @@ -127,13 +127,13 @@ export function createTypeValidatePathCondition( const isLast = index === elements.flat().length - 1; if (elem.type === 'name' && isLast) { - const id = pascalCase(elem.content); + const id = `T${pascalCase(elem.content)}`; params.set(elem.id, id); return `${elem.content}\${infer ${id}}`; } else if (elem.type === 'name') { return elem.content; } else if (elem.type === 'param' || elem.type === 'optionalParam') { - const id = pascalCase(elem.content); + const id = `T${pascalCase(elem.content)}`; params.set(elem.id, id); return `\${infer ${id}}`; } else if (elem.type === 'catchAll') {