🔧 fix: soundness for guard, group

Author: SaltyAom

src/index.ts

@@ -3918,9 +3918,7 @@ export default class Elysia<
 			Omit<Input, NonResolvableMacroKey>,
 			Definitions['typebox']
 		>,
-		const BeforeHandle extends MaybeArray<
-			OptionalHandler<Schema, Singleton>
-		>,
+		const BeforeHandle extends MaybeArray<OptionalHandler<Schema, Singleton>>	,
 		const AfterHandle extends MaybeArray<AfterHandler<Schema, Singleton>>,
 		const ErrorHandle extends MaybeArray<
 			ErrorHandler<Definitions['error'], Schema, Singleton>
@@ -3934,10 +3932,9 @@ export default class Elysia<
 			Schema & MacroContext,
 			Singleton & {
 				derive: Ephemeral['derive'] & Volatile['derive']
-				resolve: Ephemeral['resolve'] &
-					Volatile['resolve'] &
-					// @ts-ignore
-					MacroContext['response']
+				resolve: Ephemeral['resolve'] & Volatile['resolve'] &
+				// @ts-ignore
+				MacroContext['response']
 			},
 			keyof Metadata['parser'],
 			BeforeHandle,
@@ -3968,7 +3965,10 @@ export default class Elysia<
 					parser: Metadata['parser']
 					response: Metadata['response'] &
 						// @ts-ignore
-						MacroContext['response']
+						MacroContext['response'] &
+						ElysiaHandlerToResponseSchemaAmbiguous<BeforeHandle> &
+						ElysiaHandlerToResponseSchemaAmbiguous<AfterHandle> &
+						ElysiaHandlerToResponseSchemaAmbiguous<ErrorHandle>
 				},
 				{},
 				Ephemeral,
@@ -4144,9 +4144,7 @@ export default class Elysia<
 		>,
 		const GuardType extends GuardSchemaType,
 		const AsType extends LifeCycleType,
-		const BeforeHandle extends MaybeArray<
-			OptionalHandler<Schema, Singleton>
-		>,
+		const BeforeHandle extends MaybeArray<OptionalHandler<Schema, Singleton>>	,
 		const AfterHandle extends MaybeArray<AfterHandler<Schema, Singleton>>,
 		const ErrorHandle extends MaybeArray<
 			ErrorHandler<Definitions['error'], Schema, Singleton>
@@ -4158,10 +4156,9 @@ export default class Elysia<
 			Schema & MacroContext,
 			Singleton & {
 				derive: Ephemeral['derive'] & Volatile['derive']
-				resolve: Ephemeral['resolve'] &
-					Volatile['resolve'] &
-					// @ts-ignore
-					MacroContext['response']
+				resolve: Ephemeral['resolve'] & Volatile['resolve'] &
+			// @ts-ignore
+			 MacroContext['response']
 			},
 			keyof Metadata['parser'],
 			BeforeHandle,
@@ -4504,7 +4501,10 @@ export default class Elysia<
 					parser: Metadata['parser']
 					response: Metadata['response'] &
 						// @ts-ignore
-						MacroContext['response']
+						MacroContext['response'] &
+						ElysiaHandlerToResponseSchemaAmbiguous<BeforeHandle> &
+						ElysiaHandlerToResponseSchemaAmbiguous<AfterHandle> &
+						ElysiaHandlerToResponseSchemaAmbiguous<ErrorHandle>
 				},
 				{},
 				Ephemeral,
@@ -4527,7 +4527,9 @@ export default class Elysia<
 			>
 			schema: Volatile['schema']
 			standaloneSchema: Volatile['standaloneSchema']
-			response: Volatile['response']
+			response: Volatile['response'] &
+				// @ts-ignore
+				MacroContext['response']
 		}
 	>
 

src/types.ts

@@ -1784,67 +1784,6 @@ export type GuardLocalHook<
 	tags?: DocumentDecoration['tags']
 }
 
-export type GuardLocalHook<
-	Input extends BaseMacro | undefined,
-	Schema extends RouteSchema,
-	Singleton extends SingletonBase,
-	Parser extends keyof any,
-	BeforeHandle extends MaybeArray<OptionalHandler<any, any>>,
-	AfterHandle extends MaybeArray<AfterHandler<any, any>>,
-	ErrorHandle extends MaybeArray<ErrorHandler<any, any, any>>,
-	GuardType extends GuardSchemaType = 'standalone',
-	AsType extends LifeCycleType = 'local',
-> = (Input extends any ? Input : Prettify<Input>) & {
-	/**
-	 * @default 'override'
-	 */
-	as?: AsType
-	/**
-	 * @default 'standalone'
-	 * @since 1.3.0
-	 */
-	schema?: GuardType
-
-	detail?: DocumentDecoration
-	/**
-	 * Short for 'Content-Type'
-	 *
-	 * Available:
-	 * - 'none': do not parse body
-	 * - 'text' / 'text/plain': parse body as string
-	 * - 'json' / 'application/json': parse body as json
-	 * - 'formdata' / 'multipart/form-data': parse body as form-data
-	 * - 'urlencoded' / 'application/x-www-form-urlencoded: parse body as urlencoded
-	 * - 'arraybuffer': parse body as readable stream
-	 */
-	parse?: MaybeArray<BodyHandler<Schema, Singleton> | ContentType | Parser>
-	/**
-	 * Transform context's value
-	 */
-	transform?: MaybeArray<TransformHandler<Schema, Singleton>>
-	/**
-	 * Execute before main handler
-	 */
-	beforeHandle?: BeforeHandle
-	/**
-	 * Execute after main handler
-	 */
-	afterHandle?: AfterHandle
-	/**
-	 * Execute after main handler
-	 */
-	mapResponse?: MaybeArray<MapResponse<Schema, Singleton>>
-	/**
-	 * Execute after response is sent
-	 */
-	afterResponse?: MaybeArray<AfterResponseHandler<Schema, Singleton>>
-	/**
-	 * Catch error
-	 */
-	error?: ErrorHandle
-	tags?: DocumentDecoration['tags']
-}
-
 export type ComposedHandler = (context: Context) => MaybePromise<Response>
 
 export interface InternalRoute {

test/types/lifecycle/soundness.ts

@@ -1982,6 +1982,25 @@ import { Prettify } from '../../../src/types'
 					)
 			)
 	)
+
+	expectTypeOf<(typeof app)['~Routes']['get']['response']>().toEqualTypeOf<{
+		200: {
+			playing: boolean
+			name: 'lilith'
+			limit: number
+		}
+		400: 'Bad Request'
+		401: 'Unauthorized'
+		422: {
+			type: 'validation'
+			on: string
+			summary?: string
+			message?: string
+			found?: unknown
+			property?: string
+			expected?: string
+		}
+	}>()
 }
 
 {
@@ -2024,6 +2043,25 @@ import { Prettify } from '../../../src/types'
 					)
 			)
 	)
+
+	expectTypeOf<(typeof app)['~Routes']['get']['response']>().toEqualTypeOf<{
+		200: {
+			playing: boolean
+			name: 'lilith'
+			limit: number
+		}
+		400: 'Bad Request'
+		401: 'Unauthorized'
+		422: {
+			type: 'validation'
+			on: string
+			summary?: string
+			message?: string
+			found?: unknown
+			property?: string
+			expected?: string
+		}
+	}>()
 }
 
 // Inherit macro context