Merge pull request #1805 from MarcelOlsen/fix/guard-dynamic-import

Fix dynamic imports inside `.guard()` not registering routes

Author: SaltyAom

src/index.ts

@@ -4685,6 +4685,80 @@ export default class Elysia<
 			}
 		)
 
+		// Handle dynamic imports (Promises) used inside guard callback
+		if (instance.promisedModules.size > 0) {
+			let processedUntil = instance.router.history.length
+
+			for (const promise of instance.promisedModules.promises) {
+				this.promisedModules.add(
+					promise.then(() => {
+						const {
+							body,
+							headers,
+							query,
+							params,
+							cookie,
+							response,
+							...guardHook
+						} = hook
+
+						const hasStandaloneSchema =
+							body || headers || query || params || cookie || response
+
+						const startIndex = processedUntil
+						processedUntil = instance.router.history.length
+
+						for (
+							let i = startIndex;
+							i < instance.router.history.length;
+							i++
+						) {
+							const {
+								method,
+								path,
+								handler,
+								hooks: localHook
+							} = instance.router.history[i]
+
+							this.add(
+								method,
+								path,
+								handler,
+								mergeHook(guardHook as AnyLocalHook, {
+									...((localHook || {}) as AnyLocalHook),
+									error: !localHook.error
+										? sandbox.event.error
+										: Array.isArray(localHook.error)
+											? [
+													...(localHook.error ?? []),
+													...(sandbox.event.error ?? [])
+												]
+											: [
+													localHook.error,
+													...(sandbox.event.error ?? [])
+												],
+									standaloneValidator: !hasStandaloneSchema
+										? localHook.standaloneValidator
+										: [
+												...(localHook.standaloneValidator ??
+													[]),
+												{
+													body,
+													headers,
+													query,
+													params,
+													cookie,
+													response
+												}
+											]
+								})
+							)
+						}
+					})
+				)
+			}
+		}
+
 		return this as any
 	}
 

test/core/modules.test.ts

@@ -248,4 +248,55 @@ describe('Modules', () => {
 		const text = await response.text()
 		expect(text).toEqual('GET /plugin')
 	})
+
+	it('register dynamic import routes inside guard', async () => {
+		const app = new Elysia().guard(
+			{},
+			(app) => app.use(import('../modules').then((m) => m.lazyInstance))
+		)
+
+		await app.modules
+
+		const res = await app.handle(req('/lazy-instance'))
+
+		expect(res.status).toBe(200)
+		expect(await res.text()).toBe('lazy-instance')
+	})
+
+	it('register multiple dynamic import routes inside guard', async () => {
+		const lazyA = Promise.resolve(new Elysia().get('/a', () => 'a'))
+		const lazyB = Promise.resolve(new Elysia().get('/b', () => 'b'))
+
+		let hookCalls = 0
+
+		const app = new Elysia().guard(
+			{ beforeHandle: () => { hookCalls++ } },
+			(app) => app.use(lazyA).use(lazyB)
+		)
+
+		await app.modules
+
+		expect((await app.handle(req('/a'))).status).toBe(200)
+		expect((await app.handle(req('/b'))).status).toBe(200)
+		expect(hookCalls).toBe(2)
+	})
+
+	it('register dynamic import routes inside guard with hook', async () => {
+		let called = false
+
+		const app = new Elysia().guard(
+			{
+				beforeHandle: () => {
+					called = true
+				}
+			},
+			(app) => app.use(import('../modules').then((m) => m.lazyInstance))
+		)
+
+		await app.modules
+
+		await app.handle(req('/lazy-instance'))
+
+		expect(called).toBe(true)
+	})
 })

test/modules.ts

@@ -2,4 +2,6 @@ import { Elysia } from '../src'
 
 export const lazy = async (app: Elysia) => app.get('/lazy', () => 'lazy')
 
+export const lazyInstance = new Elysia().get('/lazy-instance', () => 'lazy-instance')
+
 export default lazy