nuxt-typed-router 2.1.0-beta.2 → 2.1.0-beta.4

package/dist/module.json

@@ -5,5 +5,5 @@
     "nuxt": "^3.0.0-rc.1",
     "bridge": false
   },
-  "version": "2.1.0-beta.2"
+  "version": "2.1.0-beta.4"
 }

package/dist/module.mjs

@@ -26,8 +26,8 @@ import type {
   TypedRouteParams,
   ResolvedTypedRouteNamedMapper,
 } from './__routes';
-import {useTypedRoute} from './__useTypedRoute';
-import {useTypedRouter} from './__useTypedRouter';
+import {useRoute as _useRoute} from './__useTypedRoute';
+import {useRouter as _useRouter} from './__useTypedRouter';
 `;
 
 const watermarkTemplate = `
@@ -133,8 +133,8 @@ function createRuntimeTypeUtils(autoImport) {
    export type TypedRoute = _TypedRoute;
    export type TypedNamedRoute<T extends TypedRouteList> = _TypedNamedRoute<T>;
  
-   ${autoImport ? `const useRoute: typeof useTypedRoute;
-      const useRouter: typeof useTypedRouter;` : ""}
+   ${autoImport ? `const useRoute: typeof _useRoute;
+      const useRouter: typeof _useRouter;` : ""}
  }
  
  type TypedNuxtLinkProps = Omit<NuxtLinkProps, 'to'> & {
@@ -281,7 +281,7 @@ function createRuntimeRoutesFile({
 function createUseTypedRouteFile(routesDeclTemplate) {
   return `
   ${watermarkTemplate}
-  import { useRoute } from '#app';
+  import { useRoute as defaultRoute } from '#app';
   import type { TypedRouteList } from './__routes';
 
   /** Acts the same as \`useRoute\`, but typed.
@@ -289,30 +289,29 @@ function createUseTypedRouteFile(routesDeclTemplate) {
  * @exemple
  *
  * \`\`\`ts
- * const route = useTypedRoute();
+ * const route = useRoute();
  * \`\`\`
  *
  * \`\`\`ts
- * const route = useTypedRoute('my-route-with-param-id');
+ * const route = useRoute('my-route-with-param-id');
  * route.params.id // autocompletes!
  * \`\`\`
  *
  * \`\`\`ts
- * const route = useTypedRoute();
+ * const route = useRoute();
  * if (route.name === 'my-route-with-param-id') {
  *    route.params.id // autocompletes!
  * }
  * \`\`\`
  */
-export function useTypedRoute<T extends TypedRouteList = never>(
+export function useRoute<T extends TypedRouteList = never>(
   name?: T
 ): [T] extends [never] ? TypedRoute : TypedNamedRoute<T> {
-  const route = useRoute();
+  const route = defaultRoute();
 
   return route as any;
 }
 
-export const useRoute = useTypedRoute;
 
 `;
 }
@@ -320,7 +319,7 @@ export const useRoute = useTypedRoute;
 function createRuntimeUseTypedRouterFile(routesDeclTemplate) {
   return `
   ${watermarkTemplate}
-  import { useRouter } from '#app';
+  import { useRouter as defaultRouter } from '#app';
   import type { TypedRouter } from './typed-router';
 
   /** Returns instances of $typedRouter and $routesList fully typed to use in your components or your Vuex/Pinia store
@@ -328,16 +327,15 @@ function createRuntimeUseTypedRouterFile(routesDeclTemplate) {
    * @exemple
    * 
    * \`\`\`ts
-   * const { router, routes } = useTypedRouter();
+   * const { router, routes } = useRouter();
    * \`\`\`
    */
-  export function useTypedRouter(): TypedRouter {
-    const router = useRouter();
+  export function useRouter(): TypedRouter {
+    const router = defaultRouter();
 
     return router;
   };
 
-  export const useRouter = useTypedRouter;
   `;
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nuxt-typed-router",
-  "version": "2.1.0-beta.2",
+  "version": "2.1.0-beta.4",
   "description": "Provide autocompletion for pages route names generated by Nuxt router",
   "type": "module",
   "main": "./dist/module.cjs",