🔧 fix: recursive macro with conflict value per status

Author: SaltyAom

example/a.ts

@@ -13,14 +13,18 @@ type Models = {
 
 const app = new Elysia()
 	.macro('isAuth', {
-		// headers: t.Object({
-		// 	authorization: t.TemplateLiteral('Authorization ${string}')
-		// }),
+		headers: t.Object({
+			authorization: t.TemplateLiteral('Authorization ${string}')
+		}),
 		async resolve({ headers, status }) {
 			// Mock authentication logic
 			if (Math.random() > 0.5) return status(401, 'Not signed in')
 			if (Math.random() > 0.5) return status(401, 'Deactivated account')
 
+
+
+			headers.authorization
+
 			return {
 				user: 'saltyaom'
 			}
@@ -51,16 +55,15 @@ const app = new Elysia()
 	.post(
 		'/',
 		async ({ user, admin, body, headers }) => {
-			return 'ok'
-			// const updated = await admin.updateUser(body)
+			const updated = await admin.updateUser(body)
 
-			// if (updated instanceof ElysiaStatus) return updated
+			if (updated instanceof ElysiaStatus) return updated
 
-			// return `User ${user} updated user ${updated.id}` as const
+			return `User ${user} updated user ${updated.id}` as const
 		},
 		{
-			isAuth: true,
-			// body: 'user.update'
+			isAdmin: true,
+			body: 'user.update'
 		}
 	)
 

src/types.ts

@@ -965,11 +965,13 @@ type ExtractResolveFromMacro<A> =
 type ExtractOnlyResponseFromMacro<A> =
 	IsNever<A> extends true
 		? {}
-		: {} extends A
-			? {}
-			: {
-					return: MergeResponseStatus<A>
-				}
+		: Extract<A, AnyElysiaCustomStatusResponse> extends infer A
+			? IsNever<A> extends true
+				? {}
+				: {
+						return: MergeResponseStatus<A>
+					}
+			: {}
 
 type MergeResponseStatus<A> = {
 	[status in keyof UnionToIntersect<
@@ -978,7 +980,12 @@ type MergeResponseStatus<A> = {
 			? { [A in Status]: 1 }
 			: never
 		// @ts-ignore A is checked in key computation
-	>]: Extract<A, { code: status }>['response']
+	>]: Extract<A, { code: status }>['response'] extends infer Value
+		? IsAny<Value> extends true
+			? // @ts-ignore status is always in Status Map
+				InvertedStatusMap[status]
+			: Value
+		: never
 }
 
 type MergeAllStatus<T> = {
@@ -990,29 +997,24 @@ type MergeAllStatus<T> = {
 type ExtractAllResponseFromMacro<A> =
 	IsNever<A> extends true
 		? {}
-		: {} extends A
-			? {}
-			: {
-					// Merge all status to single object first
-					return: MergeResponseStatus<A> &
-						(Exclude<
-							A,
-							AnyElysiaCustomStatusResponse
-						> extends infer A
-							? IsAny<A> extends true
+		: {
+				// Merge all status to single object first
+				return: MergeResponseStatus<A> &
+					(Exclude<A, AnyElysiaCustomStatusResponse> extends infer A
+						? IsAny<A> extends true
+							? {}
+							: IsNever<A> extends true
 								? {}
-								: IsNever<A> extends true
+								: // FunctionArrayReturnType
+									NonNullable<void> extends A
 									? {}
-									: // FunctionArrayReturnType
-										NonNullable<void> extends A
+									: undefined extends A
 										? {}
-										: undefined extends A
-											? {}
-											: {
-													200: A
-												}
-							: {})
-				}
+										: {
+												200: A
+											}
+						: {})
+			}
 
 type FlattenMacroResponse<T> = T extends object
 	? '_' extends keyof T

test/types/lifecycle/soundness.ts

@@ -2244,6 +2244,7 @@ import { Prettify } from '../../../src/types'
 		.macro('multiple', {
 			resolve({ status }) {
 				if (Math.random() > 0.5) return status(401)
+
 				return status(403)
 			}
 		})
@@ -2370,6 +2371,7 @@ import { Prettify } from '../../../src/types'
 					if (Math.random()) return status(400, 'a')
 					if (Math.random()) return status(401, 'a')
 					if (Math.random()) return status(401, 'b')
+					if (Math.random()) return status(402)
 
 					if (Math.random())
 						// Test status-like response but literal not box
@@ -2389,5 +2391,6 @@ import { Prettify } from '../../../src/types'
 		200: string | { readonly status: 401; readonly response: 'c' }
 		400: 'a'
 		401: 'a' | 'b'
+		402: 'Payment Required'
 	}>
 }