aaex-file-router 1.3.1 → 1.4.0

package/README.md

@@ -2,11 +2,9 @@
 
 A file-based routing system for React projects that automatically generates routes from your file structure. Similar to Next.js App Router or Remix file conventions.
 
-## V. 1.3.1
+## V. 1.4.0
 
-Routes are now able to be infinitely nested
-
-**Notice** Only tested 3 levels deep but there is no reason i shouldnt work further
+Added support for loading components
 
 ## Table of Contents
 
@@ -19,11 +17,12 @@ Routes are now able to be infinitely nested
     - [Using createBrowserRouter](#1-using-createbrowserrouter-recommended-for-most-users)
     - [Using nested Route elements](#2-using-nested-route-elements)
 - [File Conventions](#file-conventions)
-- [Generated Routes File](#generated-routes-file)
 - [Route Resolution Examples](#route-resolution-examples)
+- [Import strategy](#import-strategy)
 - [Layouts](#layouts)
 - [FileLink component](#filelink-component)
 - [Usage](#usage)
+- [Generated files](#generated-files)
 - [API Reference](#api-reference)
 - [How It Works](#how-it-works)
 - [Performance Considerations](#performance-considerations)
@@ -53,13 +52,15 @@ npm install aaex-file-router
 
 ```
 src/pages/
-├── index.tsx          # Root page "/"
-├── about.tsx          # Route "/about"
-└── test/
-    ├── layout.tsx     # Layout wrapper for /test/* routes
-    ├── index.tsx      # Route "/test"
-    ├── hello.tsx      # Route "/test/hello"
-    └── [slug].tsx     # Route "/test/:slug"
+└── dashboard/
+    ├── loading.tsx      ← Used as fallback for ALL lazy imports below
+    ├── index.tsx
+    ├── stats/
+    │   ├── loading.tsx  ← Overrides parent
+    │   └── weekly.tsx
+    └── users/
+        └── [id].tsx     ← used for dynamic routes ex :users/123
+
 ```
 
 ### 2. Configure Vite
@@ -83,6 +84,8 @@ export default defineConfig({
 
 ### 3. Use in your app
 
+### Note: Since v1.4.0 every lazy-loaded route is automatically wrapped in a Suspense boundary, using the nearest loading.tsx file as the fallback.
+
 #### 1. Using createBrowserRouter (recommended for most users)
 
 ```typescript
@@ -105,9 +108,7 @@ function App() {
 export default App;
 ```
 
-## **OR**
-
-### 2. using nested Route elements
+### 2. Using nested Route elements
 
 **Note** I will probably create a custom route provider using this version later since this is the only solution that works with VITE-SSR if you wrap client in `<BrowserRouter/>` and server in `<StaticRouter/>`
 
@@ -160,7 +161,7 @@ pages/about/index.tsx → "/about"
 
 Wraps all sibling and nested routes. Children are rendered in an `<Outlet />`.
 
-```typescript
+```tsx
 // pages/admin/layout.tsx
 import { Outlet } from "react-router-dom";
 
@@ -174,6 +175,18 @@ export default function AdminLayout() {
 }
 ```
 
+### `loading.tsx`
+
+Folder level loading component <br>
+Autmatically gets rendered instead of files waiting on lazy import
+
+```tsx
+// src/pages/test/loading.tsx
+export default function Test() {
+  return <div>Loading...</div>;
+}
+```
+
 ### Slug files
 
 Filenames wrapper in square brackets `[filename]` will resolve to a dynamic route
@@ -204,7 +217,7 @@ pages/about.tsx       → "/about"
 pages/blog/post.tsx   → "/blog/post"
 ```
 
-## Generated Routes File
+<!-- ## Generated Routes File
 
 The plugin generates a `routes.ts` file with all your routes:
 
@@ -231,7 +244,7 @@ const routes: RouteObject[] = [
 ];
 
 export default routes;
-```
+``` -->
 
 ## Route Resolution Examples
 
@@ -265,6 +278,19 @@ export default function DashboardLayout() {
 
 All routes in `src/pages/dashboard/*` will render inside this layout.
 
+## Import Strategy
+
+| File type                             |     |     | Import style  |     |
+| ------------------------------------- | --- | --- | ------------- | --- |
+| pages/\*.tsx (top level)              |     |     | static import |     |
+| Files inside a folder with layout.tsx |     |     | Lazy loaded   |     |
+| Files inside a folder without layout  |     |     | Lazy loaded   |     |
+| layout.tsx                            |     |     | Static import |
+| loading.tsx                           |     |     | Static import |
+--- 
+Top-level pages are always statically imported for faster initial navigation.
+All nested pages are lazy-loaded and wrapped in a Suspense boundary.
+
 ## FileLink component
 
 The FileLink component is a type safe wrapper for the Link component in react router that uses an autogenerated type to check which routes are available.
@@ -276,18 +302,21 @@ React Router's normal Link still works in cases where type safety is less import
 
 ## Usage
 
+If reades the type file that is automatically generated
+
+`users/{string}` is what users/:slug gets translated to this means users/ allows any string after even if the route dosnt exist. Will look into better solution
+
 ```ts
 // src/routeTypes.ts
 // * AUTO GENERATED: DO NOT EDIT
-
-//this file is auto generated along with the route definition file
-export type FileRoutes = "/" | "test";
+/
+export type FileRoutes = "/" | "test" | "users/{string}";
 ```
 
 ```tsx
 // src/pages/index.tsx
 import { FileLink } from "aaex-file-router";
-import type { FileRoutes } from "../routeTypes";
+import type { FileRoutes } from "../routeTypes"; //import type
 
 export default function Home() {
   return (
@@ -302,6 +331,47 @@ export default function Home() {
 }
 ```
 
+## Generated files
+
+### routes.ts
+
+Generated route definition file
+
+```ts
+// src/routes.ts
+...imports
+export default routes = [
+    {
+        path: "/",
+        element: React.createElement(Index)},
+    {
+        path: "test",
+        element: React.createElement(TestLayout),
+        children:
+        [
+            {
+            path: "",
+            element: React.createElement(
+                React.Suspense,
+                { fallback: React.createElement(TestLoading) },
+                React.createElement(React.lazy(() => import("./pages/test/index.tsx")))
+            )
+            },
+            ...
+        ]
+    }
+    ]
+
+```
+
+### routeTypes.ts
+
+Exports TypeScript union type of existing routes
+
+```ts
+export type FileRoutes = `/` | `test`;
+```
+
 ## API Reference
 
 ### FileScanner
@@ -323,7 +393,7 @@ Converts file structure into React Router route configuration.
 import { RouteGenerator } from "aaex-file-router/core";
 
 const generator = new RouteGenerator();
-const routesCode = await generator.generateComponentsMap(fileData);
+const routesCode = await generator.generateRoutesFile(fileData);
 ```
 
 ### aaexFileRouter (Vite Plugin)

package/dist/core/FileScanner.d.ts

@@ -10,10 +10,20 @@ export declare class FileScanner {
     constructor(pages_dir: string);
     /**
      * Recursively scan directory and return nested FileData
+     * - Scans files of a given folder
+     * - converts and returns as usable data
+     * - Format:
+     * {name: string,
+     * relative_path: string,
+     * parent_path: string,
+     * isDirectory: string
+     * }
+     * @param dir string
+     * @returns FileData[]
      */
     private scan_files;
     /**
-     * Public entry point: returns nested FileData structure
+     * Public file point: returns nested FileData structure
      */
     get_file_data(): Promise<FileData[]>;
 }

package/dist/core/FileScanner.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"FileScanner.d.ts","sourceRoot":"","sources":["../../src/core/FileScanner.ts"],"names":[],"mappings":"AAGA,MAAM,WAAW,QAAQ;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,aAAa,EAAE,MAAM,CAAC;IACtB,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,OAAO,CAAC;IACrB,QAAQ,CAAC,EAAE,QAAQ,EAAE,CAAC;CACvB;AAED,qBAAa,WAAW;IACtB,QAAQ,EAAE,MAAM,CAAC;gBAEL,SAAS,EAAE,MAAM;IAI7B;;OAEG;YACW,UAAU;IA0BxB;;OAEG;IACU,aAAa,IAAI,OAAO,CAAC,QAAQ,EAAE,CAAC;CAKlD"}
+{"version":3,"file":"FileScanner.d.ts","sourceRoot":"","sources":["../../src/core/FileScanner.ts"],"names":[],"mappings":"AAGA,MAAM,WAAW,QAAQ;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,aAAa,EAAE,MAAM,CAAC;IACtB,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,OAAO,CAAC;IACrB,QAAQ,CAAC,EAAE,QAAQ,EAAE,CAAC;CACvB;AAED,qBAAa,WAAW;IACtB,QAAQ,EAAE,MAAM,CAAC;gBAEL,SAAS,EAAE,MAAM;IAI7B;;;;;;;;;;;;OAYG;YACW,UAAU;IA+BxB;;OAEG;IACU,aAAa,IAAI,OAAO,CAAC,QAAQ,EAAE,CAAC;CAKlD"}

package/dist/core/FileScanner.js

@@ -7,21 +7,36 @@ export class FileScanner {
     }
     /**
      * Recursively scan directory and return nested FileData
+     * - Scans files of a given folder
+     * - converts and returns as usable data
+     * - Format:
+     * {name: string,
+     * relative_path: string,
+     * parent_path: string,
+     * isDirectory: string
+     * }
+     * @param dir string
+     * @returns FileData[]
      */
     async scan_files(dir) {
-        const entries = await fs.readdir(dir, { withFileTypes: true });
+        //scans the parent folder and outputs an array of files
+        const files = await fs.readdir(dir, { withFileTypes: true });
         const result = [];
-        for (const entry of entries) {
-            const fullPath = path.join(dir, entry.name);
-            const relativePath = path.relative(process.cwd(), fullPath).replace(/\\/g, "/");
+        for (const file of files) {
+            const fullPath = path.join(dir, file.name);
+            const relativePath = path
+                .relative(process.cwd(), fullPath)
+                .replace(/\\/g, "/");
             const parentPath = path.relative(process.cwd(), dir).replace(/\\/g, "/") + "/";
+            // convert to usable data
             const fileData = {
-                name: entry.name,
+                name: file.name,
                 relative_path: relativePath,
                 parent_path: parentPath,
-                isDirectory: entry.isDirectory(),
+                isDirectory: file.isDirectory(),
             };
-            if (entry.isDirectory()) {
+            //recurivly scan directories for more files
+            if (file.isDirectory()) {
                 fileData.children = await this.scan_files(fullPath);
             }
             result.push(fileData);
@@ -29,7 +44,7 @@ export class FileScanner {
         return result;
     }
     /**
-     * Public entry point: returns nested FileData structure
+     * Public file point: returns nested FileData structure
      */
     async get_file_data() {
         const fullDir = path.join(process.cwd(), this.page_dir);

package/dist/core/FileScanner.js.map

@@ -1 +1 @@
-{"version":3,"file":"FileScanner.js","sourceRoot":"","sources":["../../src/core/FileScanner.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,QAAQ,IAAI,EAAE,EAAE,MAAM,SAAS,CAAC;AACjD,OAAO,IAAI,MAAM,MAAM,CAAC;AAUxB,MAAM,OAAO,WAAW;IACtB,QAAQ,CAAS;IAEjB,YAAY,SAAiB;QAC3B,IAAI,CAAC,QAAQ,GAAG,SAAS,CAAC;IAC5B,CAAC;IAED;;OAEG;IACK,KAAK,CAAC,UAAU,CAAC,GAAW;QAClC,MAAM,OAAO,GAAG,MAAM,EAAE,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC;QAC/D,MAAM,MAAM,GAAe,EAAE,CAAC;QAE9B,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE,CAAC;YAC5B,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;YAC5C,MAAM,YAAY,GAAG,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,QAAQ,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;YAChF,MAAM,UAAU,GAAG,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,GAAG,GAAG,CAAC;YAE/E,MAAM,QAAQ,GAAa;gBACzB,IAAI,EAAE,KAAK,CAAC,IAAI;gBAChB,aAAa,EAAE,YAAY;gBAC3B,WAAW,EAAE,UAAU;gBACvB,WAAW,EAAE,KAAK,CAAC,WAAW,EAAE;aACjC,CAAC;YAEF,IAAI,KAAK,CAAC,WAAW,EAAE,EAAE,CAAC;gBACxB,QAAQ,CAAC,QAAQ,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;YACtD,CAAC;YAED,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QACxB,CAAC;QAED,OAAO,MAAM,CAAC;IAChB,CAAC;IAED;;OAEG;IACI,KAAK,CAAC,aAAa;QACxB,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;QACxD,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;QAC5C,OAAO,IAAI,CAAC;IACd,CAAC;CACF"}
+{"version":3,"file":"FileScanner.js","sourceRoot":"","sources":["../../src/core/FileScanner.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,IAAI,EAAE,EAAE,MAAM,SAAS,CAAC;AACzC,OAAO,IAAI,MAAM,MAAM,CAAC;AAUxB,MAAM,OAAO,WAAW;IACtB,QAAQ,CAAS;IAEjB,YAAY,SAAiB;QAC3B,IAAI,CAAC,QAAQ,GAAG,SAAS,CAAC;IAC5B,CAAC;IAED;;;;;;;;;;;;OAYG;IACK,KAAK,CAAC,UAAU,CAAC,GAAW;QAClC,uDAAuD;QACvD,MAAM,KAAK,GAAG,MAAM,EAAE,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC;QAC7D,MAAM,MAAM,GAAe,EAAE,CAAC;QAE9B,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;YACzB,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;YAC3C,MAAM,YAAY,GAAG,IAAI;iBACtB,QAAQ,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,QAAQ,CAAC;iBACjC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;YACvB,MAAM,UAAU,GACd,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,GAAG,GAAG,CAAC;YAE9D,yBAAyB;YACzB,MAAM,QAAQ,GAAa;gBACzB,IAAI,EAAE,IAAI,CAAC,IAAI;gBACf,aAAa,EAAE,YAAY;gBAC3B,WAAW,EAAE,UAAU;gBACvB,WAAW,EAAE,IAAI,CAAC,WAAW,EAAE;aAChC,CAAC;YACF,2CAA2C;YAC3C,IAAI,IAAI,CAAC,WAAW,EAAE,EAAE,CAAC;gBACvB,QAAQ,CAAC,QAAQ,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;YACtD,CAAC;YAED,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QACxB,CAAC;QAED,OAAO,MAAM,CAAC;IAChB,CAAC;IAED;;OAEG;IACI,KAAK,CAAC,aAAa;QACxB,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;QACxD,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;QAC5C,OAAO,IAAI,CAAC;IACd,CAAC;CACF"}

package/dist/core/RouteGenerator.d.ts

@@ -8,22 +8,18 @@ interface FileNode {
 export declare class RouteGenerator {
     private topLevelImports;
     private importSet;
-    /**
-     * Converts a FileData-like tree into React Router routes
-     * @param files - Array of file/folder objects passed externally
-     * @param parentPath - Current path for recursion
-     */
+    private normalizeSegment;
+    private normalizeTypeSegment;
+    private toPascal;
+    private addImport;
+    private getImportName;
+    private createDirectoryRoute;
+    private createFileRoute;
     private fileDataToRoutes;
-    /**
-     * Generates a React Router routes file as a string
-     * @param fileData - FileData-like tree
-     */
-    generateRoutesFile(fileData: FileNode[]): Promise<string>;
-    /**
-     * Generates TypeScript type definition for all route paths
-     * @param fileData - FileData-like tree
-     */
-    generateRoutesTypeDef(fileData: FileNode[]): Promise<string>;
+    private collectPaths;
+    private buildTypeUnion;
+    generateRoutesFile(fileData: FileNode[]): string;
+    generateTypesFile(fileData: FileNode[]): string;
 }
 export {};
 //# sourceMappingURL=RouteGenerator.d.ts.map

package/dist/core/RouteGenerator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RouteGenerator.d.ts","sourceRoot":"","sources":["../../src/core/RouteGenerator.ts"],"names":[],"mappings":"AAMA,UAAU,QAAQ;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,aAAa,EAAE,MAAM,CAAC;IACtB,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,OAAO,CAAC;IACrB,QAAQ,CAAC,EAAE,QAAQ,EAAE,CAAC;CACvB;AAED,qBAAa,cAAc;IACzB,OAAO,CAAC,eAAe,CAAgB;IACvC,OAAO,CAAC,SAAS,CAA0B;IAE3C;;;;OAIG;IACH,OAAO,CAAC,gBAAgB;IAgGxB;;;OAGG;IACU,kBAAkB,CAAC,QAAQ,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC;IAsBtE;;;OAGG;IACU,qBAAqB,CAAC,QAAQ,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC;CA8B1E"}
+{"version":3,"file":"RouteGenerator.d.ts","sourceRoot":"","sources":["../../src/core/RouteGenerator.ts"],"names":[],"mappings":"AAMA,UAAU,QAAQ;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,aAAa,EAAE,MAAM,CAAC;IACtB,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,OAAO,CAAC;IACrB,QAAQ,CAAC,EAAE,QAAQ,EAAE,CAAC;CACvB;AAED,qBAAa,cAAc;IACzB,OAAO,CAAC,eAAe,CAAgB;IACvC,OAAO,CAAC,SAAS,CAA0B;IAG3C,OAAO,CAAC,gBAAgB;IAIxB,OAAO,CAAC,oBAAoB;IAI5B,OAAO,CAAC,QAAQ;IAMhB,OAAO,CAAC,SAAS;IAQjB,OAAO,CAAC,aAAa;IAUrB,OAAO,CAAC,oBAAoB;IA0C5B,OAAO,CAAC,eAAe;IA4BvB,OAAO,CAAC,gBAAgB;IAcxB,OAAO,CAAC,YAAY;IA2BpB,OAAO,CAAC,cAAc;IAUf,kBAAkB,CAAC,QAAQ,EAAE,QAAQ,EAAE,GAAG,MAAM;IAqBhD,iBAAiB,CAAC,QAAQ,EAAE,QAAQ,EAAE,GAAG,MAAM;CASvD"}

package/dist/core/RouteGenerator.js

@@ -1,126 +1,129 @@
 export class RouteGenerator {
     topLevelImports = [];
     importSet = new Set();
-    /**
-     * Converts a FileData-like tree into React Router routes
-     * @param files - Array of file/folder objects passed externally
-     * @param parentPath - Current path for recursion
-     */
-    fileDataToRoutes(files, parentPath = "", isChild = false) {
-        const routes = [];
-        const normalizeSegment = (name) => name.replace(/\[([^\]]+)\]/g, ":$1").toLowerCase();
-        const toPascal = (str) => str
+    // ---------------- Helpers ----------------
+    normalizeSegment(name) {
+        return name.replace(/\[([^\]]+)\]/g, ":$1").toLowerCase();
+    }
+    normalizeTypeSegment(name) {
+        return name.replace(/\[([^\]]+)\]/g, "{string}");
+    }
+    toPascal(str) {
+        return str
             .replace(/\[|\]/g, "")
             .replace(/(^\w|[-_]\w)/g, (m) => m.replace(/[-_]/, "").toUpperCase());
-        const getImportName = (file, parentPath) => {
-            const nameWithoutExt = file.name.replace(/\.[jt]sx?$/, "");
-            if (nameWithoutExt.toLowerCase() === "index" && parentPath) {
-                // Use parent folder prefix for nested index
-                const segments = parentPath.split("/").filter(Boolean);
-                return toPascal(segments.join("")) + "Index";
-            }
-            return toPascal(nameWithoutExt);
-        };
+    }
+    addImport(file, importName) {
+        if (!this.importSet.has(file.relative_path)) {
+            const importPath = `./${file.relative_path.replace(/^src[\/\\]/, "")}`;
+            this.topLevelImports.push(`import ${importName} from '${importPath}';`);
+            this.importSet.add(file.relative_path);
+        }
+    }
+    getImportName(file, parentPath) {
+        const nameWithoutExt = file.name.replace(/\.[jt]sx?$/, "");
+        if (nameWithoutExt.toLowerCase() === "index" && parentPath) {
+            const segments = parentPath.split("/").filter(Boolean);
+            return this.toPascal(segments.join("")) + "Index";
+        }
+        return this.toPascal(nameWithoutExt);
+    }
+    // ---------------- Route Creation ----------------
+    createDirectoryRoute(file) {
+        const route = { path: this.normalizeSegment(file.name) };
+        const layout = file.children?.find((f) => /^layout\.(tsx|jsx|ts|js)$/i.test(f.name));
+        if (layout) {
+            const importName = `${this.toPascal(file.name)}Layout`;
+            this.addImport(layout, importName);
+            route.element = `React.createElement(${importName})`;
+        }
+        const loadingFile = file.children?.find((f) => /^loading\.(tsx|jsx|ts|js)$/i.test(f.name));
+        let loadingName = null;
+        if (loadingFile) {
+            loadingName = this.getImportName(loadingFile, file.relative_path);
+            this.addImport(loadingFile, loadingName);
+        }
+        const children = file.children?.filter((f) => !/^layout\.(tsx|jsx|ts|js)$/i.test(f.name) &&
+            !/^loading\.(tsx|jsx|ts|js)$/i.test(f.name));
+        if (children?.length) {
+            route.children = this.fileDataToRoutes(children, route.path, true, loadingName);
+        }
+        return route;
+    }
+    createFileRoute(file, parentPath, isChild, folderLoadingName) {
+        const nameWithoutExt = file.name.replace(/\.[jt]sx?$/, "");
+        const isIndex = nameWithoutExt.toLowerCase() === "index";
+        let pathSegment = isIndex ? "" : this.normalizeSegment(nameWithoutExt);
+        if (!isChild && parentPath)
+            pathSegment = `${parentPath}/${pathSegment}`;
+        const importName = this.getImportName(file, parentPath);
+        this.addImport(file, importName);
+        const fallback = folderLoadingName
+            ? `React.createElement(${folderLoadingName})`
+            : `<div>Loading...</div>`;
+        const elementString = `React.createElement(React.Suspense, { fallback: ${fallback} }, React.createElement(React.lazy(() => import('./${file.relative_path.replace(/^src[\/\\]/, "")}'))))`;
+        return { path: pathSegment, element: elementString };
+    }
+    // ---------------- Route Recursion ----------------
+    fileDataToRoutes(files, parentPath = "", isChild = false, folderLoadingName = null) {
+        return files.map((file) => file.isDirectory
+            ? this.createDirectoryRoute(file)
+            : this.createFileRoute(file, parentPath, isChild, folderLoadingName));
+    }
+    // ---------------- Type Helpers ----------------
+    collectPaths(files, prefix = "") {
+        let result = [];
         for (const file of files) {
             if (file.isDirectory) {
-                const layout = file.children?.find((f) => !f.isDirectory && /^layout\.(tsx|jsx|ts|js)$/i.test(f.name));
-                const route = {
-                    path: normalizeSegment(file.name),
-                };
-                if (layout) {
-                    const importName = `${toPascal(file.name)}Layout`;
-                    const importPath = `./${layout.relative_path.replace(/^src[\/\\]/, "")}`;
-                    if (!this.importSet.has(layout.relative_path)) {
-                        this.topLevelImports.push(`import ${importName} from '${importPath}';`);
-                        this.importSet.add(layout.relative_path);
-                    }
-                    route.element = `React.createElement(${importName})`;
-                }
+                const newPrefix = `${prefix}/${this.normalizeTypeSegment(file.name)}`;
+                result.push(newPrefix);
                 if (file.children?.length) {
-                    const children = file.children.filter((f) => !/^layout\.(tsx|jsx|ts|js)$/i.test(f.name));
-                    if (children.length) {
-                        // Pass true for isChild to make children paths relative
-                        route.children = this.fileDataToRoutes(children, route.path, true);
-                    }
+                    result.push(...this.collectPaths(file.children, newPrefix));
                 }
-                routes.push(route);
             }
             else {
-                const nameWithoutExt = file.name.replace(/\.[jt]sx?$/, "");
-                const isIndex = nameWithoutExt.toLowerCase() === "index";
-                // If child, path is relative; otherwise, top-level gets full path
-                let pathSegment = isIndex ? "" : normalizeSegment(nameWithoutExt);
-                if (isChild) {
-                    // Children always use relative paths
-                    pathSegment = pathSegment;
+                const clean = file.name.replace(/\.[jt]sx?$/, "");
+                if (clean === "layout" || clean === "loading")
+                    continue;
+                if (clean === "index") {
+                    result.push(prefix || "/");
                 }
                 else {
-                    pathSegment = parentPath
-                        ? `${parentPath}/${pathSegment}`
-                        : pathSegment;
-                }
-                const importName = getImportName(file, parentPath);
-                ;
-                const importPath = `./${file.relative_path.replace(/^src[\/\\]/, "")}`;
-                if (!this.importSet.has(file.relative_path)) {
-                    this.topLevelImports.push(`import ${importName} from '${importPath}';`);
-                    this.importSet.add(file.relative_path);
+                    result.push(`${prefix}/${this.normalizeTypeSegment(clean)}`);
                 }
-                routes.push({
-                    path: pathSegment,
-                    element: `React.createElement(${importName})`,
-                });
             }
         }
-        return routes;
+        return result;
     }
-    /**
-     * Generates a React Router routes file as a string
-     * @param fileData - FileData-like tree
-     */
-    async generateRoutesFile(fileData) {
+    buildTypeUnion(paths) {
+        const normalized = [...new Set(paths)]
+            .map((p) => p.replace(/\/+/g, "/"))
+            .map((p) => (p === "" ? "/" : p))
+            .sort();
+        return normalized.map((p) => `  | "${p}"`).join("\n");
+    }
+    // ---------------- PUBLIC METHODS ----------------
+    generateRoutesFile(fileData) {
         this.topLevelImports = [];
-        this.importSet = new Set();
+        this.importSet.clear();
         const routes = this.fileDataToRoutes(fileData);
-        const routesString = JSON.stringify(routes, null, 2).replace(/"React\.createElement\((\w+)\)"/g, "React.createElement($1)");
         return `//* AUTO GENERATED: DO NOT EDIT
 import React from 'react';
 ${this.topLevelImports.join("\n")}
 import type { RouteObject } from 'react-router-dom';
 
-const routes: RouteObject[] = ${routesString};
+const routes: RouteObject[] = ${JSON.stringify(routes, null, 2).replace(/"React\.createElement\(([\s\S]*?)\)"/g, (_, inner) => `React.createElement(${inner})`)}
+
 
 export default routes;
 `;
     }
-    /**
-     * Generates TypeScript type definition for all route paths
-     * @param fileData - FileData-like tree
-     */
-    async generateRoutesTypeDef(fileData) {
-        const routes = this.fileDataToRoutes(fileData);
-        const paths = [];
-        const collectPaths = (routes, parentPath = "") => {
-            for (const route of routes) {
-                const fullPath = parentPath
-                    ? `${parentPath}/${route.path}`.replace(/\/+/g, "/")
-                    : route.path;
-                const tsPath = fullPath
-                    .split("/")
-                    .map((seg) => (seg.startsWith(":") ? "${string}" : seg))
-                    .join("/");
-                paths.push(tsPath);
-                if (route.children)
-                    collectPaths(route.children, fullPath);
-            }
-        };
-        collectPaths(routes);
-        const uniquePaths = Array.from(new Set(paths))
-            .map((p) => `\`${p}\``)
-            .join(" | ");
-        return `// * AUTO GENERATED: DO NOT EDIT
-
-export type FileRoutes = ${uniquePaths};
+    generateTypesFile(fileData) {
+        const paths = this.collectPaths(fileData, "");
+        const union = this.buildTypeUnion(paths);
+        return `// AUTO-GENERATED: DO NOT EDIT
+export type FileRoutes =
+${union};
 `;
     }
 }

package/dist/core/RouteGenerator.js.map

@@ -1 +1 @@
-{"version":3,"file":"RouteGenerator.js","sourceRoot":"","sources":["../../src/core/RouteGenerator.ts"],"names":[],"mappings":"AAcA,MAAM,OAAO,cAAc;IACjB,eAAe,GAAa,EAAE,CAAC;IAC/B,SAAS,GAAgB,IAAI,GAAG,EAAE,CAAC;IAE3C;;;;OAIG;IACK,gBAAgB,CACtB,KAAiB,EACjB,UAAU,GAAG,EAAE,EACf,OAAO,GAAG,KAAK;QAEf,MAAM,MAAM,GAAkB,EAAE,CAAC;QAEjC,MAAM,gBAAgB,GAAG,CAAC,IAAY,EAAE,EAAE,CACxC,IAAI,CAAC,OAAO,CAAC,eAAe,EAAE,KAAK,CAAC,CAAC,WAAW,EAAE,CAAC;QAErD,MAAM,QAAQ,GAAG,CAAC,GAAW,EAAE,EAAE,CAC/B,GAAG;aACA,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC;aACrB,OAAO,CAAC,eAAe,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC;QAE1E,MAAM,aAAa,GAAG,CAAC,IAAc,EAAE,UAAkB,EAAE,EAAE;YAC3D,MAAM,cAAc,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC;YAC3D,IAAI,cAAc,CAAC,WAAW,EAAE,KAAK,OAAO,IAAI,UAAU,EAAE,CAAC;gBAC3D,4CAA4C;gBAC5C,MAAM,QAAQ,GAAG,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;gBACvD,OAAO,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,GAAG,OAAO,CAAC;YAC/C,CAAC;YACD,OAAO,QAAQ,CAAC,cAAc,CAAC,CAAC;QAClC,CAAC,CAAC;QAEF,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;YACzB,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC;gBACrB,MAAM,MAAM,GAAG,IAAI,CAAC,QAAQ,EAAE,IAAI,CAChC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,WAAW,IAAI,4BAA4B,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CACnE,CAAC;gBAEF,MAAM,KAAK,GAAgB;oBACzB,IAAI,EAAE,gBAAgB,CAAC,IAAI,CAAC,IAAI,CAAC;iBAClC,CAAC;gBAEF,IAAI,MAAM,EAAE,CAAC;oBACX,MAAM,UAAU,GAAG,GAAG,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC;oBAClD,MAAM,UAAU,GAAG,KAAK,MAAM,CAAC,aAAa,CAAC,OAAO,CAClD,YAAY,EACZ,EAAE,CACH,EAAE,CAAC;oBACJ,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,aAAa,CAAC,EAAE,CAAC;wBAC9C,IAAI,CAAC,eAAe,CAAC,IAAI,CACvB,UAAU,UAAU,UAAU,UAAU,IAAI,CAC7C,CAAC;wBACF,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;oBAC3C,CAAC;oBACD,KAAK,CAAC,OAAO,GAAG,uBAAuB,UAAU,GAAG,CAAC;gBACvD,CAAC;gBAED,IAAI,IAAI,CAAC,QAAQ,EAAE,MAAM,EAAE,CAAC;oBAC1B,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,MAAM,CACnC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,4BAA4B,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAClD,CAAC;oBACF,IAAI,QAAQ,CAAC,MAAM,EAAE,CAAC;wBACpB,wDAAwD;wBACxD,KAAK,CAAC,QAAQ,GAAG,IAAI,CAAC,gBAAgB,CAAC,QAAQ,EAAE,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;oBACrE,CAAC;gBACH,CAAC;gBAED,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YACrB,CAAC;iBAAM,CAAC;gBACN,MAAM,cAAc,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC;gBAC3D,MAAM,OAAO,GAAG,cAAc,CAAC,WAAW,EAAE,KAAK,OAAO,CAAC;gBAEzD,kEAAkE;gBAClE,IAAI,WAAW,GAAG,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,gBAAgB,CAAC,cAAc,CAAC,CAAC;gBAClE,IAAI,OAAO,EAAE,CAAC;oBACZ,qCAAqC;oBACrC,WAAW,GAAG,WAAW,CAAC;gBAC5B,CAAC;qBAAM,CAAC;oBACN,WAAW,GAAG,UAAU;wBACtB,CAAC,CAAC,GAAG,UAAU,IAAI,WAAW,EAAE;wBAChC,CAAC,CAAC,WAAW,CAAC;gBAClB,CAAC;gBAED,MAAM,UAAU,GAAG,aAAa,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;gBAC3D,CAAC;gBACO,MAAM,UAAU,GAAG,KAAK,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,YAAY,EAAE,EAAE,CAAC,EAAE,CAAC;gBACvE,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,aAAa,CAAC,EAAE,CAAC;oBAC5C,IAAI,CAAC,eAAe,CAAC,IAAI,CACvB,UAAU,UAAU,UAAU,UAAU,IAAI,CAC7C,CAAC;oBACF,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;gBACzC,CAAC;gBAED,MAAM,CAAC,IAAI,CAAC;oBACV,IAAI,EAAE,WAAW;oBACjB,OAAO,EAAE,uBAAuB,UAAU,GAAG;iBAC9C,CAAC,CAAC;YACL,CAAC;QACH,CAAC;QAED,OAAO,MAAM,CAAC;IAChB,CAAC;IAED;;;OAGG;IACI,KAAK,CAAC,kBAAkB,CAAC,QAAoB;QAClD,IAAI,CAAC,eAAe,GAAG,EAAE,CAAC;QAC1B,IAAI,CAAC,SAAS,GAAG,IAAI,GAAG,EAAE,CAAC;QAE3B,MAAM,MAAM,GAAG,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC;QAE/C,MAAM,YAAY,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,OAAO,CAC1D,kCAAkC,EAClC,yBAAyB,CAC1B,CAAC;QAEF,OAAO;;EAET,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC;;;gCAGD,YAAY;;;CAG3C,CAAC;IACA,CAAC;IAED;;;OAGG;IACI,KAAK,CAAC,qBAAqB,CAAC,QAAoB;QACrD,MAAM,MAAM,GAAG,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC;QAE/C,MAAM,KAAK,GAAa,EAAE,CAAC;QAE3B,MAAM,YAAY,GAAG,CAAC,MAAqB,EAAE,UAAU,GAAG,EAAE,EAAE,EAAE;YAC9D,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;gBAC3B,MAAM,QAAQ,GAAG,UAAU;oBACzB,CAAC,CAAC,GAAG,UAAU,IAAI,KAAK,CAAC,IAAI,EAAE,CAAC,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC;oBACpD,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC;gBACf,MAAM,MAAM,GAAG,QAAQ;qBACpB,KAAK,CAAC,GAAG,CAAC;qBACV,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;qBACvD,IAAI,CAAC,GAAG,CAAC,CAAC;gBACb,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;gBACnB,IAAI,KAAK,CAAC,QAAQ;oBAAE,YAAY,CAAC,KAAK,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;YAC7D,CAAC;QACH,CAAC,CAAC;QAEF,YAAY,CAAC,MAAM,CAAC,CAAC;QAErB,MAAM,WAAW,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,KAAK,CAAC,CAAC;aAC3C,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC;aACtB,IAAI,CAAC,KAAK,CAAC,CAAC;QAEf,OAAO;;2BAEgB,WAAW;CACrC,CAAC;IACA,CAAC;CACF"}
+{"version":3,"file":"RouteGenerator.js","sourceRoot":"","sources":["../../src/core/RouteGenerator.ts"],"names":[],"mappings":"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"}

package/dist/pages/test/loading.d.ts

@@ -0,0 +1,2 @@
+export default function Loading(): import("react/jsx-runtime").JSX.Element;
+//# sourceMappingURL=loading.d.ts.map

package/dist/pages/test/loading.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"loading.d.ts","sourceRoot":"","sources":["../../../src/pages/test/loading.tsx"],"names":[],"mappings":"AAAA,MAAM,CAAC,OAAO,UAAU,OAAO,4CAE9B"}

package/dist/pages/test/loading.js

@@ -0,0 +1,5 @@
+import { Fragment as _Fragment, jsx as _jsx } from "react/jsx-runtime";
+export default function Loading() {
+    return _jsx(_Fragment, { children: "Loading test..." });
+}
+//# sourceMappingURL=loading.js.map

package/dist/pages/test/loading.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"loading.js","sourceRoot":"","sources":["../../../src/pages/test/loading.tsx"],"names":[],"mappings":";AAAA,MAAM,CAAC,OAAO,UAAU,OAAO;IAC3B,OAAO,gDAAoB,CAAA;AAC/B,CAAC"}

package/dist/plugin/plugin.js

@@ -30,8 +30,8 @@ export function aaexFileRouter(options = {}) {
                         scanner = new FileScanner(pagesDir);
                         generator = new RouteGenerator();
                         const fileData = await scanner.get_file_data();
-                        const routesCode = await generator.generateRoutesFile(fileData);
-                        const routesType = await generator.generateRoutesTypeDef(fileData);
+                        const routesCode = generator.generateRoutesFile(fileData);
+                        const routesType = generator.generateTypesFile(fileData);
                         // Write routes file
                         await fs.writeFile(outputFile, routesCode, "utf-8");
                         await fs.writeFile("src/routeTypes.ts", routesType, "utf-8");

package/dist/plugin/plugin.js.map

@@ -1 +1 @@
-{"version":3,"file":"plugin.js","sourceRoot":"","sources":["../../src/plugin/plugin.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,IAAI,EAAE,EAAE,MAAM,SAAS,CAAC;AACzC,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAO3D;;;GAGG;AACH,MAAM,UAAU,cAAc,CAAC,UAA6B,EAAE;IAC5D,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAQ,IAAI,aAAa,CAAC;IACnD,MAAM,UAAU,GAAG,OAAO,CAAC,UAAU,IAAI,iBAAiB,CAAC;IAE3D,IAAI,OAAoB,CAAC;IACzB,IAAI,SAAyB,CAAC;IAE9B,OAAO;QACL,IAAI,EAAE,kBAAkB;QACxB,KAAK,EAAE,OAAO,EAAE,uBAAuB;QAEvC,cAAc;YACZ,OAAO,GAAG,IAAI,WAAW,CAAC,QAAQ,CAAC,CAAC;YACpC,SAAS,GAAG,IAAI,cAAc,EAAE,CAAC;QACnC,CAAC;QAED,KAAK,CAAC,eAAe,CAAC,MAAM;YAC1B,wCAAwC;YACxC,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,QAAQ,CAAC,CAAC,CAAC;YAE1D,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE;gBACjD,4CAA4C;gBAC5C,IAAI,KAAK,KAAK,KAAK,IAAI,KAAK,KAAK,QAAQ,EAAE,CAAC;oBAC1C,IAAI,CAAC;wBACH,OAAO,CAAC,GAAG,CAAC,yBAAyB,KAAK,KAAK,QAAQ,EAAE,CAAC,CAAC;wBAE3D,oBAAoB;wBACpB,OAAO,GAAG,IAAI,WAAW,CAAC,QAAQ,CAAC,CAAC;wBACpC,SAAS,GAAG,IAAI,cAAc,EAAE,CAAC;wBAEjC,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,aAAa,EAAE,CAAC;wBAC/C,MAAM,UAAU,GAAG,MAAM,SAAS,CAAC,kBAAkB,CAAC,QAAQ,CAAC,CAAC;wBAChE,MAAM,UAAU,GAAG,MAAM,SAAS,CAAC,qBAAqB,CAAC,QAAQ,CAAC,CAAC;wBAEnE,oBAAoB;wBACpB,MAAM,EAAE,CAAC,SAAS,CAAC,UAAU,EAAE,UAAU,EAAE,OAAO,CAAC,CAAC;wBACpD,MAAM,EAAE,CAAC,SAAS,CAAC,mBAAmB,EAAE,UAAU,EAAE,OAAO,CAAC,CAAC;wBAE7D,OAAO,CAAC,GAAG,CACT,8CAA8C,UAAU,EAAE,CAC3D,CAAC;oBACJ,CAAC;oBAAC,OAAO,KAAK,EAAE,CAAC;wBACf,OAAO,CAAC,KAAK,CACX,iDAAiD,EACjD,KAAK,CACN,CAAC;oBACJ,CAAC;gBACH,CAAC;YACH,CAAC,CAAC,CAAC;QACL,CAAC;KACF,CAAC;AACJ,CAAC"}
+{"version":3,"file":"plugin.js","sourceRoot":"","sources":["../../src/plugin/plugin.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,IAAI,EAAE,EAAE,MAAM,SAAS,CAAC;AACzC,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAO3D;;;GAGG;AACH,MAAM,UAAU,cAAc,CAAC,UAA6B,EAAE;IAC5D,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAQ,IAAI,aAAa,CAAC;IACnD,MAAM,UAAU,GAAG,OAAO,CAAC,UAAU,IAAI,iBAAiB,CAAC;IAE3D,IAAI,OAAoB,CAAC;IACzB,IAAI,SAAyB,CAAC;IAE9B,OAAO;QACL,IAAI,EAAE,kBAAkB;QACxB,KAAK,EAAE,OAAO,EAAE,uBAAuB;QAEvC,cAAc;YACZ,OAAO,GAAG,IAAI,WAAW,CAAC,QAAQ,CAAC,CAAC;YACpC,SAAS,GAAG,IAAI,cAAc,EAAE,CAAC;QACnC,CAAC;QAED,KAAK,CAAC,eAAe,CAAC,MAAM;YAC1B,wCAAwC;YACxC,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,QAAQ,CAAC,CAAC,CAAC;YAE1D,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE;gBACjD,4CAA4C;gBAC5C,IAAI,KAAK,KAAK,KAAK,IAAI,KAAK,KAAK,QAAQ,EAAE,CAAC;oBAC1C,IAAI,CAAC;wBACH,OAAO,CAAC,GAAG,CAAC,yBAAyB,KAAK,KAAK,QAAQ,EAAE,CAAC,CAAC;wBAE3D,oBAAoB;wBACpB,OAAO,GAAG,IAAI,WAAW,CAAC,QAAQ,CAAC,CAAC;wBACpC,SAAS,GAAG,IAAI,cAAc,EAAE,CAAC;wBAEjC,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,aAAa,EAAE,CAAC;wBAC/C,MAAM,UAAU,GAAG,SAAS,CAAC,kBAAkB,CAAC,QAAQ,CAAC,CAAC;wBAC1D,MAAM,UAAU,GAAG,SAAS,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAC;wBAEzD,oBAAoB;wBACpB,MAAM,EAAE,CAAC,SAAS,CAAC,UAAU,EAAE,UAAU,EAAE,OAAO,CAAC,CAAC;wBACpD,MAAM,EAAE,CAAC,SAAS,CAAC,mBAAmB,EAAE,UAAU,EAAE,OAAO,CAAC,CAAC;wBAE7D,OAAO,CAAC,GAAG,CACT,8CAA8C,UAAU,EAAE,CAC3D,CAAC;oBACJ,CAAC;oBAAC,OAAO,KAAK,EAAE,CAAC;wBACf,OAAO,CAAC,KAAK,CACX,iDAAiD,EACjD,KAAK,CACN,CAAC;oBACJ,CAAC;gBACH,CAAC;YACH,CAAC,CAAC,CAAC;QACL,CAAC;KACF,CAAC;AACJ,CAAC"}

package/dist/test/index.js

@@ -11,9 +11,10 @@ async function generateRoutes() {
         // console.log(fileData);
         console.dir(fileData, { depth: null });
         const generator = new RouteGenerator();
-        const routeMap = await generator.generateRoutesFile(fileData);
+        const routeMap = generator.generateRoutesFile(fileData);
         // console.log("Route map: ", routeMap)
-        // const routType = await generator.generateRoutesTypeDef(fileData);
+        const routType = generator.generateTypesFile(fileData);
+        console.log(routType);
         // console.log(routeMap);
         fs.writeFile("./src/test/output.ts", routeMap, "utf-8", (err) => {
             if (err) {

package/dist/test/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/test/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,KAAK,CAAC;AACpC,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAE3D,OAAO,EAAE,MAAM,IAAI,CAAA;AAEnB,MAAM,UAAU,GAAG,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAClD,MAAM,QAAQ,GAAG,YAAY,CAAC;AAE9B,KAAK,UAAU,cAAc;IAC3B,IAAI,CAAC;QACH,MAAM,OAAO,GAAG,IAAI,WAAW,CAAC,QAAQ,CAAC,CAAC;QAC1C,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,aAAa,EAAE,CAAC;QAE/C,yBAAyB;QAEzB,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAC,EAAC,KAAK,EAAC,IAAI,EAAC,CAAC,CAAC;QAEnC,MAAM,SAAS,GAAG,IAAI,cAAc,EAAE,CAAC;QACvC,MAAM,QAAQ,GAAG,MAAM,SAAS,CAAC,kBAAkB,CAAC,QAAQ,CAAC,CAAC;QAE9D,uCAAuC;QAEvC,oEAAoE;QAEpE,yBAAyB;QAEzB,EAAE,CAAC,SAAS,CAAC,sBAAsB,EAAC,QAAQ,EAAC,OAAO,EAAC,CAAC,GAAG,EAAC,EAAE;YAC1D,IAAI,GAAG,EAAE,CAAC;gBACR,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YAEnB,CAAC;QACH,CAAC,CAAC,CAAA;IACJ,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,CAAC,KAAK,CAAC,0BAA0B,EAAE,KAAK,CAAC,CAAC;IACnD,CAAC;AACH,CAAC;AAED,cAAc,EAAE,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/test/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,KAAK,CAAC;AACpC,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAE3D,OAAO,EAAE,MAAM,IAAI,CAAA;AAEnB,MAAM,UAAU,GAAG,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAClD,MAAM,QAAQ,GAAG,YAAY,CAAC;AAE9B,KAAK,UAAU,cAAc;IAC3B,IAAI,CAAC;QACH,MAAM,OAAO,GAAG,IAAI,WAAW,CAAC,QAAQ,CAAC,CAAC;QAC1C,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,aAAa,EAAE,CAAC;QAE/C,yBAAyB;QAEzB,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAC,EAAC,KAAK,EAAC,IAAI,EAAC,CAAC,CAAC;QAEnC,MAAM,SAAS,GAAG,IAAI,cAAc,EAAE,CAAC;QACvC,MAAM,QAAQ,GAAI,SAAS,CAAC,kBAAkB,CAAC,QAAQ,CAAC,CAAC;QAEzD,uCAAuC;QAEvC,MAAM,QAAQ,GAAI,SAAS,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAC;QACxD,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAGtB,yBAAyB;QAEzB,EAAE,CAAC,SAAS,CAAC,sBAAsB,EAAC,QAAQ,EAAC,OAAO,EAAC,CAAC,GAAG,EAAC,EAAE;YAC1D,IAAI,GAAG,EAAE,CAAC;gBACR,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YAEnB,CAAC;QACH,CAAC,CAAC,CAAA;IACJ,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,CAAC,KAAK,CAAC,0BAA0B,EAAE,KAAK,CAAC,CAAC;IACnD,CAAC;AACH,CAAC;AAED,cAAc,EAAE,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aaex-file-router",
-  "version": "1.3.1",
+  "version": "1.4.0",
   "description": "A file-based routing system for React projects that automatically generates routes from your file structure. Similar to Next.js App Router or Remix file conventions.",
   "main": "dist/index.js",
   "scripts": {