chore: wip

Author: glennmichael123

.stacks/core/router/src/middleware.ts

@@ -1,8 +1,7 @@
-export interface MiddlewareType {
-  name: string
-  priority: number
-  handle: Function
-}
+import fs from 'fs';
+import path from 'path';
+import { promisify } from 'util';
+import { MiddlewareType } from '@stacksjs/types';
 
 export class Middleware implements MiddlewareType {
   name: string
@@ -15,3 +14,26 @@ export class Middleware implements MiddlewareType {
       this.handle = data.handle
   }
 }
+
+const readdir = promisify(fs.readdir);
+
+async function importMiddlewares(directory: any) {
+    const middlewares = [];
+    const files = await readdir(directory);
+
+    for (const file of files) {
+        // Skip non-JavaScript files
+        if (path.extname(file) !== '.ts') continue;
+
+        // Dynamically import the middleware
+        const imported = await import(path.join(directory, file));
+        middlewares.push(imported.default);
+    }
+
+    return middlewares;
+}
+
+// Example usage:
+const middlewareDirectory = path.join(__dirname, '../../../../app/middleware');
+
+export const middlewares = await importMiddlewares(middlewareDirectory)

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

@@ -1,6 +1,6 @@
 import { URL } from 'node:url'
 import { extname } from 'node:path'
-import type { Route, StatusCode } from '@stacksjs/types'
+import type { Route, StatusCode, MiddlewareType } from '@stacksjs/types'
 import { middlewares }  from './middleware'
 import { request } from './request'
 import { route } from './index'
@@ -40,17 +40,24 @@ function addRouteParamsAndQuery(url: URL, route: Route): void {
 function executeMiddleware(route: Route): void {
   const { middleware = null } = route
 
+
   if (middleware && middlewares && isObjectNotEmpty(middlewares)) {
     if (isString(middleware)) {
-      const fn = middlewares[middleware]
-      if (fn)
-        fn() // Invoke only if it exists and is not undefined.
+      const middlewareItem: MiddlewareType = middlewares.find((middlewareItem: MiddlewareType) => {
+        return middlewareItem.name === middleware
+      })
+
+      if (middlewareItem)
+        middlewareItem.handle() // Invoke only if it exists and is not undefined.
     }
     else {
       middleware.forEach((m) => {
-        const fn = middlewares[m]
-        if (fn)
-          fn() // Again, invoke only if it exists.
+        const middlewareItem: MiddlewareType = middlewares.find((middlewareItem: MiddlewareType) => {
+          return middlewareItem.name === m
+        })
+
+        if (middlewareItem)
+          middlewareItem.handle() // Again, invoke only if it exists.
       })
     }
   }

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

@@ -46,6 +46,12 @@ export interface Route {
   statusCode?: StatusCode
 }
 
+export interface MiddlewareType {
+   name: string
+   priority: number
+   handle: Function
+ }
+
 export type StatusCode = 200 | 201 | 202 | 204 | 301 | 302 | 304 | 400 | 401 | 403 | 404 | 500
 export type RedirectCode = Extract<StatusCode, 301 | 302>
 

app/middleware/logger.ts

@@ -1,3 +1,5 @@
+import { Middleware } from '../../.stacks/core/router/src/middleware'
+
 export default new Middleware({
   name: 'logger',
   priority: 1,

routes/web.ts

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