@tsed/common 6.75.9 → 6.76.0

package/lib/index.modern.js

@@ -1,4 +1,7 @@
-import { DIConfiguration, ProviderType, ProviderScope, Injectable, Inject, InjectorService, Constant, Scope, DIContext, Provider, setLoggerLevel, GlobalProviders, registerProvider, Configuration, createContainer, Container, getConfiguration, DITest } from '@tsed/di';
+import { $log, colorize } from '@tsed/logger';
+export { $log, Logger } from '@tsed/logger';
+import '@tsed/logger-file';
+import { DIConfiguration, ProviderType, ProviderScope, Injectable, Inject, InjectorService, Constant, Scope, DIContext, Provider, GlobalProviders, setLoggerLevel, registerProvider, Configuration, createContainer, Container, getConfiguration, DITest } from '@tsed/di';
 export * from '@tsed/di';
 import { ParamTypes, ParamMetadata, PlatformParams, Context, UseParam, mapParamsOptions } from '@tsed/platform-params';
 export * from '@tsed/platform-params';
@@ -13,13 +16,11 @@ export * from '@tsed/platform-views';
 import { importProviders } from '@tsed/components-scan';
 export * from '@tsed/components-scan';
 export * from '@tsed/platform-log-middleware';
-import { $log, colorize } from '@tsed/logger';
-export { $log, Logger } from '@tsed/logger';
 import { __decorate, __metadata, __param } from 'tslib';
-import { Env, AnyToPromise, AnyToPromiseStatus, nameOf, Store, descriptorOf, classOf, prototypeOf, deepMerge, isFunction, DecoratorTypes, isStream, uniq, isBoolean, isNumber, isString, getValue, toMap, constructorOf, StoreMerge, Metadata, useDecorators, useMethodDecorators, isClass } from '@tsed/core';
+import { Env, AnyToPromise, AnyToPromiseStatus, nameOf, Store, descriptorOf, prototypeOf, deepMerge, isFunction, DecoratorTypes, isStream, uniq, isBoolean, isNumber, isString, getValue, toMap, StoreMerge, Metadata, useDecorators, useMethodDecorators, StoreSet, isClass } from '@tsed/core';
 import { PerfLogger } from '@tsed/perf';
 import { Exception, NotAcceptable } from '@tsed/exceptions';
-import { JsonEntityStore, getOperationsStores, JsonEntityComponent, OperationMethods, getProperties, Returns, Consumes, JsonEntityFn, Produces } from '@tsed/schema';
+import { JsonEntityStore, JsonEntityComponent, getOperationsRoutes, OperationMethods, JsonOperationRoute, getProperties, concatPath, Returns, Consumes, Produces, JsonEntityFn } from '@tsed/schema';
 export { All, Delete, Get, Head, Location, Options, Patch, Post, Put, Redirect } from '@tsed/schema';
 import { promisify } from 'util';
 import Http, { ServerResponse, IncomingMessage } from 'http';
@@ -491,7 +492,6 @@ class HandlerMetadata {
 
 }
 
-var EndpointMetadata_1;
 /**
  * EndpointMetadata contains metadata about a controller and his method.
  * Each annotation (@Get, @Body...) attached to a method are stored in a endpoint.
@@ -509,7 +509,7 @@ var EndpointMetadata_1;
  *
  */
 
-let EndpointMetadata = EndpointMetadata_1 = class EndpointMetadata extends JsonEntityStore {
+let EndpointMetadata = class EndpointMetadata extends JsonEntityStore {
   constructor(options) {
     super(_extends({
       store: Store.fromMethod(options.target, options.propertyKey),
@@ -563,21 +563,6 @@ let EndpointMetadata = EndpointMetadata_1 = class EndpointMetadata extends JsonE
   set acceptMimes(mimes) {
     this.store.set("acceptMimes", mimes);
   }
-  /**
-   * Get all endpoints from a given class and his parents.
-   * @param {Type<any>} target
-   * @returns {EndpointMetadata[]}
-   */
-
-
-  static getEndpoints(target) {
-    const operations = getOperationsStores(target);
-    return Array.from(operations.values()).map(endpoint => {
-      endpoint = endpoint.clone();
-      endpoint.token = classOf(target);
-      return endpoint;
-    });
-  }
   /**
    * Get an endpoint.
    * @param target
@@ -639,26 +624,8 @@ let EndpointMetadata = EndpointMetadata_1 = class EndpointMetadata extends JsonE
     return this;
   }
 
-  clone() {
-    const endpoint = new EndpointMetadata_1(_extends({}, this, {
-      target: this.target,
-      propertyKey: this.propertyKey,
-      descriptor: this.descriptor,
-      store: this.store,
-      children: this.children
-    }));
-    endpoint.collectionType = this.collectionType;
-    endpoint._type = this._type;
-    endpoint._operation = this.operation;
-    endpoint._schema = this._schema;
-    endpoint.middlewares = [...this.middlewares];
-    endpoint.afterMiddlewares = [...this.afterMiddlewares];
-    endpoint.beforeMiddlewares = [...this.beforeMiddlewares];
-    return endpoint;
-  }
-
 };
-EndpointMetadata = EndpointMetadata_1 = __decorate([JsonEntityComponent(DecoratorTypes.METHOD), __metadata("design:paramtypes", [Object])], EndpointMetadata);
+EndpointMetadata = __decorate([JsonEntityComponent(DecoratorTypes.METHOD), __metadata("design:paramtypes", [Object])], EndpointMetadata);
 
 function isMetadata(input) {
   return input instanceof HandlerMetadata;
@@ -676,7 +643,7 @@ function createHandlerMetadata(injector, obj, routeOptions = {}) {
   let options;
 
   if (obj instanceof EndpointMetadata) {
-    const provider = injector.getProvider(obj.token);
+    const provider = injector.getProvider(routeOptions.token);
     options = {
       token: provider.token,
       target: provider.useClass,
@@ -1028,6 +995,7 @@ PlatformHandler = __decorate([Injectable({
   scope: ProviderScope.SINGLETON
 }), __metadata("design:paramtypes", [InjectorService, PlatformParams])], PlatformHandler);
 
+const _excluded$3 = ["method", "path", "handlers"];
 var PlatformRouter_1;
 /**
  * @ignore
@@ -1079,15 +1047,15 @@ let PlatformRouter = PlatformRouter_1 = class PlatformRouter {
     const {
       method,
       path,
-      handlers,
-      isFinal
-    } = options; // @ts-ignore
+      handlers
+    } = options,
+          opts = _objectWithoutPropertiesLoose(options, _excluded$3); // @ts-ignore
 
-    this.getRouter()[method](path, ...this.mapHandlers(handlers, {
+
+    this.getRouter()[method](path, ...this.mapHandlers(handlers, _extends({
       method,
-      path,
-      isFinal
-    }));
+      path
+    }, opts)));
     return this;
   }
 
@@ -1376,7 +1344,6 @@ class PlatformControllerBuilder {
     this.provider = provider;
   }
   /**
-   *
    * @returns {any}
    */
 
@@ -1396,48 +1363,32 @@ class PlatformControllerBuilder {
   }
 
   buildEndpoints() {
-    const {
-      endpoints
-    } = this.provider;
-    const operationPaths = new Map();
-
-    const getKey = (method, path) => `${method}-${path}`;
-
-    const updateFinalRouteState = key => {
-      if (operationPaths.has(key)) {
-        operationPaths.get(key).isFinal = false;
-      }
-    };
-
-    const setFinalRoute = (key, operationPath) => {
-      operationPaths.set(key, operationPath);
-      operationPath.isFinal = true;
-    };
-
-    endpoints.forEach(({
-      operation
-    }) => {
-      operation == null ? void 0 : operation.operationPaths.forEach(operationPath => {
-        if (operationPath.method !== OperationMethods.CUSTOM) {
-          const key = getKey(operationPath.method, operationPath.path);
-          updateFinalRouteState(key);
-          updateFinalRouteState(getKey(OperationMethods.ALL, operationPath.path));
-          setFinalRoute(key, operationPath);
-        }
-      });
-    });
-    endpoints.forEach(endpoint => {
-      this.buildEndpoint(endpoint);
+    getOperationsRoutes(this.provider.token).forEach(operationRoute => {
+      this.buildEndpoint(operationRoute);
     });
     return this;
   }
 
-  buildEndpoint(endpoint) {
+  buildEndpoint(operationRoute) {
+    let handlers = this.getMiddlewares(operationRoute);
+    const router = this.provider.getRouter();
+    router.addRoute({
+      handlers,
+      token: operationRoute.token,
+      method: formatMethod(operationRoute.method),
+      path: operationRoute.path,
+      isFinal: operationRoute.isFinal
+    });
+  }
+
+  getMiddlewares(operationRoute) {
+    const {
+      endpoint
+    } = operationRoute;
     const {
       beforeMiddlewares,
       middlewares: mldwrs,
-      afterMiddlewares,
-      operation
+      afterMiddlewares
     } = endpoint;
     const {
       middlewares: {
@@ -1445,35 +1396,15 @@ class PlatformControllerBuilder {
         useAfter
       }
     } = this.provider;
-    const router = this.provider.getRouter(); // Endpoint lifecycle
-
-    let handlers = [];
-    const hasFiles = [...endpoint.children.values()].find(item => item.paramType === ParamTypes.FILES);
-    handlers = handlers.concat(useCtxHandler(bindEndpointMiddleware(endpoint))).concat(PlatformAcceptMimesMiddleware).concat(hasFiles && PlatformMulterMiddleware).concat(beforeMiddlewares) // Endpoint before-middlewares
+    const hasFiles = [...operationRoute.endpoint.children.values()].find(item => item.paramType === ParamTypes.FILES);
+    return [].concat(useCtxHandler(bindEndpointMiddleware(endpoint))).concat(PlatformAcceptMimesMiddleware).concat(hasFiles && PlatformMulterMiddleware).concat(beforeMiddlewares) // Endpoint before-middlewares
     .concat(use) // Controller use-middlewares
     // .concat(endpoint.cache && PlatformCacheMiddleware)
     .concat(mldwrs) // Endpoint middlewares
     .concat(endpoint) // Endpoint metadata
     .concat(afterMiddlewares) // Endpoint after-middlewares
     .concat(useAfter) // Controller after middlewares (equivalent to afterEach)
-    .filter(item => !!item); // Add handlers to the router
-
-    operation == null ? void 0 : operation.operationPaths.forEach(({
-      path,
-      method,
-      isFinal
-    }) => {
-      router.addRoute({
-        method: formatMethod(method),
-        path,
-        handlers,
-        isFinal
-      });
-    });
-
-    if (!(operation != null && operation.operationPaths.size)) {
-      router.use(...handlers);
-    }
+    .filter(item => !!item);
   }
 
   buildChildrenCtrls(injector) {
@@ -1556,7 +1487,7 @@ let PlatformRequest = class PlatformRequest {
   }
 
   get rawBody() {
-    return this.raw.rawBody;
+    return this.raw.rawBody || this.raw.body;
   }
   /**
    * When using `cookie-parser` middleware, this property is an object that contains cookies sent by the request.
@@ -2078,18 +2009,14 @@ class PlatformContext extends DIContext {
 
 }
 
-class PlatformRouteDetails {
-  constructor({
-    provider,
-    endpoint,
-    method,
-    url
-  }) {
-    this.provider = provider;
-    this.endpoint = endpoint;
-    this.method = method;
-    this.url = url;
-    this.rawBody = !!endpoint.params.find(param => param.paramType === ParamTypes.RAW_BODY);
+class PlatformRouteDetails extends JsonOperationRoute {
+  constructor(options = {}) {
+    super(options);
+    this.rawBody = !!this.endpoint.params.find(param => param.paramType === ParamTypes.RAW_BODY);
+  }
+
+  get url() {
+    return this.fullPath;
   }
 
   get name() {
@@ -2128,37 +2055,6 @@ class ControllerProvider extends Provider {
   constructor(provide, options = {}) {
     super(provide, options);
     this.type = ProviderType.CONTROLLER;
-    this.entity = JsonEntityStore.from(provide);
-  }
-
-  get path() {
-    return this.entity.path;
-  }
-
-  set path(path) {
-    this.entity.path = path;
-  }
-  /**
-   *
-   * @returns {EndpointMetadata[]}
-   */
-
-
-  get endpoints() {
-    return EndpointMetadata.getEndpoints(this.provide);
-  }
-
-  get children() {
-    return this.store.get("childrenControllers", []);
-  }
-  /**
-   *
-   * @returns {ControllerProvider}
-   */
-
-
-  get parent() {
-    return this.store.get("parentController");
   }
   /**
    *
@@ -2206,24 +2102,6 @@ class ControllerProvider extends Provider {
     });
     this.store.set("middlewares", mdlwrs);
   }
-  /**
-   *
-   * @returns {boolean}
-   */
-
-
-  hasChildren() {
-    return !!this.children.length;
-  }
-  /**
-   *
-   * @returns {boolean}
-   */
-
-
-  hasParent() {
-    return !!this.store.get("parentController");
-  }
 
   getRouter() {
     return this.router;
@@ -2252,9 +2130,12 @@ let PropertyMetadata = class PropertyMetadata extends JsonEntityStore {
 };
 PropertyMetadata = __decorate([JsonEntityComponent(DecoratorTypes.PROP)], PropertyMetadata);
 
-function getControllerPath(basePath, provider) {
-  return (basePath === provider.path ? provider.path : (basePath || "") + provider.path).replace(/\/\//gi, "/");
-}
+GlobalProviders.createRegistry(ProviderType.CONTROLLER, ControllerProvider, {
+  onInvoke(provider, locals) {
+    locals.set(PlatformRouter, provider.getRouter());
+  }
+
+});
 
 /**
  * `Platform` is used to provide all routes collected by annotation `@Controller`.
@@ -2279,42 +2160,44 @@ let Platform = class Platform {
     return this._routes;
   }
 
-  $onInit() {
-    this.buildControllers();
-  }
-
   addRoutes(routes) {
     routes.forEach(routeSettings => {
       this.addRoute(routeSettings.route, routeSettings.token);
     });
   }
 
-  addRoute(endpoint, token) {
+  addRoute(basePath, token) {
     const {
       injector
     } = this;
+    const provider = injector.getProvider(token);
 
-    if (injector.hasProvider(token)) {
-      const provider = injector.getProvider(token);
-
-      if (provider.type === ProviderType.CONTROLLER) {
-        const route = getControllerPath(endpoint, provider);
-
-        if (!provider.hasParent()) {
-          const routes = this.buildRoutes(route, provider);
+    if (!provider || provider.hasParent()) {
+      return;
+    }
 
-          this._routes.push(...routes);
+    const ctrlPath = concatPath(basePath, JsonEntityStore.from(provider.token).path);
 
-          this._controllers.push({
-            route,
-            provider
-          });
+    this._controllers.push({
+      route: ctrlPath,
+      provider
+    });
 
-          this.app.use(route, ...[].concat(provider.getRouter().callback()));
-        }
+    this.app.use(ctrlPath, ...[].concat(provider.getRouter().callback()));
+    this._routes = getOperationsRoutes(provider.token, {
+      withChildren: true,
+      basePath
+    }).reduce((routes, operationRoute) => {
+      if (injector.hasProvider(token)) {
+        const provider = injector.getProvider(operationRoute.token);
+        const route = new PlatformRouteDetails(_extends({}, operationRoute, {
+          provider
+        }));
+        return routes.concat(route);
       }
-    }
 
+      return routes;
+    }, this._routes);
     return this;
   }
   /**
@@ -2330,6 +2213,10 @@ let Platform = class Platform {
   getMountedControllers() {
     return this._controllers;
   }
+
+  $onInit() {
+    this.buildControllers();
+  }
   /**
    * Create routers from the collected controllers.
    * @private
@@ -2360,38 +2247,6 @@ let Platform = class Platform {
       }
     });
   }
-  /**
-   *
-   * @param ctrl
-   * @param endpointUrl
-   */
-
-
-  buildRoutes(endpointUrl, ctrl) {
-    const {
-      injector
-    } = this;
-    let routes = [];
-    routes = ctrl.children.map(ctrl => injector.getProvider(ctrl)).reduce((routes, provider) => {
-      return routes.concat(this.buildRoutes(`${endpointUrl}${provider.path}`, provider));
-    }, routes);
-    ctrl.endpoints.forEach(endpoint => {
-      endpoint.operationPaths.forEach(({
-        path,
-        method
-      }) => {
-        if (method) {
-          routes.push(new PlatformRouteDetails({
-            provider: ctrl,
-            endpoint,
-            method,
-            url: `${endpointUrl}${path || ""}`.replace(/\/\//gi, "/")
-          }));
-        }
-      });
-    });
-    return routes;
-  }
 
 };
 Platform = __decorate([Injectable({
@@ -2670,7 +2525,6 @@ function getStaticsOptions(statics) {
   }, []);
 }
 
-const SKIP_HOOKS = ["$beforeInit", "$afterInit", "$onInit", "$onMountingMiddlewares"];
 const {
   bind,
   start,
@@ -2681,26 +2535,26 @@ const {
  * @platform
  */
 
-var _rootModule = /*#__PURE__*/_classPrivateFieldLooseKey("rootModule");
-
 var _injector = /*#__PURE__*/_classPrivateFieldLooseKey("injector");
 
 var _providers = /*#__PURE__*/_classPrivateFieldLooseKey("providers");
 
+var _rootModule = /*#__PURE__*/_classPrivateFieldLooseKey("rootModule");
+
 class PlatformBuilder {
   constructor({
     name,
     providers
   }) {
-    Object.defineProperty(this, _rootModule, {
+    Object.defineProperty(this, _injector, {
       writable: true,
       value: void 0
     });
-    Object.defineProperty(this, _injector, {
+    Object.defineProperty(this, _providers, {
       writable: true,
       value: void 0
     });
-    Object.defineProperty(this, _providers, {
+    Object.defineProperty(this, _rootModule, {
       writable: true,
       value: void 0
     });
@@ -2717,7 +2571,7 @@ class PlatformBuilder {
   }
 
   get rootModule() {
-    return _classPrivateFieldLooseBase(this, _rootModule)[_rootModule];
+    return _classPrivateFieldLooseBase(this, _injector)[_injector].get(_classPrivateFieldLooseBase(this, _rootModule)[_rootModule]);
   }
 
   get app() {
@@ -2824,9 +2678,12 @@ class PlatformBuilder {
     const {
       injector
     } = this;
-    await this.callHook("$beforeInit");
     this.log("Build providers");
-    const container = createContainer(constructorOf(this.rootModule));
+    const container = createContainer();
+    container.addProvider(_classPrivateFieldLooseBase(this, _rootModule)[_rootModule], {
+      type: "server:module",
+      scope: ProviderScope.SINGLETON
+    });
     await injector.load(container);
     this.log("Settings and injector loaded");
     await this.callHook("$afterInit");
@@ -2856,26 +2713,18 @@ class PlatformBuilder {
 
   async callHook(hook, ...args) {
     const {
-      injector,
-      rootModule
+      injector
     } = this;
     log(hook);
 
     if (!this.disableBootstrapLog) {
       injector.logger.info(`\x1B[1mCall hook ${hook}\x1B[22m`);
-    } // call hook for the Server
-
-
-    if (hook in rootModule) {
-      await rootModule[hook](...args);
     } // Load middlewares for the given hook
 
 
     this.loadMiddlewaresFor(hook); // call hooks added by providers
 
-    if (!SKIP_HOOKS.includes(hook)) {
-      await injector.emit(hook);
-    }
+    await injector.emit(hook);
   }
 
   async loadStatics(hook) {
@@ -2945,7 +2794,6 @@ class PlatformBuilder {
     this.createInjector(module, _extends({}, settings, {
       PLATFORM_NAME: this.name
     }));
-    this.createRootModule(module);
     await this.runLifecycle();
     return this;
   }
@@ -2994,6 +2842,7 @@ class PlatformBuilder {
   }
 
   createInjector(module, settings) {
+    _classPrivateFieldLooseBase(this, _rootModule)[_rootModule] = module;
     const configuration = getConfiguration(module, settings);
     _classPrivateFieldLooseBase(this, _injector)[_injector] = createInjector(configuration); // configure locals providers
 
@@ -3005,12 +2854,6 @@ class PlatformBuilder {
     createHttpServer(this.injector);
   }
 
-  createRootModule(module) {
-    _classPrivateFieldLooseBase(this, _rootModule)[_rootModule] = this.injector.invoke(module);
-    this.injector.delete(constructorOf(_classPrivateFieldLooseBase(this, _rootModule)[_rootModule]));
-    this.injector.delete(classOf(_classPrivateFieldLooseBase(this, _rootModule)[_rootModule]));
-  }
-
 }
 
 /**
@@ -3167,16 +3010,6 @@ function MultipartFile(name, maxCount) {
   };
 }
 
-/**
- *
- * @param fn
- * @decorator
- */
-
-function EndpointFn(fn) {
-  return JsonEntityFn(fn);
-}
-
 /**
  * Set a mime list which are acceptable and checks if the specified content types are acceptable, based on the request’s Accept HTTP header field.
  *
@@ -3197,9 +3030,18 @@ function EndpointFn(fn) {
  */
 
 function AcceptMime(...mimes) {
-  return useDecorators(Produces(...mimes), EndpointFn(endpoint => {
-    endpoint.acceptMimes = mimes;
-  }));
+  return useDecorators(Produces(...mimes), StoreSet("acceptMimes", mimes));
+}
+
+/**
+ *
+ * @param fn
+ * @decorator
+ * @deprecated Deprecated since 2021-10-05. Use JsonEntityFn instead.
+ */
+
+function EndpointFn(fn) {
+  return JsonEntityFn(fn);
 }
 
 /**
@@ -3572,13 +3414,6 @@ class PlatformTest extends DITest {
 
 }
 
-GlobalProviders.createRegistry(ProviderType.CONTROLLER, ControllerProvider, {
-  onInvoke(provider, locals) {
-    locals.set(PlatformRouter, provider.getRouter());
-  }
-
-});
-
 /**
  * @ignore
  * @deprecated Will be removed in v7