elysia 2.0.0-exp.22 → 2.0.0-exp.23

package/dist/base.js

@@ -1029,11 +1029,7 @@ var Elysia = class Elysia {
 		return this.#handle ??= async (requestOrUrl, options) => this.fetch(typeof requestOrUrl === "string" ? new Request(requestOrUrl.startsWith("/") ? `http://e.ly${requestOrUrl}` : requestOrUrl, options) : requestOrUrl);
 	}
 	listen(options, callback) {
-		if (!this["~config"]?.adapter && require_universal_constants.isBun) {
-			this["~config"] ??= require_utils.nullObject();
-			this["~config"].adapter = require_adapter_bun_index.BunAdapter;
-		}
-		const listen = this["~config"]?.adapter?.listen;
+		const listen = (this["~config"]?.adapter ?? require_universal_constants.isBun ? require_adapter_bun_index.BunAdapter : void 0)?.listen;
 		if (!listen) throw new Error("No adapter provided for listen()");
 		if (!require_universal_env.env.ELYSIA_AOT_BUILD) listen(this, options, callback);
 		return this;

package/dist/base.mjs

@@ -1026,11 +1026,7 @@ var Elysia = class Elysia {
 		return this.#handle ??= async (requestOrUrl, options) => this.fetch(typeof requestOrUrl === "string" ? new Request(requestOrUrl.startsWith("/") ? `http://e.ly${requestOrUrl}` : requestOrUrl, options) : requestOrUrl);
 	}
 	listen(options, callback) {
-		if (!this["~config"]?.adapter && isBun) {
-			this["~config"] ??= nullObject();
-			this["~config"].adapter = BunAdapter;
-		}
-		const listen = this["~config"]?.adapter?.listen;
+		const listen = (this["~config"]?.adapter ?? isBun ? BunAdapter : void 0)?.listen;
 		if (!listen) throw new Error("No adapter provided for listen()");
 		if (!env.ELYSIA_AOT_BUILD) listen(this, options, callback);
 		return this;

package/dist/type/bridge.d.ts

@@ -1,16 +1,16 @@
-import { Intersect as Intersect$2 } from "./elysia/intersect.js";
+import { Intersect as Intersect$1 } from "./elysia/intersect.js";
 import { applyCoercions as applyCoercions$1, coerceBody as coerceBody$1, coerceFormData as coerceFormData$1, coerceQuery as coerceQuery$1, coerceRoot as coerceRoot$1, coerceStringToStructure as coerceStringToStructure$1 } from "./coerce.js";
 import { hasTypes as hasTypes$1 } from "./utils.js";
 import { TypeBoxValidatorCache as TypeBoxValidatorCache$1 } from "./validator/validator-cache.js";
 import { TypeBoxValidator as TypeBoxValidator$1 } from "./validator/index.js";
-import { Compile as Compile$1 } from "typebox/compile";
 import { Ref as Ref$1, TAny, TSchema } from "typebox/type";
-import { Decode as Decode$2, Default as Default$1, HasCodec as HasCodec$1 } from "typebox/value";
+import { Compile as Compile$1 } from "typebox/compile";
+import { Decode as Decode$1, Default as Default$1, HasCodec as HasCodec$1 } from "typebox/value";
 
 //#region src/type/bridge.d.ts
 interface TypeboxModule {
   Compile: typeof Compile$1;
-  Decode: typeof Decode$2;
+  Decode: typeof Decode$1;
   applyCoercions: typeof applyCoercions$1;
   TypeBoxValidator: TypeBoxValidator$1;
   TypeBoxValidatorCache: TypeBoxValidatorCache$1;
@@ -21,12 +21,12 @@ interface TypeboxModule {
   coerceBody: typeof coerceBody$1;
   hasTypes: typeof hasTypes$1;
   HasCodec: typeof HasCodec$1;
-  Intersect: typeof Intersect$2;
+  Intersect: typeof Intersect$1;
   Default: typeof Default$1;
   Ref: typeof Ref$1;
 }
 declare let Compile: typeof Compile$1;
-declare let Decode: typeof Decode$2;
+declare let Decode: typeof Decode$1;
 declare let applyCoercions: typeof applyCoercions$1;
 declare let TypeBoxValidator: TypeBoxValidator$1;
 type TypeBoxValidator<T extends TSchema = TAny> = TypeBoxValidator$1<T>;
@@ -39,7 +39,7 @@ declare let coerceStringToStructure: typeof coerceStringToStructure$1;
 declare let coerceBody: typeof coerceBody$1;
 declare let hasTypes: typeof hasTypes$1;
 declare let HasCodec: typeof HasCodec$1;
-declare let Intersect: typeof Intersect$2;
+declare let Intersect: typeof Intersect$1;
 declare let Default: typeof Default$1;
 declare let Ref: typeof Ref$1;
 declare function useTypebox(mod: TypeboxModule): void;

package/dist/type/coerce.d.ts

@@ -36,7 +36,7 @@ declare const coerceQuery: () => CoerceOption[];
 declare const coerceBody: () => CoerceOption[];
 declare const coerceFormData: () => CoerceOption[];
 declare const coerceStringToStructure: () => CoerceOption[];
-declare function applyCoercions(schema: BaseSchema | TSchema, coerces: CoerceOption[] | undefined): BaseSchema | TSchema;
+declare function applyCoercions(schema: BaseSchema | TSchema, coerces: CoerceOption[] | undefined): TSchema | BaseSchema;
 interface CoerceLeaf {
   e: number;
   c?: Record<string, unknown>;

package/dist/type/coerce.js

@@ -249,16 +249,12 @@ function captureCoercePlan(original, coerced) {
 	const walk = (o, c) => {
 		if (o === c || !c || typeof c !== "object") return null;
 		const ely = c["~elyTyp"];
-		if (ely === require_type_constants.ELYSIA_TYPES.ObjectString && (!o || o["~elyTyp"] !== ely)) {
+		if ((ely === require_type_constants.ELYSIA_TYPES.ObjectString || ely === require_type_constants.ELYSIA_TYPES.ArrayString) && (!o || o["~elyTyp"] !== ely)) {
 			any = true;
 			const site = { os: ely };
 			if (o && "~optional" in o) site.o = o["~optional"];
 			return site;
 		}
-		if (ely === require_type_constants.ELYSIA_TYPES.ArrayString) {
-			bakeable = false;
-			return null;
-		}
 		if (ely && COERCE_LEAF_CTOR[ely] && (!o || o["~elyTyp"] !== ely)) {
 			any = true;
 			const leaf = { e: ely };

package/dist/type/coerce.mjs

@@ -248,16 +248,12 @@ function captureCoercePlan(original, coerced) {
 	const walk = (o, c) => {
 		if (o === c || !c || typeof c !== "object") return null;
 		const ely = c["~elyTyp"];
-		if (ely === ELYSIA_TYPES.ObjectString && (!o || o["~elyTyp"] !== ely)) {
+		if ((ely === ELYSIA_TYPES.ObjectString || ely === ELYSIA_TYPES.ArrayString) && (!o || o["~elyTyp"] !== ely)) {
 			any = true;
 			const site = { os: ely };
 			if (o && "~optional" in o) site.o = o["~optional"];
 			return site;
 		}
-		if (ely === ELYSIA_TYPES.ArrayString) {
-			bakeable = false;
-			return null;
-		}
 		if (ely && COERCE_LEAF_CTOR[ely] && (!o || o["~elyTyp"] !== ely)) {
 			any = true;
 			const leaf = { e: ely };

package/dist/type/constants.d.ts

@@ -17,7 +17,7 @@ declare const ELYSIA_TYPES: {
   readonly NoValidate: 15;
 };
 type ELYSIA_TYPES = typeof ELYSIA_TYPES;
-declare const primitiveElysiaTypes: Set<3 | 1 | 2 | 6 | 10 | 11 | 13 | 14>;
+declare const primitiveElysiaTypes: Set<2 | 1 | 3 | 6 | 10 | 11 | 13 | 14>;
 declare const noEnumerable: {
   readonly enumerable: false;
 };

package/dist/type/types.d.ts

@@ -1,9 +1,9 @@
 import { ELYSIA_TYPES } from "./constants.js";
 import { CookieOptions } from "../cookie/types.js";
 import { MaybeArray } from "../types.js";
-import { Validator } from "typebox/schema";
 import { TObjectOptions, TSchemaOptions } from "typebox";
 import { TLocalizedValidationError } from "typebox/error";
+import { Validator } from "typebox/schema";
 
 //#region src/type/types.d.ts
 type FileUnit = number | `${number}${'k' | 'm'}`;

package/dist/type/validator/index.d.ts

@@ -2,8 +2,8 @@ import { Validator as Validator$1, ValidatorOptions } from "../../validator/inde
 import { TypeBoxValidatorCache } from "./validator-cache.js";
 import { MaybePromise } from "../../types.js";
 import { Static, StaticDecode, StaticEncode, TAny, TSchema } from "typebox/type";
-import { Validator } from "typebox/schema";
 import { TLocalizedValidationError } from "typebox/error";
+import { Validator } from "typebox/schema";
 
 //#region src/type/validator/index.d.ts
 declare function shallowMergeObjects(members: any[]): TSchema | null;

package/dist/type/validator/index.js

@@ -148,8 +148,13 @@ var TypeBoxValidator = class extends require_validator_index.Validator {
 		const originalElyTyp = schema?.["~elyTyp"];
 		const frozen = options?.aot && options.slot ? require_compile_aot.Compiled.getValidator(options.aot.method, options.aot.path, options.slot) : void 0;
 		let schemaHasRef = false;
-		if (name && options?.models) schema = moduleCache.getOrInsertComputed(options.models, () => (0, typebox_type.Module)(options.models))[name];
-		else if (options?.models && typeof name !== "string") {
+		if (name && options?.models) {
+			schema = moduleCache.getOrInsertComputed(options.models, () => (0, typebox_type.Module)(options.models))[name];
+			if (isIntersectable) {
+				const members = [schema, ...options.schemas];
+				schema = shallowMergeObjects(members) ?? (0, typebox_type.Evaluate)((0, typebox_type.Intersect)(members));
+			}
+		} else if (options?.models && typeof name !== "string") {
 			schemaHasRef = frozen ? frozen.r === 1 : schemaContainsRef(schema);
 			if (schemaHasRef) {
 				const id = `inline@${++inlineRefId}`;

package/dist/type/validator/index.mjs

@@ -145,8 +145,13 @@ var TypeBoxValidator = class extends Validator$1 {
 		const originalElyTyp = schema?.["~elyTyp"];
 		const frozen = options?.aot && options.slot ? Compiled.getValidator(options.aot.method, options.aot.path, options.slot) : void 0;
 		let schemaHasRef = false;
-		if (name && options?.models) schema = moduleCache.getOrInsertComputed(options.models, () => Module(options.models))[name];
-		else if (options?.models && typeof name !== "string") {
+		if (name && options?.models) {
+			schema = moduleCache.getOrInsertComputed(options.models, () => Module(options.models))[name];
+			if (isIntersectable) {
+				const members = [schema, ...options.schemas];
+				schema = shallowMergeObjects(members) ?? Evaluate(Intersect(members));
+			}
+		} else if (options?.models && typeof name !== "string") {
 			schemaHasRef = frozen ? frozen.r === 1 : schemaContainsRef(schema);
 			if (schemaHasRef) {
 				const id = `inline@${++inlineRefId}`;

package/dist/types.d.ts

@@ -10,8 +10,8 @@ import { Context, ErrorContext, LifecycleContext, PreContext } from "./context.j
 import { WebSocketHandler } from "./ws/types.js";
 import { AnyElysia, Elysia } from "./base.js";
 import { ElysiaAdapter } from "./adapter/index.js";
-import { Instruction } from "exact-mirror";
 import { Static, StaticDecode, StaticEncode, TIntersect, TObject, TSchema } from "typebox";
+import { Instruction } from "exact-mirror";
 import { OpenAPIV3 } from "openapi-types";
 
 //#region src/types.d.ts

package/package.json

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