rajt 0.0.71 → 0.0.72

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.71",
+  "version": "0.0.72",
   "type": "module",
   "main": "dist/index.js",
   "bin": {
@@ -25,7 +25,6 @@
     "src"
   ],
   "scripts": {
-    "rajt": "./src/bin/rajt.js",
     "aws:local": "bun run --silent aws:build && bun run --silent sam:local",
     "aws:package": "bun run --silent aws:build && bun run --silent sam:package",
     "aws:deploy": "bun run --silent aws:build && bun run --silent sam:package && bun run --silent sam:deploy",
@@ -34,11 +33,7 @@
     "sam:package": "sam package --template-file ../../template-prod.yaml --output-template-file ../../packaged.yaml",
     "sam:deploy": "sam deploy --template-file ../../packaged.yaml --stack-name rajt-llrt --capabilities CAPABILITY_IAM",
     "sam:update": "source ../../.env.prod && aws lambda update-function-code --function-name $AWS_NAME --zip-file fileb://../../lambda.zip --region $AWS_REGION --no-cli-pager 2>&1 >/dev/null",
-    "clean": "rm -rf ../../dist ../../tmp",
-    "clean:build": "rm -rf ../../dist",
-    "clean:temp": "rm -rf ../../tmp",
-    "zip": "zip -j ../../lambda.zip ../../dist/index.js",
-    "start": "node ../../dist/index.js"
+    "zip": "zip -j ../../lambda.zip ../../dist/index.js"
   },
   "dependencies": {
     "cripta": "^0.1",
@@ -97,8 +92,11 @@
     "application",
     "framework",
     "router",
+    "serverless",
+    "typescript",
     "cloudflare",
     "workers",
+    "vercel",
     "deno",
     "bun",
     "nodejs"

package/src/cli/commands/build.ts

@@ -1,7 +1,7 @@
 import { defineCommand } from 'citty'
 import { gray } from '../../utils/colors'
 import { build, normalizePlatform, platformError } from './utils'
-import { wait, error } from '../../utils/log'
+import { wait, error, rn } from '../../utils/log'
 
 import { platforms } from './constants'
 
@@ -27,11 +27,11 @@ export default defineCommand({
 
 		try {
 			await build(platform)
-		} catch (e) {
-			error('Build failed:', e)
+		} catch (e: any) {
+			error('Build failed:', e?.message || e)
 			process.exit(0)
 		} finally {
-			console.log('\t')
+			rn()
 		}
 	},
 })

package/src/cli/commands/dev.ts

@@ -53,8 +53,8 @@ export default defineCommand({
 						try {
 							await build(platform)
 							if (!lambda) await startLambda()
-						} catch (e) {
-							error('Build failed:', e)
+						} catch (e: any) {
+							error('Build failed:', e?.message || e)
 							process.exit(0)
 						} finally {
 							isBuilding = false
@@ -141,8 +141,8 @@ export default defineCommand({
 						try {
 							await build(platform)
 							await startWorker()
-						} catch (e) {
-							error('Build failed:', e)
+						} catch (e: any) {
+							error('Build failed:', e?.message || e)
 							process.exit(0)
 						} finally {
 							isBuilding = false

package/src/cli/commands/routes.ts

@@ -0,0 +1,106 @@
+import { join } from 'node:path'
+import { defineCommand } from 'citty'
+import { inspectRoutes } from 'hono/dev'
+import { gray, purple, red, yellow } from '../../utils/colors'
+import { __rajt } from './utils'
+import { rn } from '../../utils/log'
+import IMPORT from '../../utils/import'
+
+export default defineCommand({
+	meta: {
+		name: 'routes',
+		description: '📒 Displays all registered routes\n',
+	},
+	args: {
+		path: {
+			description: 'Filter the routes by path',
+			type: 'string',
+		},
+		method: {
+			description: 'Filter the routes by method',
+			type: 'string',
+		},
+		reverse: {
+			description: 'Reverse the ordering of the routes',
+			type: 'boolean',
+		},
+	},
+	async run({ args }) {
+		const mod = await IMPORT(join(__rajt, 'dev.ts'))
+		const app = mod.default
+
+		const opts = {
+			path: args?.path || '',
+			method: args?.method?.toUpperCase() || '',
+			reverse: !!args?.reverse,
+		}
+
+		const keys: Set<string> = new Set()
+		let maxMethodLength = 0
+		let maxPathLength = 0
+
+		const colorMethod = (method: string, str?: string) => {
+			const val = str || method
+
+			switch (method) {
+				case 'HEAD':
+				case 'OPTIONS':
+				case 'CONNECT':
+				case 'TRACE':
+					return gray(val)
+				case 'GET':
+					return purple(val)
+				case 'POST':
+				case 'PUT':
+				case 'PATCH':
+					return yellow(val)
+				case 'DELETE':
+					return red(val)
+			}
+
+			return val
+		}
+
+		let routes = inspectRoutes(app)
+			.filter(({ method, path, isMiddleware }) => {
+				const key = method + '-' + path
+				if (keys.has(key)) return false
+				keys.add(key)
+
+				let mLength = method.length
+				if (method == 'GET') mLength += 5
+
+				maxMethodLength = Math.max(maxMethodLength, mLength)
+				maxPathLength = Math.max(maxPathLength, path.length)
+
+				return [
+					!isMiddleware,
+					opts.path ? path.startsWith(opts.path) : true,
+					opts.method ? method == opts.method : true,
+				].every(Boolean)
+			})
+
+		if (opts.reverse)
+			routes = routes.reverse()
+
+		routes.forEach(route => {
+			if (!route) return
+			const { method, path } = route
+
+			let mLength = method.length
+			let str = colorMethod(method)
+
+			if (method == 'GET') {
+				mLength += 5
+				str += gray('|') + colorMethod('HEAD')
+			}
+
+			console.log(str + ' '.repeat(maxMethodLength - mLength) +'  '+ path.replace(
+				/(?::([a-zA-Z_][a-zA-Z0-9_]*)(\{[^}]+\})?|\*)/g,
+				_ => colorMethod(method, _)
+			))
+		})
+
+		rn()
+	},
+})

package/src/cli/commands/utils.ts

@@ -14,7 +14,7 @@ import { step, substep, event, error, warn } from '../../utils/log'
 import { platforms } from './constants'
 
 export const _root = join(dirname(new URL(import.meta.url).pathname), '../../../../../')
-const __rajt = join(_root, 'node_modules/rajt/src')
+export const __rajt = join(_root, 'node_modules/rajt/src')
 
 export function normalizePlatform(platform: Platform) {
   platform = platform?.toLowerCase() as Platform

package/src/cli/index.ts

@@ -5,10 +5,10 @@ import { logo } from '../utils/log'
 import { isColorSupported, gray } from '../utils/colors'
 import { version as rajtVersion } from '../../package.json'
 
-
 import dev from './commands/dev'
 import build from './commands/build'
 import deploy from './commands/deploy'
+import routes from './commands/routes'
 
 /**
  * The main entrypoint for the CLI.
@@ -56,6 +56,8 @@ if (directly()) {
       dev,
       build,
       deploy,
+      routes,
+      endpoints: routes,
     },
   })
 

package/src/create-app.ts

@@ -1,5 +1,6 @@
 import { Hono } from 'hono'
 import { logger } from 'hono/logger'
+import { matchedRoutes } from 'hono/route'
 import { Envir } from 't0n'
 import type {
   Env, Context, Next,
@@ -64,8 +65,31 @@ export const createApp = <E extends Env>(options?: ServerOptions<E>) => {
   // const root = options?.root ?? '/'
   const app = options?.app ?? new Hono<E>()
 
-  if (isDev())
-    app.use('*', logger((...args: any[]) => console.log(gray(localDate()), ...args)))
+  if (isDev()) {
+    app.use('*', async function (c: Context, next: Next) {
+      const method = c.req.method
+      const route = matchedRoutes(c).find(route => route.method == method)?.path
+      const logWithRoute = (args: string[]) => {
+        if (!route || !args.length) return args
+        return args.map(arg => {
+          if (!arg) return arg
+          const split = arg?.split(' ')
+          if (split.length < 3 || split[2] == route)
+            return arg
+
+          split.splice(Math.min(3, split.length), 0, gray(route))
+          return split.join(' ')
+        })
+      }
+
+      const devLogger = logger((...args: any[]) => {
+        const timestamp = gray(localDate())
+        console.log(timestamp, ...logWithRoute(args))
+      })
+
+      await devLogger(c, next)
+    })
+  }
 
   app.use(async (c: Context, next: Next) => {
     c.set(GET_REQUEST as unknown as string, new request(c))

package/src/register.ts

@@ -1,8 +1,8 @@
 export const handlers: Record<string, Function> = {}
 
 export function registerHandler(id: string, handler: any) {
-  if (id in handlers)
-    console.warn(`🟠 Handler "${id}" has already been registered`)
+  // if (id in handlers)
+  //   console.warn(`Handler "${id}" has already been registered`)
 
   handlers[id] = handler
 }

package/src/request.ts

@@ -3,6 +3,8 @@ import { HTTPException } from 'hono/http-exception'
 import { Authnz, Token } from './auth'
 
 import type { Context } from 'hono'
+import { routePath, matchedRoutes } from 'hono/route'
+import type { RouterRoute } from 'hono/types'
 import type { CookieOptions, CookiePrefixOptions } from 'hono/utils/cookie'
 import type { CustomHeader, RequestHeader } from 'hono/utils/headers'
 import type { BodyData, ParseBodyOptions } from 'hono/utils/body'
@@ -25,6 +27,8 @@ export default class $Request {
   #u: Authnz<any> | null = null
 
   #host: string
+  #routePath: string
+  #matchedRoutes: RouterRoute[]
 
   constructor(c: Context) {
     this.#c = c
@@ -33,6 +37,9 @@ export default class $Request {
 
     const url = new URL(c.req.raw.url)
     this.#host = url.protocol +'//'+ url.host
+
+    this.#routePath = routePath(c)
+    this.#matchedRoutes = matchedRoutes(c)
   }
 
   get user() {
@@ -83,7 +90,7 @@ export default class $Request {
   }
 
   get routePath() {
-    return this.#c.req.routePath
+    return this.#routePath
   }
 
   get url() {
@@ -98,12 +105,17 @@ export default class $Request {
     return this.#c.req.path
   }
 
+  get fullPath() {
+    const url = this.url
+    return url.slice(url.indexOf('/', 8))
+  }
+
   get method() {
     return this.#c.req.raw.method
   }
 
   get matchedRoutes() {
-    return this.#c.req.matchedRoutes
+    return this.#matchedRoutes
   }
 
   get raw() {

package/src/routes.ts

@@ -9,6 +9,7 @@ import { isAnonFn } from './utils/func'
 import ensureDir from './utils/ensuredir'
 import versionSHA from './utils/version-sha'
 import type { Route } from './types'
+import { error, substep, warn } from './utils/log'
 
 const __filename = new URL(import.meta.url).pathname
 const __root = resolve(dirname(__filename), '../../..')
@@ -42,11 +43,16 @@ const walk = async (dir: string, baseDir: string, fn: Function, parentMw: string
   }
 }
 
+let hasDuplicatedRoutes = false
 export async function getRoutes(
   dirs: string[] = ['actions', 'features', 'routes']
 ): Promise<Route[]> {
+  hasDuplicatedRoutes = false
   const routes: Route[] = []
-  let mw: string[] = []
+
+  let length = 0
+  const keys: Set<string> = new Set()
+  const bag: Record<string, string[]> = {}
 
   await Promise.all(dirs.map(dir => walk(
     resolve(__root, dir),
@@ -66,9 +72,24 @@ export async function getRoutes(
         middlewares,
         handle,
       })
+
+      if (!keys.has(name)) {
+        keys.add(name)
+      } else {
+        ;(bag[name] ||= []).push(file)
+        length++
+      }
     }
   )))
 
+  if (length) {
+    hasDuplicatedRoutes = true
+    Object.entries(bag).forEach(([name, paths]) => {
+      warn(`Route "${name}" has `+ (paths.length > 1 ? `registered ${paths.length} times:` : 'already been registered:'))
+      substep(...paths)
+    })
+  }
+
   return sortRoutes(routes)
 }
 
@@ -93,13 +114,13 @@ function extractHttpPath(file: string) {
   return route == '/' ? '/' : route.replace(/\/$/, '')
 }
 
-function sortRoutes(routes: Route[]) {
+export function sortRoutes(routes: Route[]) {
   const metas = new Map<string, { score: number, segmentsCount: number }>()
 
   for (const route of routes)
     metas.set(route.path, computeRouteMeta(route.path))
 
-  return routes.sort((a, b) => {
+  const list = routes.sort((a, b) => {
     const metaA = metas.get(a.path)!
     const metaB = metas.get(b.path)!
 
@@ -108,6 +129,13 @@ function sortRoutes(routes: Route[]) {
 
     return metaB.score - metaA.score
   })
+
+  while (list.length && list.at(-1)?.path == '/') {
+    const last = list.pop()
+    last && list.unshift(last)
+  }
+
+  return list
 }
 
 function computeRouteMeta(path: string) {
@@ -116,7 +144,7 @@ function computeRouteMeta(path: string) {
   let score = 0
   for (const segment of segments) {
     if (segment === '*') {
-      score += 0
+      continue
     } else if (segment.startsWith(':')) {
       score += 1
     } else {
@@ -219,6 +247,9 @@ export async function cacheRoutes() {
     writeFileSync(rolePath, `export default {\n\n}`)
 
   const routes = await getRoutes()
+  if (hasDuplicatedRoutes)
+    throw new Error("The app can't build with duplicate routes")
+
   const middlewares = await getMiddlewares()
   const configs = Object.entries(await getConfigs())