|
|
|
@ -1,8 +1,8 @@
|
|
|
|
|
import {Collection, Either, ErrorWithContext, Maybe, Pipeline, PrefixTypeArray, right} from '../../util'
|
|
|
|
|
import {Awaitable, Collection, Either, ErrorWithContext, Maybe, Pipeline, PrefixTypeArray, right} from '../../util'
|
|
|
|
|
import {ResponseFactory} from '../response/ResponseFactory'
|
|
|
|
|
import {HTTPMethod, Request} from '../lifecycle/Request'
|
|
|
|
|
import {constructable, Constructable, Container, Instantiable, isInstantiableOf, TypedDependencyKey} from '../../di'
|
|
|
|
|
import {Middleware} from './Middleware'
|
|
|
|
|
import {Middleware, ParameterMiddleware} from './Middleware'
|
|
|
|
|
import {Valid, Validator, ValidatorFactory} from '../../validation/Validator'
|
|
|
|
|
import {validateMiddleware} from '../../validation/middleware'
|
|
|
|
|
import {RouteGroup} from './RouteGroup'
|
|
|
|
@ -20,7 +20,7 @@ export type ResponseObject = ResponseFactory | string | number | void | any | Pr
|
|
|
|
|
*/
|
|
|
|
|
export type ResolvedRouteHandler = (request: Request) => ResponseObject
|
|
|
|
|
|
|
|
|
|
export type ParameterProvidingMiddleware<T> = (request: Request) => Either<ResponseObject, T>
|
|
|
|
|
export type ParameterProvidingMiddleware<T> = (request: Request) => Awaitable<Either<ResponseObject, T>>
|
|
|
|
|
|
|
|
|
|
export interface HandledRoute<TReturn extends ResponseObject, THandlerParams extends unknown[] = []> {
|
|
|
|
|
handler: Constructable<(...x: THandlerParams) => TReturn>
|
|
|
|
@ -311,7 +311,7 @@ export class Route<TReturn extends ResponseObject, THandlerParams extends unknow
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
public parameterMiddleware<T>(
|
|
|
|
|
handler: ParameterProvidingMiddleware<T>,
|
|
|
|
|
handler: ParameterProvidingMiddleware<T> | Instantiable<ParameterMiddleware<T>>,
|
|
|
|
|
): Route<TReturn, PrefixTypeArray<T, THandlerParams>> {
|
|
|
|
|
const route = new Route<TReturn, PrefixTypeArray<T, THandlerParams>>(
|
|
|
|
|
this.method,
|
|
|
|
@ -319,7 +319,12 @@ export class Route<TReturn extends ResponseObject, THandlerParams extends unknow
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
route.copyFrom(this)
|
|
|
|
|
route.parameters.push(handler)
|
|
|
|
|
|
|
|
|
|
if ( handler.prototype instanceof ParameterMiddleware ) {
|
|
|
|
|
route.parameters.push(req => req.make<ParameterMiddleware<T>>(handler).handle())
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
route.parameters.push(handler as ParameterProvidingMiddleware<T>)
|
|
|
|
|
return route
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|