@deepkit/http 1.0.1-alpha.58 → 1.0.1-alpha.62

package/dist/esm/src/router.js

@@ -4,9 +4,13 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
+import { __ΩSerializationOptions as __ΩSerializationOptions } from '@deepkit/type';
+import { __ΩClassType as __ΩClassType } from '@deepkit/core';
+import { __ΩMiddlewareRegistryEntry as __ΩMiddlewareRegistryEntry } from '@deepkit/app';
+import { __ΩLoggerInterface as __ΩLoggerInterface } from '@deepkit/logger';
+import { __ΩHttpMiddlewareFn as __ΩHttpMiddlewareFn } from './middleware';
+import { __ΩHttpRequestQuery as __ΩHttpRequestQuery } from './model';
+import { __ΩHttpRequestResolvedParameters as __ΩHttpRequestResolvedParameters } from './model';
 /*
  * Deepkit Framework
  * Copyright (C) 2021 Deepkit UG, Marc J. Schmidt
@@ -16,58 +20,33 @@ var __metadata = (this && this.__metadata) || function (k, v) {
  *
  * You should have received a copy of the MIT License along with this program.
  */
-import 'reflect-metadata';
-import { asyncOperation, CompilerContext, getClassName, isClass, urlJoin } from '@deepkit/core';
-import { entity, getClassSchema, getPropertyXtoClassFunction, jitValidateProperty, jsonSerializer, t, ValidationFailed } from '@deepkit/type';
+import { asyncOperation, CompilerContext, getClassName, isClass, isObject, urlJoin } from '@deepkit/core';
+import { assertType, entity, findMember, getSerializeFunction, getValidatorFunction, metaAnnotation, ReflectionClass, ReflectionParameter, serializer, Serializer, stringifyType, typeToObject, ValidationError } from '@deepkit/type';
 // @ts-ignore
 import formidable from 'formidable';
 import { httpClass } from './decorator';
-import { injectable, TagRegistry } from '@deepkit/injector';
+import { BodyValidationError, getRegExp, HttpRequest, ValidatedBody } from './model';
+import { InjectorContext, InjectorModule, TagRegistry } from '@deepkit/injector';
 import { Logger } from '@deepkit/logger';
 import { HttpControllers } from './controllers';
-import { AppModule, MiddlewareRegistry } from '@deepkit/app';
+import { MiddlewareRegistry } from '@deepkit/app';
 import { HttpMiddlewareConfig } from './middleware';
+var __ΩRouteParameterResolverForInjector = [() => InjectorContext, 'injector', '', 'PP7!2"P"F"F`J/#'];
+export { __ΩRouteParameterResolverForInjector };
+var __ΩResolvedController = [() => __ΩRouteParameterResolverForInjector, 'parameters', () => RouteConfig, 'routeConfig', () => UploadedFile, 'uploadedFiles', () => InjectorContext, 'injector', () => __ΩHttpMiddlewareFn, 'fn', 'timeout', '', 'middlewares', 'Pn!4"P7#4$P&P7%LM4&PP7\'2(Pn)4*\'4+MF/,4-8M'];
 let UploadedFile = class UploadedFile {
 };
-__decorate([
-    t.required,
-    __metadata("design:type", Number)
-], UploadedFile.prototype, "size", void 0);
-__decorate([
-    t.required,
-    __metadata("design:type", String)
-], UploadedFile.prototype, "path", void 0);
-__decorate([
-    t.string.required.nullable,
-    __metadata("design:type", Object)
-], UploadedFile.prototype, "name", void 0);
-__decorate([
-    t.string.required.nullable,
-    __metadata("design:type", Object)
-], UploadedFile.prototype, "type", void 0);
-__decorate([
-    t.date.required.nullable,
-    __metadata("design:type", Object)
-], UploadedFile.prototype, "lastModifiedDate", void 0);
+UploadedFile.__type = ['size', 'path', 'name', 'type', 'lastModifiedDate', '\'3!&3"P&,J3#P&,J3$PT,J3%5'];
 UploadedFile = __decorate([
     entity.name('@deepkit/UploadedFile')
 ], UploadedFile);
 export { UploadedFile };
-function parseBody(form, req, files) {
-    return asyncOperation((resolve, reject) => {
-        form.parse(req, (err, fields, files) => {
-            if (err) {
-                reject(err);
-            }
-            else {
-                resolve({ fields, files });
-            }
-        });
-    });
-}
+var __ΩRouteControllerAction = [() => InjectorModule, 'module', () => __ΩClassType, 'controller', 'methodName', 'PP"7!4"8n#4$&4%M'];
+export { __ΩRouteControllerAction };
 function getRouterControllerActionName(action) {
     return `${getClassName(action.controller)}.${action.methodName}`;
 }
+getRouterControllerActionName.__type = [() => __ΩRouteControllerAction, 'action', 'getRouterControllerActionName', 'Pn!2"&/#'];
 export class RouteConfig {
     constructor(name, httpMethods, path, action, internal = false) {
         this.name = name;
@@ -76,7 +55,6 @@ export class RouteConfig {
         this.action = action;
         this.internal = internal;
         this.baseUrl = '';
-        this.parameterRegularExpressions = {};
         this.responses = [];
         this.description = '';
         this.groups = [];
@@ -88,7 +66,6 @@ export class RouteConfig {
          * An arbitrary data container the user can use to store app specific settings/values.
          */
         this.data = new Map();
-        this.parameters = {};
     }
     getSchemaForResponse(statusCode) {
         if (!this.responses.length)
@@ -106,39 +83,15 @@ export class RouteConfig {
         return path;
     }
 }
-/**
- * When this class is injected into a route, then validation errors are not automatically thrown (using onHttpControllerValidationError event),
- * but injected to the route itself. The user is then responsible to handle the errors.
- *
- * Note: The body parameter is still passed, however it might contain now invalid data. The BodyValidation tells what data is invalid.
- */
-export class BodyValidation {
-    constructor(errors = []) {
-        this.errors = errors;
-    }
-    hasErrors(prefix) {
-        return this.getErrors(prefix).length > 0;
-    }
-    getErrors(prefix) {
-        if (prefix)
-            return this.errors.filter(v => v.path.startsWith(prefix));
-        return this.errors;
-    }
-    getErrorsForPath(path) {
-        return this.errors.filter(v => v.path === path);
-    }
-    getErrorMessageForPath(path) {
-        return this.getErrorsForPath(path).map(v => v.message).join(', ');
-    }
-}
+RouteConfig.__type = ['baseUrl', () => "", 'statusCode', 'description', 'type', 'responses', () => [], () => "", 'groups', () => [], 'category', () => "", 'returnType', () => __ΩSerializationOptions, 'serializationOptions', () => Serializer, 'serializer', () => InjectorModule, 'module', () => __ΩClassType, 'resolverForToken', () => new Map(), () => HttpMiddlewareConfig, 'config', () => InjectorModule, 'middlewares', () => [], () => __ΩClassType, 'resolverForParameterName', () => new Map(), 'name', 'httpMethods', 'path', () => __ΩRouteControllerAction, 'action', 'internal', () => false, 'constructor', 'getSchemaForResponse', 'getFullPath', '&3!>"P\'4#&4$"4%8MF3&>\'&3$>(&F3)>*&3+>,"3-8n.3/8P70318P"72338"n4E35>6PP7748P"7943MF3:>;&n<E3=>>P&2?:&F2@:&2A:nB2C:)2D:>E"0FP\'2#P"-J0GP&0H5'];
 class ParsedRoute {
     constructor(routeConfig) {
         this.routeConfig = routeConfig;
         this.pathParameterNames = {};
         this.parameters = [];
     }
-    addParameter(property, config) {
-        const parameter = new ParsedRouteParameter(property, config);
+    addParameter(property) {
+        const parameter = new ParsedRouteParameter(property);
         this.parameters.push(parameter);
         return parameter;
     }
@@ -153,69 +106,97 @@ class ParsedRoute {
         throw new Error(`No route parameter with name ${name} defined.`);
     }
 }
+ParsedRoute.__type = ['regex', 'pathParameterNames', () => ({}), () => ParsedRouteParameter, 'parameters', () => [], () => RouteConfig, 'routeConfig', 'constructor', () => ReflectionParameter, 'property', () => ParsedRouteParameter, 'addParameter', () => ParsedRouteParameter, 'getParameters', 'name', () => ParsedRouteParameter, 'getParameter', '&3!8P&\'LM3">#P7$F3%<>&PP7\'2(:"0)PP7*2+P7,0-PP7.F0/P&20P71025'];
 class ParsedRouteParameter {
-    constructor(property, config) {
-        this.property = property;
-        this.config = config;
+    constructor(parameter) {
+        this.parameter = parameter;
     }
     get body() {
-        return this.config ? this.config.type === 'body' : false;
+        return metaAnnotation.getForName(this.parameter.type, 'httpBody') !== undefined;
+    }
+    get bodyValidation() {
+        return metaAnnotation.getForName(this.parameter.type, 'httpBodyValidation') !== undefined;
+    }
+    getType() {
+        if (this.bodyValidation) {
+            assertType(this.parameter.type, 20 /* class */);
+            const valueType = findMember('value', this.parameter.type);
+            if (!valueType || valueType.kind !== 15 /* property */)
+                throw new Error(`No property value found at ${stringifyType(this.parameter.type)}`);
+            return valueType.type;
+        }
+        return this.parameter.type;
     }
     get query() {
-        return this.config ? this.config.type === 'query' : false;
+        return metaAnnotation.getForName(this.parameter.type, 'httpQuery') !== undefined;
     }
     get queries() {
-        return this.config ? this.config.type === 'queries' : false;
+        return metaAnnotation.getForName(this.parameter.type, 'httpQueries') !== undefined;
     }
     get typePath() {
-        return this.config ? this.config.typePath : undefined;
+        const typeOptions = metaAnnotation.getForName(this.parameter.type, 'httpQueries') || metaAnnotation.getForName(this.parameter.type, 'httpQuery');
+        if (!typeOptions)
+            return;
+        const options = typeToObject(typeOptions[0]);
+        if (isObject(options))
+            return options.name;
+        return;
     }
     getName() {
-        return this.property.name;
+        return this.parameter.name;
     }
     isPartOfPath() {
         return this.regexPosition !== undefined;
     }
 }
+ParsedRouteParameter.__type = ['regexPosition', () => ReflectionParameter, 'parameter', 'constructor', 'getType', 'getName', 'isPartOfPath', '\'3!8PP7"2#:"0$!!P"0%!!!P"0&P)0\'5'];
 function parseRoutePathToRegex(routeConfig) {
     const parameterNames = {};
     let path = routeConfig.getFullPath();
+    const method = ReflectionClass.from(routeConfig.action.controller).getMethod(routeConfig.action.methodName);
     let argumentIndex = 0;
-    path = path.replace(/:(\w+)/g, (a, name) => {
+    path = path.replace(/:(\w+)/g, Object.assign((a, name) => {
         parameterNames[name] = argumentIndex;
         argumentIndex++;
-        return routeConfig.parameterRegularExpressions[name] ? '(' + routeConfig.parameterRegularExpressions[name] + ')' : String.raw `([^/]+)`;
-    });
+        const parameter = method.getParameterOrUndefined(name);
+        if (parameter) {
+            const regExp = getRegExp(parameter.type);
+            if (regExp)
+                return '(' + regExp + ')';
+        }
+        return String.raw `([^/]+)`;
+    }, { __type: ['a', 'name', '', 'P"2!"2""/#'] }));
     return { regex: path, parameterNames };
 }
+parseRoutePathToRegex.__type = [() => RouteConfig, 'routeConfig', 'regex', 'parameterNames', 'parseRoutePathToRegex', 'PP7!2"P&4#P&\'LM4$M/%'];
 export function parseRouteControllerAction(routeConfig) {
-    const schema = getClassSchema(routeConfig.action.controller);
+    const schema = ReflectionClass.from(routeConfig.action.controller);
     const parsedRoute = new ParsedRoute(routeConfig);
-    const methodArgumentProperties = schema.getMethodProperties(routeConfig.action.methodName);
+    const methodArgumentProperties = schema.getMethodParameters(routeConfig.action.methodName);
     const parsedPath = parseRoutePathToRegex(routeConfig);
     parsedRoute.regex = parsedPath.regex;
     parsedRoute.pathParameterNames = parsedPath.parameterNames;
     for (const property of methodArgumentProperties) {
-        const decoratorData = routeConfig.parameters[property.name];
-        const parsedParameter = parsedRoute.addParameter(property, decoratorData);
-        if (decoratorData && decoratorData.optional)
-            property.isOptional = true;
-        if (property.type === 'class' && property.classType === BodyValidation) {
-            parsedRoute.customValidationErrorHandling = parsedParameter;
-        }
+        const parsedParameter = parsedRoute.addParameter(property);
         parsedParameter.regexPosition = parsedPath.parameterNames[property.name];
     }
     return parsedRoute;
 }
+parseRouteControllerAction.__type = [() => RouteConfig, 'routeConfig', () => ParsedRoute, 'parseRouteControllerAction', 'PP7!2"P7#/$'];
 export function dotToUrlPath(dotPath) {
     if (-1 === dotPath.indexOf('.'))
         return dotPath;
     return dotPath.replace(/\./g, '][').replace('][', '[') + ']';
 }
+dotToUrlPath.__type = ['dotPath', 'dotToUrlPath', 'P&2!&/"'];
+var __ΩRouteParameterResolver = [() => __ΩRouteParameterResolverContext, 'context', 'resolve', 'PPn!2"P""`J1#M'];
+export { __ΩRouteParameterResolver };
+var __ΩRouteParameterResolverContext = [() => __ΩClassType, 'token', () => RouteConfig, 'route', () => HttpRequest, 'request', 'name', 'value', () => __ΩHttpRequestQuery, 'query', () => __ΩHttpRequestResolvedParameters, 'parameters', 'PPn!&+"J4"P7#4$P7%4&"4\'"4(n)4*n+4,M'];
+export { __ΩRouteParameterResolverContext };
 function filterMiddlewaresForRoute(middlewareRawConfigs, routeConfig, fullPath) {
     const middlewares = middlewareRawConfigs.slice(0);
     middlewares.push(...routeConfig.middlewares);
-    const middlewareConfigs = middlewares.filter((v) => {
+    const middlewareConfigs = middlewares.filter(Object.assign((v) => {
         var _a;
         if (!(v.config instanceof HttpMiddlewareConfig))
             return false;
@@ -278,34 +259,50 @@ function filterMiddlewaresForRoute(middlewareRawConfigs, routeConfig, fullPath)
             }
         }
         return true;
-    });
-    middlewareConfigs.sort((a, b) => {
+    }, { __type: ['v', '', 'P"2!"/"'] }));
+    middlewareConfigs.sort(Object.assign((a, b) => {
         return a.config.order - b.config.order;
-    });
+    }, { __type: ['a', 'b', '', 'P"2!"2""/#'] }));
     return middlewareConfigs;
 }
-let Router = class Router {
+filterMiddlewaresForRoute.__type = [() => __ΩMiddlewareRegistryEntry, 'middlewareRawConfigs', () => RouteConfig, 'routeConfig', 'fullPath', () => HttpMiddlewareConfig, 'config', () => InjectorModule, 'module', 'filterMiddlewaresForRoute', 'Pn!F2"P7#2$&2%PP7&4\'P"7(4)MF/*'];
+export class Router {
     constructor(controllers, logger, tagRegistry, middlewareRegistry = new MiddlewareRegistry) {
         this.logger = logger;
         this.middlewareRegistry = middlewareRegistry;
         this.routes = [];
-        //todo, move some settings to KernelConfig
-        this.form = formidable({
+        for (const controller of controllers.controllers) {
+            this.addRouteForController(controller.controller, controller.module);
+        }
+    }
+    parseBody(req, files) {
+        const form = formidable({
             multiples: true,
             hash: 'sha1',
             enabledPlugins: ['octetstream', 'querystring', 'json'],
         });
-        for (const controller of controllers.controllers) {
-            this.addRouteForController(controller.controller, controller.module);
-        }
+        return asyncOperation(Object.assign((resolve, reject) => {
+            if (req.body) {
+                return resolve(req.body);
+            }
+            form.parse(req, Object.assign((err, fields, files) => {
+                if (err) {
+                    reject(err);
+                }
+                else {
+                    const body = req.body = { ...fields, ...files };
+                    resolve(body);
+                }
+            }, { __type: ['err', 'fields', 'files', '', 'P"2!"2""2#"/$'] }));
+        }, { __type: ['resolve', 'reject', '', 'P"2!"2""/#'] }));
     }
     getRoutes() {
         return this.routes;
     }
-    static forControllers(controllers, tagRegistry = new TagRegistry(), middlewareRegistry = new MiddlewareRegistry(), module = new AppModule({})) {
-        return new this(new HttpControllers(controllers.map(v => {
+    static forControllers(controllers, tagRegistry = new TagRegistry(), middlewareRegistry = new MiddlewareRegistry(), module = new InjectorModule()) {
+        return new this(new HttpControllers(controllers.map(Object.assign(v => {
             return isClass(v) ? { controller: v, module } : v;
-        })), new Logger([], []), tagRegistry, middlewareRegistry);
+        }, { __type: ['v', '', 'P"2!"/"'] }))), new Logger([], []), tagRegistry, middlewareRegistry);
     }
     getRouteCode(compiler, routeConfig) {
         const routeConfigVar = compiler.reserveVariable('routeConfigVar', routeConfig);
@@ -316,7 +313,7 @@ let Router = class Router {
         const setParameters = [];
         const parameterNames = [];
         const parameterValidator = [];
-        let bodyValidationErrorHandling = `if (bodyErrors.length) throw ValidationFailed.from(bodyErrors);`;
+        let bodyValidationErrorHandling = `if (bodyErrors.length) throw ValidationError.from(bodyErrors);`;
         let enableParseBody = false;
         const hasParameters = parsedRoute.getParameters().length > 0;
         let requiresAsyncParameters = false;
@@ -324,49 +321,51 @@ let Router = class Router {
         const fullPath = routeConfig.getFullPath();
         const middlewareConfigs = filterMiddlewaresForRoute(this.middlewareRegistry.configs, routeConfig, fullPath);
         for (const parameter of parsedRoute.getParameters()) {
-            if (parsedRoute.customValidationErrorHandling === parameter) {
-                compiler.context.set('BodyValidation', BodyValidation);
-                bodyValidationErrorHandling = '';
-                setParameters.push(`parameters.${parameter.property.name} = new BodyValidation(bodyErrors);`);
-                parameterNames.push(`parameters.${parameter.property.name}`);
-            }
-            else if (parameter.body) {
-                const validatorVar = compiler.reserveVariable('argumentValidator', jitValidateProperty(parameter.property));
-                const converterVar = compiler.reserveVariable('argumentConverter', getPropertyXtoClassFunction(parameter.property, jsonSerializer));
+            if (parameter.body || parameter.bodyValidation) {
+                const type = parameter.getType();
+                const validatorVar = compiler.reserveVariable('argumentValidator', getValidatorFunction(undefined, type));
+                const converterVar = compiler.reserveVariable('argumentConverter', getSerializeFunction(type, serializer.deserializeRegistry));
                 enableParseBody = true;
-                setParameters.push(`parameters.${parameter.property.name} = ${converterVar}(bodyFields);`);
-                parameterValidator.push(`${validatorVar}(parameters.${parameter.property.name}, ${JSON.stringify(parameter.typePath || '')}, bodyErrors);`);
-                parameterNames.push(`parameters.${parameter.property.name}`);
+                setParameters.push(`parameters.${parameter.parameter.name} = ${converterVar}(bodyFields, {loosely: true});`);
+                parameterValidator.push(`${validatorVar}(parameters.${parameter.parameter.name}, {errors: bodyErrors});`);
+                if (parameter.bodyValidation) {
+                    compiler.context.set('BodyValidation', ValidatedBody);
+                    compiler.context.set('BodyValidationError', BodyValidationError);
+                    parameterNames.push(`new BodyValidation(new BodyValidationError(bodyErrors), bodyErrors.length === 0 ? parameters.${parameter.parameter.name} : undefined)`);
+                    bodyValidationErrorHandling = '';
+                }
+                else {
+                    parameterNames.push(`parameters.${parameter.parameter.name}`);
+                }
             }
             else if (parameter.query || parameter.queries) {
-                const converted = parameter.property.type === 'any' ? (v) => v : getPropertyXtoClassFunction(parameter.property, jsonSerializer);
-                const validator = parameter.property.type === 'any' ? (v) => undefined : jitValidateProperty(parameter.property);
+                const converted = getSerializeFunction(parameter.parameter.parameter, serializer.deserializeRegistry, undefined, parameter.getName());
+                const validator = getValidatorFunction(undefined, parameter.parameter.parameter);
                 const converterVar = compiler.reserveVariable('argumentConverter', converted);
                 const validatorVar = compiler.reserveVariable('argumentValidator', validator);
-                const queryPath = parameter.typePath === undefined ? parameter.property.name : parameter.typePath;
+                const queryPath = parameter.typePath === undefined && parameter.query ? parameter.parameter.name : parameter.typePath;
                 const accessor = queryPath ? `['` + (queryPath.replace(/\./g, `']['`)) + `']` : '';
                 const queryAccessor = queryPath ? `_query${accessor}` : '_query';
-                setParameters.push(`parameters.${parameter.property.name} = ${converterVar}(${queryAccessor});`);
-                parameterNames.push(`parameters.${parameter.property.name}`);
-                parameterValidator.push(`${validatorVar}(parameters.${parameter.property.name}, ${JSON.stringify(parameter.typePath)}, validationErrors);`);
+                setParameters.push(`parameters.${parameter.parameter.name} = ${converterVar}(${queryAccessor}, {loosely: true});`);
+                parameterNames.push(`parameters.${parameter.parameter.name}`);
+                parameterValidator.push(`${validatorVar}(parameters.${parameter.parameter.name}, {errors: validationErrors}, ${JSON.stringify(parameter.typePath || parameter.getName())});`);
             }
             else {
-                parameterNames.push(`parameters.${parameter.property.name}`);
+                parameterNames.push(`parameters.${parameter.parameter.name}`);
                 if (parameter.isPartOfPath()) {
-                    if (parameter.property.type !== 'class') {
-                        const converted = parameter.property.type === 'any' ? (v) => v : getPropertyXtoClassFunction(parameter.property, jsonSerializer);
+                    if (parameter.parameter.type.kind !== 20 /* class */) {
+                        const converted = getSerializeFunction(parameter.parameter.parameter, serializer.deserializeRegistry, undefined, parameter.getName());
                         const converterVar = compiler.reserveVariable('argumentConverter', converted);
-                        setParameters.push(`parameters.${parameter.property.name} = ${converterVar}(_match[${1 + (parameter.regexPosition || 0)}]);`);
-                        const validator = parameter.property.type === 'any' ? (v) => undefined : jitValidateProperty(parameter.property);
+                        setParameters.push(`parameters.${parameter.parameter.name} = ${converterVar}(_match[${1 + (parameter.regexPosition || 0)}], {loosely: true});`);
+                        const validator = getValidatorFunction(undefined, parameter.parameter.parameter);
                         const validatorVar = compiler.reserveVariable('argumentValidator', validator);
-                        parameterValidator.push(`${validatorVar}(parameters.${parameter.property.name}, ${JSON.stringify(parameter.getName())}, validationErrors);`);
+                        parameterValidator.push(`${validatorVar}(parameters.${parameter.parameter.name}, {errors: validationErrors}, ${JSON.stringify(parameter.getName())});`);
                     }
                     else {
-                        setParameters.push(`parameters.${parameter.property.name} = _match[${1 + (parameter.regexPosition || 0)}];`);
+                        setParameters.push(`parameters.${parameter.parameter.name} = _match[${1 + (parameter.regexPosition || 0)}];`);
                     }
                 }
-                const injectorOptions = parameter.property.data['deepkit/inject'];
-                const injectorToken = injectorOptions && injectorOptions.token ? injectorOptions.token : (parameter.property.type === 'class' ? parameter.property.getResolvedClassType() : undefined);
+                const injectorToken = parameter.parameter.type.kind === 20 /* class */ ? parameter.parameter.type.classType : undefined;
                 const injectorTokenVar = compiler.reserveVariable('classType', injectorToken);
                 const parameterResolverFoundVar = compiler.reserveVariable('parameterResolverFound', false);
                 setParameters.push(`${parameterResolverFoundVar} = false;`);
@@ -388,27 +387,21 @@ let Router = class Router {
                     ${instance} = ${injector}.get(${resolverProvideTokenVar}${moduleVar});
                     if (!${parameterResolverFoundVar}) {
                         ${parameterResolverFoundVar} = true;
-                        parameters.${parameter.property.name} = await ${instance}.resolve({
+                        parameters.${parameter.parameter.name} = await ${instance}.resolve({
                             token: ${injectorTokenVar},
                             routeConfig: ${routeConfigVar},
                             request: request,
-                            name: ${JSON.stringify(parameter.property.name)},
-                            value: parameters.${parameter.property.name},
+                            name: ${JSON.stringify(parameter.parameter.name)},
+                            value: parameters.${parameter.parameter.name},
                             query: _query,
                             parameters: parameters
                         });
                     }`);
                 }
-                else {
-                    if (!parameter.isPartOfPath() && parameter.property.type !== 'class' && (!injectorOptions || !injectorOptions.token)) {
-                        throw new Error(`Route parameter '${parameter.property.name}' of ${getRouterControllerActionName(routeConfig.action)} is not a ClassType nor is a @inject(T) set. It can not be requested from the DI container like that.` +
-                            `If its a query parameter use '@http.query() ${parameter.property.name}' or if its a body '@http.body() ${parameter.property.name}'.`);
-                    }
-                }
                 if (!parameter.isPartOfPath()) {
-                    let injectorGet = `parameters.${parameter.property.name} = ${injector}.get(${injectorTokenVar});`;
-                    if (injectorOptions && injectorOptions.optional) {
-                        injectorGet = `try {parameters.${parameter.property.name} = ${injector}.get(${injectorTokenVar}); } catch (e) {}`;
+                    let injectorGet = `parameters.${parameter.parameter.name} = ${injector}.get(${injectorTokenVar});`;
+                    if (parameter.parameter.isOptional()) {
+                        injectorGet = `try {parameters.${parameter.parameter.name} = ${injector}.get(${injectorTokenVar}); } catch (e) {}`;
                     }
                     setParameters.push(`if (!${parameterResolverFoundVar}) ${injectorGet}`);
                 }
@@ -416,11 +409,9 @@ let Router = class Router {
         }
         let parseBodyLoading = '';
         if (enableParseBody) {
-            const parseBodyVar = compiler.reserveVariable('parseBody', parseBody);
-            const formVar = compiler.reserveVariable('form', this.form);
+            const parseBodyVar = compiler.reserveVariable('parseBody', this.parseBody.bind(this));
             parseBodyLoading = `
-            const bodyParsed = (await ${parseBodyVar}(${formVar}, request, uploadedFiles));
-            const bodyFields = {...bodyParsed.fields, ...bodyParsed.files};`;
+            const bodyFields = (await ${parseBodyVar}(request, uploadedFiles));`;
             requiresAsyncParameters = true;
         }
         let matcher = `_path.startsWith(${JSON.stringify(prefix)}) && (_match = _path.match(${regexVar}))`;
@@ -459,15 +450,15 @@ let Router = class Router {
                 ${setParameters.join('\n')}
                 ${parameterValidator.join('\n')}
                 ${bodyValidationErrorHandling}
-                if (validationErrors.length) throw ValidationFailed.from(validationErrors);
+                if (validationErrors.length) throw new ValidationError(validationErrors);
                 return [${parameterNames.join(',')}];
             }`;
         }
         let methodCheck = '';
         if (routeConfig.httpMethods.length) {
-            methodCheck = '(' + routeConfig.httpMethods.map(v => {
+            methodCheck = '(' + routeConfig.httpMethods.map(Object.assign(v => {
                 return `_method === '${v.toUpperCase()}'`;
-            }).join(' || ') + ') && ';
+            }, { __type: ['v', '', 'P"2!"/"'] })).join(' || ') + ') && ';
         }
         return `
             //=> ${routeConfig.httpMethods.join(',')} ${path}
@@ -479,15 +470,15 @@ let Router = class Router {
     getRouteUrlResolveCode(compiler, routeConfig) {
         const parsedRoute = parseRouteControllerAction(routeConfig);
         let url = routeConfig.getFullPath();
-        url = url.replace(/:(\w+)/g, (a, name) => {
+        url = url.replace(/:(\w+)/g, Object.assign((a, name) => {
             return `\${parameters.${name}}`;
-        });
+        }, { __type: ['a', 'name', '', 'P"2!"2""/#'] }));
         const modify = [];
         for (const parameter of parsedRoute.getParameters()) {
             if (parameter.query || parameter.queries) {
-                const queryPath = parameter.typePath === undefined ? parameter.property.name : parameter.typePath;
-                if (parameter.property.type === 'class') {
-                    for (const property of parameter.property.getResolvedClassSchema().getProperties()) {
+                const queryPath = parameter.typePath === undefined && parameter.query ? parameter.parameter.name : parameter.typePath || '';
+                if (parameter.parameter.type.kind === 20 /* class */ || parameter.parameter.type.kind === 30 /* objectLiteral */) {
+                    for (const property of ReflectionClass.from(parameter.parameter.type).getProperties()) {
                         const accessor = `parameters.${parameter.getName()}?.${property.name}`;
                         const thisPath = queryPath ? queryPath + '.' + property.name : property.name;
                         modify.push(`${accessor} !== undefined && query.push(${JSON.stringify(dotToUrlPath(thisPath))} + '=' + encodeURIComponent(${accessor}))`);
@@ -515,7 +506,7 @@ let Router = class Router {
         const data = httpClass._fetch(controller);
         if (!data)
             throw new Error(`Http controller class ${getClassName(controller)} has no @http.controller decorator.`);
-        const schema = getClassSchema(controller);
+        const schema = ReflectionClass.from(controller);
         for (const action of data.getActions()) {
             const routeConfig = new RouteConfig(action.name, action.httpMethods, action.path, {
                 controller,
@@ -523,19 +514,18 @@ let Router = class Router {
                 methodName: action.methodName
             });
             routeConfig.module = module;
-            routeConfig.parameterRegularExpressions = action.parameterRegularExpressions;
             routeConfig.responses = action.responses;
             routeConfig.description = action.description;
             routeConfig.category = action.category;
             routeConfig.groups = action.groups;
             routeConfig.data = new Map(action.data);
             routeConfig.baseUrl = data.baseUrl;
-            routeConfig.middlewares = data.middlewares.map(v => {
+            routeConfig.middlewares = data.middlewares.map(Object.assign(v => {
                 return { config: v(), module };
-            });
-            routeConfig.middlewares.push(...action.middlewares.map(v => {
+            }, { __type: ['v', '', 'P"2!"/"'] }));
+            routeConfig.middlewares.push(...action.middlewares.map(Object.assign(v => {
                 return { config: v(), module };
-            }));
+            }, { __type: ['v', '', 'P"2!"/"'] })));
             for (const item of action.resolverForToken)
                 routeConfig.resolverForToken.set(...item);
             routeConfig.resolverForToken = new Map(data.resolverForToken);
@@ -544,18 +534,17 @@ let Router = class Router {
             routeConfig.resolverForParameterName = new Map(data.resolverForParameterName);
             for (const item of action.resolverForParameterName)
                 routeConfig.resolverForParameterName.set(...item);
-            routeConfig.parameters = { ...action.parameters };
             routeConfig.serializationOptions = action.serializationOptions;
             routeConfig.serializer = action.serializer;
             routeConfig.serializer = action.serializer;
             if (schema.hasMethod(action.methodName))
-                routeConfig.returnSchema = schema.getMethod(action.methodName);
+                routeConfig.returnType = schema.getMethod(action.methodName).getReturnType();
             this.addRoute(routeConfig);
         }
     }
     build() {
         const compiler = new CompilerContext;
-        compiler.context.set('ValidationFailed', ValidationFailed);
+        compiler.context.set('ValidationError', ValidationError);
         compiler.context.set('qs', require('qs'));
         const code = [];
         for (const route of this.routes) {
@@ -601,13 +590,6 @@ let Router = class Router {
         method = method.toUpperCase();
         return this.resolveRequest({ url, method });
     }
-};
-Router = __decorate([
-    injectable,
-    __metadata("design:paramtypes", [HttpControllers,
-        Logger,
-        TagRegistry,
-        MiddlewareRegistry])
-], Router);
-export { Router };
+}
+Router.__type = [() => HttpRequest, 'request', () => __ΩResolvedController, '', 'fn', 'name', 'parameters', 'resolveFn', () => RouteConfig, 'routes', () => [], () => HttpRequest, 'req', () => UploadedFile, 'files', 'parseBody', () => HttpControllers, 'controllers', () => __ΩLoggerInterface, 'logger', () => TagRegistry, 'tagRegistry', () => MiddlewareRegistry, 'middlewareRegistry', () => new MiddlewareRegistry, 'constructor', () => RouteConfig, 'getRoutes', () => __ΩClassType, () => InjectorModule, 'module', () => __ΩClassType, 'controller', () => TagRegistry, () => new TagRegistry(), () => MiddlewareRegistry, () => new MiddlewareRegistry(), () => InjectorModule, () => new InjectorModule(), () => Router, 'forControllers', () => CompilerContext, 'compiler', () => RouteConfig, 'routeConfig', 'getRouteCode', () => CompilerContext, () => RouteConfig, 'getRouteUrlResolveCode', () => RouteConfig, 'addRoute', () => __ΩClassType, () => InjectorModule, 'addRouteForController', () => HttpRequest, () => __ΩResolvedController, 'build', 'buildUrlResolver', 'routeName', () => ({}), 'resolveUrl', () => HttpRequest, () => __ΩResolvedController, 'resolveRequest', 'method', 'url', () => __ΩResolvedController, 'resolve', 'PP7!2"Pn#-J/$3%8<P&2&P&"LM2\'&/$3(8<P7)F3*<>+PP7,2-P&P7.LM2/"00;PP7122n324;P7526P7728;>9"0:PP7;F0<PPn=PP"7>4?n@4AMJF22P7B26>CP7D28>EP"7F2?>GP7H0IPP7J2KP7L2M&0N<PP7O2KP7P2M&0Q<PP7R2M"0SPnT2AP"7U2?"0VPPP7W2"PnX-J/$0Y<P"0Z<P&2[P&"LM2\'>\\&0]PP7^2"Pn_-J0`P&2a&2bPnc-J0d5'];
 //# sourceMappingURL=router.js.map