🧹 chore: resolve merge conflict

Author: SaltyAom

example/a.ts

@@ -1,21 +1,13 @@
 import { Elysia } from '../src'
 
 const app = new Elysia({ precompile: true })
-	.post('/json', ({ body }) => body, {
-		parse: 'json'
+	.get('/', function* () {
+		yield "a"
+		yield "b"
+		yield "c"
+	}, {
+		mapResponse({ response }) {
+			console.log({ response })
+		}
 	})
 	.listen(3000)
-
-console.log(app.routes[0].composed.toString())
-
-const response = await app
-	.handle(
-		new Request('http://localhost:3000/json', {
-			method: 'POST',
-			body: JSON.stringify({ name: 'Aru' })
-		})
-	)
-	.then((x) => x.json())
-
-
-// console.log(app.fetch.toString())

src/index.ts

@@ -5748,11 +5748,18 @@ export default class Elysia<
 			case 'object':
 				const parsedSchemas = {} as Record<string, TSchema>
 
-				Object.entries(name).forEach(([key, value]) => {
-					if (!(key in this.definitions.type))
-						parsedSchemas[key] = this.definitions.type[key] =
-							coerce(value) as TSchema
-				})
+				const kvs = Object.entries(name)
+
+				for (const [key, value] of kvs) {
+					if (key in this.definitions.type) continue
+
+					parsedSchemas[key] = this.definitions.type[key] = coerce(
+						value
+					) as TSchema
+
+					parsedSchemas[key].$id ??= `#/components/schemas/${key}`
+				}
+
 				// @ts-expect-error
 				this.definitions.typebox = t.Module({
 					...(this.definitions.typebox['$defs'] as TModule<{}>),
@@ -5767,6 +5774,21 @@ export default class Elysia<
 				this.definitions.typebox = t.Module(result as any)
 
 				return this as any
+
+			case 'string':
+				if (!model) break
+
+				const newModel = {
+					...model,
+					id: model.$id ?? `#/components/schemas/${name}`
+				}
+
+				this.definitions.type[name] = model
+				this.definitions.typebox = t.Module({
+					...(this.definitions.typebox['$defs'] as TModule<{}>),
+					...newModel
+				} as any)
+				return this as any
 		}
 
 		;(this.definitions.type as Record<string, TSchema>)[name] = model!

src/type-system.ts

@@ -1,3 +1,4 @@
+import { TypeRegistry, Type, FormatRegistry } from '@sinclair/typebox'
 import {
 	ArrayOptions,
 	DateOptions,
@@ -6,24 +7,17 @@ import {
 	TArray,
 	TDate,
 	TUnsafe,
-	TypeRegistry,
 	TInteger,
 	IntegerOptions,
-	Unsafe
-} from '@sinclair/typebox'
-import {
-	Type,
-	type SchemaOptions,
-	// type TNull,
-	// type TUnion,
-	type TSchema,
-	// type TUndefined,
+	Unsafe,
+	Static,
+	SchemaOptions,
+	TSchema,
 	TProperties,
 	ObjectOptions,
 	TObject,
 	TNumber,
-	TBoolean,
-	FormatRegistry
+	TBoolean
 } from '@sinclair/typebox'
 
 import {
@@ -391,9 +385,9 @@ export const ElysiaType = {
 	},
 	Date: (property?: DateOptions) => {
 		const schema = Type.Date(property)
-		const _default = property?.default ?
-			new Date(property.default) : // in case the default is an ISO string or milliseconds from epoch
-			undefined;
+		const _default = property?.default
+			? new Date(property.default) // in case the default is an ISO string or milliseconds from epoch
+			: undefined
 		return t
 			.Transform(
 				t.Union(
@@ -744,6 +738,9 @@ t.Files = (arg = {}) =>
 		}
 	})
 
+// t.Ref = <T extends TSchema>(schema: T) =>
+// 	Type.Unsafe<Static<T>>(Type.Ref(schema.$id!))
+
 t.Nullable = (schema) => ElysiaType.Nullable(schema)
 t.MaybeEmpty = ElysiaType.MaybeEmpty as any
 

src/types.ts

@@ -337,6 +337,9 @@ type OptionalField = {
 	[OptionalKind]: 'Optional'
 }
 
+type TrimArrayName<T extends string> =
+	T extends `${infer Name}[]` ? Name : T
+
 export type UnwrapSchema<
 	Schema extends TSchema | string | undefined,
 	Definitions extends DefinitionBase['typebox'] = TModule<{}>
@@ -346,9 +349,17 @@ export type UnwrapSchema<
 		? Schema extends OptionalField
 			? Prettify<Partial<Static<Schema>>>
 			: StaticDecode<Schema>
-		: Schema extends string
-			? StaticDecode<TImport<UnwrapTypeModule<Definitions>, Schema>>
-			: unknown
+		: Schema extends `${infer Key}[]`
+			? Definitions extends Record<Key, infer NamedSchema>
+				? Array<NamedSchema>
+				: StaticDecode<TImport<UnwrapTypeModule<Definitions>, TrimArrayName<Schema>>>[]
+			: Schema extends string
+				? Definitions extends Record<Schema, infer NamedSchema>
+					? NamedSchema
+					: StaticDecode<
+							TImport<UnwrapTypeModule<Definitions>, Schema>
+						>
+				: unknown
 
 export type UnwrapBodySchema<
 	Schema extends TSchema | string | undefined,
@@ -359,9 +370,15 @@ export type UnwrapBodySchema<
 		? Schema extends OptionalField
 			? Prettify<Partial<Static<Schema>>> | null
 			: StaticDecode<Schema>
-		: Schema extends string
-			? Static<TImport<UnwrapTypeModule<Definitions>, Schema>>
-			: unknown
+		: Schema extends `${infer Key}[]`
+			? Definitions extends Record<Key, infer NamedSchema>
+				? Array<NamedSchema>
+				: Static<TImport<UnwrapTypeModule<Definitions>, TrimArrayName<Schema>>>[]
+			: Schema extends string
+				? Definitions extends Record<Schema, infer NamedSchema>
+					? NamedSchema
+					: Static<TImport<UnwrapTypeModule<Definitions>, Schema>>
+				: unknown
 
 export type IsNull<T> = [T] extends [null] ? true : false
 
@@ -528,16 +545,17 @@ export type HTTPMethod =
 	| 'ALL'
 
 export interface InputSchema<Name extends string = string> {
-	body?: TSchema | Name
+	body?: TSchema | Name | `${Name}[]`
 	headers?: TObject | TNull | TUndefined | Name
 	query?: TObject | TNull | TUndefined | Name
 	params?: TObject | TNull | TUndefined | Name
 	cookie?: TObject | TNull | TUndefined | Name
 	response?:
 		| TSchema
 		| Record<number, TSchema>
+		| `${Name}[]`
 		| Name
-		| Record<number, Name | TSchema>
+		| Record<number, `${Name}[]` | Name | TSchema>
 }
 
 export interface MergeSchema<

src/utils.ts

@@ -591,14 +591,17 @@ export const getSchemaValidator = <T extends TSchema | string | undefined>(
 	}
 ): T extends TSchema ? TypeCheck<TSchema> : undefined => {
 	if (!s) return undefined as any
-	if (typeof s === 'string' && !(s in models)) return undefined as any
 
 	let schema: TSchema =
 		typeof s === 'string'
-			? // @ts-expect-error
-				((modules as TModule<{}, {}>).Import(s) ?? models[s])
+			? s.endsWith('[]') ?
+				t.Array(t.Ref(models[s.substring(0, s.length - 2)])) :
+					// @ts-expect-error
+					((modules as TModule<{}, {}>).Import(s) ?? models[s])
 			: s
 
+	if (!schema) return undefined as any
+
 	if (coerce || additionalCoerce) {
 		if (coerce)
 			schema = replaceSchemaType(schema, [
@@ -757,14 +760,16 @@ export const getResponseSchemaValidator = (
 	}
 ): Record<number, TypeCheck<any>> | undefined => {
 	if (!s) return
-	if (typeof s === 'string' && !(s in models)) return
 
 	const maybeSchemaOrRecord =
 		typeof s === 'string'
-			? // @ts-ignore
+			?
+		s.endsWith('[]') ? t.Array(t.Ref(models[s.substring(0, s.length - 2)])) : // @ts-ignore
 				((modules as TModule<{}, {}>).Import(s) ?? models[s])
 			: s
 
+	if (!maybeSchemaOrRecord) return
+
 	const compile = (schema: TSchema, references?: TSchema[]) => {
 		if (dynamic)
 			return {
@@ -789,12 +794,14 @@ export const getResponseSchemaValidator = (
 		return compiledValidator
 	}
 
+	const modelValues = Object.values(models)
+
 	if (Kind in maybeSchemaOrRecord) {
 		if ('additionalProperties' in maybeSchemaOrRecord === false)
 			maybeSchemaOrRecord.additionalProperties = additionalProperties
 
 		return {
-			200: compile(maybeSchemaOrRecord, Object.values(models))
+			200: compile(maybeSchemaOrRecord, modelValues)
 		}
 	}
 
@@ -812,7 +819,7 @@ export const getResponseSchemaValidator = (
 				// Inherits model maybe already compiled
 				record[+status] =
 					Kind in schema
-						? compile(schema, Object.values(models))
+						? compile(schema, modelValues)
 						: schema
 			}
 
@@ -828,7 +835,7 @@ export const getResponseSchemaValidator = (
 		// Inherits model maybe already compiled
 		record[+status] =
 			Kind in maybeNameOrSchema
-				? compile(maybeNameOrSchema, Object.values(models))
+				? compile(maybeNameOrSchema, modelValues)
 				: maybeNameOrSchema
 	})
 

test/extends/models.test.ts

@@ -124,6 +124,10 @@ describe('Model', () => {
 					data: t.Number()
 				})
 			})
+			.post('/arr', ({ body }) => body, {
+				response: 'number[]',
+				body: 'number[]',
+			})
 
 		const correct = await app.handle(
 			new Request('http://localhost/', {
@@ -139,6 +143,19 @@ describe('Model', () => {
 
 		expect(correct.status).toBe(200)
 
+		const correctArr = await app.handle(
+			new Request('http://localhost/arr', {
+				method: 'POST',
+				headers: {
+					'content-type': 'application/json'
+				},
+				body: JSON.stringify([1, 2])
+			})
+		)
+
+		expect(correctArr.status).toBe(200)
+
+
 		const wrong = await app.handle(
 			new Request('http://localhost/', {
 				method: 'POST',
@@ -152,6 +169,20 @@ describe('Model', () => {
 		)
 
 		expect(wrong.status).toBe(422)
+
+		const wrongArr = await app.handle(
+			new Request('http://localhost/arr', {
+				method: 'POST',
+				headers: {
+					'content-type': 'application/json'
+				},
+				body: JSON.stringify({
+					data: true
+				})
+			})
+		)
+
+		expect(wrongArr.status).toBe(422)
 	})
 
 	it('remap', async () => {

test/plugins/plugin.test.ts

@@ -6,7 +6,7 @@ import { req } from '../utils'
 describe('Plugin', () => {
 	it('await async nested plugin', async () => {
 		const yay = async () => {
-			await Bun.sleep(1_000)
+			await Bun.sleep(2)
 
 			return new Elysia({ name: 'yay' }).get('/yay', 'yay')
 		}