[fix] fix rootDir output #59

package.json

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

src/core/fs/writeFile.ts

@@ -10,7 +10,7 @@ import { formatOutputWithPrettier } from './prettierFormat';
 export const __dirname = dirname(fileURLToPath(import.meta.url));
 
 type ProcessPathAndWriteFileArgs = {
-  srcDir: string;
+  rootDir: string;
   fileName: string;
   content: string;
   outDir?: string;
@@ -19,12 +19,12 @@ type ProcessPathAndWriteFileArgs = {
 export async function processPathAndWriteFile({
   content,
   fileName,
-  srcDir,
+  rootDir,
   outDir,
 }: ProcessPathAndWriteFileArgs): Promise<void> {
   try {
     const finalOutDir = outDir ?? `.nuxt/typed-router`;
-    const processedOutDir = resolve(srcDir, finalOutDir);
+    const processedOutDir = resolve(rootDir, finalOutDir);
     const outputFile = resolve(process.cwd(), `${processedOutDir}/${fileName}`);
     const formatedContent = await formatOutputWithPrettier(content);
     if (fs.existsSync(outputFile)) {

src/core/index.ts

@@ -8,23 +8,27 @@ import { handlePluginFileSave, saveGeneratedFiles } from './output';
 import { constructRouteMap } from './parser';
 
 type CreateTypedRouterArgs = Required<ModuleOptions> & {
-  srcDir: string;
+  rootDir: string;
   nuxt: Nuxt;
 };
 
-export function createTypedRouter({ srcDir, plugin, nuxt }: CreateTypedRouterArgs): void {
+export function createTypedRouter({ rootDir, plugin, nuxt }: CreateTypedRouterArgs): void {
   try {
     // We use extendPages here to access the NuxtRouteConfig, not accessible in the `pages:extend` hook
     extendPages(async (routes: NuxtRouteConfig[]) => {
       if (routes.length) {
         const outputData = constructRouteMap(routes);
 
         if (plugin) {
-          handlePluginFileSave({ nuxt, routesDeclTemplate: outputData.routesDeclTemplate, srcDir });
+          handlePluginFileSave({
+            nuxt,
+            routesDeclTemplate: outputData.routesDeclTemplate,
+            rootDir,
+          });
         }
 
         await saveGeneratedFiles({
-          srcDir,
+          rootDir,
           outputData,
         });
       } else {

src/core/output/fileSave/definitions.save.ts

@@ -12,12 +12,12 @@ import {
 let previousGeneratedRoutes = '';
 
 type SaveGeneratedFiles = {
-  srcDir: string;
+  rootDir: string;
   outputData: GeneratorOutput;
 };
 
 export async function saveGeneratedFiles({
-  srcDir,
+  rootDir,
   outputData: { routesDeclTemplate, routesList, routesObjectTemplate, routesParams },
 }: SaveGeneratedFiles): Promise<void> {
   const filesMap: Array<{ fileName: string; content: string }> = [
@@ -49,7 +49,7 @@ export async function saveGeneratedFiles({
   ];
 
   await Promise.all(
-    filesMap.map(({ content, fileName }) => processPathAndWriteFile({ srcDir, content, fileName }))
+    filesMap.map(({ content, fileName }) => processPathAndWriteFile({ rootDir, content, fileName }))
   );
   if (previousGeneratedRoutes !== routesList.join(',')) {
     previousGeneratedRoutes = routesList.join(',');

src/core/output/fileSave/plugin.save.ts

@@ -4,22 +4,22 @@ import { createRuntimePluginFile } from '../runtime';
 
 type HandlePluginFileSaveArgs = {
   nuxt: Nuxt;
-  srcDir: string;
+  rootDir: string;
   routesDeclTemplate: string;
 };
 
 export function handlePluginFileSave({
   nuxt,
-  srcDir,
+  rootDir,
   routesDeclTemplate,
 }: HandlePluginFileSaveArgs) {
   const pluginName = '__typed-router.ts';
 
   nuxt.hook('build:done', async () => {
-    const pluginFolder = `${srcDir}/plugins`;
+    const pluginFolder = `${rootDir}/plugins`;
     await processPathAndWriteFile({
       outDir: pluginFolder,
-      srcDir,
+      rootDir,
       fileName: pluginName,
       content: createRuntimePluginFile(routesDeclTemplate),
     });

src/module.ts

@@ -15,17 +15,17 @@ export default defineNuxtModule<ModuleOptions>({
     plugin: false,
   },
   setup(moduleOptions, nuxt: Nuxt) {
-    const srcDir = nuxt.options.srcDir;
+    const rootDir = nuxt.options.rootDir;
     const { plugin } = moduleOptions as Required<ModuleOptions>;
     // @ts-ignore
     const { resolve } = createResolver(import.meta.url);
     nuxt.options.alias = {
       ...nuxt.options.alias,
-      '@typed-router': resolve(`${nuxt.options.rootDir}/.nuxt/typed-router`),
+      '@typed-router': resolve(`${rootDir}/.nuxt/typed-router`),
     };
 
-    nuxt.hook('pages:extend', () => createTypedRouter({ srcDir, nuxt, plugin }));
+    nuxt.hook('pages:extend', () => createTypedRouter({ rootDir, nuxt, plugin }));
     // Allow generating files on load
-    createTypedRouter({ srcDir, nuxt, plugin });
+    createTypedRouter({ rootDir, nuxt, plugin });
   },
 });