@tsed/common 6.70.1 → 7.0.0-alpha.1

package/lib/index.js

@@ -668,14 +668,6 @@ exports.EndpointMetadata = EndpointMetadata_1 = class EndpointMetadata extends s
     this.store.set("view", view);
   }
 
-  get location() {
-    return this.store.get("location");
-  }
-
-  set location(url) {
-    this.store.set("location", url);
-  }
-
   get acceptMimes() {
     return this.store.get("acceptMimes", []);
   }
@@ -683,16 +675,6 @@ exports.EndpointMetadata = EndpointMetadata_1 = class EndpointMetadata extends s
   set acceptMimes(mimes) {
     this.store.set("acceptMimes", mimes);
   }
-
-  get redirect() {
-    return this.store.get("redirect");
-  }
-
-  set redirect(options) {
-    this.store.set("redirect", _extends({
-      status: 302
-    }, options));
-  }
   /**
    * Get all endpoints from a given class and his parents.
    * @param {Type<any>} target
@@ -845,12 +827,13 @@ function createHandlerMetadata(injector, obj, routeOptions = {}) {
   return new HandlerMetadata(options);
 }
 
-function toHeaders(headers) {
-  return Object.entries(headers).reduce((headers, [key, item]) => {
+function mergeHeaders(specHeaders, headers) {
+  return Object.entries(specHeaders).reduce((headers, [key, item]) => {
+    key = key.toLowerCase();
     return _extends({}, headers, {
-      [key]: String(item.example)
+      [key]: headers[key] === undefined ? String(item.example) : headers[key]
     });
-  }, {});
+  }, headers);
 }
 /**
  * @ignore
@@ -875,15 +858,13 @@ function setResponseHeaders(ctx) {
     response.status(operation.getStatus());
   }
 
+  const statusCode = response.statusCode;
   const headers = operation.getHeadersOf(response.statusCode);
-  response.setHeaders(toHeaders(headers));
+  const mergedHeaders = mergeHeaders(headers, response.getHeaders());
+  response.setHeaders(mergedHeaders);
 
-  if (endpoint.redirect) {
-    response.redirect(endpoint.redirect.status || 302, endpoint.redirect.url);
-  }
-
-  if (endpoint.location) {
-    response.location(endpoint.location);
+  if (operation.isRedirection(statusCode)) {
+    response.redirect(statusCode, String(mergedHeaders["location"]));
   }
 }
 
@@ -1476,22 +1457,6 @@ tslib.__decorate([tslib.__param(0, platformParams.Context()), tslib.__metadata("
 
 exports.PlatformMulterMiddleware = PlatformMulterMiddleware_1 = tslib.__decorate([platformMiddlewares.Middleware()], exports.PlatformMulterMiddleware);
 
-/**
- * @deprecated Since 2020-11-30. Use PlatformAcceptMimesMiddleware.
- * @ignore
- */
-
-exports.GlobalAcceptMimesMiddleware = class GlobalAcceptMimesMiddleware {
-  use(ctx) {
-    return;
-  }
-
-};
-
-tslib.__decorate([tslib.__param(0, platformParams.Context()), tslib.__metadata("design:type", Function), tslib.__metadata("design:paramtypes", [Object]), tslib.__metadata("design:returntype", void 0)], exports.GlobalAcceptMimesMiddleware.prototype, "use", null);
-
-exports.GlobalAcceptMimesMiddleware = tslib.__decorate([platformMiddlewares.Middleware()], exports.GlobalAcceptMimesMiddleware);
-
 /**
  * @middleware
  * @platform
@@ -1518,23 +1483,6 @@ tslib.__decorate([tslib.__param(0, platformParams.Context()), tslib.__metadata("
 
 exports.PlatformAcceptMimesMiddleware = tslib.__decorate([platformMiddlewares.Middleware()], exports.PlatformAcceptMimesMiddleware);
 
-/**
- * @middleware
- * @deprecated Since 2020-11-30. Use PlatformAcceptMimesMiddleware.
- * @ignore
- */
-
-exports.AcceptMimesMiddleware = class AcceptMimesMiddleware {
-  use(ctx) {
-    return;
-  }
-
-};
-
-tslib.__decorate([tslib.__param(0, platformParams.Context()), tslib.__metadata("design:type", Function), tslib.__metadata("design:paramtypes", [Object]), tslib.__metadata("design:returntype", void 0)], exports.AcceptMimesMiddleware.prototype, "use", null);
-
-exports.AcceptMimesMiddleware = tslib.__decorate([platformMiddlewares.Middleware()], exports.AcceptMimesMiddleware);
-
 /**
  * Create Ts.ED context handler
  * @param fn
@@ -1697,8 +1645,10 @@ class PlatformControllerBuilder {
  */
 
 exports.PlatformRequest = class PlatformRequest {
-  constructor(raw) {
-    this.raw = raw;
+  constructor({
+    request
+  }) {
+    this.raw = request;
   }
 
   get secure() {
@@ -1826,7 +1776,9 @@ exports.PlatformRequest = class PlatformRequest {
 
   destroy() {
     // @ts-ignore
-    delete this.raw;
+    delete this.raw; // @ts-ignore
+
+    delete this.response;
   }
   /**
    * Return the Framework response object (express, koa, etc...)
@@ -1846,7 +1798,7 @@ exports.PlatformRequest = class PlatformRequest {
   }
 
 };
-exports.PlatformRequest = tslib.__decorate([di.Injectable(), di.Scope(di.ProviderScope.INSTANCE), tslib.__param(0, di.Opts), tslib.__metadata("design:paramtypes", [Object])], exports.PlatformRequest);
+exports.PlatformRequest = tslib.__decorate([di.Injectable(), di.Scope(di.ProviderScope.INSTANCE), tslib.__metadata("design:paramtypes", [Object])], exports.PlatformRequest);
 
 var PlatformResponse_1;
 
@@ -1858,8 +1810,10 @@ const onFinished = require("on-finished");
 
 
 exports.PlatformResponse = PlatformResponse_1 = class PlatformResponse {
-  constructor(raw) {
-    this.raw = raw;
+  constructor({
+    response
+  }) {
+    this.raw = response;
   }
   /**
    * Get the current statusCode
@@ -1970,7 +1924,11 @@ exports.PlatformResponse = PlatformResponse_1 = class PlatformResponse {
   }
 
   setHeader(key, item) {
-    this.raw.set(key, String(item));
+    if (key.toLowerCase() === "location") {
+      return this.location(String(item));
+    }
+
+    this.raw.set(key, item);
     return this;
   }
   /**
@@ -2141,7 +2099,9 @@ exports.PlatformResponse = PlatformResponse_1 = class PlatformResponse {
   destroy() {
     // @ts-ignore
     delete this.raw;
-    delete this.data;
+    delete this.data; // @ts-ignore
+
+    delete this.request;
   }
 
   isHeadersSent() {
@@ -2149,28 +2109,24 @@ exports.PlatformResponse = PlatformResponse_1 = class PlatformResponse {
   }
 
 };
+exports.PlatformResponse = PlatformResponse_1 = tslib.__decorate([di.Injectable(), di.Scope(di.ProviderScope.INSTANCE), tslib.__metadata("design:paramtypes", [Object])], exports.PlatformResponse);
 
-tslib.__decorate([di.Inject(), tslib.__metadata("design:type", platformViews.PlatformViews)], exports.PlatformResponse.prototype, "platformViews", void 0);
-
-exports.PlatformResponse = PlatformResponse_1 = tslib.__decorate([di.Injectable(), di.Scope(di.ProviderScope.INSTANCE), tslib.__param(0, di.Opts), tslib.__metadata("design:paramtypes", [Object])], exports.PlatformResponse);
-
-const _excluded$2 = ["response", "request", "endpoint", "url", "ignoreUrlPatterns"];
+const _excluded$3 = ["event", "endpoint", "ignoreUrlPatterns", "ResponseKlass", "RequestKlass"];
 
 var _ignoreUrlPatterns = /*#__PURE__*/_classPrivateFieldLooseKey("ignoreUrlPatterns");
 
 class PlatformContext extends di.DIContext {
   constructor(_ref) {
     let {
-      response,
-      request,
+      event,
       endpoint,
-      url,
-      ignoreUrlPatterns = []
+      ignoreUrlPatterns = [],
+      ResponseKlass = exports.PlatformResponse,
+      RequestKlass = exports.PlatformRequest
     } = _ref,
-        options = _objectWithoutPropertiesLoose(_ref, _excluded$2);
+        options = _objectWithoutPropertiesLoose(_ref, _excluded$3);
 
     super(_extends({}, options, {
-      url,
       ignoreLog: () => {
         return _classPrivateFieldLooseBase(this, _ignoreUrlPatterns)[_ignoreUrlPatterns].find(reg => !!this.url.match(reg));
       }
@@ -2180,21 +2136,23 @@ class PlatformContext extends di.DIContext {
       value: void 0
     });
     _classPrivateFieldLooseBase(this, _ignoreUrlPatterns)[_ignoreUrlPatterns] = [];
-    this.url = url;
     endpoint && (this.endpoint = endpoint);
     _classPrivateFieldLooseBase(this, _ignoreUrlPatterns)[_ignoreUrlPatterns] = ignoreUrlPatterns.map(pattern => typeof pattern === "string" ? new RegExp(pattern, "gi") : pattern);
-
-    if (response) {
-      this.response = response;
-      this.container.set(exports.PlatformResponse, response);
-    }
-
-    if (request) {
-      this.request = request;
-      this.container.set(exports.PlatformRequest, request);
-    }
-
+    this.response = new ResponseKlass(event);
+    this.request = new RequestKlass(event);
+    this.response.request = this.request;
+    this.request.response = this.response;
+    this.request.request.$ctx = this;
+    this.request.request.id = this.id;
+    this.logger.url = this.url;
+    this.container.set(exports.PlatformResponse, this.response);
+    this.container.set(exports.PlatformRequest, this.request);
     this.container.set(PlatformContext, this);
+    this.response.setHeader("x-request-id", this.id);
+  }
+
+  get url() {
+    return this.request.url;
   }
 
   get app() {
@@ -2202,7 +2160,10 @@ class PlatformContext extends di.DIContext {
   }
 
   async destroy() {
+    var _this$request, _this$request$request;
+
     await super.destroy();
+    (_this$request = this.request) == null ? true : (_this$request$request = _this$request.request) == null ? true : delete _this$request$request.$ctx;
     this.response.destroy();
     this.request.destroy(); // @ts-ignore
 
@@ -2417,22 +2378,6 @@ class ControllerProvider extends di.Provider {
 
 }
 
-exports.PropertyMetadata = class PropertyMetadata extends schema.JsonEntityStore {
-  static get(target, propertyKey) {
-    return schema.JsonEntityStore.from(core.prototypeOf(target), propertyKey);
-  }
-  /**
-   * @deprecated Since 2020-11-11. Use getProperties from @tsed/schema
-   */
-
-
-  static getProperties(target, options = {}) {
-    return schema.getProperties(target, options);
-  }
-
-};
-exports.PropertyMetadata = tslib.__decorate([schema.JsonEntityComponent(core.DecoratorTypes.PROP)], exports.PropertyMetadata);
-
 function getControllerPath(basePath, provider) {
   return (basePath === provider.path ? provider.path : (basePath || "") + provider.path).replace(/\/\//gi, "/");
 }
@@ -2756,16 +2701,6 @@ async function listenHttpsServer(injector) {
   }
 }
 
-/**
- * @ignore
- * @deprecated User injector.load(container, module) instead
- */
-
-async function loadInjector(injector, container = di.createContainer()) {
-  injector.bootstrap(container);
-  return injector.load(container, exports.PlatformModule);
-}
-
 function printRoutes(routes) {
   const mapColor = {
     GET: "green",
@@ -2797,47 +2732,49 @@ function printRoutes(routes) {
   return "\n" + str.trim();
 }
 
+const _excluded$2 = ["reqIdBuilder"];
+
 const uuidv4 = require("uuid").v4;
 
 const defaultReqIdBuilder = req => req.get("x-request-id") || uuidv4().replace(/-/gi, "");
 /**
  * Create the TsED context to wrap request, response, injector, etc...
  * @param injector
- * @param request
- * @param response
  * @ignore
  */
 
 
-async function createContext(injector, request, response) {
-  const {
-    level,
-    ignoreUrlPatterns,
-    maxStackSize,
+function createContext(injector) {
+  var _injector$getProvider, _injector$getProvider2;
+
+  const ResponseKlass = (_injector$getProvider = injector.getProvider(exports.PlatformResponse)) == null ? void 0 : _injector$getProvider.useClass;
+  const RequestKlass = (_injector$getProvider2 = injector.getProvider(exports.PlatformRequest)) == null ? void 0 : _injector$getProvider2.useClass;
+  const platformViews$1 = injector.get(platformViews.PlatformViews);
+
+  const _injector$settings$lo = injector.settings.logger,
+        {
     reqIdBuilder = defaultReqIdBuilder
-  } = injector.settings.logger;
-  const req = request.getRequest();
-  const id = reqIdBuilder(req);
-  const ctx = new PlatformContext({
-    id,
-    logger: injector.logger,
-    url: request.url,
-    ignoreUrlPatterns,
-    level,
-    maxStackSize,
-    injector,
-    response,
-    request
-  });
-  req.$ctx = ctx;
-  response.setHeader("x-request-id", id);
-  response.onEnd(async () => {
-    await ctx.emit("$onResponse", ctx);
-    await ctx.destroy();
-    delete req.$ctx;
-  });
-  await ctx.emit("$onRequest", ctx);
-  return ctx;
+  } = _injector$settings$lo,
+        loggerOptions = _objectWithoutPropertiesLoose(_injector$settings$lo, _excluded$2);
+
+  return async event => {
+    const ctx = new PlatformContext(_extends({
+      event,
+      id: reqIdBuilder(event.request),
+      logger: injector.logger
+    }, loggerOptions, {
+      injector,
+      ResponseKlass,
+      RequestKlass
+    }));
+    ctx.response.platformViews = platformViews$1;
+    ctx.response.onEnd(async () => {
+      await ctx.emit("$onResponse", ctx);
+      await ctx.destroy();
+    });
+    await ctx.emit("$onRequest", ctx);
+    return ctx;
+  };
 }
 
 const SKIP_HOOKS = ["$beforeInit", "$afterInit", "$onInit", "$onMountingMiddlewares"];
@@ -3080,20 +3017,6 @@ class PlatformBuilder {
     }));
     this.settings.set("routes", routes);
   }
-
-  createRequest(req) {
-    const Klass = _classPrivateFieldLooseBase(this, _providers)[_providers].get(exports.PlatformRequest).useClass;
-
-    return new Klass(req);
-  }
-
-  createResponse(res) {
-    const Klass = _classPrivateFieldLooseBase(this, _providers)[_providers].get(exports.PlatformResponse).useClass;
-
-    const response = new Klass(res);
-    response.platformViews = this.injector.get(platformViews.PlatformViews);
-    return response;
-  }
   /**
    * Load middlewares from configuration for the given hook
    * @param hook
@@ -3154,17 +3077,11 @@ class PlatformBuilder {
   }
 
   async loadRoutes() {
-    var _this$settings$accept;
-
     // istanbul ignore next
     if (this.settings.logger.level !== "off") {
       this.app.use(exports.PlatformLogMiddleware);
     }
 
-    if ((_this$settings$accept = this.settings.acceptMimes) != null && _this$settings$accept.length) {
-      this.app.use(exports.GlobalAcceptMimesMiddleware);
-    }
-
     this.log("Load routes");
     await this.callHook("$beforeRoutesInit");
     await this.callHook("$$loadRoutes");
@@ -3535,43 +3452,6 @@ function AcceptMime(...mimes) {
   }));
 }
 
-/**
- * Sets the response Location HTTP header to the specified path parameter.
- *
- * ```typescript
- *  @Location('/foo/bar')
- *  @Location('http://example.com')
- *  @Location('back')
- *  private myMethod() {
- *
- *  }
- * ```
- *
- * A path value of “back” has a special meaning, it refers to the URL specified in the `Referer` header of the request. If the `Referer` header was not specified, it refers to “/”.
- *
- * @param location
- * @returns {Function}
- * @decorator
- * @operation
- */
-
-function Location(location) {
-  return EndpointFn(endpoint => {
-    endpoint.location = location;
-  });
-}
-
-function Redirect(status, url) {
-  url = !url ? status : url;
-  status = typeof status === "number" ? status : 302;
-  return core.useDecorators(schema.Status(status), EndpointFn(endpoint => {
-    endpoint.redirect = {
-      status: +status,
-      url: url
-    };
-  }));
-}
-
 const _excluded$1 = ["children"];
 
 function mapOptions(options) {
@@ -3631,22 +3511,6 @@ function Controller(options) {
   };
 }
 
-/**
- * Return the current response data. Prefer the @@Context@@ decorator to get or set data.
- *
- * @decorator
- * @operation
- * @input
- * @deprecated Use `@Context() $ctx: Context` then $ctx.data.
- */
-
-function ResponseData() {
-  return platformParams.UseParam({
-    paramType: platformParams.ParamTypes.$CTX,
-    dataPath: "$ctx.data"
-  });
-}
-
 function getParamType$1(target, propertyKey, parameterIndex) {
   const type = core.Metadata.getOwnParamTypes(target, propertyKey)[parameterIndex];
 
@@ -3773,23 +3637,6 @@ function Err() {
   });
 }
 
-/**
- * Get the current endpoint metadata.
- * @decorator
- * @operation
- * @input
- * @deprecated Use `@Context() $ctx: Context` then `$ctx.endpoint` instead.
- */
-
-function EndpointInfo() {
-  return platformParams.UseParam({
-    paramType: platformParams.ParamTypes.$CTX,
-    dataPath: "$ctx.endpoint",
-    useConverter: false,
-    useValidation: false
-  });
-}
-
 const _excluded = ["use", "collection"];
 
 /**
@@ -3913,15 +3760,90 @@ class PlatformTest extends di.DITest {
     return (_DITest$injector$get = di.DITest.injector.get(exports.PlatformApplication)) == null ? void 0 : _DITest$injector$get.callback();
   }
 
+  static createRequest(options = {}) {
+    return _extends({
+      headers: {},
+
+      get(key) {
+        return this.headers[key.toLowerCase()];
+      },
+
+      accepts(mime) {
+        return require("accepts")(this).types([].concat(mime));
+      }
+
+    }, options);
+  }
+
+  static createResponse(options = {}) {
+    return _extends({
+      headers: {},
+      locals: {},
+      statusCode: 200,
+
+      status(code) {
+        this.statusCode = code;
+        return this;
+      },
+
+      contentType(content) {
+        this.set("content-type", content);
+      },
+
+      contentLength(content) {
+        this.set("content-length", content);
+      },
+
+      redirect(status, path) {
+        this.statusCode = status;
+        this.set("location", path);
+      },
+
+      location(path) {
+        this.set("location", path);
+      },
+
+      get(key) {
+        return this.headers[key.toLowerCase()];
+      },
+
+      getHeaders() {
+        return this.headers;
+      },
+
+      set(key, value) {
+        this.headers[key.toLowerCase()] = value;
+        return this;
+      },
+
+      send(data) {
+        this.data = data;
+      },
+
+      json(data) {
+        this.data = data;
+      }
+
+    }, options);
+  }
+
   static createRequestContext(options = {}) {
-    options.request = options.request || new exports.PlatformRequest({});
-    options.response = options.response || new exports.PlatformResponse({});
-    return new PlatformContext(_extends({
+    var _options$request, _options$event, _options$response, _options$event2;
+
+    const event = {
+      request: (options == null ? void 0 : (_options$request = options.request) == null ? void 0 : _options$request.request) || (options == null ? void 0 : (_options$event = options.event) == null ? void 0 : _options$event.request) || PlatformTest.createRequest(),
+      response: (options == null ? void 0 : (_options$response = options.response) == null ? void 0 : _options$response.response) || (options == null ? void 0 : (_options$event2 = options.event) == null ? void 0 : _options$event2.response) || PlatformTest.createResponse()
+    };
+    const ctx = new PlatformContext(_extends({
       id: "id",
       injector: di.DITest.injector,
       logger: di.DITest.injector.logger,
       url: "/"
-    }, options));
+    }, options, {
+      event
+    }));
+    ctx.response.platformViews = PlatformTest.get(platformViews.PlatformViews);
+    return ctx;
   }
 
 }
@@ -3945,6 +3867,18 @@ Object.defineProperty(exports, 'Logger', {
     return logger.Logger;
   }
 });
+Object.defineProperty(exports, 'Location', {
+  enumerable: true,
+  get: function () {
+    return schema.Location;
+  }
+});
+Object.defineProperty(exports, 'Redirect', {
+  enumerable: true,
+  get: function () {
+    return schema.Redirect;
+  }
+});
 exports.AcceptMime = AcceptMime;
 exports.All = All;
 exports.AnyToPromiseWithCtx = AnyToPromiseWithCtx;
@@ -3952,14 +3886,12 @@ exports.Controller = Controller;
 exports.ControllerProvider = ControllerProvider;
 exports.Delete = Delete;
 exports.EndpointFn = EndpointFn;
-exports.EndpointInfo = EndpointInfo;
 exports.Err = Err;
 exports.Get = Get;
 exports.HandlerMetadata = HandlerMetadata;
 exports.Head = Head;
 exports.HttpServer = HttpServer;
 exports.HttpsServer = HttpsServer;
-exports.Location = Location;
 exports.MulterFileSize = MulterFileSize;
 exports.MulterOptions = MulterOptions;
 exports.MultipartFile = MultipartFile;
@@ -3975,12 +3907,10 @@ exports.PlatformTest = PlatformTest;
 exports.Post = Post;
 exports.Put = Put;
 exports.ROUTER_OPTIONS = ROUTER_OPTIONS;
-exports.Redirect = Redirect;
 exports.Req = Req;
 exports.Request = Request;
 exports.Res = Res;
 exports.Response = Response;
-exports.ResponseData = ResponseData;
 exports.bindEndpointMiddleware = bindEndpointMiddleware;
 exports.createContext = createContext;
 exports.createHttpServer = createHttpServer;
@@ -3990,7 +3920,6 @@ exports.createPlatformApplication = createPlatformApplication;
 exports.listenHttpServer = listenHttpServer;
 exports.listenHttpsServer = listenHttpsServer;
 exports.listenServer = listenServer;
-exports.loadInjector = loadInjector;
 exports.mapReturnedResponse = mapReturnedResponse;
 exports.printRoutes = printRoutes;
 exports.useCtxHandler = useCtxHandler;