Merge fix-742-responses

docs/docs/snippets/middlewares/custom-endpoint-decorator-status.ts

@@ -1,17 +1,10 @@
-import {applyDecorators, StoreSet} from "@tsed/core";
-import {IResponseOptions, UseAfter, mapReturnedResponse} from "@tsed/common";
-
-export function Status(code: number, options: IResponseOptions = {}) {
-  const response = mapReturnedResponse(options);
+import {UseAfter} from "@tsed/common";
+import {applyDecorators} from "@tsed/core";
 
+export function CustomStatus(code: number) {
   return applyDecorators(
-    StoreSet("statusCode", code),
-    StoreSet("response", response),
-    StoreSet("responses", {[code]: response}),
-    UseAfter((request: any, response: any, next: any) => {
-      if (response.statusCode === 200) {
-        response.status(code);
-      }
+    UseAfter((req: any, res: any, next: any) => {
+      res.status(code);
       next();
     })
   );

packages/common/src/converters/interfaces/IConverter.ts

@@ -1,7 +1,4 @@
-/**
- *
- */
-import {Type} from "@tsed/core";
+import {IMetadataType} from "@tsed/core";
 
 export interface IDeserializer {
   (obj: any, targetType: any, baseType?: any): any;
@@ -24,8 +21,7 @@ export interface ISerializer {
 /**
  *
  */
-export interface IConverterOptions {
-  type?: Type<any>;
+export interface IConverterOptions extends IMetadataType {
   ignoreCallback?: IConverterIgnoreCB;
   checkRequiredValue?: boolean;
 }

packages/common/src/mvc/builders/ControllerBuilder.ts

@@ -3,6 +3,7 @@ import {InjectorService} from "@tsed/di";
 import * as Express from "express";
 import {bindEndpointMiddleware} from "../components/bindEndpointMiddleware";
 import {SendResponseMiddleware} from "../components/SendResponseMiddleware";
+import {statusAndHeadersMiddleware} from "../components/statusAndHeadersMiddleware";
 import {IPathMethod} from "../interfaces/IPathMethod";
 import {ControllerProvider} from "../models/ControllerProvider";
 import {EndpointMetadata} from "../models/EndpointMetadata";
@@ -86,6 +87,7 @@ export class ControllerBuilder {
       .concat(beforeMiddlewares) // Endpoint before-middlewares
       .concat(mldwrs) // Endpoint middlewares
       .concat(endpoint) // Endpoint handler
+      .concat(statusAndHeadersMiddleware)
       .concat(afterMiddlewares) // Endpoint after-middlewares
       .filter((item: any) => !!item)
       .map((middleware: any) => HandlerBuilder.from(middleware).build(injector));

packages/common/src/mvc/components/statusAndHeadersMiddleware.ts

@@ -0,0 +1,19 @@
+import * as Express from "express";
+
+export function statusAndHeadersMiddleware(request: Express.Request, response: Express.Response, next: any) {
+  const {
+    statusCode,
+    response: {headers = {}}
+  } = request.ctx.endpoint;
+
+  if (response.statusCode === 200) {
+    // apply status only if the isn't already modified
+    response.status(statusCode);
+  }
+
+  // apply headers
+  Object.entries(headers).forEach(([key, schema]) => {
+    schema.value !== undefined && response.set(key, String(schema.value));
+  });
+  next();
+}

packages/common/src/mvc/decorators/index.ts

@@ -46,3 +46,7 @@ export * from "./params/request";
 export * from "./params/next";
 export * from "./params/error";
 export * from "./params/endpointInfo";
+
+// utils
+export * from "./utils/mapReturnedResponse";
+export * from "./utils/getStorableMetadata";

packages/common/src/mvc/decorators/method/endpointFn.ts

@@ -0,0 +1,18 @@
+import {DecoratorParameters, getDecoratorType, Type} from "@tsed/core";
+import {EndpointMetadata} from "../../models/EndpointMetadata";
+import {EndpointRegistry} from "../../registries/EndpointRegistry";
+
+/**
+ *
+ * @param fn
+ * @decorator
+ */
+export function EndpointFn(fn: (endpoint: EndpointMetadata, parameters: DecoratorParameters) => void) {
+  return <T>(target: Type<any>, property: string, descriptor: TypedPropertyDescriptor<T>): TypedPropertyDescriptor<T> | void => {
+    if (getDecoratorType([target, property, descriptor]) === "method") {
+      fn(EndpointRegistry.get(target, property!), [target, property, descriptor]);
+
+      return descriptor;
+    }
+  };
+}

packages/common/src/mvc/decorators/method/header.ts

@@ -1,8 +1,33 @@
-import {applyDecorators, StoreMerge} from "@tsed/core";
-import {IResponseHeader} from "../../interfaces/IResponseHeader";
-import {IHeadersOptions, IResponseHeaders} from "../../interfaces/IResponseHeaders";
-import {mapHeaders} from "../../utils/mapHeaders";
-import {UseAfter} from "./useAfter";
+import {deepMerge} from "@tsed/core";
+import {IResponseHeader, IResponseHeaders} from "../../interfaces";
+import {EndpointFn} from "./endpointFn";
+
+export type IHeaderOptions = string | number | IResponseHeader;
+
+export interface IHeadersOptions {
+  [key: string]: IHeaderOptions;
+}
+
+export function mapHeaders(headers: IHeadersOptions): IResponseHeaders {
+  return Object.keys(headers).reduce<IResponseHeaders>((newHeaders: IResponseHeaders, key: string, index: number, array: string[]) => {
+    const value: any = headers[key];
+    let type = typeof value;
+    let options: any = {
+      value
+    };
+
+    if (type === "object") {
+      options = value;
+      type = typeof options.value;
+    }
+
+    options.type = options.type || type;
+
+    newHeaders[key] = options;
+
+    return newHeaders;
+  }, {});
+}
 
 /**
  * Sets the response’s HTTP header field to value. To set multiple fields at once, pass an object as the parameter.
@@ -53,19 +78,15 @@ import {UseAfter} from "./useAfter";
  * @decorator
  * @endpoint
  */
-export function Header(headerName: string | number | IHeadersOptions, headerValue?: string | number | IResponseHeader): Function {
+export function Header(headerName: string | number | IHeadersOptions, headerValue?: IHeaderOptions): Function {
   if (headerValue !== undefined) {
     headerName = {[headerName as string]: headerValue};
   }
   const headers: IResponseHeaders = mapHeaders(headerName as IHeadersOptions);
 
-  return applyDecorators(
-    StoreMerge("response", {headers}),
-    UseAfter((request: any, response: any, next: any) => {
-      Object.keys(headers).forEach(key => {
-        response.set(key, headers[key].value);
-      });
-      next();
-    })
-  );
+  return EndpointFn(endpoint => {
+    const {response} = endpoint;
+
+    response.headers = deepMerge(response.headers || {}, headers);
+  });
 }

packages/common/src/mvc/decorators/method/returnType.ts

@@ -1,31 +1,45 @@
-import {getDecoratorType, Type} from "@tsed/core";
-import {EndpointRegistry} from "../../registries/EndpointRegistry";
+import {cleanObject, deepMerge} from "@tsed/core";
+import {IResponseOptions} from "../../interfaces/IResponseOptions";
+import {EndpointFn} from "./endpointFn";
+
+const isSuccessStatus = (code: number | undefined) => code && 200 <= code && code < 300;
 
 /**
  * Define the returned type for the serialization.
  *
  * ```typescript
  * @Controller('/')
  * export class Ctrl {
- *
  *    @Get('/')
- *    @ReturnType(User)
- *    get(): Promise<User> { }
+ *    @ReturnType(200, {type: User, collectionType: Map})
+ *    get(): Promise<Map<User>> { }
  * }
  *
  * ```
  *
  * @returns {Function}
- * @param type
+ * @param response
  * @decorator
  * @endpoint
  */
-export function ReturnType(type: Type<any> | any): Function {
-  return <T>(target: Type<any>, targetKey?: string, descriptor?: TypedPropertyDescriptor<T>): TypedPropertyDescriptor<T> | void => {
-    if (getDecoratorType([target, targetKey, descriptor]) === "method") {
-      EndpointRegistry.get(target, targetKey!).type = type;
+export function ReturnType(response: Partial<IResponseOptions> = {}): Function {
+  return EndpointFn(endpoint => {
+    const {responses, statusCode} = endpoint;
+    const code = response.code || statusCode; // implicit
 
-      return descriptor;
+    if (isSuccessStatus(response.code)) {
+      const {response} = endpoint;
+      responses.delete(statusCode);
+      endpoint.statusCode = code;
+      endpoint.responses.set(code, response);
     }
-  };
+
+    response = {
+      code,
+      description: "",
+      ...deepMerge(endpoint.get(code), cleanObject(response))
+    };
+
+    endpoint.responses.set(response.code!, response as IResponseOptions);
+  });
 }

packages/common/src/mvc/decorators/method/status.ts

@@ -1,6 +1,6 @@
-import {applyDecorators, StoreSet, StoreMerge} from "@tsed/core";
-import {IResponseOptions} from "../../interfaces/IResponseOptions";
-import {mapReturnedResponse} from "../../utils/mapReturnedResponse";
+import {applyDecorators, StoreMerge, StoreSet} from "@tsed/core";
+import {mapReturnedResponse} from "../utils/mapReturnedResponse";
+import {ReturnType} from "./returnType";
 import {UseAfter} from "./useAfter";
 
 /**
@@ -46,18 +46,13 @@ import {UseAfter} from "./useAfter";
  * @decorator
  * @endpoint
  */
-export function Status(code: number, options: IResponseOptions = {}) {
-  const response = mapReturnedResponse(options);
+export function Status(code: number, options: TsED.ResponseOptions = {description: ""}) {
+  const {use, collection} = options as any;
 
-  return applyDecorators(
-    StoreSet("statusCode", code),
-    StoreMerge("response", response),
-    StoreMerge("responses", {[code]: response}),
-    UseAfter((request: any, response: any, next: any) => {
-      if (response.statusCode === 200) {
-        response.status(code);
-      }
-      next();
-    })
-  );
+  return ReturnType({
+    ...options,
+    code,
+    type: options.type || use,
+    collectionType: options.collectionType || collection
+  });
 }

packages/common/src/mvc/decorators/params/bodyParams.ts

@@ -2,7 +2,7 @@ import {Type} from "@tsed/core";
 import {IParamOptions} from "../../interfaces/IParamOptions";
 import {ParamTypes} from "../../models/ParamTypes";
 import {UseFilter} from "./useFilter";
-import {mapParamsOptions} from "./utils/mapParamsOptions";
+import {mapParamsOptions} from "../utils/mapParamsOptions";
 
 /**
  * BodyParams return the value from [request.body](http://expressjs.com/en/4x/api.html#req.body) object.

packages/common/src/mvc/decorators/params/context.ts

@@ -1,7 +1,7 @@
 import {ParamTypes} from "../../models/ParamTypes";
 import {RequestContext} from "../../models/RequestContext";
 import {UseFilter} from "./useFilter";
-import {mapParamsOptions} from "./utils/mapParamsOptions";
+import {mapParamsOptions} from "../utils/mapParamsOptions";
 
 /**
  * Context decorator return the @@RequestContext@@ created by Ts.ED when request is handled by the server.

packages/common/src/mvc/decorators/params/cookies.ts

@@ -2,7 +2,7 @@ import {Type} from "@tsed/core";
 import {IParamOptions} from "../../interfaces/IParamOptions";
 import {ParamTypes} from "../../models/ParamTypes";
 import {UseFilter} from "./useFilter";
-import {mapParamsOptions} from "./utils/mapParamsOptions";
+import {mapParamsOptions} from "../utils/mapParamsOptions";
 
 /**
  * Cookies or CookiesParams return the value from [request.cookies](http://expressjs.com/en/4x/api.html#req.cookies) object.

packages/common/src/mvc/decorators/params/headerParams.ts

@@ -2,7 +2,7 @@ import {Type} from "@tsed/core";
 import {IParamOptions} from "../../interfaces/IParamOptions";
 import {ParamTypes} from "../../models/ParamTypes";
 import {UseFilter} from "./useFilter";
-import {mapParamsOptions} from "./utils/mapParamsOptions";
+import {mapParamsOptions} from "../utils/mapParamsOptions";
 
 /**
  * HeaderParams return the value from [request.params](http://expressjs.com/en/4x/api.html#req.params) object.

packages/common/src/mvc/decorators/params/locals.ts

@@ -1,6 +1,6 @@
 import {ParamTypes} from "../../models/ParamTypes";
 import {UseFilter} from "./useFilter";
-import {mapParamsOptions} from "./utils/mapParamsOptions";
+import {mapParamsOptions} from "../utils/mapParamsOptions";
 
 /**
  * Locals return the value from [response.locals](http://expressjs.com/en/4x/api.html#res.locals) object.

packages/common/src/mvc/decorators/params/pathParams.ts

@@ -2,7 +2,7 @@ import {Type} from "@tsed/core";
 import {IParamOptions} from "../../interfaces/IParamOptions";
 import {ParamTypes} from "../../models/ParamTypes";
 import {UseFilter} from "./useFilter";
-import {mapParamsOptions} from "./utils/mapParamsOptions";
+import {mapParamsOptions} from "../utils/mapParamsOptions";
 
 /**
  * PathParams return the value from [request.params](http://expressjs.com/en/4x/api.html#req.params) object.

packages/common/src/mvc/decorators/params/queryParams.ts

@@ -2,7 +2,7 @@ import {Type} from "@tsed/core";
 import {IParamOptions} from "../../interfaces/IParamOptions";
 import {ParamTypes} from "../../models/ParamTypes";
 import {UseFilter} from "./useFilter";
-import {mapParamsOptions} from "./utils/mapParamsOptions";
+import {mapParamsOptions} from "../utils/mapParamsOptions";
 
 /**
  * QueryParams return the value from [request.query](http://expressjs.com/en/4x/api.html#req.query) object.

packages/common/src/mvc/decorators/params/request.ts

@@ -2,7 +2,7 @@ import {Type} from "@tsed/core";
 import * as Express from "express";
 import {ParamTypes} from "../../models/ParamTypes";
 import {UseFilter} from "./useFilter";
-import {mapParamsOptions} from "./utils/mapParamsOptions";
+import {mapParamsOptions} from "../utils/mapParamsOptions";
 import {IParamOptions} from "../../interfaces/IParamOptions";
 
 export type Request = Express.Request;

packages/common/src/mvc/decorators/params/session.ts

@@ -2,7 +2,7 @@ import {Type} from "@tsed/core";
 import {IParamOptions} from "../../interfaces/IParamOptions";
 import {ParamTypes} from "../../models/ParamTypes";
 import {UseFilter} from "./useFilter";
-import {mapParamsOptions} from "./utils/mapParamsOptions";
+import {mapParamsOptions} from "../utils/mapParamsOptions";
 
 /**
  * Session return the value from [request.session](http://expressjs.com/en/4x/api.html#req.session) object.

packages/common/src/mvc/decorators/params/utils/mapParamsOptions.ts → packages/common/src/mvc/decorators/utils/mapParamsOptions.ts

@@ -1,5 +1,5 @@
 import {isObject, isPrimitive} from "@tsed/core";
-import {IParamOptions} from "../../../interfaces/IParamOptions";
+import {IParamOptions} from "../../interfaces/IParamOptions";
 
 export function mapParamsOptions(args: any[]): IParamOptions<any> {
   if (args.length === 1) {

packages/common/src/mvc/decorators/utils/mapReturnedResponse.ts

@@ -0,0 +1,7 @@
+export function mapReturnedResponse({use, collection, ...options}: any): any {
+  return {
+    ...options,
+    type: options.type || use,
+    collectionType: options.collectionType || collection
+  };
+}

packages/common/src/mvc/index.ts

@@ -50,8 +50,5 @@ export * from "./errors/UnknowFilterError";
 // decorators
 export * from "./decorators";
 
-// utils
-export * from "./utils/mapHeaders";
-export * from "./utils/mapReturnedResponse";
-
+// Module
 export * from "./MvcModule";

packages/common/src/mvc/interfaces/IResponseError.ts

@@ -1,10 +1,8 @@
-import {IResponseHeaders} from "./IResponseHeaders";
-
 /**
  * Interface can be implemented to customize the error sent to the client.
  */
 export interface IResponseError extends Error {
   errors?: any[];
   origin?: Error;
-  headers?: IResponseHeaders;
+  headers?: {};
 }