elysia 1.1.1 → 1.1.3

package/dist/bun/index.d.ts

@@ -300,14 +300,14 @@ export default class Elysia<const in out BasePath extends string = '', const in
     })>>) => MaybePromise<Resolver | void>): Type extends 'global' ? Elysia<BasePath, Scoped, {
         decorator: Singleton['decorator'];
         store: Singleton['store'];
-        derive: Singleton['resolve'];
+        derive: Singleton['derive'];
         resolve: Prettify<Singleton['resolve'] & ExcludeElysiaResponse<Resolver>>;
     }, Definitions, Metadata, Routes, Ephemeral, Volatile> : Type extends 'scoped' ? Elysia<BasePath, Scoped, Singleton, Definitions, Metadata, Routes, {
-        derive: Ephemeral['resolve'];
+        derive: Ephemeral['derive'];
         resolve: Prettify<Ephemeral['resolve'] & ExcludeElysiaResponse<Resolver>>;
         schema: Ephemeral['schema'];
     }, Volatile> : Elysia<BasePath, Scoped, Singleton, Definitions, Metadata, Routes, Ephemeral, {
-        derive: Volatile['resolve'];
+        derive: Volatile['derive'];
         resolve: Prettify<Volatile['resolve'] & ExcludeElysiaResponse<Resolver>>;
         schema: Volatile['schema'];
     }>;
@@ -356,14 +356,14 @@ export default class Elysia<const in out BasePath extends string = '', const in
     })>) => MaybePromise<NewResolver | void>): Type extends 'global' ? Elysia<BasePath, Scoped, {
         decorator: Singleton['decorator'];
         store: Singleton['store'];
-        derive: Singleton['resolve'];
+        derive: Singleton['derive'];
         resolve: Awaited<NewResolver>;
     }, Definitions, Metadata, Routes, Ephemeral, Volatile> : Type extends 'scoped' ? Elysia<BasePath, Scoped, Singleton, Definitions, Metadata, Routes, {
-        derive: Ephemeral['resolve'];
+        derive: Ephemeral['derive'];
         resolve: Prettify<Ephemeral['resolve'] & ExcludeElysiaResponse<NewResolver>>;
         schema: Ephemeral['schema'];
     }, Volatile> : Elysia<BasePath, Scoped, Singleton, Definitions, Metadata, Routes, Ephemeral, {
-        derive: Volatile['resolve'];
+        derive: Volatile['derive'];
         resolve: Prettify<Volatile['resolve'] & ExcludeElysiaResponse<NewResolver>>;
         schema: Volatile['schema'];
     }>;
@@ -688,12 +688,7 @@ export default class Elysia<const in out BasePath extends string = '', const in
      *     })
      * ```
      */
-    onError<const Schema extends RouteSchema>(handler: MaybeArray<ErrorHandler<Definitions['error'], MergeSchema<Schema, MergeSchema<Volatile['schema'], MergeSchema<Ephemeral['schema'], Metadata['schema']>>>, {
-        decorator: Singleton['decorator'];
-        store: Singleton['store'];
-        derive: {};
-        resolve: {};
-    }, Ephemeral, Volatile>>): this;
+    onError<const Schema extends RouteSchema>(handler: MaybeArray<ErrorHandler<Definitions['error'], MergeSchema<Schema, MergeSchema<Volatile['schema'], MergeSchema<Ephemeral['schema'], Metadata['schema']>>>, Singleton, Ephemeral, Volatile>>): this;
     /**
      * ### Error | Life cycle event
      * Called when error is thrown during processing request
@@ -708,14 +703,27 @@ export default class Elysia<const in out BasePath extends string = '', const in
      *     })
      * ```
      */
-    onError<const Schema extends RouteSchema>(options: {
-        as?: LifeCycleType;
-    }, handler: MaybeArray<ErrorHandler<Definitions['error'], MergeSchema<Schema, MergeSchema<Volatile['schema'], MergeSchema<Ephemeral['schema'], Metadata['schema']>>>, {
+    onError<const Schema extends RouteSchema, const Scope extends LifeCycleType>(options: {
+        as?: Scope;
+    }, handler: MaybeArray<ErrorHandler<Definitions['error'], MergeSchema<Schema, MergeSchema<Volatile['schema'], MergeSchema<Ephemeral['schema'], Metadata['schema']>>>, Scope extends 'global' ? {
+        store: Singleton['store'];
         decorator: Singleton['decorator'];
+        derive: Singleton['derive'] & Ephemeral['derive'] & Volatile['derive'];
+        resolve: Singleton['resolve'] & Ephemeral['resolve'] & Volatile['resolve'];
+    } : Scope extends 'scoped' ? {
         store: Singleton['store'];
-        derive: {};
-        resolve: {};
-    }, Ephemeral, Volatile>>): this;
+        decorator: Singleton['decorator'];
+        derive: Singleton['derive'] & Ephemeral['derive'];
+        resolve: Singleton['resolve'] & Ephemeral['resolve'];
+    } : Singleton, Scoped extends 'global' ? Ephemeral : {
+        derive: Partial<Ephemeral['derive']>;
+        resolve: Partial<Ephemeral['resolve']>;
+        schema: Ephemeral['schema'];
+    }, Scoped extends 'global' ? Ephemeral : Scoped extends 'scoped' ? Ephemeral : {
+        derive: Partial<Ephemeral['derive']>;
+        resolve: Partial<Ephemeral['resolve']>;
+        schema: Ephemeral['schema'];
+    }>>): this;
     /**
      * ### stop | Life cycle event
      * Called after server stop serving request
@@ -827,11 +835,11 @@ export default class Elysia<const in out BasePath extends string = '', const in
         macro: Metadata['macro'];
         macroFn: Metadata['macroFn'];
     }, Routes, Ephemeral, Volatile> : Type extends 'scoped' ? Elysia<BasePath, Scoped, Singleton, Definitions, Metadata, Routes, {
-        derive: Volatile['resolve'];
+        derive: Volatile['derive'];
         resolve: Volatile['resolve'];
         schema: Prettify<MergeSchema<UnwrapRoute<LocalSchema, Definitions['type']>, Metadata['schema'] & Ephemeral['schema']>>;
     }, Ephemeral> : Elysia<BasePath, Scoped, Singleton, Definitions, Metadata, Routes, Ephemeral, {
-        derive: Volatile['resolve'];
+        derive: Volatile['derive'];
         resolve: Volatile['resolve'];
         schema: Prettify<MergeSchema<UnwrapRoute<LocalSchema, Definitions['type']>, Metadata['schema'] & Ephemeral['schema'] & Volatile['schema']>>;
     }>;
@@ -839,7 +847,7 @@ export default class Elysia<const in out BasePath extends string = '', const in
         derive: Ephemeral['derive'] & Volatile['derive'];
         resolve: Ephemeral['resolve'] & Volatile['resolve'];
     }, Definitions['error'], Metadata['macro'], BasePath>): Elysia<BasePath, Scoped, Singleton, Definitions, Metadata, Routes, Ephemeral, {
-        derive: Volatile['resolve'];
+        derive: Volatile['derive'];
         resolve: Volatile['resolve'];
         schema: Prettify<MergeSchema<UnwrapRoute<LocalSchema, Definitions['type']>, MergeSchema<Volatile['schema'], MergeSchema<Ephemeral['schema'], Metadata['schema']>>>>;
     }>;
@@ -1454,15 +1462,15 @@ export default class Elysia<const in out BasePath extends string = '', const in
     }), BasePath>>) => MaybePromise<Derivative>): Type extends 'global' ? Elysia<BasePath, Scoped, {
         decorator: Singleton['decorator'];
         store: Singleton['store'];
-        derive: Singleton['resolve'];
-        resolve: Prettify<Singleton['resolve'] & ExcludeElysiaResponse<Derivative>>;
+        derive: Prettify<Singleton['derive'] & ExcludeElysiaResponse<Derivative>>;
+        resolve: Singleton['resolve'];
     }, Definitions, Metadata, Routes, Ephemeral, Volatile> : Type extends 'scoped' ? Elysia<BasePath, Scoped, Singleton, Definitions, Metadata, Routes, {
-        derive: Ephemeral['resolve'];
-        resolve: Prettify<Ephemeral['resolve'] & ExcludeElysiaResponse<Derivative>>;
+        derive: Prettify<Ephemeral['derive'] & ExcludeElysiaResponse<Derivative>>;
+        resolve: Ephemeral['resolve'];
         schema: Ephemeral['schema'];
     }, Volatile> : Elysia<BasePath, Scoped, Singleton, Definitions, Metadata, Routes, Ephemeral, {
-        derive: Volatile['resolve'];
-        resolve: Prettify<Volatile['resolve'] & ExcludeElysiaResponse<Derivative>>;
+        derive: Prettify<Volatile['derive'] & ExcludeElysiaResponse<Derivative>>;
+        resolve: Ephemeral['resolve'];
         schema: Volatile['schema'];
     }>;
     model<const Name extends string, const Model extends TSchema>(name: Name, model: Model): Elysia<BasePath, Scoped, Singleton, {
@@ -1507,14 +1515,14 @@ export default class Elysia<const in out BasePath extends string = '', const in
     }), BasePath>) => MaybePromise<NewDerivative>): Type extends 'global' ? Elysia<BasePath, Scoped, {
         decorator: Singleton['decorator'];
         store: Singleton['store'];
-        derive: Singleton['resolve'];
+        derive: Singleton['derive'];
         resolve: Prettify<Singleton['resolve'] & ExcludeElysiaResponse<NewDerivative>>;
     }, Definitions, Metadata, Routes, Ephemeral, Volatile> : Type extends 'scoped' ? Elysia<BasePath, Scoped, Singleton, Definitions, Metadata, Routes, {
-        derive: Ephemeral['resolve'];
+        derive: Ephemeral['derive'];
         resolve: Prettify<Ephemeral['resolve'] & ExcludeElysiaResponse<NewDerivative>>;
         schema: Ephemeral['schema'];
     }, Volatile> : Elysia<BasePath, Scoped, Singleton, Definitions, Metadata, Routes, Ephemeral, {
-        derive: Volatile['resolve'];
+        derive: Volatile['derive'];
         resolve: Prettify<Volatile['resolve'] & ExcludeElysiaResponse<NewDerivative>>;
         schema: Volatile['schema'];
     }>;