🔧 fix: NotFoundError should parse query if inferred

Author: SaltyAom

CHANGELOG.md

@@ -17,10 +17,11 @@ Bug fix:
 - [#1319](https://github.com/elysiajs/elysia/pull/1319) fix array of plugin usage causes incorrect path aggregation
 - [#1323](https://github.com/elysiajs/elysia/issues/1323) don't duplicate error from plugin
 - dynamic handle should handle named parser
-- hand
+- handle non-root additionalProperties
 
 Improvement:
 - remove `finally` from compose
+- `NotFoundError` should parse query if inferred
 
 Change:
 - afterResponse now call after response by scheduling setImmediate

example/a.ts

@@ -1,19 +1,16 @@
+// server.ts
 import { Elysia, InternalServerError, t } from '../src'
-import { describe, it, expect, beforeEach } from 'bun:test'
-
-let isOnResponseCalled: boolean
-let onResponseCalledCounter = 0
 
 class CustomError extends Error {}
 
-const app = new Elysia({ aot: true })
-	.onError(() => {
-
+const app = new Elysia()
+	.onAfterResponse((context) => {
+		console.log(context.query)
 	})
-	.onAfterResponse(() => {
-		isOnResponseCalled = true
-		onResponseCalledCounter++
-		console.log(onResponseCalledCounter)
+	.post('/', () => 'yay', {
+		body: t.Object({
+			test: t.String()
+		})
 	})
 	.get('/customError', () => {
 		throw new CustomError('whelp')
@@ -23,53 +20,49 @@ const app = new Elysia({ aot: true })
 	})
 	.listen(3000)
 
-// console.log(app.routes[0].compile().toString())
-// console.log(app.handleError.toString())
-
-app.handle(new Request('http://localhost/customError'))
-
-// beforeEach(() => {
-// 	isOnResponseCalled = false
-// 	onResponseCalledCounter = 0
-// })
+console.log(app.server!.url.toString())
 
+// client.ts
 export const newReq = (params?: {
 	path?: string
 	headers?: Record<string, string>
 	method?: string
 	body?: string
-}) => new Request(`http://localhost${params?.path ?? '/'}`, params)
-
-// describe('Error', () => {
-// 	it.each([
-// 		['NotFoundError', newReq({ path: '/notFound' })],
-// 		[
-// 			'ParseError',
-// 			newReq({
-// 				method: 'POST',
-// 				headers: { 'Content-Type': 'application/json' },
-// 				body: ''
-// 			})
-// 		],
-// 		[
-// 			'ValidationError',
-// 			newReq({
-// 				method: 'POST',
-// 				headers: { 'Content-Type': 'application/json' },
-// 				body: JSON.stringify({})
-// 			})
-// 		],
-// 		['CustomError', newReq({ path: '/customError' })],
-// 		['InternalServerError', newReq({ path: '/internalError' })]
-// 	])('%s should call onResponse', async (_name, request) => {
-// 		expect(isOnResponseCalled).toBeFalse()
-// 		expect(onResponseCalledCounter).toBe(0)
-// 		await app.handle(request)
+	query: string
+}) =>
+	new Request(
+		`http://localhost:3000${params?.path ?? '/'}?name=${params?.query}`,
+		params
+	)
 
-// 		// wait for next tick
-// 		await Bun.sleep(1)
+const cases = [
+	['NotFoundError', newReq({ path: '/notFound', query: 'NotFoundError' })],
+	[
+		'ParseError',
+		newReq({
+			method: 'POST',
+			headers: { 'Content-Type': 'application/json' },
+			body: '',
+			query: 'ParseError'
+		})
+	],
+	[
+		'ValidationError',
+		newReq({
+			method: 'POST',
+			headers: { 'Content-Type': 'application/json' },
+			body: JSON.stringify({}),
+			query: 'ValidationError'
+		})
+	],
+	['CustomError', newReq({ path: '/customError', query: 'CustomError' })],
+	[
+		'InternalServerError',
+		newReq({ path: '/internalError', query: 'InternalServerError' })
+	]
+] as const
 
-// 		expect(isOnResponseCalled).toBeTrue()
-// 		expect(onResponseCalledCounter).toBe(1)
-// 	})
-// })
+for (const [name, req] of cases) {
+	console.log("N", name)
+	await fetch(req)
+}

src/adapter/web-standard/index.ts

@@ -128,7 +128,9 @@ export const WebStandardAdapter: ElysiaAdapter = {
 		},
 		error404(hasEventHook, hasErrorHook, afterHandle = '') {
 			let findDynamicRoute =
-				`if(route===null){` + afterHandle + '\nreturn '
+				`if(route===null){` +
+				afterHandle +
+				'\nreturn '
 
 			if (hasErrorHook)
 				findDynamicRoute += `app.handleError(c,notFound,false,${this.parameters})`

src/compose.ts

@@ -2254,7 +2254,7 @@ export const composeGeneralHandler = (app: AnyElysia) => {
 
 	findDynamicRoute += router.http.root.ALL ? '??router.find("ALL",p)\n' : '\n'
 
-	let afterResponse = ''
+	let afterResponse = `c.error=notFound\n`
 	if (app.event.afterResponse?.length) {
 		const prefix = app.event.afterResponse.some(isAsync) ? 'async' : ''
 		afterResponse += `\nsetImmediate(${prefix}()=>{`
@@ -2268,6 +2268,15 @@ export const composeGeneralHandler = (app: AnyElysia) => {
 		afterResponse += `})\n`
 	}
 
+	// @ts-ignore
+	if (app.inference.query)
+		afterResponse +=
+			'if(c.qi===-1){' +
+			'c.query={}' +
+			'}else{' +
+			'c.query=parseQueryFromURL(c.url,c.qi+1)' +
+			'}'
+
 	const error404 = adapter.error404(
 		!!app.event.request?.length,
 		!!app.event.error?.length,
@@ -2334,6 +2343,8 @@ export const composeGeneralHandler = (app: AnyElysia) => {
 		`handleError,` +
 		`status,` +
 		`redirect,` +
+		// @ts-ignore
+		allocateIf(`parseQueryFromURL,`, app.inference.query) +
 		allocateIf(`ELYSIA_TRACE,`, hasTrace) +
 		allocateIf(`ELYSIA_REQUEST_ID,`, hasTrace) +
 		adapterVariables +
@@ -2397,6 +2408,8 @@ export const composeGeneralHandler = (app: AnyElysia) => {
 		handleError,
 		status,
 		redirect,
+		// @ts-ignore
+		parseQueryFromURL: app.inference.query ? parseQueryFromURL : undefined,
 		ELYSIA_TRACE: hasTrace ? ELYSIA_TRACE : undefined,
 		ELYSIA_REQUEST_ID: hasTrace ? ELYSIA_REQUEST_ID : undefined,
 		...adapter.inject

test/lifecycle/error.test.ts

@@ -330,4 +330,15 @@ describe('error', () => {
 		expect(await response.text()).toBe('Unauthorized')
 		expect(i).toBe(1)
 	})
+
+	it('404 should parse query if infer', async () => {
+		const app = new Elysia().onError(({ query }) => query)
+
+		const response = await app.handle(
+			new Request('http://localhost?hello=world')
+		)
+
+		expect(response.status).toBe(404)
+		expect(await response.json()).toEqual({ hello: 'world' })
+	})
 })