🔧 fix: 1108

Author: SaltyAom

CHANGELOG.md

@@ -1,3 +1,7 @@
+# 1.2.25 - 6 Mar 2025
+Bug fix:
+- [#1108](https://github.com/elysiajs/elysia/issues/1108) use validation response instead of return type when schema is provided
+
 # 1.2.24 - 2 Mar 2025
 Bug fix:
 - 200 object response is not inferring type in type-level

src/types.ts

@@ -1537,12 +1537,16 @@ export type EmptyRouteSchema = {
 
 type _ComposeElysiaResponse<Schema extends RouteSchema, Handle> = Prettify<
 	Prettify<
-		{
-			200: Exclude<Handle, ElysiaCustomStatusResponse<any, any, any>>
-		} & ExtractErrorFromHandle<Handle> &
-			({} extends Schema['response']
-				? {}
-				: Omit<Schema['response'], 200>) &
+		(Schema['response'] extends { 200: any }
+			? {}
+			: {
+					200: Exclude<
+						Handle,
+						ElysiaCustomStatusResponse<any, any, any>
+					>
+				}) &
+			ExtractErrorFromHandle<Handle> &
+			({} extends Schema['response'] ? {} : Schema['response']) &
 			(EmptyRouteSchema extends Schema
 				? {}
 				: {

test/types/index.ts

@@ -2246,3 +2246,55 @@ type a = keyof {}
 			}
 		})
 }
+
+// Use validation response instead of return type
+{
+	const app = new Elysia().get(
+		'/',
+		() => {
+			return {
+				name: 'a',
+				a: 'b'
+			}
+		},
+		{
+			response: {
+				200: t.Object({
+					name: t.String()
+				}),
+				400: t.Object({
+					name: t.String()
+				})
+			}
+		}
+	)
+
+	expectTypeOf<(typeof app._routes.index.get.response)[200]>().toEqualTypeOf<{
+		name: string
+	}>()
+}
+
+// Use return type when validation is not provided
+{
+	const app = new Elysia().get(
+		'/',
+		() => {
+			return {
+				name: 'a',
+				a: 'b'
+			}
+		},
+		{
+			response: {
+				400: t.Object({
+					name: t.String()
+				})
+			}
+		}
+	)
+
+	expectTypeOf<(typeof app._routes.index.get.response)[200]>().toEqualTypeOf<{
+		name: string
+		a: string
+	}>()
+}