@deepkit/http 1.0.1-alpha.129 → 1.0.1-alpha.131

package/src/request-parser.ts

@@ -170,22 +170,28 @@ function isTypeUnknown(type: Type): boolean {
         || type.kind === ReflectionKind.never;
 }
 
-export function buildRequestParser(parseOptions: HttpParserOptions, parameters: ReflectionParameter[], path?: string): (request: HttpRequest) => any[] {
+export function buildRequestParser(parseOptions: HttpParserOptions, parameters: ReflectionParameter[], routeConfig?: RouteConfig): (request: HttpRequest) => any[] {
     const compiler = new CompilerContext();
     const params = parameters.map(v => new ParameterForRequestParser(v));
 
     //todo: parse path
     let pathRegex = '';
-    if (path) {
-        const parsedPath = parseRoutePathToRegex(path, parameters);
+    let pathParameterNames: { [name: string]: number } = {};
+
+    if (routeConfig) {
+        const parsedPath = parseRoutePathToRegex(routeConfig.getFullPath(), parameters);
         pathRegex = parsedPath.regex;
+        pathParameterNames = parsedPath.parameterNames;
 
         for (const param of params) {
             param.regexPosition = parsedPath.parameterNames[param.parameter.name];
         }
     }
 
-    const code = getRequestParserCodeForParameters(compiler, parseOptions, params, {});
+    const code = getRequestParserCodeForParameters(compiler, parseOptions, params, {
+        pathParameterNames,
+        routeConfig
+    });
     compiler.context.set('ValidationError', ValidationError);
     compiler.context.set('qs', qs);
 
@@ -245,8 +251,17 @@ export function getRequestParserCodeForParameters(
             if (parameter.requestParser) {
                 const parseOptionsVar = compiler.reserveVariable('parseOptions', parseOptions);
                 const parseBodyVar = compiler.reserveVariable('parseBody', parseBody);
+
+                let assignPathNames: string[] = [];
+                for (const [name, index] of Object.entries(config.pathParameterNames || {})) {
+                    assignPathNames.push(`res.${name} = _match[${1 + index}];`);
+                }
+
                 setParameters.push(`parameters.${parameter.parameter.name} = async (options = {}) => {
-                    let res = options.withPath !== false ? Object.assign({}, parameters) : {};
+                    let res = {};
+                    if (options.withPath !== false) {
+                        ${assignPathNames.join('\n')}
+                    }
                     if (options.withHeader !== false) {
                         Object.assign(res, _headers);
                     }

package/src/router.ts

@@ -18,7 +18,7 @@ import {
     serializer,
     Serializer,
     Type,
-    ValidationError
+    ValidationError,
 } from '@deepkit/type';
 import { getActions, HttpAction, httpClass, HttpController, HttpDecorator } from './decorator.js';
 import { HttpRequest, HttpRequestPositionedParameters, HttpRequestQuery, HttpRequestResolvedParameters } from './model.js';
@@ -169,7 +169,7 @@ export class RouteConfig {
     }
 }
 
-class ParsedRoute {
+export class ParsedRoute {
     public regex?: string;
 
     public pathParameterNames: { [name: string]: number } = {};