🎉 feat: merge multiple macro resolve response

Author: SaltyAom

CHANGELOG.md

@@ -4,6 +4,7 @@ Improvement:
 - ValidationError.detail now accept optional 2nd parameter `allowUnsafeValidatorDetails`
 - macro: add `introspect`
 - prevent redundant route compilation
+- merge multiple macro resolve response
 
 Bug fix:
 - [#1537](https://github.com/elysiajs/elysia/issues/1537) websocket: ping/pong not being called

example/a.ts

@@ -1,19 +1,16 @@
-import { InternalSymbolName } from 'typescript'
-import { Elysia, t } from '../src'
-import { req } from '../test/utils'
+import { Elysia, status, t } from '../src'
 
-const app = new Elysia().get('/', () => 'ok').compile()
-for (const route of app.routes) route.compile()
+status(401)
 
-console.log(app.fetch.toString())
-console.log(app.routes[0].compile().toString())
+const app = new Elysia()
+	.macro({
+		multiple: {
+			resolve({ status }) {
+				if (Math.random() > 0.5) return status(401)
+				return status(403)
+			}
+		}
+	})
+	.get('/multiple', () => 'Ok', { multiple: true })
 
-// Bun.sleepSync(7)
-// console.log('Slept')
-
-const res = app
-	.handle(req('/'))
-	.then((x) => x.text())
-	.then(console.log)
-
-// process.exit(0)
+app['~Routes']['multiple']['get']['response']

src/error.ts

@@ -39,7 +39,7 @@ const emptyHttpStatus = {
 	308: undefined
 } as const
 
-export type SelectiveStatus<Res> = <
+export type SelectiveStatus<in out Res> = <
 	const Code extends
 		| keyof Res
 		| InvertedStatusMap[Extract<keyof InvertedStatusMap, keyof Res>]
@@ -91,7 +91,7 @@ export const status = <
 >(
 	code: Code,
 	response?: T
-) => new ElysiaCustomStatusResponse<Code, T>(code, response as any)
+) => new ElysiaCustomStatusResponse<Code, T>(code, response as T)
 
 export class InternalServerError extends Error {
 	code = 'INTERNAL_SERVER_ERROR'

src/types.ts

@@ -966,7 +966,7 @@ type ExtractOnlyResponseFromMacro<A> =
 				? IsNever<A> extends true
 					? {}
 					: {
-							return: A extends ElysiaCustomStatusResponse<
+							return: UnionToIntersect< A extends ElysiaCustomStatusResponse<
 								any,
 								infer Value,
 								infer Status
@@ -977,7 +977,7 @@ type ExtractOnlyResponseFromMacro<A> =
 												InvertedStatusMap[Status]
 											: Value
 									}
-								: {}
+								: {}>
 						}
 				: {}
 

test/types/lifecycle/soundness.ts

@@ -2192,3 +2192,91 @@ import { Prettify } from '../../../src/types'
 			}
 		})
 }
+
+// intersect multiple resolve macro response
+{
+	const app = new Elysia()
+		.macro({
+			multiple: {
+				resolve({ status }) {
+					if (Math.random() > 0.5) return status(401)
+					return status(403)
+				}
+			}
+		})
+		.get('/multiple', () => 'Ok', { multiple: true })
+
+	expectTypeOf<
+		(typeof app)['~Routes']['multiple']['get']['response']
+	>().toEqualTypeOf<{
+		200: string
+		401: 'Unauthorized'
+		403: 'Forbidden'
+	}>()
+}
+
+// intersect multiple resolve macro response
+{
+	// intersect multiple resolve macro response
+	{
+		const app = new Elysia()
+			.macro({
+				multiple: {
+					resolve({ status }) {
+						if (Math.random() > 0.5) return status(401)
+						return status(403)
+					}
+				}
+			})
+			.get('/multiple', () => 'Ok', { multiple: true })
+
+		expectTypeOf<
+			(typeof app)['~Routes']['multiple']['get']['response']
+		>().toEqualTypeOf<{
+			200: string
+			401: 'Unauthorized'
+			403: 'Forbidden'
+		}>()
+
+		const app = new Elysia()
+			.macro('multiple', {
+				resolve({ status }) {
+					if (Math.random() > 0.5) return status(401)
+					return status(403)
+				}
+			})
+			.get('/multiple', () => 'Ok', { multiple: true })
+
+		expectTypeOf<
+			(typeof app)['~Routes']['multiple']['get']['response']
+		>().toEqualTypeOf<{
+			200: string
+			401: 'Unauthorized'
+			403: 'Forbidden'
+		}>()
+	}
+	const app = new Elysia()
+		.macro('multiple', {
+			resolve({ status }) {
+				if (Math.random() > 0.5) return status(401)
+				return status(403)
+			}
+		})
+		.get('/multiple', () => 'Ok', { multiple: true })
+
+	expectTypeOf<
+		(typeof app)['~Routes']['multiple']['get']['response']
+	>().toEqualTypeOf<{
+		200: string
+		401: 'Unauthorized'
+		403: 'Forbidden'
+	}>()
+
+	expectTypeOf<
+		(typeof app)['~Routes']['multiple']['get']['response']
+	>().toEqualTypeOf<{
+		200: string
+		401: 'Unauthorized'
+		403: 'Forbidden'
+	}>()
+}