Merge pull request #1040 from hisamafahri/feat/undefined-route

fix: undefined `route` context on `aot=false`

Author: SaltyAom

src/dynamic-handle.ts

@@ -63,6 +63,7 @@ export const createDynamicHandler = (app: AnyElysia) => {
 				set,
 				// @ts-expect-error
 				store: app.singleton.store,
+				route: app._route,
 				request,
 				path,
 				qi,

src/index.ts

@@ -195,6 +195,7 @@ export default class Elysia<
 	private dependencies: Record<string, Checksum[]> = {}
 
 	_routes: Routes = {} as any
+	_route: string = ""
 
 	_types = {
 		Prefix: '' as BasePath,
@@ -688,7 +689,7 @@ export default class Elysia<
 				validator,
 				hooks,
 				content: localHook?.type as string,
-				handle
+				handle,
 			})
 
 			if (this.config.strictPath === false)
@@ -706,6 +707,7 @@ export default class Elysia<
 				handler: handle,
 				hooks
 			})
+			this._route = path
 
 			return
 		}

test/core/context.test.ts

@@ -0,0 +1,56 @@
+import { describe, expect, it } from 'bun:test'
+import { Elysia } from '../../src'
+import { req } from '../utils'
+
+describe('context', () => {
+	describe('return route', () => {
+		it('on aot=true', async () => {
+			const app = new Elysia().get('/hi/:id', ({ route }) => route)
+			const res = await app.handle(req('/hi/123')).then((x) => x.text())
+			expect(res).toBe('/hi/:id')
+		})
+
+		it('on aot=false', async () => {
+			const app = new Elysia({ aot: false }).get(
+				'/hi/:id',
+				({ route }) => route
+			)
+			const res = await app.handle(req('/hi/123')).then((x) => x.text())
+			expect(res).toBe('/hi/:id')
+		})
+	})
+
+	describe('early return on macros with route data', () => {
+		it('on aot=true', async () => {
+			const app = new Elysia()
+				.macro({
+					test: {
+						beforeHandle({ route }) {
+							return route
+						}
+					}
+				})
+				.get('/hi/:id', () => 'should not returned', {
+					test: true
+				})
+			const res = await app.handle(req('/hi/123')).then((x) => x.text())
+			expect(res).toBe('/hi/:id')
+		})
+
+		it('on aot=false', async () => {
+			const app = new Elysia({ aot: false })
+				.macro({
+					test: {
+						beforeHandle({ route }) {
+							return route
+						}
+					}
+				})
+				.get('/hi/:id', () => 'should not returned', {
+					test: true
+				})
+			const res = await app.handle(req('/hi/123')).then((x) => x.text())
+			expect(res).toBe('/hi/:id')
+		})
+	})
+})