fix: should not replace literal + with in the query string (#943)

Author: macabeus

src/compose.ts

@@ -692,7 +692,7 @@ export const composeHandler = ({
 			}`
 		} else {
 			fnLiteral += `if(c.qi !== -1) {
-				let url = '&' + decodeURIComponent(c.url.slice(c.qi + 1))
+				let url = '&' + decodeURIComponent(c.url.slice(c.qi + 1).replaceAll('+', ' '))
 
 				${destructured
 					.map(
@@ -726,8 +726,8 @@ export const composeHandler = ({
 
 											let temp
 
-											if(memory === -1) temp = url.slice(start).replace(/\\+|%20/g, ' ')
-											else temp = url.slice(start, memory).replace(/\\+|%20/g, ' ')
+											if(memory === -1) temp = url.slice(start)
+											else temp = url.slice(start, memory)
 
 											const charCode = temp.charCodeAt(0)
 											if(charCode !== 91 && charCode !== 123)
@@ -755,10 +755,10 @@ export const composeHandler = ({
 												a${index} = []
 
 											if(memory === -1) {
-												a${index}.push(url.slice(start).replace(/\\+|%20/g, ' '))
+												a${index}.push(url.slice(start))
 												break
 											}
-											else a${index}.push(url.slice(start, memory).replace(/\\+|%20/g, ' '))
+											else a${index}.push(url.slice(start, memory))
 
 											memory = url.indexOf('&${key}=', memory)
 											if(memory === -1) break
@@ -772,8 +772,8 @@ export const composeHandler = ({
 										const start = memory + ${key.length + 2}
 										memory = url.indexOf('&', start)
 
-										if(memory === -1) a${index} = url.slice(start).replace(/\\+|%20/g, ' ')
-										else a${index} = url.slice(start, memory).replace(/\\+|%20/g, ' ')
+										if(memory === -1) a${index} = url.slice(start)
+										else a${index} = url.slice(start, memory)
 
 										if (a${index} !== undefined) {
 											try {
@@ -790,9 +790,9 @@ export const composeHandler = ({
 										const start = memory + ${key.length + 2}
 										memory = url.indexOf('&', start)
 
-										if(memory === -1) a${index} = url.slice(start).replace(/\\+|%20/g, ' ')
+										if(memory === -1) a${index} = url.slice(start)
 										else {
-											a${index} = url.slice(start, memory).replace(/\\+|%20/g, ' ')
+											a${index} = url.slice(start, memory)
 
 											${
 												anyOf
@@ -811,8 +811,8 @@ export const composeHandler = ({
 														deepMemory = url.indexOf('&', start)
 
 													let value
-													if(deepMemory === -1) value = url.slice(start).replace(/\\+|%20/g, ' ')
-													else value = url.slice(start, deepMemory).replace(/\\+|%20/g, ' ')
+													if(deepMemory === -1) value = url.slice(start)
+													else value = url.slice(start, deepMemory)
 
 													const vStart = value.charCodeAt(0)
 													const vEnd = value.charCodeAt(value.length - 1)

test/validator/query.test.ts

@@ -680,23 +680,43 @@ describe('Query Validator', () => {
 		})
 	})
 
-	it('parse + in query', async () => {
+	it('parse query with space', async () => {
 		const api = new Elysia().get('', ({ query }) => query, {
 			query: t.Object({
 				keyword: t.String()
 			})
 		})
 
 		const url = new URL('http://localhost:3000/')
-		url.searchParams.append('keyword', 'hello world')
-		console.log(url.href) //http://localhost:3000/?keyword=hello+world
+		url.searchParams.append('keyword', 'with space')
+		console.log(url.href) // http://localhost:3000/?keyword=with+space
 
 		const result = await api
 			.handle(new Request(url.href))
 			.then((response) => response.json())
 
 		expect(result).toEqual({
-			keyword: 'hello world'
+			keyword: 'with space'
+		})
+	})
+
+	it('parse query with +', async () => {
+		const api = new Elysia().get('', ({ query }) => query, {
+			query: t.Object({
+				keyword: t.String()
+			})
+		})
+
+		const url = new URL("http://localhost:3000/");
+		url.searchParams.append("keyword", "with+plus");
+		console.log(url.href) // http://localhost:3000/?keyword=with%2Bplus
+	
+		const result = await api
+			.handle(new Request(url.href))
+			.then((response) => response.json())
+
+		expect(result).toEqual({
+			keyword: 'with+plus'
 		})
 	})