@deepkit/http 1.0.1-alpha.73 → 1.0.1-alpha.74

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@deepkit/http",
-  "version": "1.0.1-alpha.73",
+  "version": "1.0.1-alpha.74",
   "description": "Deepkit HTTP server and router.",
   "type": "commonjs",
   "main": "./dist/cjs/index.js",
@@ -38,15 +38,15 @@
     "send": "^0.18.0"
   },
   "devDependencies": {
-    "@deepkit/app": "^1.0.1-alpha.72",
-    "@deepkit/core": "^1.0.1-alpha.72",
-    "@deepkit/event": "^1.0.1-alpha.72",
-    "@deepkit/injector": "^1.0.1-alpha.72",
-    "@deepkit/logger": "^1.0.1-alpha.72",
-    "@deepkit/stopwatch": "^1.0.1-alpha.72",
-    "@deepkit/template": "^1.0.1-alpha.72",
-    "@deepkit/type": "^1.0.1-alpha.72",
-    "@deepkit/workflow": "^1.0.1-alpha.72",
+    "@deepkit/app": "^1.0.1-alpha.74",
+    "@deepkit/core": "^1.0.1-alpha.74",
+    "@deepkit/event": "^1.0.1-alpha.74",
+    "@deepkit/injector": "^1.0.1-alpha.74",
+    "@deepkit/logger": "^1.0.1-alpha.74",
+    "@deepkit/stopwatch": "^1.0.1-alpha.74",
+    "@deepkit/template": "^1.0.1-alpha.74",
+    "@deepkit/type": "^1.0.1-alpha.74",
+    "@deepkit/workflow": "^1.0.1-alpha.74",
     "@types/node": "14.14.28",
     "@types/send": "^0.14.6"
   },
@@ -62,5 +62,5 @@
       "**/tests/**/*.spec.ts"
     ]
   },
-  "gitHead": "59365873765c8d2a66efd4acdb8042ab4d5e4558"
+  "gitHead": "b45ede82baf9b92917b49b50fff58efb16e3959d"
 }

package/src/router.ts

@@ -7,7 +7,7 @@
  *
  * You should have received a copy of the MIT License along with this program.
  */
-import { asyncOperation, ClassType, CompilerContext, getClassName, isClass, isObject, urlJoin } from '@deepkit/core';
+import { asyncOperation, ClassType, CompilerContext, getClassName, isArray, isClass, isObject, urlJoin } from '@deepkit/core';
 import {
     assertType,
     entity,
@@ -29,7 +29,6 @@ import {
 } from '@deepkit/type';
 // @ts-ignore
 import formidable from 'formidable';
-import querystring from 'querystring';
 import { HttpAction, httpClass, HttpController, HttpDecorator } from './decorator';
 import { BodyValidationError, getRegExp, HttpRequest, HttpRequestQuery, HttpRequestResolvedParameters, ValidatedBody } from './model';
 import { InjectorContext, InjectorModule, TagRegistry } from '@deepkit/injector';
@@ -40,7 +39,7 @@ import { HttpMiddlewareConfig, HttpMiddlewareFn } from './middleware';
 
 //@ts-ignore
 import qs from 'qs';
-import { isArray } from '@deepkit/core';
+import { HtmlResponse, JSONResponse, Response } from './http.js';
 
 export type RouteParameterResolverForInjector = ((injector: InjectorContext) => any[] | Promise<any[]>);
 
@@ -418,6 +417,14 @@ function convertOptions(methods: string[], pathOrOptions: string | HttpRouterFun
     return { ...options, methods };
 }
 
+/**
+ * Annotated types like HTMLResponse/JSONResponse are not used for serialization.
+ */
+function filterValidReturnType(type: Type): Type | undefined {
+    if (type.kind === ReflectionKind.class && (type.classType === HtmlResponse || type.classType === JSONResponse || type.classType === Response)) return;
+    return type;
+}
+
 export abstract class HttpRouterRegistryFunctionRegistrar {
     protected defaultOptions: Partial<HttpRouterFunctionOptions> = {};
 
@@ -463,7 +470,7 @@ export abstract class HttpRouterRegistryFunctionRegistrar {
             type: 'function',
             fn: callback,
         }, action);
-        routeConfig.returnType = fn.getReturnType();
+        routeConfig.returnType = filterValidReturnType(fn.getReturnType());
         this.addRoute(routeConfig);
     }
 
@@ -534,7 +541,7 @@ export abstract class HttpRouterRegistryFunctionRegistrar {
         routeConfig.serializer = options.serializer;
         routeConfig.serializationOptions = options.serializationOptions;
 
-        routeConfig.returnType = fn.getReturnType();
+        routeConfig.returnType = filterValidReturnType(fn.getReturnType());
         this.addRoute(routeConfig);
     }
 }
@@ -597,7 +604,7 @@ export class HttpRouterRegistry extends HttpRouterRegistryFunctionRegistrar {
 
             routeConfig.module = module;
 
-            if (schema.hasMethod(action.methodName)) routeConfig.returnType = schema.getMethod(action.methodName).getReturnType();
+            if (schema.hasMethod(action.methodName)) routeConfig.returnType = filterValidReturnType(schema.getMethod(action.methodName).getReturnType());
             this.addRoute(routeConfig);
         }
     }
@@ -674,7 +681,8 @@ export class HttpRouter {
         const routeConfigVar = compiler.reserveVariable('routeConfigVar', routeConfig);
         const parsedRoute = parseRouteControllerAction(routeConfig);
         const path = routeConfig.getFullPath();
-        const prefix = path.substr(0, path.indexOf(':'));
+        const pathParamStarter = path.indexOf(':')
+        const prefix = path.substr(0, pathParamStarter);
 
         const regexVar = compiler.reserveVariable('regex', new RegExp('^' + parsedRoute.regex + '$'));
         const setParameters: string[] = [];
@@ -683,7 +691,7 @@ export class HttpRouter {
         let bodyValidationErrorHandling = `if (bodyErrors.length) throw ValidationError.from(bodyErrors);`;
 
         let enableParseBody = false;
-        const hasParameters = parsedRoute.getParameters().length > 0;
+        const hasParameters = pathParamStarter !== -1 || parsedRoute.getParameters().length > 0;
         let requiresAsyncParameters = false;
         let setParametersFromPath = '';