chore: wip

Author: glennmichael123

storage/framework/core/router/src/router.ts

@@ -7,15 +7,14 @@ import { path as p } from '@stacksjs/path'
 import { fs } from '@stacksjs/storage'
 import { kebabCase, pascalCase } from '@stacksjs/strings'
 import { customValidate, isObjectNotEmpty } from '@stacksjs/validation'
-import { StaticRouteManager } from './static'
+import { staticRoute } from './'
 import { extractDefaultRequest, findRequestInstance } from './utils'
 
 type ActionPath = string
 
 export class Router implements RouterInterface {
   private routes: Route[] = []
   private path = ''
-  private staticManager: StaticRouteManager = new StaticRouteManager()
 
   private addRoute(
     method: Route['method'],
@@ -142,15 +141,15 @@ export class Router implements RouterInterface {
     const uri = this.prepareUri(this.path)
 
     // Add to static manager
-    this.staticManager.addHtmlFile(uri, htmlFile)
+    staticRoute.addHtmlFile(uri, htmlFile)
 
     // Register as a route for consistency
     return this.addRoute('GET', uri, async () => htmlFile, 200)
   }
 
   // New method to get static configuration
   public getStaticConfig(): Record<string, any> {
-    return this.staticManager.getStaticConfig()
+    return staticRoute.getStaticConfig()
   }
 
   public redirect(path: Route['url'], callback: Route['callback'], _status?: RedirectCode): this {
@@ -255,12 +254,16 @@ export class Router implements RouterInterface {
   }
 
   public async getRoutes(): Promise<Route[]> {
-    await import('../../../../../routes/api') // user routes
-    await import('../../../orm/routes') // auto-generated routes
+    await this.importRoutes()
 
     return this.routes
   }
 
+  public async importRoutes(): Promise<void> {
+    await import('../../../../../routes/api') // user routes
+    await import('../../../orm/routes') // auto-generated routes
+  }
+
   public async resolveCallback(callback: Route['callback']): Promise<Route['callback']> {
     if (callback instanceof Promise) {
       const actionModule = await callback

storage/framework/core/router/src/server.ts

@@ -7,7 +7,7 @@ import { getModelName } from '@stacksjs/orm'
 import { extname, path } from '@stacksjs/path'
 import { fs, globSync } from '@stacksjs/storage'
 import { isNumber } from '@stacksjs/validation'
-import { route, StaticRouteManager } from '.'
+import { route, staticRoute } from '.'
 
 import { middlewares } from './middleware'
 
@@ -28,8 +28,7 @@ export async function serve(options: ServeOptions = {}): Promise<void> {
   const hostname = options.host || 'localhost'
   const port = options.port || 3000
   const development = options.debug ? true : process.env.APP_ENV !== 'production' && process.env.APP_ENV !== 'prod'
-  const staticManager: StaticRouteManager = new StaticRouteManager()
-  const staticFiles = staticManager.getStaticConfig()
+  const staticFiles = await staticRoute.getStaticConfig()
 
   if (options.timezone)
     process.env.TZ = options.timezone
@@ -63,6 +62,7 @@ export async function serverResponse(req: Request, body: string): Promise<Respon
   const url: URL = new URL(trimmedUrl) as URL
   const routesList: Route[] = await route.getRoutes()
 
+
   log.info(`Routes List: ${JSON.stringify(routesList)}`)
   log.info(`URL: ${JSON.stringify(url)}`)
 

storage/framework/core/router/src/static.ts

@@ -1,3 +1,5 @@
+import { route } from './'
+
 export class StaticRouteManager {
   private staticRoutes: Record<string, any> = {}
 
@@ -8,7 +10,11 @@ export class StaticRouteManager {
     this.staticRoutes[normalizedUri] = htmlFile
   }
 
-  public getStaticConfig(): Record<string, any> {
+  public async getStaticConfig(): Promise<Record<string, any>> {
+    await route.importRoutes()
+
     return this.staticRoutes
   }
 }
+
+export const staticRoute: StaticRouteManager = new StaticRouteManager()