nuxt-typed-router 2.0.0 → 2.0.2

package/dist/module.json

@@ -5,5 +5,5 @@
     "nuxt": "^3.0.0-rc.1",
     "bridge": false
   },
-  "version": "2.0.0"
+  "version": "2.0.2"
 }

package/dist/module.mjs

@@ -1,9 +1,9 @@
-import { fileURLToPath } from 'url';
-import { extendPages, defineNuxtModule } from '@nuxt/kit';
+import { extendPages, defineNuxtModule, createResolver } from '@nuxt/kit';
 import chalk from 'chalk';
 import logSymbols from 'log-symbols';
 import prettier from 'prettier';
 import fs from 'fs';
+import { fileURLToPath } from 'url';
 import { dirname, resolve } from 'pathe';
 import mkdirp from 'mkdirp';
 import { camelCase } from 'lodash-es';
@@ -171,7 +171,8 @@ function createDeclarationRoutesFile() {
 function createRuntimeIndexFile() {
   return `
   ${watermarkTemplate}
-  export {routesNames, TypedRouteList} from './__routes';
+  export { routesNames } from './__routes';
+  export type { TypedRouteList } from './__routes';
   export * from './__useTypedRouter';
   export * from './__useTypedRoute';
   `;
@@ -205,7 +206,7 @@ function createTypedRouteParamsExport(routesParams) {
   return `export type TypedRouteParams = {
     ${routesParams.map(
     ({ name, params }) => `"${name}": ${params.length ? `{
-          ${params.map(({ key, required, type }) => `"${key}"${required ? "" : "?"}: ${type}`).join(",\n")}
+          ${params.map(({ key, required }) => `"${key}"${required ? "" : "?"}: string | number`).join(",\n")}
         }` : "never"}`
   ).join(",\n")}
   }`;
@@ -214,7 +215,7 @@ function createTypedRouteNamedMapperExport(routesParams) {
   return `export type TypedRouteNamedMapper = 
     ${routesParams.map(
     ({ name, params }) => `{name: "${name}" ${params.length ? `, params${params.some((s) => s.required) ? "" : "?"}: {
-          ${params.map(({ key, required, type }) => `"${key}"${required ? "" : "?"}: ${type}`).join(",\n")}
+          ${params.map(({ key, required }) => `"${key}"${required ? "" : "?"}: string | number`).join(",\n")}
         }` : ""}}`
   ).join("|\n")}
   `;
@@ -228,7 +229,7 @@ function createResolvedTypedRouteNamedMapperExport(routesParams) {
     ${routesParams.map(
     ({ name, params }) => `{name: "${name}" ${params.length ? `, params: {
                 ${params.map(
-      ({ key, notRequiredOnPage, type }) => `"${key}"${notRequiredOnPage ? "?" : ""}: ${type}`
+      ({ key, notRequiredOnPage }) => `"${key}"${notRequiredOnPage ? "?" : ""}: string`
     ).join(",\n")}
         }` : ""}}`
   ).join("|\n")}
@@ -466,7 +467,6 @@ function extractRouteParamsFromPath(path, isIndexFileForRouting, previousParams)
   let allMergedParams = params.map(
     ({ name, optional }) => ({
       key: name,
-      type: "string | number",
       required: !optional,
       notRequiredOnPage: optional
     })
@@ -642,11 +642,10 @@ const module = defineNuxtModule({
   setup(moduleOptions, nuxt) {
     const srcDir = nuxt.options.srcDir;
     const { plugin } = moduleOptions;
+    const { resolve } = createResolver(import.meta.url);
     nuxt.options.alias = {
       ...nuxt.options.alias,
-      "@typed-router": fileURLToPath(
-        new URL(`${nuxt.options.rootDir}/.nuxt/typed-router`, import.meta.url)
-      )
+      "@typed-router": resolve(`${nuxt.options.rootDir}/.nuxt/typed-router`)
     };
     nuxt.hook("pages:extend", () => createTypedRouter({ srcDir, nuxt, plugin }));
     createTypedRouter({ srcDir, nuxt, plugin });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nuxt-typed-router",
-  "version": "2.0.0",
+  "version": "2.0.2",
   "description": "Provide autocompletion for pages route names generated by Nuxt router",
   "type": "module",
   "main": "./dist/module.cjs",
@@ -20,10 +20,10 @@
     "dev": "nuxi dev playground",
     "dev:build": "nuxi build playground",
     "dev:prepare": "nuxt-module-build --stub && nuxi prepare playground",
-    "build:test": "cross-env NUXT_BUILD_TYPE=stub pnpm run prepack && pnpm run dev:build",
-    "test": "pnpm run dev:prepare && pnpm run build:test && vitest run",
-    "test:watch": "pnpm run build:test && vitest",
-    "docs:dev": "cd docs && pnpm run dev",
+    "build:test": "cross-env NUXT_BUILD_TYPE=stub yarn prepack && yarn dev:build",
+    "test": "yarn dev:prepare && yarn build:test && vitest run",
+    "test:watch": "yarn build:test && vitest",
+    "docs:dev": "cd docs && yarn dev",
     "docs:build": "npm run dev:prepare && cd docs && nuxi generate"
   },
   "publishConfig": {