@deepkit/http 1.0.1-alpha.92 → 1.0.1-alpha.94

package/dist/cjs/src/request-parser.d.ts

@@ -0,0 +1,35 @@
+import { ClassType, CompilerContext } from '@deepkit/core';
+import { InjectorModule } from '@deepkit/injector';
+import { ReflectionParameter, Type } from '@deepkit/type';
+import { HttpRequest } from './model.js';
+import { RouteConfig } from './router.js';
+export declare class ParameterForRequestParser {
+    parameter: ReflectionParameter;
+    regexPosition?: number;
+    constructor(parameter: ReflectionParameter);
+    get body(): boolean;
+    get bodyValidation(): boolean;
+    getType(): Type;
+    get header(): boolean;
+    get query(): boolean;
+    get queries(): boolean;
+    get typePath(): string | undefined;
+    getName(): string;
+    isPartOfPath(): boolean;
+}
+export declare function parseRoutePathToRegex(path: string, params: ReflectionParameter[]): {
+    regex: string;
+    parameterNames: {
+        [name: string]: number;
+    };
+};
+export declare function buildRequestParser(parameters: ReflectionParameter[], path?: string): (request: HttpRequest) => any[];
+export declare function getRequestParserCodeForParameters(compiler: CompilerContext, parameters: ParameterForRequestParser[], config: {
+    module?: InjectorModule<any>;
+    resolverForParameterName?: Map<string, ClassType>;
+    resolverForToken?: Map<any, ClassType>;
+    pathParameterNames?: {
+        [name: string]: number;
+    };
+    routeConfig?: RouteConfig;
+}): string;

package/dist/cjs/src/request-parser.js

@@ -0,0 +1,302 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getRequestParserCodeForParameters = exports.buildRequestParser = exports.parseRoutePathToRegex = exports.ParameterForRequestParser = void 0;
+/*@ts-ignore*/
+const { __ΩClassType } = require('@deepkit/core');
+function __assignType(fn, args) {
+    fn.__type = args;
+    return fn;
+}
+const core_1 = require("@deepkit/core");
+const injector_1 = require("@deepkit/injector");
+const type_1 = require("@deepkit/type");
+const model_js_1 = require("./model.js");
+const router_js_1 = require("./router.js");
+//@ts-ignore
+const qs_1 = __importDefault(require("qs"));
+// @ts-ignore
+const formidable_1 = __importDefault(require("formidable"));
+function parseBody(req, foundFiles) {
+    const form = (0, formidable_1.default)({
+        multiples: true,
+        hash: 'sha1',
+    });
+    return (0, core_1.asyncOperation)(__assignType((resolve, reject) => {
+        function parseData(err, fields, files) {
+            if (err) {
+                reject(err);
+            }
+            else {
+                for (const [name, file] of Object.entries(files)) {
+                    if (file.size === 0)
+                        continue;
+                    foundFiles[name] = {
+                        size: file.size,
+                        path: file.filepath,
+                        name: file.originalFilename,
+                        type: file.mimetype,
+                        lastModifiedDate: file.lastModifiedDate,
+                    };
+                }
+                const body = { ...fields, ...foundFiles };
+                resolve(body);
+            }
+        }
+        parseData.__type = ['err', 'fields', 'files', 'parseData', 'P"2!"2""2#"/$'];
+        if (req.body) {
+            form.parse((0, model_js_1.createRequestWithCachedBody)(req, req.body), parseData);
+            return;
+        }
+        const chunks = [];
+        function read(chunk) {
+            chunks.push(chunk);
+        }
+        read.__type = ['chunk', 'read', 'P!2!"/"'];
+        req.on('data', read);
+        req.once('end', () => {
+            req.body = Buffer.concat(chunks);
+            req.off('data', read);
+        });
+        req.once('error', () => req.off('data', read));
+        form.parse(req, parseData);
+    }, ['resolve', 'reject', '', 'P"2!"2""/#']));
+}
+parseBody.__type = [() => model_js_1.HttpRequest, 'req', () => router_js_1.UploadedFile, 'foundFiles', 'parseBody', 'PP7!2"P&P7#LM2$"/%'];
+class ParameterForRequestParser {
+    constructor(parameter) {
+        this.parameter = parameter;
+    }
+    get body() {
+        return type_1.metaAnnotation.getForName(this.parameter.type, 'httpBody') !== undefined;
+    }
+    get bodyValidation() {
+        return type_1.metaAnnotation.getForName(this.parameter.type, 'httpBodyValidation') !== undefined;
+    }
+    getType() {
+        if (this.bodyValidation) {
+            (0, type_1.assertType)(this.parameter.type, type_1.ReflectionKind.class);
+            const valueType = (0, type_1.findMember)('value', this.parameter.type.types);
+            if (!valueType || valueType.kind !== type_1.ReflectionKind.property)
+                throw new Error(`No property value found at ${(0, type_1.stringifyType)(this.parameter.type)}`);
+            return valueType.type;
+        }
+        return this.parameter.type;
+    }
+    get header() {
+        return type_1.metaAnnotation.getForName(this.parameter.type, 'httpHeader') !== undefined;
+    }
+    get query() {
+        return type_1.metaAnnotation.getForName(this.parameter.type, 'httpQuery') !== undefined;
+    }
+    get queries() {
+        return type_1.metaAnnotation.getForName(this.parameter.type, 'httpQueries') !== undefined;
+    }
+    get typePath() {
+        const typeOptions = type_1.metaAnnotation.getForName(this.parameter.type, 'httpQueries') || type_1.metaAnnotation.getForName(this.parameter.type, 'httpQuery')
+            || type_1.metaAnnotation.getForName(this.parameter.type, 'httpPath') || type_1.metaAnnotation.getForName(this.parameter.type, 'httpHeader');
+        if (!typeOptions)
+            return;
+        const options = (0, type_1.typeToObject)(typeOptions[0]);
+        if ((0, core_1.isObject)(options))
+            return options.name;
+        return;
+    }
+    getName() {
+        return this.parameter.name;
+    }
+    isPartOfPath() {
+        return type_1.metaAnnotation.getForName(this.parameter.type, 'httpPath') !== undefined || this.regexPosition !== undefined;
+    }
+}
+exports.ParameterForRequestParser = ParameterForRequestParser;
+ParameterForRequestParser.__type = ['regexPosition', () => type_1.ReflectionParameter, 'parameter', 'constructor', 'getType', 'getName', 'isPartOfPath', '\'3!8PP7"2#:"0$!!P"0%!!!!P"0&P)0\'5'];
+function parseRoutePathToRegex(path, params) {
+    const parameterNames = {};
+    let argumentIndex = 0;
+    path = path.replace(/:(\w+)/g, __assignType((a, name) => {
+        parameterNames[name] = argumentIndex;
+        argumentIndex++;
+        const parameter = params.find(__assignType(v => v.name === name, ['v', '', 'P"2!"/"']));
+        if (parameter) {
+            const regExp = (0, model_js_1.getRegExp)(parameter.type);
+            if (regExp instanceof RegExp) {
+                return '(' + regExp.source + ')';
+            }
+            else if (regExp) {
+                return '(' + regExp + ')';
+            }
+        }
+        return String.raw `([^/]+)`;
+    }, ['a', 'name', '', 'P"2!"2""/#']));
+    return { regex: path, parameterNames };
+}
+exports.parseRoutePathToRegex = parseRoutePathToRegex;
+parseRoutePathToRegex.__type = ['path', () => type_1.ReflectionParameter, 'params', 'regex', 'parameterNames', 'parseRoutePathToRegex', 'P&2!P7"F2#P&4$P&\'LM4%M/&'];
+function buildRequestParser(parameters, path) {
+    const compiler = new core_1.CompilerContext();
+    const params = parameters.map(__assignType(v => new ParameterForRequestParser(v), ['v', '', 'P"2!"/"']));
+    //todo: parse path
+    let pathRegex = '';
+    if (path) {
+        const parsedPath = parseRoutePathToRegex(path, parameters);
+        pathRegex = parsedPath.regex;
+        for (const param of params) {
+            param.regexPosition = parsedPath.parameterNames[param.parameter.name];
+        }
+    }
+    const code = getRequestParserCodeForParameters(compiler, params, {});
+    compiler.context.set('ValidationError', type_1.ValidationError);
+    compiler.context.set('qs', qs_1.default);
+    let needsQueryString = !!params.find(__assignType(v => v.query || v.queries, ['v', '', 'P"2!"/"']));
+    const query = needsQueryString ? '_qPosition === -1 ? {} : qs.parse(_url.substr(_qPosition + 1))' : '{}';
+    const regexVar = compiler.reserveVariable('regex', new RegExp('^' + pathRegex + '$'));
+    return compiler.build(`
+        const _method = request.method || 'GET';
+        const _url = request.url || '/';
+        const _headers = request.headers || {};
+        const _qPosition = _url.indexOf('?');
+        let uploadedFiles = {};
+        const _path = _qPosition === -1 ? _url : _url.substr(0, _qPosition);
+        const _match = _path.match(${regexVar}) || [];
+        const _query = ${query};
+        return ${code}
+    `, 'request');
+}
+exports.buildRequestParser = buildRequestParser;
+buildRequestParser.__type = [() => type_1.ReflectionParameter, 'parameters', 'path', () => model_js_1.HttpRequest, 'request', '', 'buildRequestParser', 'PP7!F2"&2#8PP7$2%"F/&/\''];
+function getRequestParserCodeForParameters(compiler, parameters, config) {
+    var _a, _b;
+    let enableParseBody = false;
+    let requiresAsyncParameters = false;
+    const setParameters = [];
+    const parameterNames = [];
+    const parameterValidator = [];
+    let setParametersFromPath = '';
+    let bodyValidationErrorHandling = `if (bodyErrors.length) throw ValidationError.from(bodyErrors);`;
+    for (const parameter of parameters) {
+        if (parameter.body || parameter.bodyValidation) {
+            const type = parameter.getType();
+            const validatorVar = compiler.reserveVariable('argumentValidator', (0, type_1.getValidatorFunction)(undefined, type));
+            const converterVar = compiler.reserveVariable('argumentConverter', (0, type_1.getSerializeFunction)(type, type_1.serializer.deserializeRegistry));
+            enableParseBody = true;
+            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', model_js_1.ValidatedBody);
+                compiler.context.set('BodyValidationError', model_js_1.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 || parameter.header) {
+            const converted = (0, type_1.getSerializeFunction)(parameter.parameter.parameter, type_1.serializer.deserializeRegistry, undefined, parameter.getName());
+            const validator = (0, type_1.getValidatorFunction)(undefined, parameter.parameter.parameter);
+            const converterVar = compiler.reserveVariable('argumentConverter', converted);
+            const validatorVar = compiler.reserveVariable('argumentValidator', validator);
+            const queryPath = parameter.typePath === undefined && !parameter.queries ? parameter.parameter.name : parameter.typePath;
+            const accessor = queryPath ? `['` + (queryPath.replace(/\./g, `']['`)) + `']` : '';
+            const queryAccessor = parameter.header ? `_headers${accessor}` : queryPath ? `_query${accessor}` : '_query';
+            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.parameter.name}`);
+            if (parameter.isPartOfPath()) {
+                if (parameter.parameter.type.kind !== type_1.ReflectionKind.class) {
+                    const converted = (0, type_1.getSerializeFunction)(parameter.parameter.parameter, type_1.serializer.deserializeRegistry, undefined, parameter.getName());
+                    const converterVar = compiler.reserveVariable('argumentConverter', converted);
+                    setParameters.push(`parameters.${parameter.parameter.name} = ${converterVar}(_match[${1 + (parameter.regexPosition || 0)}], {loosely: true});`);
+                    const validator = (0, type_1.getValidatorFunction)(undefined, parameter.parameter.parameter);
+                    const validatorVar = compiler.reserveVariable('argumentValidator', validator);
+                    parameterValidator.push(`${validatorVar}(parameters.${parameter.parameter.name}, {errors: validationErrors}, ${JSON.stringify(parameter.getName())});`);
+                }
+                else {
+                    setParameters.push(`parameters.${parameter.parameter.name} = _match[${1 + (parameter.regexPosition || 0)}];`);
+                }
+            }
+            const injectorToken = parameter.parameter.type.kind === type_1.ReflectionKind.class ? parameter.parameter.type.classType : undefined;
+            const injectorTokenVar = compiler.reserveVariable('classType', injectorToken);
+            const parameterResolverFoundVar = compiler.reserveVariable('parameterResolverFound', false);
+            setParameters.push(`${parameterResolverFoundVar} = false;`);
+            const resolverType = ((_a = config.resolverForParameterName) === null || _a === void 0 ? void 0 : _a.get(parameter.getName())) || ((_b = config.resolverForToken) === null || _b === void 0 ? void 0 : _b.get(injectorToken));
+            //make sure all parameter values from the path are available, important for parameter resolver
+            if (resolverType && !setParametersFromPath && config.pathParameterNames) {
+                for (const i in config.pathParameterNames) {
+                    setParametersFromPath += `parameters.${i} = _match[${1 + config.pathParameterNames[i]}];`;
+                }
+            }
+            let injector = '_injector';
+            const moduleVar = config.module ? ', ' + compiler.reserveConst(config.module, 'module') : '';
+            if (resolverType) {
+                requiresAsyncParameters = true;
+                let instanceFetcher = '';
+                if (config.module && config.module.injector) {
+                    const resolverResolverVar = compiler.reserveVariable('resolverProvideToken', config.module.injector.createResolver((0, type_1.resolveReceiveType)(resolverType)));
+                    instanceFetcher = `${resolverResolverVar}(${injector}.scope)`;
+                }
+                else {
+                    const resolverProvideTokenVar = compiler.reserveVariable('resolverProvideToken', resolverType);
+                    instanceFetcher = `${injector}.get(${resolverProvideTokenVar}${moduleVar})`;
+                }
+                const instance = compiler.reserveVariable('resolverInstance');
+                const routeConfigVar = compiler.reserveVariable('routeConfigVar', config.routeConfig);
+                setParameters.push(`
+                    //resolver ${(0, core_1.getClassName)(resolverType)} for ${parameter.getName()}
+                    ${instance} = ${instanceFetcher};
+                    if (!${parameterResolverFoundVar}) {
+                        ${parameterResolverFoundVar} = true;
+                        parameters.${parameter.parameter.name} = await ${instance}.resolve({
+                            token: ${injectorTokenVar},
+                            route: ${routeConfigVar},
+                            request: request,
+                            name: ${JSON.stringify(parameter.parameter.name)},
+                            value: parameters.${parameter.parameter.name},
+                            query: _query,
+                            parameters: parameters,
+                            type: ${compiler.reserveVariable('parameterType', parameter.parameter)}
+                        });
+                    }`);
+            }
+            if (!parameter.isPartOfPath()) {
+                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}`);
+            }
+        }
+    }
+    let parseBodyLoading = '';
+    if (enableParseBody) {
+        const parseBodyVar = compiler.reserveVariable('parseBody', parseBody);
+        parseBodyLoading = `
+            const bodyFields = (await ${parseBodyVar}(request, uploadedFiles));`;
+        requiresAsyncParameters = true;
+    }
+    let parametersLoader = '() => {}';
+    if (setParameters.length) {
+        parametersLoader = `${requiresAsyncParameters ? 'async' : ''} function parse(_injector){
+                const validationErrors = [];
+                const bodyErrors = [];
+                const parameters = {};
+                ${setParametersFromPath}
+                ${parseBodyLoading}
+                ${setParameters.join('\n')}
+                ${parameterValidator.join('\n')}
+                ${bodyValidationErrorHandling}
+                if (validationErrors.length) throw new ValidationError(validationErrors);
+                return {arguments: [${parameterNames.join(',')}], parameters: parameters};
+            }`;
+    }
+    return parametersLoader;
+}
+exports.getRequestParserCodeForParameters = getRequestParserCodeForParameters;
+getRequestParserCodeForParameters.__type = [() => core_1.CompilerContext, 'compiler', () => ParameterForRequestParser, 'parameters', () => injector_1.InjectorModule, 'module', () => __ΩClassType, 'resolverForParameterName', () => __ΩClassType, 'resolverForToken', 'pathParameterNames', () => router_js_1.RouteConfig, 'routeConfig', 'config', 'getRequestParserCodeForParameters', 'PP7!2"P7#F2$PP"7%4&8&n\'E4(8"n)E4*8P&\'LM4+8P7,4-8M2."//'];
+//# sourceMappingURL=request-parser.js.map

package/dist/cjs/src/request-parser.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"request-parser.js","sourceRoot":"","sources":["../../../src/request-parser.ts"],"names":[],"mappings":";;;;;;;iCAAmF,eAAe;;;;;AAAlG,wCAAmG;AACnG,gDAAmD;AACnD,wCAauB;AACvB,yCAAqH;AACrH,2CAAwD;AAExD,YAAY;AACZ,4CAAoB;AAEpB,aAAa;AACb,4DAAoC;AAGpC,SAAS,SAAS,CAAC,GAAgB,EAAE,UAA4C;IAC7E,MAAM,IAAI,GAAG,IAAA,oBAAU,EAAC;QACpB,SAAS,EAAE,IAAI;QACf,IAAI,EAAE,MAAM;KACf,CAAC,CAAC;IACH,OAAO,IAAA,qBAAc,eAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACtC,SAAS,SAAS,CAAC,GAAQ,EAAE,MAAW,EAAE,KAAU;YAChD,IAAI,GAAG,EAAE;gBACL,MAAM,CAAC,GAAG,CAAC,CAAC;aACf;iBAAM;gBACH,KAAK,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,KAAK,CAAQ,EAAE;oBACrD,IAAI,IAAI,CAAC,IAAI,KAAK,CAAC;wBAAE,SAAS;oBAC9B,UAAU,CAAC,IAAI,CAAC,GAAG;wBACf,IAAI,EAAE,IAAI,CAAC,IAAI;wBACf,IAAI,EAAE,IAAI,CAAC,QAAQ;wBACnB,IAAI,EAAE,IAAI,CAAC,gBAAgB;wBAC3B,IAAI,EAAE,IAAI,CAAC,QAAQ;wBACnB,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;qBAC1C,CAAC;iBACL;gBACD,MAAM,IAAI,GAAG,EAAE,GAAG,MAAM,EAAE,GAAG,UAAU,EAAE,CAAC;gBAC1C,OAAO,CAAC,IAAI,CAAC,CAAC;aACjB;QACL,CAAC;;QAED,IAAI,GAAG,CAAC,IAAI,EAAE;YACV,IAAI,CAAC,KAAK,CAAC,IAAA,sCAA2B,EAAC,GAAG,EAAE,GAAG,CAAC,IAAI,CAAC,EAAE,SAAS,CAAC,CAAC;YAClE,OAAO;SACV;QAED,MAAM,MAAM,GAAa,EAAE,CAAC;QAE5B,SAAS,IAAI,CAAC,KAAa;YACvB,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACvB,CAAC;;QAED,GAAG,CAAC,EAAE,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QACrB,GAAG,CAAC,IAAI,CAAC,KAAK,EAAE,GAAG,EAAE;YACjB,GAAG,CAAC,IAAI,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;YACjC,GAAG,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QAC1B,CAAC,CAAC,CAAC;QACH,GAAG,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,CAAC;QAE/C,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;IAC/B,CAAC,2CAAC,CAAC;AACP,CAAC;;AAED,MAAa,yBAAyB;IAGlC,YACW,SAA8B;QAA9B,cAAS,GAAT,SAAS,CAAqB;IAEzC,CAAC;IAED,IAAI,IAAI;QACJ,OAAO,qBAAc,CAAC,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,UAAU,CAAC,KAAK,SAAS,CAAC;IACpF,CAAC;IAED,IAAI,cAAc;QACd,OAAO,qBAAc,CAAC,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,oBAAoB,CAAC,KAAK,SAAS,CAAC;IAC9F,CAAC;IAED,OAAO;QACH,IAAI,IAAI,CAAC,cAAc,EAAE;YACrB,IAAA,iBAAU,EAAC,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,qBAAc,CAAC,KAAK,CAAC,CAAC;YACtD,MAAM,SAAS,GAAG,IAAA,iBAAU,EAAC,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YACjE,IAAI,CAAC,SAAS,IAAI,SAAS,CAAC,IAAI,KAAK,qBAAc,CAAC,QAAQ;gBAAE,MAAM,IAAI,KAAK,CAAC,8BAA8B,IAAA,oBAAa,EAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YAClJ,OAAO,SAAS,CAAC,IAAY,CAAC;SACjC;QACD,OAAO,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC;IAC/B,CAAC;IAED,IAAI,MAAM;QACN,OAAO,qBAAc,CAAC,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,YAAY,CAAC,KAAK,SAAS,CAAC;IACtF,CAAC;IAED,IAAI,KAAK;QACL,OAAO,qBAAc,CAAC,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,WAAW,CAAC,KAAK,SAAS,CAAC;IACrF,CAAC;IAED,IAAI,OAAO;QACP,OAAO,qBAAc,CAAC,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,aAAa,CAAC,KAAK,SAAS,CAAC;IACvF,CAAC;IAED,IAAI,QAAQ;QACR,MAAM,WAAW,GAAG,qBAAc,CAAC,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,aAAa,CAAC,IAAI,qBAAc,CAAC,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,WAAW,CAAC;eACzI,qBAAc,CAAC,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,UAAU,CAAC,IAAI,qBAAc,CAAC,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;QAClI,IAAI,CAAC,WAAW;YAAE,OAAO;QACzB,MAAM,OAAO,GAAG,IAAA,mBAAY,EAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC;QAC7C,IAAI,IAAA,eAAQ,EAAC,OAAO,CAAC;YAAE,OAAO,OAAO,CAAC,IAAI,CAAC;QAC3C,OAAO;IACX,CAAC;IAED,OAAO;QACH,OAAO,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC;IAC/B,CAAC;IAED,YAAY;QACR,OAAO,qBAAc,CAAC,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,UAAU,CAAC,KAAK,SAAS,IAAI,IAAI,CAAC,aAAa,KAAK,SAAS,CAAC;IACxH,CAAC;;AArDL,8DAsDC;;AAED,SAAgB,qBAAqB,CAAC,IAAY,EAAE,MAA6B;IAC7E,MAAM,cAAc,GAA+B,EAAE,CAAC;IAEtD,IAAI,aAAa,GAAG,CAAC,CAAC;IACtB,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,eAAE,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE;QACvC,cAAc,CAAC,IAAI,CAAC,GAAG,aAAa,CAAC;QACrC,aAAa,EAAE,CAAC;QAChB,MAAM,SAAS,GAAG,MAAM,CAAC,IAAI,cAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,IAAI,wBAAC,CAAC;QACpD,IAAI,SAAS,EAAE;YACX,MAAM,MAAM,GAAG,IAAA,oBAAS,EAAC,SAAS,CAAC,IAAI,CAAC,CAAC;YACzC,IAAI,MAAM,YAAY,MAAM,EAAE;gBAC1B,OAAO,GAAG,GAAG,MAAM,CAAC,MAAM,GAAG,GAAG,CAAC;aACpC;iBAAM,IAAI,MAAM,EAAE;gBACf,OAAO,GAAG,GAAG,MAAM,GAAG,GAAG,CAAC;aAC7B;SACJ;QACD,OAAO,MAAM,CAAC,GAAG,CAAA,SAAS,CAAC;IAC/B,CAAC,mCAAC,CAAC;IAEH,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,cAAc,EAAE,CAAC;AAC3C,CAAC;AApBD,sDAoBC;;AAED,SAAgB,kBAAkB,CAAC,UAAiC,EAAE,IAAa;IAC/E,MAAM,QAAQ,GAAG,IAAI,sBAAe,EAAE,CAAC;IACvC,MAAM,MAAM,GAAG,UAAU,CAAC,GAAG,cAAC,CAAC,CAAC,EAAE,CAAC,IAAI,yBAAyB,CAAC,CAAC,CAAC,wBAAC,CAAC;IAErE,kBAAkB;IAClB,IAAI,SAAS,GAAG,EAAE,CAAC;IACnB,IAAI,IAAI,EAAE;QACN,MAAM,UAAU,GAAG,qBAAqB,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;QAC3D,SAAS,GAAG,UAAU,CAAC,KAAK,CAAC;QAE7B,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE;YACxB,KAAK,CAAC,aAAa,GAAG,UAAU,CAAC,cAAc,CAAC,KAAK,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;SACzE;KACJ;IAED,MAAM,IAAI,GAAG,iCAAiC,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC;IACrE,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,iBAAiB,EAAE,sBAAe,CAAC,CAAC;IACzD,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,EAAE,YAAE,CAAC,CAAC;IAE/B,IAAI,gBAAgB,GAAG,CAAC,CAAC,MAAM,CAAC,IAAI,cAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC,OAAO,wBAAC,CAAC;IAChE,MAAM,KAAK,GAAG,gBAAgB,CAAC,CAAC,CAAC,gEAAgE,CAAC,CAAC,CAAC,IAAI,CAAC;IAEzG,MAAM,QAAQ,GAAG,QAAQ,CAAC,eAAe,CAAC,OAAO,EAAE,IAAI,MAAM,CAAC,GAAG,GAAG,SAAS,GAAG,GAAG,CAAC,CAAC,CAAC;IAEtF,OAAO,QAAQ,CAAC,KAAK,CAAC;;;;;;;qCAOW,QAAQ;yBACpB,KAAK;iBACb,IAAI;KAChB,EAAE,SAAS,CAAC,CAAC;AAClB,CAAC;AAnCD,gDAmCC;;AAED,SAAgB,iCAAiC,CAC7C,QAAyB,EACzB,UAAuC,EACvC,MAMC;;IAED,IAAI,eAAe,GAAG,KAAK,CAAC;IAC5B,IAAI,uBAAuB,GAAG,KAAK,CAAC;IACpC,MAAM,aAAa,GAAa,EAAE,CAAC;IACnC,MAAM,cAAc,GAAa,EAAE,CAAC;IACpC,MAAM,kBAAkB,GAAa,EAAE,CAAC;IACxC,IAAI,qBAAqB,GAAG,EAAE,CAAC;IAC/B,IAAI,2BAA2B,GAAG,gEAAgE,CAAC;IAEnG,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE;QAChC,IAAI,SAAS,CAAC,IAAI,IAAI,SAAS,CAAC,cAAc,EAAE;YAC5C,MAAM,IAAI,GAAG,SAAS,CAAC,OAAO,EAAE,CAAC;YACjC,MAAM,YAAY,GAAG,QAAQ,CAAC,eAAe,CAAC,mBAAmB,EAAE,IAAA,2BAAoB,EAAC,SAAS,EAAE,IAAI,CAAC,CAAC,CAAC;YAC1G,MAAM,YAAY,GAAG,QAAQ,CAAC,eAAe,CAAC,mBAAmB,EAAE,IAAA,2BAAoB,EAAC,IAAI,EAAE,iBAAU,CAAC,mBAAmB,CAAC,CAAC,CAAC;YAE/H,eAAe,GAAG,IAAI,CAAC;YACvB,aAAa,CAAC,IAAI,CAAC,cAAc,SAAS,CAAC,SAAS,CAAC,IAAI,MAAM,YAAY,gCAAgC,CAAC,CAAC;YAC7G,kBAAkB,CAAC,IAAI,CAAC,GAAG,YAAY,eAAe,SAAS,CAAC,SAAS,CAAC,IAAI,0BAA0B,CAAC,CAAC;YAC1G,IAAI,SAAS,CAAC,cAAc,EAAE;gBAC1B,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,gBAAgB,EAAE,wBAAa,CAAC,CAAC;gBACtD,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,qBAAqB,EAAE,8BAAmB,CAAC,CAAC;gBACjE,cAAc,CAAC,IAAI,CAAC,gGAAgG,SAAS,CAAC,SAAS,CAAC,IAAI,eAAe,CAAC,CAAC;gBAC7J,2BAA2B,GAAG,EAAE,CAAC;aACpC;iBAAM;gBACH,cAAc,CAAC,IAAI,CAAC,cAAc,SAAS,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC,CAAC;aACjE;SACJ;aAAM,IAAI,SAAS,CAAC,KAAK,IAAI,SAAS,CAAC,OAAO,IAAI,SAAS,CAAC,MAAM,EAAE;YACjE,MAAM,SAAS,GAAG,IAAA,2BAAoB,EAAC,SAAS,CAAC,SAAS,CAAC,SAAS,EAAE,iBAAU,CAAC,mBAAmB,EAAE,SAAS,EAAE,SAAS,CAAC,OAAO,EAAE,CAAC,CAAC;YACtI,MAAM,SAAS,GAAG,IAAA,2BAAoB,EAAC,SAAS,EAAE,SAAS,CAAC,SAAS,CAAC,SAAS,CAAE,CAAC;YAClF,MAAM,YAAY,GAAG,QAAQ,CAAC,eAAe,CAAC,mBAAmB,EAAE,SAAS,CAAC,CAAC;YAC9E,MAAM,YAAY,GAAG,QAAQ,CAAC,eAAe,CAAC,mBAAmB,EAAE,SAAS,CAAC,CAAC;YAE9E,MAAM,SAAS,GAAG,SAAS,CAAC,QAAQ,KAAK,SAAS,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,QAAQ,CAAC;YACzH,MAAM,QAAQ,GAAG,SAAS,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC,SAAS,CAAC,OAAO,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;YACnF,MAAM,aAAa,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,WAAW,QAAQ,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,QAAQ,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC;YAE5G,aAAa,CAAC,IAAI,CAAC,cAAc,SAAS,CAAC,SAAS,CAAC,IAAI,MAAM,YAAY,IAAI,aAAa,qBAAqB,CAAC,CAAC;YACnH,cAAc,CAAC,IAAI,CAAC,cAAc,SAAS,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC,CAAC;YAC9D,kBAAkB,CAAC,IAAI,CAAC,GAAG,YAAY,eAAe,SAAS,CAAC,SAAS,CAAC,IAAI,iCAAiC,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,QAAQ,IAAI,SAAS,CAAC,OAAO,EAAE,CAAC,IAAI,CAAC,CAAC;SACjL;aAAM;YACH,cAAc,CAAC,IAAI,CAAC,cAAc,SAAS,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC,CAAC;YAE9D,IAAI,SAAS,CAAC,YAAY,EAAE,EAAE;gBAC1B,IAAI,SAAS,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,KAAK,qBAAc,CAAC,KAAK,EAAE;oBACxD,MAAM,SAAS,GAAG,IAAA,2BAAoB,EAAC,SAAS,CAAC,SAAS,CAAC,SAAS,EAAE,iBAAU,CAAC,mBAAmB,EAAE,SAAS,EAAE,SAAS,CAAC,OAAO,EAAE,CAAC,CAAC;oBACtI,MAAM,YAAY,GAAG,QAAQ,CAAC,eAAe,CAAC,mBAAmB,EAAE,SAAS,CAAC,CAAC;oBAC9E,aAAa,CAAC,IAAI,CAAC,cAAc,SAAS,CAAC,SAAS,CAAC,IAAI,MAAM,YAAY,WAAW,CAAC,GAAG,CAAC,SAAS,CAAC,aAAa,IAAI,CAAC,CAAC,sBAAsB,CAAC,CAAC;oBAEhJ,MAAM,SAAS,GAAG,IAAA,2BAAoB,EAAC,SAAS,EAAE,SAAS,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;oBACjF,MAAM,YAAY,GAAG,QAAQ,CAAC,eAAe,CAAC,mBAAmB,EAAE,SAAS,CAAC,CAAC;oBAC9E,kBAAkB,CAAC,IAAI,CAAC,GAAG,YAAY,eAAe,SAAS,CAAC,SAAS,CAAC,IAAI,iCAAiC,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC,IAAI,CAAC,CAAC;iBAC3J;qBAAM;oBACH,aAAa,CAAC,IAAI,CAAC,cAAc,SAAS,CAAC,SAAS,CAAC,IAAI,aAAa,CAAC,GAAG,CAAC,SAAS,CAAC,aAAa,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC;iBACjH;aACJ;YAED,MAAM,aAAa,GAAG,SAAS,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,KAAK,qBAAc,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC;YAC9H,MAAM,gBAAgB,GAAG,QAAQ,CAAC,eAAe,CAAC,WAAW,EAAE,aAAa,CAAC,CAAC;YAC9E,MAAM,yBAAyB,GAAG,QAAQ,CAAC,eAAe,CAAC,wBAAwB,EAAE,KAAK,CAAC,CAAC;YAE5F,aAAa,CAAC,IAAI,CAAC,GAAG,yBAAyB,WAAW,CAAC,CAAC;YAE5D,MAAM,YAAY,GAAG,CAAA,MAAA,MAAM,CAAC,wBAAwB,0CAAE,GAAG,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC,MAAI,MAAA,MAAM,CAAC,gBAAgB,0CAAE,GAAG,CAAC,aAAa,CAAC,CAAA,CAAC;YAE9H,8FAA8F;YAC9F,IAAI,YAAY,IAAI,CAAC,qBAAqB,IAAI,MAAM,CAAC,kBAAkB,EAAE;gBACrE,KAAK,MAAM,CAAC,IAAI,MAAM,CAAC,kBAAkB,EAAE;oBACvC,qBAAqB,IAAI,cAAc,CAAC,aAAa,CAAC,GAAG,MAAM,CAAC,kBAAkB,CAAC,CAAC,CAAC,IAAI,CAAC;iBAC7F;aACJ;YAED,IAAI,QAAQ,GAAG,WAAW,CAAC;YAC3B,MAAM,SAAS,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,GAAG,QAAQ,CAAC,YAAY,CAAC,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;YAE7F,IAAI,YAAY,EAAE;gBACd,uBAAuB,GAAG,IAAI,CAAC;gBAC/B,IAAI,eAAe,GAAG,EAAE,CAAC;gBACzB,IAAI,MAAM,CAAC,MAAM,IAAI,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE;oBACzC,MAAM,mBAAmB,GAAG,QAAQ,CAAC,eAAe,CAAC,sBAAsB,EAAE,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,cAAc,CAAC,IAAA,yBAAkB,EAAC,YAAY,CAAC,CAAC,CAAC,CAAC;oBACtJ,eAAe,GAAG,GAAG,mBAAmB,IAAI,QAAQ,SAAS,CAAC;iBACjE;qBAAM;oBACH,MAAM,uBAAuB,GAAG,QAAQ,CAAC,eAAe,CAAC,sBAAsB,EAAE,YAAY,CAAC,CAAC;oBAC/F,eAAe,GAAG,GAAG,QAAQ,QAAQ,uBAAuB,GAAG,SAAS,GAAG,CAAC;iBAC/E;gBACD,MAAM,QAAQ,GAAG,QAAQ,CAAC,eAAe,CAAC,kBAAkB,CAAC,CAAC;gBAE9D,MAAM,cAAc,GAAG,QAAQ,CAAC,eAAe,CAAC,gBAAgB,EAAE,MAAM,CAAC,WAAW,CAAC,CAAC;gBACtF,aAAa,CAAC,IAAI,CAAC;iCACF,IAAA,mBAAY,EAAC,YAAY,CAAC,QAAQ,SAAS,CAAC,OAAO,EAAE;sBAChE,QAAQ,MAAM,eAAe;2BACxB,yBAAyB;0BAC1B,yBAAyB;qCACd,SAAS,CAAC,SAAS,CAAC,IAAI,YAAY,QAAQ;qCAC5C,gBAAgB;qCAChB,cAAc;;oCAEf,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,SAAS,CAAC,IAAI,CAAC;gDAC5B,SAAS,CAAC,SAAS,CAAC,IAAI;;;oCAGpC,QAAQ,CAAC,eAAe,CAAC,eAAe,EAAE,SAAS,CAAC,SAAS,CAAC;;sBAE5E,CAAC,CAAC;aACX;YAED,IAAI,CAAC,SAAS,CAAC,YAAY,EAAE,EAAE;gBAC3B,IAAI,WAAW,GAAG,cAAc,SAAS,CAAC,SAAS,CAAC,IAAI,MAAM,QAAQ,QAAQ,gBAAgB,IAAI,CAAC;gBACnG,IAAI,SAAS,CAAC,SAAS,CAAC,UAAU,EAAE,EAAE;oBAClC,WAAW,GAAG,mBAAmB,SAAS,CAAC,SAAS,CAAC,IAAI,MAAM,QAAQ,QAAQ,gBAAgB,mBAAmB,CAAC;iBACtH;gBACD,aAAa,CAAC,IAAI,CAAC,QAAQ,yBAAyB,KAAK,WAAW,EAAE,CAAC,CAAC;aAC3E;SACJ;KACJ;IAGD,IAAI,gBAAgB,GAAG,EAAE,CAAC;IAC1B,IAAI,eAAe,EAAE;QACjB,MAAM,YAAY,GAAG,QAAQ,CAAC,eAAe,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC;QACtE,gBAAgB,GAAG;wCACa,YAAY,4BAA4B,CAAC;QACzE,uBAAuB,GAAG,IAAI,CAAC;KAClC;IAED,IAAI,gBAAgB,GAAG,UAAU,CAAC;IAElC,IAAI,aAAa,CAAC,MAAM,EAAE;QACtB,gBAAgB,GAAG,GAAG,uBAAuB,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;;;;kBAIlD,qBAAqB;kBACrB,gBAAgB;kBAChB,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC;kBACxB,kBAAkB,CAAC,IAAI,CAAC,IAAI,CAAC;kBAC7B,2BAA2B;;sCAEP,cAAc,CAAC,IAAI,CAAC,GAAG,CAAC;cAChD,CAAC;KACV;IACD,OAAO,gBAAgB,CAAC;AAC5B,CAAC;AAvJD,8EAuJC"}

package/dist/cjs/src/router.d.ts

@@ -1,13 +1,14 @@
 import { ClassType, CompilerContext } from '@deepkit/core';
 import { ReflectionFunction, ReflectionParameter, SerializationOptions, Serializer, Type } from '@deepkit/type';
 import { HttpDecorator } from './decorator.js';
-import { HttpRequest, HttpRequestQuery, HttpRequestResolvedParameters } from './model.js';
+import { HttpRequest, HttpRequestPositionedParameters, HttpRequestQuery, HttpRequestResolvedParameters } from './model.js';
 import { InjectorContext, InjectorModule, TagRegistry } from '@deepkit/injector';
 import { LoggerInterface } from '@deepkit/logger';
 import { HttpControllers } from './controllers.js';
 import { MiddlewareRegistry } from '@deepkit/app';
 import { HttpMiddlewareConfig, HttpMiddlewareFn } from './middleware.js';
-export declare type RouteParameterResolverForInjector = ((injector: InjectorContext) => any[] | Promise<any[]>);
+import { ParameterForRequestParser } from './request-parser.js';
+export declare type RouteParameterResolverForInjector = ((injector: InjectorContext) => HttpRequestPositionedParameters | Promise<HttpRequestPositionedParameters>);
 interface ResolvedController {
     parameters: RouteParameterResolverForInjector;
     routeConfig: RouteConfig;
@@ -96,24 +97,11 @@ declare class ParsedRoute {
     pathParameterNames: {
         [name: string]: number;
     };
-    protected parameters: ParsedRouteParameter[];
+    protected parameters: ParameterForRequestParser[];
     constructor(routeConfig: RouteConfig);
-    addParameter(property: ReflectionParameter): ParsedRouteParameter;
-    getParameters(): ParsedRouteParameter[];
-    getParameter(name: string): ParsedRouteParameter;
-}
-declare class ParsedRouteParameter {
-    parameter: ReflectionParameter;
-    regexPosition?: number;
-    constructor(parameter: ReflectionParameter);
-    get body(): boolean;
-    get bodyValidation(): boolean;
-    getType(): Type;
-    get query(): boolean;
-    get queries(): boolean;
-    get typePath(): string | undefined;
-    getName(): string;
-    isPartOfPath(): boolean;
+    addParameter(property: ReflectionParameter): ParameterForRequestParser;
+    getParameters(): ParameterForRequestParser[];
+    getParameter(name: string): ParameterForRequestParser;
 }
 export declare function parseRouteControllerAction(routeConfig: RouteConfig): ParsedRoute;
 export declare function dotToUrlPath(dotPath: string): string;
@@ -208,7 +196,6 @@ export declare class HttpRouter {
     protected resolveFn?: (name: string, parameters: {
         [name: string]: any;
     }) => string;
-    private parseBody;
     constructor(controllers: HttpControllers, logger: LoggerInterface, tagRegistry: TagRegistry, middlewareRegistry?: MiddlewareRegistry, registry?: HttpRouterRegistry);
     getRoutes(): RouteConfig[];
     static forControllers(controllers: (ClassType | {