elysia 1.4.4 → 1.4.5

package/dist/adapter/bun/handler-native.mjs

@@ -2679,7 +2679,7 @@ var hasProperty = (expectedProperty, _schema) => {
         ...rest,
         ...v
       };
-      return delete value.required, properties2 && v.type === "string" && v.format === "ObjectString" && v.default === "{}" && (transform = t.ObjectString(properties2, rest), value.properties = properties2), items && v.type === "string" && v.format === "ArrayString" && v.default === "[]" && (transform = t.ArrayString(items, rest), value.items = items), value;
+      return delete value.required, properties2 && v.type === "string" && v.format === "ObjectString" && v.default === "{}" ? (transform = t.ObjectString(properties2, rest), value.properties = properties2) : items && v.type === "string" && v.format === "ArrayString" && v.default === "[]" && (transform = t.ArrayString(items, rest), value.items = items), value;
     };
     if (isRoot) {
       if (properties2) {
@@ -2856,22 +2856,16 @@ var hasProperty = (expectedProperty, _schema) => {
     if (typeof s2 != "string") schema2 = s2;
     else if (schema2 = // @ts-expect-error private property
     modules && s2 in modules.$defs ? modules.Import(s2) : models[s2], !schema2) return;
-    let _doesHaveRef;
-    if (Kind3 in schema2 && schema2[Kind3] !== "Import" && (_doesHaveRef = hasRef(schema2))) {
-      let id = randomId();
-      doesHaveRef === void 0 && (doesHaveRef = _doesHaveRef), schema2 = t.Module({
-        // @ts-expect-error private property
-        ...modules?.$defs,
-        [id]: schema2
-      }).Import(id);
-    }
     if (Kind3 in schema2)
-      if (schema2[Kind3] === "Import") {
-        let newDefs = {};
-        for (let [key2, value] of Object.entries(schema2.$defs))
-          newDefs[key2] = replaceSchema(value);
-        let key = schema2.$ref;
-        schema2 = t.Module(newDefs).Import(key);
+      if (schema2[Kind3] === "Import")
+        hasRef(schema2.$defs[schema2.$ref]) || (schema2 = schema2.$defs[schema2.$ref], (coerce || additionalCoerce) && (schema2 = replaceSchema(schema2)));
+      else if (hasRef(schema2)) {
+        let id = randomId();
+        schema2 = t.Module({
+          // @ts-expect-error private property
+          ...modules?.$defs,
+          [id]: schema2
+        }).Import(id);
       } else (coerce || additionalCoerce) && (schema2 = replaceSchema(schema2));
     return schema2;
   }, schema = mapSchema(s), _validators = validators;

package/dist/adapter/bun/index.mjs

@@ -2679,7 +2679,7 @@ var hasProperty = (expectedProperty, _schema) => {
         ...rest,
         ...v
       };
-      return delete value.required, properties2 && v.type === "string" && v.format === "ObjectString" && v.default === "{}" && (transform = t.ObjectString(properties2, rest), value.properties = properties2), items && v.type === "string" && v.format === "ArrayString" && v.default === "[]" && (transform = t.ArrayString(items, rest), value.items = items), value;
+      return delete value.required, properties2 && v.type === "string" && v.format === "ObjectString" && v.default === "{}" ? (transform = t.ObjectString(properties2, rest), value.properties = properties2) : items && v.type === "string" && v.format === "ArrayString" && v.default === "[]" && (transform = t.ArrayString(items, rest), value.items = items), value;
     };
     if (isRoot) {
       if (properties2) {
@@ -2856,22 +2856,16 @@ var hasProperty = (expectedProperty, _schema) => {
     if (typeof s2 != "string") schema2 = s2;
     else if (schema2 = // @ts-expect-error private property
     modules && s2 in modules.$defs ? modules.Import(s2) : models[s2], !schema2) return;
-    let _doesHaveRef;
-    if (Kind3 in schema2 && schema2[Kind3] !== "Import" && (_doesHaveRef = hasRef(schema2))) {
-      let id = randomId();
-      doesHaveRef === void 0 && (doesHaveRef = _doesHaveRef), schema2 = t.Module({
-        // @ts-expect-error private property
-        ...modules?.$defs,
-        [id]: schema2
-      }).Import(id);
-    }
     if (Kind3 in schema2)
-      if (schema2[Kind3] === "Import") {
-        let newDefs = {};
-        for (let [key2, value] of Object.entries(schema2.$defs))
-          newDefs[key2] = replaceSchema(value);
-        let key = schema2.$ref;
-        schema2 = t.Module(newDefs).Import(key);
+      if (schema2[Kind3] === "Import")
+        hasRef(schema2.$defs[schema2.$ref]) || (schema2 = schema2.$defs[schema2.$ref], (coerce || additionalCoerce) && (schema2 = replaceSchema(schema2)));
+      else if (hasRef(schema2)) {
+        let id = randomId();
+        schema2 = t.Module({
+          // @ts-expect-error private property
+          ...modules?.$defs,
+          [id]: schema2
+        }).Import(id);
       } else (coerce || additionalCoerce) && (schema2 = replaceSchema(schema2));
     return schema2;
   }, schema = mapSchema(s), _validators = validators;

package/dist/bun/index.d.ts

@@ -9,7 +9,7 @@ import { PromiseGroup } from './utils';
 import { type DynamicHandler } from './dynamic-handle';
 import { ValidationError, type ParseError, type NotFoundError, type InternalServerError, type ElysiaCustomStatusResponse } from './error';
 import type { TraceHandler } from './trace';
-import type { ElysiaConfig, SingletonBase, DefinitionBase, Handler, ComposedHandler, InputSchema, LocalHook, MergeSchema, RouteSchema, UnwrapRoute, InternalRoute, HTTPMethod, PreHandler, BodyHandler, OptionalHandler, ErrorHandler, LifeCycleStore, MaybePromise, Prettify, Prettify2, AddPrefix, AddSuffix, AddPrefixCapitalize, AddSuffixCapitalize, MaybeArray, GracefulHandler, MapResponse, MacroToProperty, TransformHandler, MetadataBase, RouteBase, CreateEden, ComposeElysiaResponse, InlineHandler, HookContainer, LifeCycleType, EphemeralType, ExcludeElysiaResponse, ModelValidator, ContextAppendType, Reconcile, AfterResponseHandler, HigherOrderFunction, JoinPath, ValidatorLayer, MergeElysiaInstances, Macro, MacroToContext, StandaloneValidator, GuardSchemaType, Or, DocumentDecoration, AfterHandler, NonResolvableMacroKey, StandardSchemaV1Like, ElysiaHandlerToResponseSchema, ElysiaHandlerToResponseSchemas, ExtractErrorFromHandle, ElysiaHandlerToResponseSchemaAmbiguous, GuardLocalHook, PickIfExists, SimplifyToSchema, UnionResponseStatus, CreateEdenResponse, MacroProperty, MaybeValueOrVoidFunction } from './types';
+import type { ElysiaConfig, SingletonBase, DefinitionBase, Handler, ComposedHandler, InputSchema, LocalHook, MergeSchema, RouteSchema, UnwrapRoute, InternalRoute, HTTPMethod, PreHandler, BodyHandler, OptionalHandler, ErrorHandler, LifeCycleStore, MaybePromise, Prettify, Prettify2, AddPrefix, AddSuffix, AddPrefixCapitalize, AddSuffixCapitalize, MaybeArray, GracefulHandler, MapResponse, MacroToProperty, TransformHandler, MetadataBase, RouteBase, CreateEden, ComposeElysiaResponse, InlineHandler, HookContainer, LifeCycleType, EphemeralType, ExcludeElysiaResponse, ModelValidator, ContextAppendType, Reconcile, AfterResponseHandler, HigherOrderFunction, JoinPath, ValidatorLayer, MergeElysiaInstances, Macro, MacroToContext, StandaloneValidator, GuardSchemaType, Or, DocumentDecoration, AfterHandler, NonResolvableMacroKey, StandardSchemaV1Like, ElysiaHandlerToResponseSchema, ElysiaHandlerToResponseSchemas, ExtractErrorFromHandle, ElysiaHandlerToResponseSchemaAmbiguous, GuardLocalHook, PickIfExists, SimplifyToSchema, UnionResponseStatus, CreateEdenResponse, MacroProperty, MaybeValueOrVoidFunction, IntersectIfObjectSchema } from './types';
 export type AnyElysia = Elysia<any, any, any, any, any, any, any>;
 /**
  * ### Elysia Server
@@ -1270,25 +1270,21 @@ export default class Elysia<const in out BasePath extends string = '', const in
         parser: Metadata['parser'];
         response: Metadata['response'];
     }, {}, Ephemeral, Volatile>) => NewElysia): Elysia<BasePath, Singleton, Definitions, Metadata, Prettify<Routes & NewElysia['~Routes']>, Ephemeral, Volatile>;
-    group<const Prefix extends string, const NewElysia extends AnyElysia, const Input extends Metadata['macro'] & InputSchema<keyof Definitions['typebox'] & string>, const Schema extends MergeSchema<UnwrapRoute<Input, Definitions['typebox'], JoinPath<BasePath, Prefix>>, Metadata['schema']> & Metadata['standaloneSchema']>(prefix: Prefix, schema: LocalHook<Input, Schema & {
-        response: {};
-        return: {};
-        resolve: {};
-    }, Singleton & {
+    group<const Prefix extends string, const Input extends Metadata['macro'] & InputSchema<keyof Definitions['typebox'] & string>, const Schema extends MergeSchema<UnwrapRoute<Input, Definitions['typebox'], JoinPath<BasePath, Prefix>>, MergeSchema<Volatile['schema'], MergeSchema<Ephemeral['schema'], Metadata['schema']>>> & Metadata['standaloneSchema'] & Ephemeral['standaloneSchema'] & Volatile['standaloneSchema'], const MacroContext extends MacroToContext<Metadata['macroFn'], Omit<Input, NonResolvableMacroKey>, Definitions['typebox']>, const BeforeHandle extends MaybeArray<OptionalHandler<Schema, Singleton>>, const AfterHandle extends MaybeArray<AfterHandler<Schema, Singleton>>, const ErrorHandle extends MaybeArray<ErrorHandler<Definitions['error'], Schema, Singleton>>, const NewElysia extends AnyElysia>(prefix: Prefix, schema: GuardLocalHook<Input, Schema & MacroContext, Singleton & {
         derive: Ephemeral['derive'] & Volatile['derive'];
-        resolve: Ephemeral['resolve'] & Volatile['resolve'];
-    }, Definitions['error'], keyof Metadata['parser']>, run: (group: Elysia<JoinPath<BasePath, Prefix>, {
+        resolve: Ephemeral['resolve'] & Volatile['resolve'] & MacroContext['response'];
+    }, keyof Metadata['parser'], BeforeHandle, AfterHandle, ErrorHandle>, run: (group: Elysia<JoinPath<BasePath, Prefix>, {
         decorator: Singleton['decorator'];
         store: Singleton['store'];
-        derive: Prettify<Singleton['derive'] & Ephemeral['derive'] & Volatile['derive']>;
-        resolve: Prettify<Singleton['resolve'] & Ephemeral['resolve'] & Volatile['resolve']>;
+        derive: Singleton['derive'];
+        resolve: Prettify<Singleton['resolve'] & MacroContext['resolve']>;
     }, Definitions, {
         schema: Schema;
-        standaloneSchema: Metadata['standaloneSchema'];
+        standaloneSchema: Metadata['standaloneSchema'] & Schema & MacroContext;
         macro: Metadata['macro'];
         macroFn: Metadata['macroFn'];
         parser: Metadata['parser'];
-        response: Metadata['response'];
+        response: Metadata['response'] & MacroContext['response'] & ElysiaHandlerToResponseSchemaAmbiguous<BeforeHandle> & ElysiaHandlerToResponseSchemaAmbiguous<AfterHandle> & ElysiaHandlerToResponseSchemaAmbiguous<ErrorHandle>;
     }, {}, Ephemeral, Volatile>) => NewElysia): Elysia<BasePath, Singleton, Definitions, Metadata, Routes & NewElysia['~Routes'], Ephemeral, Volatile>;
     /**
      * ### guard
@@ -1308,10 +1304,10 @@ export default class Elysia<const in out BasePath extends string = '', const in
      *     })
      * ```
      */
-    guard<const Input extends Metadata['macro'] & InputSchema<keyof Definitions['typebox'] & string>, const Schema extends MergeSchema<UnwrapRoute<Input, Definitions['typebox'], BasePath>, Metadata['schema']>, const MacroContext extends MacroToContext<Metadata['macroFn'], NoInfer<Omit<Input, keyof InputSchema>>>, const GuardType extends GuardSchemaType, const AsType extends LifeCycleType, const BeforeHandle extends MaybeArray<OptionalHandler<Schema, Singleton>>, const AfterHandle extends MaybeArray<AfterHandler<Schema, Singleton>>, const ErrorHandle extends MaybeArray<ErrorHandler<Definitions['error'], Schema, Singleton>>>(hook: GuardLocalHook<Input, Schema, Singleton & {
+    guard<const Input extends Metadata['macro'] & InputSchema<keyof Definitions['typebox'] & string>, const Schema extends MergeSchema<UnwrapRoute<Input, Definitions['typebox'], BasePath>, Metadata['schema']>, const MacroContext extends MacroToContext<Metadata['macroFn'], NoInfer<Omit<Input, keyof InputSchema>>>, const GuardType extends GuardSchemaType, const AsType extends LifeCycleType, const BeforeHandle extends MaybeArray<OptionalHandler<Schema, Singleton>>, const AfterHandle extends MaybeArray<AfterHandler<Schema, Singleton>>, const ErrorHandle extends MaybeArray<ErrorHandler<Definitions['error'], Schema, Singleton>>>(hook: GuardLocalHook<Input, Schema & MacroContext, Singleton & {
         derive: Ephemeral['derive'] & Volatile['derive'];
-        resolve: Ephemeral['resolve'] & Volatile['resolve'];
-    }, keyof Metadata['parser'], GuardType, AsType, BeforeHandle, AfterHandle, ErrorHandle>): Or<GuardSchemaType extends GuardType ? true : false, GuardType extends 'override' ? true : false> extends true ? Or<LifeCycleType extends AsType ? true : false, AsType extends 'local' ? true : false> extends true ? Elysia<BasePath, Singleton, Definitions, Metadata, Routes, Ephemeral, {
+        resolve: Ephemeral['resolve'] & Volatile['resolve'] & MacroContext['response'];
+    }, keyof Metadata['parser'], BeforeHandle, AfterHandle, ErrorHandle, GuardType, AsType>): Or<GuardSchemaType extends GuardType ? true : false, GuardType extends 'override' ? true : false> extends true ? Or<LifeCycleType extends AsType ? true : false, AsType extends 'local' ? true : false> extends true ? Elysia<BasePath, Singleton, Definitions, Metadata, Routes, Ephemeral, {
         derive: Volatile['derive'];
         resolve: Prettify<Volatile['resolve'] & MacroContext['resolve']>;
         schema: {} extends PickIfExists<Input, keyof InputSchema> ? Volatile['schema'] : Prettify<MergeSchema<UnwrapRoute<Input, Definitions['typebox']>, Metadata['schema']>>;
@@ -1360,27 +1356,27 @@ export default class Elysia<const in out BasePath extends string = '', const in
         standaloneSchema: Prettify<SimplifyToSchema<MacroContext> & ({} extends PickIfExists<Input, keyof InputSchema> ? Ephemeral['standaloneSchema'] : Ephemeral['standaloneSchema'] & UnwrapRoute<Input, Definitions['typebox']>)>;
         response: Prettify<Ephemeral['response'] & ElysiaHandlerToResponseSchemaAmbiguous<BeforeHandle> & ElysiaHandlerToResponseSchemaAmbiguous<AfterHandle> & ElysiaHandlerToResponseSchemaAmbiguous<ErrorHandle> & MacroContext['return']>;
     }, Volatile>;
-    guard<const Input extends Metadata['macro'] & InputSchema<keyof Definitions['typebox'] & string>, const NewElysia extends AnyElysia, const Schema extends MergeSchema<UnwrapRoute<Input, Definitions['typebox'], BasePath>, Metadata['schema']>, const MacroContext extends MacroToContext<Metadata['macroFn'], NoInfer<Omit<Input, keyof InputSchema>>>>(schema: LocalHook<Input, Schema & MacroContext, Singleton & {
+    guard<const Input extends Metadata['macro'] & InputSchema<keyof Definitions['typebox'] & string>, const Schema extends MergeSchema<UnwrapRoute<Input, Definitions['typebox'], BasePath>, MergeSchema<Volatile['schema'], MergeSchema<Ephemeral['schema'], Metadata['schema']>>> & Metadata['standaloneSchema'] & Ephemeral['standaloneSchema'] & Volatile['standaloneSchema'], const MacroContext extends MacroToContext<Metadata['macroFn'], Omit<Input, NonResolvableMacroKey>, Definitions['typebox']>, const BeforeHandle extends MaybeArray<OptionalHandler<Schema, Singleton>>, const AfterHandle extends MaybeArray<AfterHandler<Schema, Singleton>>, const ErrorHandle extends MaybeArray<ErrorHandler<any, Schema, Singleton>>, const NewElysia extends AnyElysia>(schema: GuardLocalHook<Input, Schema & MacroContext, Singleton & {
         derive: Ephemeral['derive'] & Volatile['derive'];
         resolve: Ephemeral['resolve'] & Volatile['resolve'];
-    }, Definitions['error'], keyof Metadata['parser']>, run: (group: Elysia<BasePath, {
+    }, keyof Metadata['parser'], BeforeHandle, AfterHandle, ErrorHandle>, run: (group: Elysia<BasePath, {
         decorator: Singleton['decorator'];
         store: Singleton['store'];
         derive: Singleton['derive'];
         resolve: Prettify<Singleton['resolve'] & MacroContext['resolve']>;
     }, Definitions, {
         schema: Schema;
-        standaloneSchema: Metadata['standaloneSchema'];
+        standaloneSchema: Metadata['standaloneSchema'] & Schema & MacroContext;
         macro: Metadata['macro'];
         macroFn: Metadata['macroFn'];
         parser: Metadata['parser'];
-        response: Metadata['response'];
+        response: Metadata['response'] & MacroContext['response'] & ElysiaHandlerToResponseSchemaAmbiguous<BeforeHandle> & ElysiaHandlerToResponseSchemaAmbiguous<AfterHandle> & ElysiaHandlerToResponseSchemaAmbiguous<ErrorHandle>;
     }, {}, Ephemeral, Volatile>) => NewElysia): Elysia<BasePath, Singleton, Definitions, Metadata, Prettify<Routes & NewElysia['~Routes']>, Ephemeral, {
         derive: Volatile['derive'];
         resolve: Prettify<Volatile['resolve'] & MacroContext['resolve']>;
         schema: Volatile['schema'];
         standaloneSchema: Volatile['standaloneSchema'];
-        response: Volatile['response'];
+        response: Volatile['response'] & MacroContext['response'];
     }>;
     /**
      * Inline fn
@@ -1457,7 +1453,7 @@ export default class Elysia<const in out BasePath extends string = '', const in
     private _use;
     macro<const Name extends string, const Input extends Metadata['macro'] & InputSchema<keyof Definitions['typebox'] & string>, const Schema extends MergeSchema<UnwrapRoute<Input, Definitions['typebox'], BasePath>, MergeSchema<Volatile['schema'], MergeSchema<Ephemeral['schema'], Metadata['schema']>> & Metadata['standaloneSchema'] & Ephemeral['standaloneSchema'] & Volatile['standaloneSchema']>, const MacroContext extends MacroToContext<Metadata['macroFn'], Omit<Input, NonResolvableMacroKey>, Definitions['typebox']>, const Property extends MaybeValueOrVoidFunction<MacroProperty<Schema & MacroContext, Singleton & {
         derive: Partial<Ephemeral['derive'] & Volatile['derive']>;
-        resolve: Partial<Ephemeral['resolve'] & Volatile['resolve']>;
+        resolve: Partial<Ephemeral['resolve'] & Volatile['resolve']> & MacroContext['resolve'];
     }, Definitions['error']>>>(name: Name, macro: (Input extends any ? Input : Prettify<Input>) & Property): Elysia<BasePath, Singleton, Definitions, {
         schema: Metadata['schema'];
         standaloneSchema: Metadata['standaloneSchema'];
@@ -1504,7 +1500,7 @@ export default class Elysia<const in out BasePath extends string = '', const in
      *     })
      * ```
      */
-    get<const Path extends string, const Input extends Metadata['macro'] & InputSchema<keyof Definitions['typebox'] & string>, const Schema extends MergeSchema<UnwrapRoute<Input, Definitions['typebox'], JoinPath<BasePath, Path>>, MergeSchema<Volatile['schema'], MergeSchema<Ephemeral['schema'], Metadata['schema']>>> & Metadata['standaloneSchema'] & Ephemeral['standaloneSchema'] & Volatile['standaloneSchema'], const Decorator extends Singleton & {
+    get<const Path extends string, const Input extends Metadata['macro'] & InputSchema<keyof Definitions['typebox'] & string>, const Schema extends IntersectIfObjectSchema<MergeSchema<UnwrapRoute<Input, Definitions['typebox'], JoinPath<BasePath, Path>>, MergeSchema<Volatile['schema'], MergeSchema<Ephemeral['schema'], Metadata['schema']>>>, Metadata['standaloneSchema'] & Ephemeral['standaloneSchema'] & Volatile['standaloneSchema']>, const Decorator extends Singleton & {
         derive: Ephemeral['derive'] & Volatile['derive'];
         resolve: Ephemeral['resolve'] & Volatile['resolve'];
     }, const MacroContext extends MacroToContext<Metadata['macroFn'], Omit<Input, NonResolvableMacroKey>, Definitions['typebox']>, const Handle extends InlineHandler<NoInfer<Schema>, Decorator, MacroContext>>(path: Path, handler: Handle, hook?: LocalHook<Input, Schema & MacroContext, Decorator, Definitions['error'], keyof Metadata['parser']>): Elysia<BasePath, Singleton, Definitions, Metadata, Routes & CreateEden<JoinPath<BasePath, Path>, {
@@ -1526,7 +1522,7 @@ export default class Elysia<const in out BasePath extends string = '', const in
      *     })
      * ```
      */
-    post<const Path extends string, const Input extends Metadata['macro'] & InputSchema<keyof Definitions['typebox'] & string>, const Schema extends MergeSchema<UnwrapRoute<Input, Definitions['typebox'], JoinPath<BasePath, Path>>, MergeSchema<Volatile['schema'], MergeSchema<Ephemeral['schema'], Metadata['schema']>>> & Metadata['standaloneSchema'] & Ephemeral['standaloneSchema'] & Volatile['standaloneSchema'], const Decorator extends Singleton & {
+    post<const Path extends string, const Input extends Metadata['macro'] & InputSchema<keyof Definitions['typebox'] & string>, const Schema extends IntersectIfObjectSchema<MergeSchema<UnwrapRoute<Input, Definitions['typebox'], JoinPath<BasePath, Path>>, MergeSchema<Volatile['schema'], MergeSchema<Ephemeral['schema'], Metadata['schema']>>>, Metadata['standaloneSchema'] & Ephemeral['standaloneSchema'] & Volatile['standaloneSchema']>, const Decorator extends Singleton & {
         derive: Ephemeral['derive'] & Volatile['derive'];
         resolve: Ephemeral['resolve'] & Volatile['resolve'];
     }, const MacroContext extends MacroToContext<Metadata['macroFn'], Omit<Input, NonResolvableMacroKey>, Definitions['typebox']>, const Handle extends InlineHandler<NoInfer<Schema>, NoInfer<Decorator>, MacroContext>>(path: Path, handler: Handle, hook?: LocalHook<Input, Schema & MacroContext, Decorator, Definitions['error'], keyof Metadata['parser']>): Elysia<BasePath, Singleton, Definitions, Metadata, Routes & CreateEden<JoinPath<BasePath, Path>, {
@@ -1548,7 +1544,7 @@ export default class Elysia<const in out BasePath extends string = '', const in
      *     })
      * ```
      */
-    put<const Path extends string, const Input extends Metadata['macro'] & InputSchema<keyof Definitions['typebox'] & string>, const Schema extends MergeSchema<UnwrapRoute<Input, Definitions['typebox'], JoinPath<BasePath, Path>>, MergeSchema<Volatile['schema'], MergeSchema<Ephemeral['schema'], Metadata['schema']>>> & Metadata['standaloneSchema'] & Ephemeral['standaloneSchema'] & Volatile['standaloneSchema'], const Decorator extends Singleton & {
+    put<const Path extends string, const Input extends Metadata['macro'] & InputSchema<keyof Definitions['typebox'] & string>, const Schema extends IntersectIfObjectSchema<MergeSchema<UnwrapRoute<Input, Definitions['typebox'], JoinPath<BasePath, Path>>, MergeSchema<Volatile['schema'], MergeSchema<Ephemeral['schema'], Metadata['schema']>>>, Metadata['standaloneSchema'] & Ephemeral['standaloneSchema'] & Volatile['standaloneSchema']>, const Decorator extends Singleton & {
         derive: Ephemeral['derive'] & Volatile['derive'];
         resolve: Ephemeral['resolve'] & Volatile['resolve'];
     }, const MacroContext extends MacroToContext<Metadata['macroFn'], Omit<Input, NonResolvableMacroKey>, Definitions['typebox']>, const Handle extends InlineHandler<NoInfer<Schema>, NoInfer<Decorator>, MacroContext>>(path: Path, handler: Handle, hook?: LocalHook<Input, Schema & MacroContext, Definitions['error'], keyof Metadata['parser']>): Elysia<BasePath, Singleton, Definitions, Metadata, Routes & CreateEden<JoinPath<BasePath, Path>, {
@@ -1570,7 +1566,7 @@ export default class Elysia<const in out BasePath extends string = '', const in
      *     })
      * ```
      */
-    patch<const Path extends string, const Input extends Metadata['macro'] & InputSchema<keyof Definitions['typebox'] & string>, const Schema extends MergeSchema<UnwrapRoute<Input, Definitions['typebox'], JoinPath<BasePath, Path>>, MergeSchema<Volatile['schema'], MergeSchema<Ephemeral['schema'], Metadata['schema']>>> & Metadata['standaloneSchema'] & Ephemeral['standaloneSchema'] & Volatile['standaloneSchema'], const Decorator extends Singleton & {
+    patch<const Path extends string, const Input extends Metadata['macro'] & InputSchema<keyof Definitions['typebox'] & string>, const Schema extends IntersectIfObjectSchema<MergeSchema<UnwrapRoute<Input, Definitions['typebox'], JoinPath<BasePath, Path>>, MergeSchema<Volatile['schema'], MergeSchema<Ephemeral['schema'], Metadata['schema']>>>, Metadata['standaloneSchema'] & Ephemeral['standaloneSchema'] & Volatile['standaloneSchema']>, const Decorator extends Singleton & {
         derive: Ephemeral['derive'] & Volatile['derive'];
         resolve: Ephemeral['resolve'] & Volatile['resolve'];
     }, const MacroContext extends MacroToContext<Metadata['macroFn'], Omit<Input, NonResolvableMacroKey>, Definitions['typebox']>, const Handle extends InlineHandler<NoInfer<Schema>, NoInfer<Decorator>, MacroContext>>(path: Path, handler: Handle, hook?: LocalHook<Input, Schema & MacroContext, Definitions['error'], keyof Metadata['parser']>): Elysia<BasePath, Singleton, Definitions, Metadata, Routes & CreateEden<JoinPath<BasePath, Path>, {
@@ -1592,7 +1588,7 @@ export default class Elysia<const in out BasePath extends string = '', const in
      *     })
      * ```
      */
-    delete<const Path extends string, const Input extends Metadata['macro'] & InputSchema<keyof Definitions['typebox'] & string>, const Schema extends MergeSchema<UnwrapRoute<Input, Definitions['typebox'], JoinPath<BasePath, Path>>, MergeSchema<Volatile['schema'], MergeSchema<Ephemeral['schema'], Metadata['schema']>>> & Metadata['standaloneSchema'] & Ephemeral['standaloneSchema'] & Volatile['standaloneSchema'], const Decorator extends Singleton & {
+    delete<const Path extends string, const Input extends Metadata['macro'] & InputSchema<keyof Definitions['typebox'] & string>, const Schema extends IntersectIfObjectSchema<MergeSchema<UnwrapRoute<Input, Definitions['typebox'], JoinPath<BasePath, Path>>, MergeSchema<Volatile['schema'], MergeSchema<Ephemeral['schema'], Metadata['schema']>>>, Metadata['standaloneSchema'] & Ephemeral['standaloneSchema'] & Volatile['standaloneSchema']>, const Decorator extends Singleton & {
         derive: Ephemeral['derive'] & Volatile['derive'];
         resolve: Ephemeral['resolve'] & Volatile['resolve'];
     }, const MacroContext extends MacroToContext<Metadata['macroFn'], Omit<Input, NonResolvableMacroKey>, Definitions['typebox']>, const Handle extends InlineHandler<NoInfer<Schema>, NoInfer<Decorator>, MacroContext>>(path: Path, handler: Handle, hook?: LocalHook<Input, Schema & MacroContext, Definitions['error'], keyof Metadata['parser']>): Elysia<BasePath, Singleton, Definitions, Metadata, Routes & CreateEden<JoinPath<BasePath, Path>, {
@@ -1614,7 +1610,7 @@ export default class Elysia<const in out BasePath extends string = '', const in
      *     })
      * ```
      */
-    options<const Path extends string, const Input extends Metadata['macro'] & InputSchema<keyof Definitions['typebox'] & string>, const Schema extends MergeSchema<UnwrapRoute<Input, Definitions['typebox'], JoinPath<BasePath, Path>>, MergeSchema<Volatile['schema'], MergeSchema<Ephemeral['schema'], Metadata['schema']>>> & Metadata['standaloneSchema'] & Ephemeral['standaloneSchema'] & Volatile['standaloneSchema'], const Decorator extends Singleton & {
+    options<const Path extends string, const Input extends Metadata['macro'] & InputSchema<keyof Definitions['typebox'] & string>, const Schema extends IntersectIfObjectSchema<MergeSchema<UnwrapRoute<Input, Definitions['typebox'], JoinPath<BasePath, Path>>, MergeSchema<Volatile['schema'], MergeSchema<Ephemeral['schema'], Metadata['schema']>>>, Metadata['standaloneSchema'] & Ephemeral['standaloneSchema'] & Volatile['standaloneSchema']>, const Decorator extends Singleton & {
         derive: Ephemeral['derive'] & Volatile['derive'];
         resolve: Ephemeral['resolve'] & Volatile['resolve'];
     }, const MacroContext extends MacroToContext<Metadata['macroFn'], Omit<Input, NonResolvableMacroKey>, Definitions['typebox']>, const Handle extends InlineHandler<NoInfer<Schema>, NoInfer<Decorator>, MacroContext>>(path: Path, handler: Handle, hook?: LocalHook<Input, Schema & MacroContext, Definitions['error'], keyof Metadata['parser']>): Elysia<BasePath, Singleton, Definitions, Metadata, Routes & CreateEden<JoinPath<BasePath, Path>, {
@@ -1636,7 +1632,7 @@ export default class Elysia<const in out BasePath extends string = '', const in
      *     })
      * ```
      */
-    all<const Path extends string, const Input extends Metadata['macro'] & InputSchema<keyof Definitions['typebox'] & string>, const Schema extends MergeSchema<UnwrapRoute<Input, Definitions['typebox'], JoinPath<BasePath, Path>>, MergeSchema<Volatile['schema'], MergeSchema<Ephemeral['schema'], Metadata['schema']>>> & Metadata['standaloneSchema'] & Ephemeral['standaloneSchema'] & Volatile['standaloneSchema'], const Decorator extends Singleton & {
+    all<const Path extends string, const Input extends Metadata['macro'] & InputSchema<keyof Definitions['typebox'] & string>, const Schema extends IntersectIfObjectSchema<MergeSchema<UnwrapRoute<Input, Definitions['typebox'], JoinPath<BasePath, Path>>, MergeSchema<Volatile['schema'], MergeSchema<Ephemeral['schema'], Metadata['schema']>>>, Metadata['standaloneSchema'] & Ephemeral['standaloneSchema'] & Volatile['standaloneSchema']>, const Decorator extends Singleton & {
         derive: Ephemeral['derive'] & Volatile['derive'];
         resolve: Ephemeral['resolve'] & Volatile['resolve'];
     }, const MacroContext extends MacroToContext<Metadata['macroFn'], Omit<Input, NonResolvableMacroKey>, Definitions['typebox']>, const Handle extends InlineHandler<NoInfer<Schema>, NoInfer<Decorator>, MacroContext>>(path: Path, handler: Handle, hook?: LocalHook<Input, Schema & MacroContext, Definitions['error'], keyof Metadata['parser']>): Elysia<BasePath, Singleton, Definitions, Metadata, Routes & CreateEden<JoinPath<BasePath, Path>, {
@@ -1658,7 +1654,7 @@ export default class Elysia<const in out BasePath extends string = '', const in
      *     })
      * ```
      */
-    head<const Path extends string, const Input extends Metadata['macro'] & InputSchema<keyof Definitions['typebox'] & string>, const Schema extends MergeSchema<UnwrapRoute<Input, Definitions['typebox'], JoinPath<BasePath, Path>>, MergeSchema<Volatile['schema'], MergeSchema<Ephemeral['schema'], Metadata['schema']>>> & Metadata['standaloneSchema'] & Ephemeral['standaloneSchema'] & Volatile['standaloneSchema'], const Decorator extends Singleton & {
+    head<const Path extends string, const Input extends Metadata['macro'] & InputSchema<keyof Definitions['typebox'] & string>, const Schema extends IntersectIfObjectSchema<MergeSchema<UnwrapRoute<Input, Definitions['typebox'], JoinPath<BasePath, Path>>, MergeSchema<Volatile['schema'], MergeSchema<Ephemeral['schema'], Metadata['schema']>>>, Metadata['standaloneSchema'] & Ephemeral['standaloneSchema'] & Volatile['standaloneSchema']>, const Decorator extends Singleton & {
         derive: Ephemeral['derive'] & Volatile['derive'];
         resolve: Ephemeral['resolve'] & Volatile['resolve'];
     }, const MacroContext extends MacroToContext<Metadata['macroFn'], Omit<Input, NonResolvableMacroKey>, Definitions['typebox']>, const Handle extends InlineHandler<NoInfer<Schema>, NoInfer<Decorator>, MacroContext>>(path: Path, handler: Handle, hook?: LocalHook<Input, Schema & MacroContext, Definitions['error'], keyof Metadata['parser']>): Elysia<BasePath, Singleton, Definitions, Metadata, Routes & CreateEden<JoinPath<BasePath, Path>, {
@@ -1680,7 +1676,7 @@ export default class Elysia<const in out BasePath extends string = '', const in
      *     })
      * ```
      */
-    connect<const Path extends string, const Input extends Metadata['macro'] & InputSchema<keyof Definitions['typebox'] & string>, const Schema extends MergeSchema<UnwrapRoute<Input, Definitions['typebox'], JoinPath<BasePath, Path>>, MergeSchema<Volatile['schema'], MergeSchema<Ephemeral['schema'], Metadata['schema']>>> & Metadata['standaloneSchema'] & Ephemeral['standaloneSchema'] & Volatile['standaloneSchema'], const Decorator extends Singleton & {
+    connect<const Path extends string, const Input extends Metadata['macro'] & InputSchema<keyof Definitions['typebox'] & string>, const Schema extends IntersectIfObjectSchema<MergeSchema<UnwrapRoute<Input, Definitions['typebox'], JoinPath<BasePath, Path>>, MergeSchema<Volatile['schema'], MergeSchema<Ephemeral['schema'], Metadata['schema']>>>, Metadata['standaloneSchema'] & Ephemeral['standaloneSchema'] & Volatile['standaloneSchema']>, const Decorator extends Singleton & {
         derive: Ephemeral['derive'] & Volatile['derive'];
         resolve: Ephemeral['resolve'] & Volatile['resolve'];
     }, const MacroContext extends MacroToContext<Metadata['macroFn'], Omit<Input, NonResolvableMacroKey>, Definitions['typebox']>, const Handle extends InlineHandler<NoInfer<Schema>, NoInfer<Decorator>, MacroContext>>(path: Path, handler: Handle, hook?: LocalHook<Input, Schema & MacroContext, Definitions['error'], keyof Metadata['parser']>): Elysia<BasePath, Singleton, Definitions, Metadata, Routes & CreateEden<JoinPath<BasePath, Path>, {
@@ -1702,7 +1698,7 @@ export default class Elysia<const in out BasePath extends string = '', const in
      *     })
      * ```
      */
-    route<const Method extends HTTPMethod, const Path extends string, const Input extends Metadata['macro'] & InputSchema<keyof Definitions['typebox'] & string>, const Schema extends MergeSchema<UnwrapRoute<Input, Definitions['typebox'], JoinPath<BasePath, Path>>, MergeSchema<Volatile['schema'], MergeSchema<Ephemeral['schema'], Metadata['schema']>>> & Metadata['standaloneSchema'] & Ephemeral['standaloneSchema'] & Volatile['standaloneSchema'], const Decorator extends Singleton & {
+    route<const Method extends HTTPMethod, const Path extends string, const Input extends Metadata['macro'] & InputSchema<keyof Definitions['typebox'] & string>, const Schema extends IntersectIfObjectSchema<MergeSchema<UnwrapRoute<Input, Definitions['typebox'], JoinPath<BasePath, Path>>, MergeSchema<Volatile['schema'], MergeSchema<Ephemeral['schema'], Metadata['schema']>>>, Metadata['standaloneSchema'] & Ephemeral['standaloneSchema'] & Volatile['standaloneSchema']>, const Decorator extends Singleton & {
         derive: Ephemeral['derive'] & Volatile['derive'];
         resolve: Ephemeral['resolve'] & Volatile['resolve'];
     }, const MacroContext extends MacroToContext<Metadata['macroFn'], Omit<Input, NonResolvableMacroKey>, Definitions['typebox']>, const Handle extends InlineHandler<NoInfer<Schema>, NoInfer<Decorator>, MacroContext>>(method: Method, path: Path, handler: Handle, hook?: LocalHook<Input, Schema & MacroContext, Definitions['error'], keyof Metadata['parser']> & {
@@ -1730,7 +1726,7 @@ export default class Elysia<const in out BasePath extends string = '', const in
      *     })
      * ```
      */
-    ws<const Path extends string, const Input extends Metadata['macro'] & InputSchema<keyof Definitions['typebox'] & string>, const Schema extends MergeSchema<UnwrapRoute<Input, Definitions['typebox'], JoinPath<BasePath, Path>>, MergeSchema<Volatile['schema'], MergeSchema<Ephemeral['schema'], Metadata['schema']>>> & Metadata['standaloneSchema'] & Ephemeral['standaloneSchema'] & Volatile['standaloneSchema'], const MacroContext extends MacroToContext<Metadata['macroFn'], Omit<Input, NonResolvableMacroKey>>>(path: Path, options: WSLocalHook<Input, Schema, Singleton & {
+    ws<const Path extends string, const Input extends Metadata['macro'] & InputSchema<keyof Definitions['typebox'] & string>, const Schema extends IntersectIfObjectSchema<MergeSchema<UnwrapRoute<Input, Definitions['typebox'], JoinPath<BasePath, Path>>, MergeSchema<Volatile['schema'], MergeSchema<Ephemeral['schema'], Metadata['schema']>>>, Metadata['standaloneSchema'] & Ephemeral['standaloneSchema'] & Volatile['standaloneSchema']>, const MacroContext extends MacroToContext<Metadata['macroFn'], Omit<Input, NonResolvableMacroKey>>>(path: Path, options: WSLocalHook<Input, Schema, Singleton & {
         derive: Ephemeral['derive'] & Volatile['derive'];
         resolve: Ephemeral['resolve'] & Volatile['resolve'] & MacroContext['resolve'];
     }>): Elysia<BasePath, Singleton, Definitions, Metadata, Routes & CreateEden<JoinPath<BasePath, Path>, {