🎉 feat: merge guard and hook responses status

Author: SaltyAom

CHANGELOG.md

@@ -1,3 +1,7 @@
+# 1.1.20 - 10 Oct 2024
+Bug fix:
+- merge guard and not specified hook responses status
+
 # 1.1.19 - 7 Oct 2024
 Bug fix:
 - unable to return `error` from derive/resolve

example/a.ts

@@ -1,21 +1,14 @@
-import { Elysia } from '../src'
+import { Elysia, t } from '../src'
 
-const optionalUserMiddleware = (app: Elysia) =>
-	app.derive({ as: 'scoped' }, async () => {
-		const user = { name: 'something' }
-
-		return {
-			user
+const app = new Elysia()
+	.guard({
+		response: {
+			400: t.String(),
+			500: t.String()
 		}
 	})
-
-export const isUserAuthenticated = (app: Elysia) =>
-	app.derive(({ error }) => {
-		if (true) return error('Unauthorized')
-
-		return {
-			user: 'a'
-		}
+	.get('/', () => '', {
+		response: t.String()
 	})
 
-export default optionalUserMiddleware
+console.log(app.routes[0].hooks)

package.json

@@ -1,7 +1,7 @@
 {
 	"name": "elysia",
 	"description": "Ergonomic Framework for Human",
-	"version": "1.1.19",
+	"version": "1.1.20",
 	"author": {
 		"name": "saltyAom",
 		"url": "https://github.com/SaltyAom",

src/utils.ts

@@ -165,6 +165,8 @@ export const mergeResponse = (
 
 	if (isRecordNumber(a) && isRecordNumber(b))
 		return { ...(a as RecordNumber), ...(b as RecordNumber) }
+	else if (a && !isRecordNumber(a) && isRecordNumber(b))
+		return { 200: a, ...(b as RecordNumber) }
 
 	return b ?? a
 }

test/path/guard.test.ts

@@ -401,4 +401,23 @@ describe('guard', () => {
 		expect(called).toBe(3)
 		expect(response).toEqual([422, 200])
 	})
+
+	it('handle merge guard and hook responses status', () => {
+		const app = new Elysia()
+			.guard({
+				response: {
+					400: t.String(),
+					500: t.String()
+				}
+			})
+			.get('/', () => '', {
+				response: t.String()
+			})
+
+		expect(Object.keys(app.routes[0].hooks.response)).toEqual([
+			'200',
+			'400',
+			'500'
+		])
+	})
 })