rajt 0.0.18 → 0.0.19

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "rajt",
   "description": "A serverless bundler layer, fully typed for AWS Lambda (Node.js and LLRT) and Cloudflare Workers.",
-  "version": "0.0.18",
+  "version": "0.0.19",
   "type": "module",
   "main": "dist/index.js",
   "exports": {

package/src/auth/token.ts

@@ -7,14 +7,7 @@ export class Token {
   static #prefix: string = 'bearer'
 
   static fromRequest(c: Context) {
-    // const token = this.fromHeader(c.req)
-    // Mock user
-    const token = this.create(c.req, {
-      name: 'Nicolau',
-      email: 'nicolau@zunq.com',
-      role: 'user',
-    }).get()
-
+    const token = this.fromHeader(c.req)
     return token ? this.parse(c.req, token) : null
   }
 

package/src/dev.ts

@@ -1,7 +1,7 @@
 import { config } from 'dotenv'
 import { serve } from '@hono/node-server'
 import createApp from './create-app'
-import getRoutes from './routes'
+import { getRoutes, getMiddlewares } from './routes'
 import { Ability } from './auth'
 import { getAvailablePort } from './utils/port'
 import jsonImport from './utils/json-import'
@@ -9,6 +9,7 @@ import jsonImport from './utils/json-import'
 config({ path: '../../.env.dev' })
 
 const routes = await getRoutes()
+const middlewares = await getMiddlewares()
 Ability.fromRoutes(routes)
 Ability.roles = jsonImport('../../../../.rolefile')
 

package/src/routes.ts

@@ -8,9 +8,9 @@ import { isAnonFn } from './utils/func'
 const __filename = fileURLToPath(import.meta.url)
 const __dirname = dirname(__filename)
 
-export default async function getRoutes(
+export async function getRoutes(
   all: boolean = false,
-  dirs: string[] = ['actions', 'features', 'errors', 'middlewares']
+  dirs: string[] = ['actions', 'features']
 ): Promise<Route[]> {
   const routes: Route[] = []
 
@@ -66,3 +66,54 @@ export default async function getRoutes(
   await Promise.all(dirs.map(dir => walk(resolve(__dirname, '../../..', dir), dir)))
   return routes
 }
+
+export async function getMiddlewares(
+  dirs: string[] = ['middlewares']
+): Promise<Route[]> {
+  const mw: Route[] = []
+
+  const walk = async (dir: string, baseDir: string, middlewares: Function[] = []): Promise<void> => {
+    if (!existsSync(dir)) return
+    const files = readdirSync(dir)
+
+    for (const file of files) {
+      const fullPath = join(dir, file)
+      const stat = statSync(fullPath)
+
+      if (stat.isDirectory()) {
+        const indexFile = join(fullPath, 'index.ts')
+
+        if (existsSync(indexFile)) {
+          const mod = await import(indexFile)
+          const group = mod.default
+
+          if (group?.gmw) {
+            // @ts-ignore
+            mw.push({
+              name: group.name.replace(/\.ts$/, ''),
+              file: baseDir + fullPath.split(baseDir)[1],
+              handle: group,
+            })
+          }
+        }
+
+        await walk(fullPath, baseDir, middlewares)
+      } else if (file.endsWith('.ts')) {
+        const mod = await import(fullPath)
+        const handle = mod.default
+
+        if (handle?.gmw) {
+          // @ts-ignore
+          mw.push({
+            name: handle.name.replace(/\.ts$/, ''),
+            file: baseDir + fullPath.split(baseDir)[1],
+            handle,
+          })
+        }
+      }
+    }
+  }
+
+  await Promise.all(dirs.map(dir => walk(resolve(__dirname, '../../..', dir), dir)))
+  return mw
+}

package/src/scripts/cache-routes.ts

@@ -1,6 +1,6 @@
 import { existsSync, writeFileSync } from 'node:fs'
 import { config } from 'dotenv'
-import getRoutes from '../routes'
+import { getRoutes, getMiddlewares } from '../routes'
 import ensureDir from '../utils/ensuredir'
 
 config({ path: '../../.env.dev' })
@@ -11,6 +11,7 @@ async function cacheRoutes() {
     writeFileSync(rolePath, '{}')
 
   const routes = await getRoutes(true)
+  const middlewares = await getMiddlewares()
 
   const iPath = '../../tmp/import-routes.mjs'
   ensureDir(iPath)
@@ -18,6 +19,7 @@ async function cacheRoutes() {
 import { registerHandler } from '../node_modules/rajt/src/register'
 
 ${routes.map(r => `import ${r.name} from '../${normalizePath(r.file)}'`).join('\n')}
+${middlewares.map(r => `import ${r.name} from '../${normalizePath(r.file)}'`).join('\n')}
 
 try {
   const handlers = {${routes.map(r => r.name).join()}}