chore: wip

Author: glennmichael123

.stacks/core/router/src/index.ts

@@ -1,45 +1,44 @@
-import type { Route, RouteCallback, RouteGroupOptions } from '@stacksjs/types'
-import { handleRequest } from './server'
+import { type Route, type RouteCallback, type RouteGroupOptions } from '@stacksjs/types'
 import { projectPath } from '@stacksjs/path'
 
+import type { StatusCode, RedirectCode } from '@stacksjs/types'
 export class Router {
   private routes: Route[] = []
 
-  private addRoute(method: Route['method'], uri: string, callback: RouteCallback | string | object): void {
+  private addRoute(method: Route['method'], uri: string, callback: RouteCallback | string | object, statusCode: StatusCode): void {
     const pattern = new RegExp(`^${uri.replace(/:[a-zA-Z]+/g, (match) => {
       return '([a-zA-Z0-9-]+)'
     })}$`)
 
-    this.routes.push({ method, uri, callback, pattern })
+    this.routes.push({ method, uri, callback, pattern, statusCode })
   }
 
   public get(url: string, callback: RouteCallback): void {
-    this.addRoute('GET', url, callback)
+    this.addRoute('GET', url, callback, 200)
   }
 
   public post(url: string, callback: RouteCallback): void {
-    this.addRoute('POST', url, callback)
+    this.addRoute('POST', url, callback, 201)
   }
 
   public view(url: string, callback: RouteCallback): void {
-    this.addRoute('GET', url, callback)
+    this.addRoute('GET', url, callback, 200)
   }
 
-  public redirect(url: string, callback: RouteCallback): void {
-    this.addRoute('GET', url, callback)
-    handleRequest(this.getRoutes(), true)
+  public redirect(url: string, callback: RouteCallback, status?: RedirectCode): void {
+    this.addRoute('GET', url, callback, 302)
   }
 
   public delete(url: string, callback: RouteCallback): void {
-    this.addRoute('DELETE', url, callback)
+    this.addRoute('DELETE', url, callback, 204)
   }
 
   public patch(url: string, callback: RouteCallback): void {
-    this.addRoute('PATCH', url, callback)
+    this.addRoute('PATCH', url, callback, 202)
   }
 
   public put(url: string, callback: RouteCallback): void {
-    this.addRoute('PUT', url, callback)
+    this.addRoute('PUT', url, callback, 202)
   }
 
   public group(options: RouteGroupOptions, callback: () => void): void {
@@ -57,6 +56,9 @@ export class Router {
     // For each route added by the callback, adjust the URI and add to the original routes array.
     this.routes.forEach((r) => {
       r.uri = `${prefix}${r.uri}`
+
+      if (middleware.length)
+        r.middleware = middleware
       // Assuming you have a middleware property for each route.
 
       originalRoutes.push(r)
@@ -78,7 +80,6 @@ export class Router {
     // const routeFileData = (await readTextFile(projectPath('routes/web.ts'))).data
 
     await import(projectPath('routes/web.ts'))
-    await import(projectPath('routes/api.ts'))
 
     // run routes/web.ts
     // const webRoutesPath = projectPath('routes/web.ts')

.stacks/core/router/src/server.ts

@@ -1,37 +1,34 @@
 import { URL } from 'node:url'
 import { extname } from 'node:path'
-import { type Route } from '@stacksjs/types'
+import { StatusCode, type Route } from '@stacksjs/types'
 import middlewares from '../../../../app/middleware'
 import { request } from './request'
 import { route } from './index'
 
+const routesList: Route[] = await route.getRoutes()
 
-const routesList: Route[] = route.getRoutes()
+Bun.serve({
+  async fetch(req) {
+    const url = new URL(req.url)
 
-export function handleRequest(): void {
-  Bun.serve({
-    fetch(req) {
-      const url = new URL(req.url)
+    const foundRoute: Route = routesList.find((route: Route) => {
+      const pattern = new RegExp(`^${route.uri.replace(/:\w+/g, '\\w+')}$`)
 
-      const foundRoute: Route = routesList.find((route: Route) => {
-        const pattern = new RegExp(`^${route.uri.replace(/:\w+/g, '\\w+')}$`)
+      return pattern.test(url.pathname)
+    }) as Route
 
-        return pattern.test(url.pathname)
-      }) as Route
+    if (url.pathname === '/favicon.ico')
+      return new Response('')
 
-      if (url.pathname === '/favicon.ico')
-        return new Response('')
+    if (!foundRoute)
+      return new Response('Not found', { status: 404 })
 
-      if (!foundRoute)
-        return new Response('Not found', { status: 404 })
+    addRouteParamsandQuery(url, foundRoute)
+    executeMiddleware(foundRoute)
 
-      addRouteParamsandQuery(url, foundRoute)
-      executeMiddleware(foundRoute)
-
-      return execute(foundRoute, req)
-    },
-  })
-}
+    return execute(foundRoute, req, { statusCode: foundRoute.statusCode })
+  },
+})
 
 function addRouteParamsandQuery(url: URL, route: Route): void {
   if (!isObjectNotEmpty(url.searchParams))
@@ -41,8 +38,8 @@ function addRouteParamsandQuery(url: URL, route: Route): void {
 }
 
 function executeMiddleware(route: Route): void {
-  const { middleware } = route
-
+  const { middleware = null } = route
+  
   if (middleware && middlewares && isObjectNotEmpty(middlewares)) {
     if (isString(middleware)) {
       const fn = middlewares[middleware]
@@ -59,11 +56,17 @@ function executeMiddleware(route: Route): void {
   }
 }
 
-function execute(route: Route, request: any): Response {
-  if (route?.method === 'GET' && isRedirect) {
+function execute(route: Route, request: any, { statusCode }: { statusCode: StatusCode }) {
+  if (route?.method === 'GET' && (statusCode === 301 || statusCode === 302)) {
     const callback = String(route.callback)
 
-    return Response.redirect(callback, 301)
+    const response = Response.redirect(callback, statusCode)
+
+    response.headers.set('Cache-Control', 'no-store, no-cache, must-revalidate, proxy-revalidate');
+    response.headers.set('Pragma', 'no-cache');
+    response.headers.set('Expires', '0');
+
+    return response;
   }
 
   if (route?.method !== request.method)

.stacks/core/types/src/router.ts

@@ -41,8 +41,13 @@ export interface Route {
   callback: RouteCallback
   paramNames: string[]
   middleware?: string | string[]
+  statusCode?: StatusCode
 }
 
+export type StatusCode = 200 | 201 | 202 | 204 | 301 | 302 | 304 | 400 | 401 | 403 | 404 | 500
+
+export type RedirectCode = 301 | 302
+
 export type Middleware = () => void
 
 export interface Middlewares {

routes/web.ts

@@ -1,27 +1,23 @@
 import { route } from '../.stacks/core/router/src/index.ts'
 import { request } from '../.stacks/core/router/src/request.ts'
 
-route.get('/users/list', getBlogs)
-// route.post('/blogs', 'hello world')
+route.get('/blogs', 'hello blogs')
 
-// route.group({ prefix: '/users', middleware: 'auth' }, () => {
-//   route.get('/get/:id', getUsers)
+route.group({ prefix: '/users', middleware: 'auth' }, () => {
+  route.get('/get/:id', getUsers)
 
-//   // route.get('/delete', getUsers)
-// })
+  route.get('/delete', getBlogs)
+})
 
 // TODO: Add a way to register a view.
-// route.view('/welcome', 'hello world')
-route.redirect('/wel', '/welcome')
+route.redirect('/user', '/welcome')
+route.get('/welcome', 'hello world')
+route.get('/users', 'hello users')
 
 function getUsers() {
   return request.getParams('id')
 }
 
-// function getUserId() {
-//   return request.getParams('id')
-// }
-
 function getBlogs() {
-  return request.all()
+  return 'hello blogs function'
 }