🔧 fix: use StaticDecode to unwrap TImport

Author: SaltyAom

CHANGELOG.md

@@ -1,6 +1,6 @@
 # 1.3.0
 Feature:
-- add `jsonAccelerator`, `exactMirror`
+- add `exactMirror`
 - add `systemRouter` config
 - `standalone Validator`
 - add `Elysia.Ref` for referencing schema with autocompletion instead of `t.Ref`

example/a.ts

@@ -1,41 +1,16 @@
-import { Elysia, t } from '../src'
-import { hasType } from '../src/schema'
-import { req, upload } from '../test/utils'
+import Elysia, { t } from '../src'
+
+function addTwo(num: number) {
+	return num + 2
+}
 
 const app = new Elysia()
-	.post('/', ({ body }) => 'ok', {
-		body: t.Union([
-			t.Object({
-				hello: t.String(),
-				file: t.File({
-					type: 'image'
-				}),
-				a: t.File({
-					type: 'image'
-				})
-			}),
-			t.Object({
-				world: t.String(),
-				image: t.File({
-					type: 'image'
-				})
-			}),
-			t.Object({
-				world: t.String()
-			})
-		])
+	.get('', async ({ query: { foo } }) => addTwo(foo), {
+		query: t.Object({
+			foo: t
+				.Transform(t.String())
+				.Decode((x) => 12)
+				.Encode((x) => x.toString())
+		})
 	})
-	.listen(3000)
-
-app.compile()
-
-// app.handle(
-// 	upload('/', {
-// 		hello: 'world',
-// 		file: 'aris-yuzu.jpg'
-// 	}).request
-// )
-// 	.then((x) => x.text())
-// 	.then(console.log)
-
-// // console.log(app.router)
+	.listen(1234)

package.json

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

src/index.ts

@@ -3697,7 +3697,7 @@ export default class Elysia<
 		BasePath,
 		// @ts-expect-error - This is truly ideal
 		Prettify2<Singleton & NewElysia['~Singleton']>,
-		Prettify2<Definitions & NewElysia['~Singleton']>,
+		Prettify2<Definitions & NewElysia['~Definitions']>,
 		Prettify2<Metadata & NewElysia['~Metadata']>,
 		BasePath extends ``
 			? Routes & NewElysia['~Routes']
@@ -5415,20 +5415,16 @@ export default class Elysia<
 				Volatile['schema'],
 				MergeSchema<Ephemeral['schema'], Metadata['schema']>
 			>
-		>,
-		const Macro extends Metadata['macro']
+		>
 	>(
 		path: Path,
 		options: WSLocalHook<
 			LocalSchema,
 			Schema,
 			Singleton & {
 				derive: Ephemeral['derive'] & Volatile['derive']
-				resolve: Ephemeral['resolve'] &
-					Volatile['resolve'] &
-					MacroToContext<Metadata['macroFn'], Macro>
-			},
-			Macro
+				resolve: Ephemeral['resolve'] & Volatile['resolve']
+			}
 		>
 	): Elysia<
 		BasePath,

src/types.ts

@@ -404,19 +404,23 @@ export type UnwrapSchema<
 	: Schema extends TSchema
 		? Schema extends OptionalField
 			? Partial<
+					StaticDecode<
+						TImport<
+							Definitions & {
+								readonly __elysia: Schema
+							},
+							'__elysia'
+						>
+					>
+				>
+			: StaticDecode<
 					TImport<
 						Definitions & {
 							readonly __elysia: Schema
 						},
 						'__elysia'
-					>['static']
+					>
 				>
-			: TImport<
-					Definitions & {
-						readonly __elysia: Schema
-					},
-					'__elysia'
-				>['static']
 		: Schema extends `${infer Key}[]`
 			? Definitions extends Record<
 					Key,

src/ws/index.ts

@@ -53,7 +53,9 @@ export class ElysiaWS<Context = unknown, Route extends RouteSchema = {}>
 			id?: string
 			validator?: TypeCheck<TSchema>
 		}>,
-		public data: Context,
+		public data: Prettify<
+			Omit<Context, 'body' | 'error' | 'status' | 'redirect'>
+		>,
 		public body: Route['body'] = undefined
 	) {
 		this.validator = raw.data?.validator

src/ws/types.ts

@@ -8,9 +8,11 @@ import {
 	DocumentDecoration,
 	ErrorHandler,
 	InputSchema,
+	MacroToContext,
 	MapResponse,
 	MaybeArray,
 	MaybePromise,
+	MetadataBase,
 	OptionalHandler,
 	Prettify,
 	RouteSchema,
@@ -116,62 +118,46 @@ export type WSParseHandler<Route extends RouteSchema, Context = {}> = (
 	message: unknown
 ) => MaybePromise<Route['body'] | void | undefined>
 
-export type AnyWSLocalHook = WSLocalHook<any, any, any, any>
-
-type WSLocalHookKey =
-	| keyof TypedWebSocketHandler<any, any>
-	| 'detail'
-	| 'upgrade'
-	| 'parse'
-	| 'transform'
-	| 'beforeHandle'
-	| 'afterHandle'
-	| 'mapResponse'
-	| 'afterResponse'
-	| 'error'
-	| 'tags'
-	| keyof InputSchema<any>
+export type AnyWSLocalHook = WSLocalHook<any, any, any>
 
 export type WSLocalHook<
 	LocalSchema extends InputSchema,
 	Schema extends RouteSchema,
-	Singleton extends SingletonBase,
-	Macro extends BaseMacro
-> = Macro &
-	(LocalSchema extends any ? LocalSchema : Prettify<LocalSchema>) & {
-		detail?: DocumentDecoration
-		/**
-		 * Headers to register to websocket before `upgrade`
-		 */
-		upgrade?: Record<string, unknown> | ((context: Context) => unknown)
-		parse?: MaybeArray<WSParseHandler<Schema>>
+	Singleton extends SingletonBase
+> = (LocalSchema extends any ? LocalSchema : Prettify<LocalSchema>) & {
+	detail?: DocumentDecoration
+	/**
+	 * Headers to register to websocket before `upgrade`
+	 */
+	upgrade?: Record<string, unknown> | ((context: Context) => unknown)
+	parse?: MaybeArray<WSParseHandler<Schema>>
 
-		/**
-		 * Transform context's value
-		 */
-		transform?: MaybeArray<TransformHandler<Schema, Singleton>>
-		/**
-		 * Execute before main handler
-		 */
-		beforeHandle?: MaybeArray<OptionalHandler<Schema, Singleton>>
-		/**
-		 * Execute after main handler
-		 */
-		afterHandle?: MaybeArray<OptionalHandler<Schema, Singleton>>
-		/**
-		 * Execute after main handler
-		 */
-		mapResponse?: MaybeArray<MapResponse<Schema, Singleton>>
-		/**
-		 * Execute after response is sent
-		 */
-		afterResponse?: MaybeArray<AfterResponseHandler<Schema, Singleton>>
-		/**
-		 * Catch error
-		 */
-		error?: MaybeArray<ErrorHandler<{}, Schema, Singleton>>
-		tags?: DocumentDecoration['tags']
-	} & TypedWebSocketHandler<
+	/**
+	 * Transform context's value
+	 */
+	transform?: MaybeArray<TransformHandler<Schema, Singleton>>
+	/**
+	 * Execute before main handler
+	 */
+	beforeHandle?: MaybeArray<OptionalHandler<Schema, Singleton>>
+	/**
+	 * Execute after main handler
+	 */
+	afterHandle?: MaybeArray<OptionalHandler<Schema, Singleton>>
+	/**
+	 * Execute after main handler
+	 */
+	mapResponse?: MaybeArray<MapResponse<Schema, Singleton>>
+	/**
+	 * Execute after response is sent
+	 */
+	afterResponse?: MaybeArray<AfterResponseHandler<Schema, Singleton>>
+	/**
+	 * Catch error
+	 */
+	error?: MaybeArray<ErrorHandler<{}, Schema, Singleton>>
+	tags?: DocumentDecoration['tags']
+} & TypedWebSocketHandler<
 		Omit<Context<Schema, Singleton>, 'body'> & {
 			body: never
 		},

test/types/type-system.ts

@@ -57,7 +57,6 @@ import { expectTypeOf } from 'expect-type'
 			expectTypeOf<typeof body>().toEqualTypeOf<{
 				images: File[]
 			}>()
-
 		},
 		{
 			body: t.Object({
@@ -69,3 +68,36 @@ import { expectTypeOf } from 'expect-type'
 		}
 	)
 }
+
+// use StaticDecode to unwrap type parameter
+{
+	function addTwo(num: number) {
+		return num + 2
+	}
+
+	new Elysia().get('', async ({ query: { foo } }) => addTwo(foo), {
+		query: t.Object({
+			foo: t
+				.Transform(t.String())
+				.Decode((x) => 12)
+				.Encode((x) => x.toString())
+		})
+	})
+}
+
+// handle Elysia.Ref
+{
+	const Model = new Elysia().model({
+		hello: t.Number()
+	})
+
+	new Elysia().use(Model).get(
+		'',
+		async ({ body }) => {
+			expectTypeOf<typeof body>().toEqualTypeOf<number>()
+		},
+		{
+			body: Model.Ref('hello')
+		}
+	)
+}