🔧 fix: resolve macro with conflict literal value per status

Author: SaltyAom

CHANGELOG.md

@@ -1,3 +1,7 @@
+# 1.4.25 - 12 Feb 2025
+Bug fix:
+- resolve macro with conflict literal value per status
+
 # 1.4.24 - 11 Feb 2025
 Feature:
 - graceful unsigned cookie transition

package.json

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

src/types.ts

@@ -988,27 +988,45 @@ type ExtractOnlyResponseFromMacro<A> =
 						}
 				: {}
 
-type ExtractAllResponseFromMacro<A> =
+export type ExtractAllResponseFromMacro<A> =
 	IsNever<A> extends true
 		? {}
 		: {
+				// Merge all status to single object first
 				return: UnionToIntersect<
-					A extends ElysiaCustomStatusResponse<
-						any,
-						infer Value,
-						infer Status
-					>
-						? {
-								[status in Status]: IsAny<Value> extends true
-									? // @ts-ignore status is always in Status Map
-										InvertedStatusMap[Status]
-									: Value
-							}
-						: Exclude<
-									A,
-									AnyElysiaCustomStatusResponse
-							  > extends infer A
+					// Must be using generic to separate literal from Box<T>
+					A extends ElysiaCustomStatusResponse<any, any, infer Status>
+						? { [A in Status]: 1 }
+						: never
+				> extends infer B
+					? // Compute each one individually
+						{
+							// @ts-ignore A is checked in B computation
+							[status in keyof B]: Extract<
+								A,
+								{ code: status }
+							>['response']
+						} & (Exclude<
+							A,
+							AnyElysiaCustomStatusResponse
+						> extends infer A
 							? IsAny<A> extends true
+								? {}
+								: IsNever<A> extends true
+									? {}
+									: // FunctionArrayReturnType
+										NonNullable<void> extends A
+										? {}
+										: undefined extends A
+											? {}
+											: {
+													200: A
+												}
+							: {})
+					: Exclude<A, AnyElysiaCustomStatusResponse> extends infer A
+						? IsAny<A> extends true
+							? {}
+							: IsNever<A> extends true
 								? {}
 								: // FunctionArrayReturnType
 									NonNullable<void> extends A
@@ -1018,8 +1036,7 @@ type ExtractAllResponseFromMacro<A> =
 										: {
 												200: A
 											}
-							: {}
-				>
+						: {}
 			}
 
 // There's only resolve that can add new properties to Context

test/types/lifecycle/soundness.ts

@@ -1,4 +1,4 @@
-import { Cookie, Elysia, ElysiaCustomStatusResponse, t } from '../../../src'
+import { Cookie, Elysia, t } from '../../../src'
 import { expectTypeOf } from 'expect-type'
 import { Prettify } from '../../../src/types'
 
@@ -2262,3 +2262,60 @@ import { Prettify } from '../../../src/types'
 		403: 'Forbidden'
 	}>()
 }
+
+// Macro with conflict value per status
+{
+	const app = new Elysia()
+		.macro({
+			a: {
+				beforeHandle({ status }) {
+					if (Math.random()) return status(400, 'a')
+					if (Math.random()) return status(401, 'a')
+
+					return 'a'
+				}
+			}
+		})
+		.get('/', () => 'ok', {
+			a: true
+		})
+
+	type Route = (typeof app)['~Routes']['get']['response']
+
+	expectTypeOf<Route>().toEqualTypeOf<{
+		200: string
+		400: 'a'
+		401: 'a'
+	}>
+}
+
+// Separate Box from literal status-like response in macro
+{
+	const app = new Elysia()
+		.macro({
+			a: {
+				beforeHandle({ status }) {
+					if (Math.random()) return status(400, 'a')
+					if (Math.random()) return status(401, 'a')
+					if (Math.random()) return status(401, 'b')
+
+					if (Math.random())
+						// Test status-like response but literal not box
+						return { status: 401, response: 'c' } as const
+
+					return 'a'
+				}
+			}
+		})
+		.get('/', () => 'ok', {
+			a: true
+		})
+
+	type Route = (typeof app)['~Routes']['get']['response']
+
+	expectTypeOf<Route>().toEqualTypeOf<{
+		200: string | { readonly status: 401; readonly response: 'c' }
+		400: 'a'
+		401: 'a' | 'b'
+	}>
+}