🔧 fix: #548 accessing all query params doesn't work

Author: SaltyAom

example/a.ts

@@ -1,17 +1,33 @@
 import { Elysia, error, t } from '../src'
+import { sucrose } from '../src/sucrose'
 import { post, req } from '../test/utils'
 
-const app = new Elysia()
-	.resolve(() => {
-		return error(418)
-
-		return {
-			a: 'a'
-		}
+console.log(
+	sucrose({
+		handler: function ({ query }) {
+			query.a
+		},
+		afterHandle: [],
+		beforeHandle: [],
+		error: [
+			function a({
+				query,
+				query: { a, c: d },
+				headers: { hello },
+				...rest
+			}) {
+				query.b
+				rest.query.e
+			},
+			({ query: { f } }) => {}
+		],
+		mapResponse: [],
+		onResponse: [],
+		parse: [],
+		request: [],
+		start: [],
+		stop: [],
+		trace: [],
+		transform: []
 	})
-	.get('/', ({ a }) => a)
-	.listen(3000)
-
-app.handle(req('/'))
-	.then((x) => x.status)
-	.then(console.log)
+)

src/sucrose.ts

@@ -324,6 +324,13 @@ export const findAlias = (type: string, body: string, depth = 0) => {
 	return aliases
 }
 
+const accessor = <T extends string, P extends string>(parent: T, prop: P) =>
+	[
+		parent + '.' + prop,
+		parent + '["' + prop + '"]',
+		parent + "['" + prop + "']"
+	] as const
+
 export const extractMainParameter = (parameter: string) => {
 	if (!parameter) return
 
@@ -357,6 +364,8 @@ export const inferBodyReference = (
 		code.includes(alias + "['" + type + "']")
 
 	for (let alias of aliases) {
+		if (!alias) continue
+
 		if (alias.charCodeAt(0) === 123) {
 			alias = retrieveRootParamters(alias)
 
@@ -391,7 +400,18 @@ export const inferBodyReference = (
 
 		if (!inference.query && access('query', alias)) inference.query = true
 
-		if (inference.query)
+		if (
+			['return'].some((type) =>
+				accessor(type + ' ' + alias, 'query').some((key) =>
+					code.includes(key)
+				)
+			)
+		) {
+			inference.query = true
+			inference.unknownQueries = true
+		}
+
+		if (inference.query && !inference.unknownQueries)
 			while (true) {
 				let keyword = alias + '.'
 				if (code.includes(keyword + 'query')) keyword = alias + '.query'
@@ -677,6 +697,19 @@ export const sucrose = (
 			inferBodyReference(body, aliases, inference)
 		}
 
+		const context = rootParameters || mainParameter
+		if (
+			context &&
+			['', 'return '].some((type) =>
+				accessor(type + context, 'query').some((key) =>
+					body.includes(key)
+				)
+			)
+		) {
+			inference.query = true
+			inference.unknownQueries = true
+		}
+
 		if (inference.query) {
 			inferBodyReference(body, ['query'], inference)
 

test/sucrose/query.test.ts

@@ -0,0 +1,35 @@
+import { Elysia } from '../../src'
+
+import { describe, expect, it } from 'bun:test'
+
+const req = () => new Request(`http://localhost/?name=sucrose`)
+
+describe('Query', () => {
+	it('access all using property name', async () => {
+		const app = new Elysia().get('/', (ctx) => ctx.query)
+		const response = await app.handle(req())
+
+		expect(await response.json()).toEqual({ name: 'sucrose' })
+	})
+
+	it('access all using destructuring', async () => {
+		const app = new Elysia().get('/', ({ query }) => query)
+		const response = await app.handle(req())
+
+		expect(await response.json()).toEqual({ name: 'sucrose' })
+	})
+
+	it('access single param using property name', async () => {
+		const app = new Elysia().get('/', (ctx) => ctx.query.name)
+		const response = await app.handle(req())
+
+		expect(await response.text()).toEqual('sucrose')
+	})
+
+	it('access single param using destructuring', async () => {
+		const app = new Elysia().get('/', ({ query: { name } }) => name)
+		const response = await app.handle(req())
+
+		expect(await response.text()).toEqual('sucrose')
+	})
+})