nuxt-typed-router 3.3.2 → 3.3.3

package/dist/module.json

@@ -5,5 +5,5 @@
     "nuxt": "^3.0.0",
     "bridge": false
   },
-  "version": "3.3.2"
+  "version": "3.3.3"
 }

package/dist/module.mjs

@@ -12,27 +12,19 @@ import { mkdirp } from 'mkdirp';
 import { camelCase } from 'lodash-es';
 import { readFile } from 'fs/promises';
 
-var __defProp = Object.defineProperty;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __publicField = (obj, key, value) => {
-  __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
-  return value;
-};
 class ModuleOptionsStore {
-  constructor() {
-    __publicField(this, "plugin", false);
-    __publicField(this, "strict", false);
-    __publicField(this, "pathCheck", true);
-    __publicField(this, "autoImport", false);
-    __publicField(this, "rootDir", "");
-    __publicField(this, "buildDir", "");
-    __publicField(this, "srcDir", "");
-    __publicField(this, "pagesDir", "");
-    __publicField(this, "i18n", false);
-    __publicField(this, "i18nOptions", null);
-    __publicField(this, "i18nLocales", []);
-    __publicField(this, "experimentalIgnoreRoutes", []);
-  }
+  plugin = false;
+  strict = false;
+  pathCheck = true;
+  autoImport = false;
+  rootDir = "";
+  buildDir = "";
+  srcDir = "";
+  pagesDir = "";
+  i18n = false;
+  i18nOptions = null;
+  i18nLocales = [];
+  experimentalIgnoreRoutes = [];
   updateOptions(options) {
     if (options.plugin != null)
       this.plugin = options.plugin;
@@ -220,7 +212,7 @@ function createLocaleRoutePathSchema(routePaths) {
     ${routePaths.filter((f) => !!f.path && !f.isLocale).map((route) => `"${route.path}"`).join("|")}
   `;
 }
-function createValidatePathTypes(pathElements, withLocale = false) {
+function createValidatePathTypes(pathElements, routesList, withLocale = false) {
   let pathConditions = pathElements.map(createTypeValidatePathCondition).filter((f) => {
     if (withLocale) {
       return !f.isLocale;
@@ -243,14 +235,14 @@ function createValidatePathTypes(pathElements, withLocale = false) {
       : ${pathConditions.length ? `\`Error: \${${pathConditions.map((t) => `${t.typeName}<T>`).join("|")}}\`` : "never"}
       : never;
   
-  
+    // RouteNameFromPath, RouteNameFromLocalePath
     export type RouteNameFrom${returnIfTrue(
     withLocale,
     "Locale"
   )}Path<T extends string> = T extends string 
       ? T extends '/' 
         ? "index"
-         ${pathConditions.length ? `: ${pathConditions.map((t) => `${t.typeName}<T> extends true ? "${t.routeName}"`).join(": ")} : never` : ": never"} 
+         ${pathConditions.length ? `: ${pathConditions.filter((f) => routesList.includes(f.routeName)).map((t) => `${t.typeName}<T> extends true ? "${t.routeName}"`).join(": ")} : never` : ": never"} 
        : never; 
   
         `;
@@ -541,6 +533,7 @@ function createTypedRouterDefinitionFile() {
     import type {TypedRouter, TypedRoute, TypedRouteLocationRawFromName, TypedLocationAsRelativeRaw} from './__router';
     import { useRoute as _useRoute } from './__useTypedRoute';
     import { useRouter as _useRouter } from './__useTypedRouter';
+    import { useLink as _useLink } from './__useTypedLink';
     import { navigateTo as _navigateTo } from './__navigateTo';
     ${returnIfTrue(
       i18n,
@@ -560,6 +553,7 @@ function createTypedRouterDefinitionFile() {
       `
             const useRoute: typeof _useRoute;
             const useRouter: typeof _useRouter;
+            const useLink: typeof _useLink;
             const navigateTo: typeof _navigateTo;
             const definePageMeta: typeof _definePageMeta;
             
@@ -661,6 +655,7 @@ function createIndexFile() {
     } from './__routes';
     export { useRoute } from './__useTypedRoute';
     export { useRouter } from './__useTypedRouter';
+    export { useLink } from './__useTypedLink';
     export { navigateTo } from './__navigateTo';
     export { definePageMeta } from './__definePageMeta';
     export { helpers } from './__helpers';
@@ -688,7 +683,7 @@ function createPluginFile() {
     /* typescript */
     `
   
-  import { defineNuxtPlugin, useRouter, useRoute } from '#app';
+  import { defineNuxtPlugin, useRouter, useRoute } from '#imports';
   import {TypedRouter, TypedRoute, routesNames} from '@typed-router';
 
   export default defineNuxtPlugin(() => {
@@ -711,7 +706,7 @@ function createUseTypedRouteFile() {
   return (
     /* typescript */
     `
-  import { useRoute as defaultRoute } from '#app';
+  import { useRoute as defaultRoute } from '#imports';
   import type { RoutesNamesList } from './__routes';
   import type {TypedRoute, TypedRouteFromName} from './__router'
 
@@ -752,7 +747,7 @@ function createUseTypedRouterFile() {
     /* typescript */
     `
   
-  import { useRouter as defaultRouter } from '#app';
+  import { useRouter as defaultRouter } from '#imports';
   import type { TypedRouter } from './__router';
 
   /** 
@@ -774,13 +769,76 @@ function createUseTypedRouterFile() {
   );
 }
 
+function createUseTypedLinkFile() {
+  const strictOptions = moduleOptionStore.getResolvedStrictOptions();
+  const { pathCheck } = moduleOptionStore;
+  return (
+    /* typescript */
+    `
+  
+  import { useLink as defaultLink } from '#imports';
+  import type {MaybeRef} from 'vue';
+  import type { NavigateToOptions } from 'nuxt/dist/app/composables/router';
+  import type { NavigationFailure } from 'vue-router';
+  import type { TypedRouteLocationRawFromName, TypedRouteFromName, TypedRoute } from './__router';
+  import type { RoutesNamesList } from './__routes';
+  ${returnIfTrue(
+      pathCheck,
+      `import type {TypedPathParameter, RouteNameFromPath} from './__paths';`
+    )}
+
+
+  type LinkedRoute<T extends RoutesNamesList> = {
+    route: ComputedRef<TypedRouteFromName<T> & {
+        href: string;
+    }>;
+    href: ComputedRef<string>;
+    isActive: ComputedRef<boolean>;
+    isExactActive: ComputedRef<boolean>;
+    navigate: (e?: MouseEvent) => Promise<void | NavigationFailure>;
+};
+
+
+  interface UseLinkFunction {
+    <T extends RoutesNamesList, P extends string>(
+     props: { 
+      to: MaybeRef<TypedRouteLocationRawFromName<T, P>>,
+      replace?: MaybeRef<boolean>
+    }
+    ) : LinkedRoute<T>
+    ${returnIfTrue(
+      pathCheck && !strictOptions.router.strictToArgument,
+      `<T extends string>(
+       props: {
+        to: MaybeRef<TypedPathParameter<T>>,
+        replace?: MaybeRef<boolean>
+       }
+      ) : LinkedRoute<RouteNameFromPath<T>>`
+    )}
+  }
+
+  /** 
+   * Typed clone of \`useLink\`
+   * 
+   * @exemple
+   * 
+   * \`\`\`ts
+   * const router = useLink(props);
+   * \`\`\`
+   */
+  export const useLink: UseLinkFunction = defaultLink as any;
+
+  `
+  );
+}
+
 function createNavigateToFile() {
   const { router } = moduleOptionStore.getResolvedStrictOptions();
   const { pathCheck } = moduleOptionStore;
   return (
     /* typescript */
     `
-    import { navigateTo as defaultNavigateTo } from '#app';
+    import { navigateTo as defaultNavigateTo } from '#imports';
     import type { NavigateToOptions } from 'nuxt/dist/app/composables/router';
     import type { NavigationFailure } from 'vue-router';
     import type { TypedRouteLocationRawFromName, TypedRouteFromName, TypedRoute } from './__router';
@@ -818,7 +876,8 @@ function createNavigateToFile() {
       ) : Promise<void | NavigationFailure | TypedRouteFromName<RouteNameFromPath<T>>>`
     )}
   }
-    export const navigateTo: NavigateToFunction = defaultNavigateTo as any;
+  
+  export const navigateTo: NavigateToFunction = defaultNavigateTo as any;
 
   `
   );
@@ -1000,7 +1059,7 @@ function extractPathElements(partOfPath, route) {
   return { pathElements, strippedPath };
 }
 
-function createPathsFiles({ routesPaths }) {
+function createPathsFiles({ routesPaths, routesList }) {
   const { i18n, i18nOptions } = moduleOptionStore;
   const hasPrefixStrategy = i18n && i18nOptions?.strategy !== "no_prefix";
   const filteredRoutesPaths = routesPaths.filter((route) => !routesPaths.find((r) => `${route.path}/` === r.path)).map((route) => ({
@@ -1048,8 +1107,8 @@ 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);
+  const validatePathTypes = createValidatePathTypes(pathElements, routesList);
+  const validateLocalePathTypes = createValidatePathTypes(pathElements, routesList, true);
   return (
     /* typescript */
     `
@@ -1307,6 +1366,10 @@ async function saveGeneratedFiles({ outputData }) {
       fileName: "__useTypedRoute.ts",
       content: createUseTypedRouteFile()
     },
+    {
+      fileName: "__useTypedLink.ts",
+      content: createUseTypedLinkFile()
+    },
     {
       fileName: "__paths.d.ts",
       content: createPathsFiles(outputData)
@@ -1451,7 +1514,7 @@ function walkThoughRoutes({
     return;
   }
   const newPath = `${parent?.path ?? ""}${route.path.startsWith("/") || parent?.path === "/" ? route.path : `/${route.path}`}`;
-  if (parent?.path !== "/") {
+  if (parent?.path !== "/" || newPath !== parent?.path) {
     output.routesPaths.push({
       name: route.name,
       path: newPath,

package/dist/types.d.mts

@@ -1,5 +1,6 @@
 
-import { ModuleOptions } from './module'
+import type { ModuleOptions } from './module'
+
 
 declare module '@nuxt/schema' {
   interface NuxtConfig { ['nuxtTypedRouter']?: Partial<ModuleOptions> }
@@ -12,4 +13,4 @@ declare module 'nuxt/schema' {
 }
 
 
-export { ModuleOptions, default } from './module'
+export type { ModuleOptions, default } from './module'

package/dist/types.d.ts

@@ -1,5 +1,6 @@
 
-import { ModuleOptions } from './module'
+import type { ModuleOptions } from './module'
+
 
 declare module '@nuxt/schema' {
   interface NuxtConfig { ['nuxtTypedRouter']?: Partial<ModuleOptions> }
@@ -12,4 +13,4 @@ declare module 'nuxt/schema' {
 }
 
 
-export { ModuleOptions, default } from './module'
+export type { ModuleOptions, default } from './module'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nuxt-typed-router",
-  "version": "3.3.2",
+  "version": "3.3.3",
   "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.8.0",
-    "chalk": "^5.3.0",
-    "defu": "^6.1.2",
-    "lodash-es": "^4.17.21",
-    "log-symbols": "^5.1.0",
-    "mkdirp": "^3.0.1",
-    "nanoid": "^5.0.2",
+    "@nuxt/kit": "3.8.1",
+    "chalk": "5.3.0",
+    "defu": "6.1.3",
+    "lodash-es": "4.17.21",
+    "log-symbols": "5.1.0",
+    "mkdirp": "3.0.1",
+    "nanoid": "5.0.3",
     "pathe": "1.1.1"
   },
   "devDependencies": {
-    "@nuxt/devtools": "^1.0.0",
-    "@nuxt/module-builder": "^0.5.2",
-    "@nuxt/test-utils": "^3.8.0",
-    "@nuxt/types": "^2.17.1",
-    "@nuxtjs/eslint-config-typescript": "^12.1.0",
+    "@nuxt/devtools": "1.0.0",
+    "@nuxt/module-builder": "0.5.4",
+    "@nuxt/test-utils": "3.8.1",
+    "@nuxt/types": "2.17.2",
+    "@nuxtjs/eslint-config-typescript": "12.1.0",
     "@nuxtjs/i18n": "8.0.0-beta.10",
-    "@nuxtjs/web-vitals": "^0.2.6",
-    "@types/lodash-es": "^4.17.10",
-    "@types/node": "^20.8.7",
-    "@types/prettier": "^3.0.0",
-    "@typescript-eslint/eslint-plugin": "^6.8.0",
-    "@typescript-eslint/parser": "^6.8.0",
-    "@vue/test-utils": "^2.4.1",
+    "@nuxtjs/web-vitals": "0.2.6",
+    "@types/lodash-es": "4.17.11",
+    "@types/node": "20.9.0",
+    "@types/prettier": "3.0.0",
+    "@typescript-eslint/eslint-plugin": "6.10.0",
+    "@typescript-eslint/parser": "6.10.0",
+    "@vue/test-utils": "2.4.1",
     "bumpp": "9.2.0",
-    "changelogithub": "0.13.1",
-    "cross-env": "^7.0.3",
-    "eslint": "8.51.0",
-    "eslint-config-prettier": "^9.0.0",
-    "eslint-plugin-vue": "^9.17.0",
-    "nuxt": "3.8.0",
+    "changelogithub": "0.13.2",
+    "cross-env": "7.0.3",
+    "eslint": "8.53.0",
+    "eslint-config-prettier": "9.0.0",
+    "eslint-plugin-vue": "9.18.1",
+    "nuxt": "3.8.1",
     "nuxt-seo-kit": "1.3.13",
-    "playwright": "1.39.0",
+    "playwright": "1.37.0",
     "prettier": "3.0.3",
-    "tsd": "^0.29.0",
-    "typescript": "^5.2.2",
-    "vitest": "^0.34.6",
-    "vue-eslint-parser": "^9.3.2",
-    "vue-router": "^4.2.5",
-    "vue-tsc": "^1.8.19"
+    "tsd": "0.29.0",
+    "typescript": "5.2.2",
+    "vitest": "0.34.6",
+    "vue-eslint-parser": "9.3.2",
+    "vue-router": "4.2.5",
+    "vue-tsc": "1.8.22"
   }
 }