@tsed/common 6.82.0 → 6.85.0

package/lib/index.modern.js

@@ -1,7 +1,7 @@
 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';
+import { DIConfiguration, Injectable, ProviderScope, Inject, InjectorService, Constant, Scope, DIContext, Provider, ProviderType, GlobalProviders, setLoggerLevel, registerProvider, Configuration, createContainer, colors, DITest } from '@tsed/di';
 export * from '@tsed/di';
 import { ParamTypes, PlatformParams, Context, UseParam, mapParamsOptions } from '@tsed/platform-params';
 export * from '@tsed/platform-params';
@@ -17,8 +17,7 @@ import { importProviders } from '@tsed/components-scan';
 export * from '@tsed/components-scan';
 export * from '@tsed/platform-log-middleware';
 import { __decorate, __metadata, __param } from 'tslib';
-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 { AnyToPromise, AnyToPromiseStatus, nameOf, Store, descriptorOf, prototypeOf, deepMerge, isFunction, DecoratorTypes, isStream, uniq, isBoolean, isNumber, isString, getValue, Env, toMap, StoreMerge, Metadata, useDecorators, useMethodDecorators, StoreSet, isClass } from '@tsed/core';
 import { Exception, NotAcceptable } from '@tsed/exceptions';
 import { JsonParameterStore, JsonMethodStore, JsonEntityStore, JsonEntityComponent, getOperationsRoutes, OperationMethods, JsonOperationRoute, JsonPropertyStore, getProperties, concatPath, Returns, Consumes, Produces, JsonEntityFn } from '@tsed/schema';
 export { All, Delete, Get, Head, Location, Options, Patch, Post, Put, Redirect } from '@tsed/schema';
@@ -82,27 +81,7 @@ const rootDir = process.cwd();
 let PlatformConfiguration = PlatformConfiguration_1 = class PlatformConfiguration extends DIConfiguration {
   constructor() {
     super({
-      rootDir,
-      env: process.env.NODE_ENV || Env.DEV,
-      httpPort: 8080,
-      httpsPort: false,
-      scopes: {
-        [ProviderType.CONTROLLER]: ProviderScope.SINGLETON
-      },
-      logger: {
-        debug: false,
-        level: "info",
-        logRequest: true,
-        jsonIndentation: process.env.NODE_ENV === Env.PROD ? 0 : 2
-      },
-      errors: {
-        headerName: "errors"
-      },
-      mount: {
-        "/rest": "${rootDir}/controllers/**/*.ts"
-      },
-      exclude: ["**/*.spec.ts", "**/*.spec.js"],
-      componentsScan: ["${rootDir}/mvc/**/*.ts", "${rootDir}/services/**/*.ts", "${rootDir}/middlewares/**/*.ts"]
+      rootDir
     });
   }
 
@@ -2500,45 +2479,81 @@ function getStaticsOptions(statics) {
   }, []);
 }
 
-const {
-  bind,
-  start,
-  end,
-  log
-} = PerfLogger.get("bootstrap");
+function getConfiguration(configuration = {}, module = null) {
+  const store = module ? Store.from(module).get("configuration") || {} : {};
+  const env = configuration.env || store.mount || process.env.NODE_ENV || Env.DEV;
+
+  const config = _extends({
+    exclude: ["**/*.spec.ts", "**/*.spec.js"],
+    componentsScan: ["${rootDir}/mvc/**/*.ts", "${rootDir}/services/**/*.ts", "${rootDir}/middlewares/**/*.ts"],
+    env,
+    httpPort: 8080,
+    httpsPort: false
+  }, store, configuration, {
+    scopes: _extends({
+      [ProviderType.CONTROLLER]: ProviderScope.SINGLETON
+    }, store.scopes, configuration.scopes),
+    mount: store.mount || configuration.mount ? deepMerge(store.mount || {}, configuration.mount || {}) : {
+      "/rest": "${rootDir}/controllers/**/*.ts"
+    },
+    logger: _extends({
+      debug: false,
+      level: env === Env.TEST ? "off" : "info",
+      logRequest: true
+    }, store.logger, configuration.logger, {
+      jsonIndentation: process.env.NODE_ENV === Env.PROD ? 0 : 2
+    })
+  });
+
+  if (!configuration.disableComponentsScan && store.componentsScan && configuration.componentsScan) {
+    config.componentsScan = [...store.componentsScan, ...configuration.componentsScan];
+  }
+
+  return config;
+}
+
+const DEFAULT_PROVIDERS = [{
+  provide: PlatformHandler
+}, {
+  provide: PlatformResponse
+}, {
+  provide: PlatformRequest
+}, {
+  provide: PlatformRouter
+}, {
+  provide: PlatformApplication
+}, {
+  provide: Platform
+}];
 /**
  * @platform
  */
 
 var _injector = /*#__PURE__*/_classPrivateFieldLooseKey("injector");
 
-var _providers = /*#__PURE__*/_classPrivateFieldLooseKey("providers");
-
 var _rootModule = /*#__PURE__*/_classPrivateFieldLooseKey("rootModule");
 
 class PlatformBuilder {
   constructor({
     name,
-    providers
+    providers,
+    settings,
+    module
   }) {
     Object.defineProperty(this, _injector, {
       writable: true,
       value: void 0
     });
-    Object.defineProperty(this, _providers, {
-      writable: true,
-      value: void 0
-    });
     Object.defineProperty(this, _rootModule, {
       writable: true,
       value: void 0
     });
     this.name = "";
     this.startedAt = new Date();
+    this.current = new Date();
     this.name = name;
-    _classPrivateFieldLooseBase(this, _providers)[_providers] = toMap(providers, "provide");
-    this.locals = new Container();
-    this.useProvider(PlatformHandler, _classPrivateFieldLooseBase(this, _providers)[_providers].get(PlatformHandler)).useProvider(PlatformResponse, _classPrivateFieldLooseBase(this, _providers)[_providers].get(PlatformResponse)).useProvider(PlatformRequest, _classPrivateFieldLooseBase(this, _providers)[_providers].get(PlatformRequest)).useProvider(PlatformRouter, _classPrivateFieldLooseBase(this, _providers)[_providers].get(PlatformRouter)).useProvider(PlatformApplication, _classPrivateFieldLooseBase(this, _providers)[_providers].get(PlatformApplication)).useProvider(Platform, _classPrivateFieldLooseBase(this, _providers)[_providers].get(Platform));
+    _classPrivateFieldLooseBase(this, _rootModule)[_rootModule] = module;
+    this.createInjector(module, providers, settings);
   }
 
   get injector() {
@@ -2593,15 +2608,25 @@ class PlatformBuilder {
     return (_this$settings$logger = this.settings.logger) == null ? void 0 : _this$settings$logger.disableBootstrapLog;
   }
 
-  static build(platformBuildClass) {
+  static build(platformBuildClass, module, settings = {}) {
     return new platformBuildClass({
       name: nameOf(platformBuildClass).replace("Platform", "").toLowerCase(),
+      module,
+      settings,
       providers: platformBuildClass.providers
     });
   }
 
+  callback(req, res) {
+    if (req && res) {
+      return this.app.callback()(req, res);
+    }
+
+    return this.app.callback();
+  }
+
   log(...data) {
-    return this.disableBootstrapLog && this.logger.info(...data);
+    return !this.disableBootstrapLog && this.logger.info(...data, this.diff());
   }
   /**
    * Add classes to the components list
@@ -2647,6 +2672,7 @@ class PlatformBuilder {
     this.useRouter();
     await this.loadRoutes();
     await this.logRoutes();
+    return this;
   }
 
   async loadInjector() {
@@ -2660,7 +2686,7 @@ class PlatformBuilder {
       scope: ProviderScope.SINGLETON
     });
     await injector.load(container);
-    this.log("Settings and injector loaded");
+    this.log("Settings and injector loaded...");
     await this.callHook("$afterInit");
   }
 
@@ -2669,7 +2695,6 @@ class PlatformBuilder {
     await this.listenServers();
     await this.callHook("$afterListen");
     await this.ready();
-    end();
   }
 
   async stop() {
@@ -2690,16 +2715,15 @@ class PlatformBuilder {
     const {
       injector
     } = this;
-    log(hook);
 
     if (!this.disableBootstrapLog) {
-      injector.logger.info(`\x1B[1mCall hook ${hook}\x1B[22m`);
+      injector.logger.debug(`\x1B[1mCall hook ${hook}\x1B[22m`);
     } // Load middlewares for the given hook
 
 
     this.loadMiddlewaresFor(hook); // call hooks added by providers
 
-    await injector.emit(hook);
+    await injector.emit(hook, ...args);
   }
 
   async loadStatics(hook) {
@@ -2715,10 +2739,20 @@ class PlatformBuilder {
   }
 
   useProvider(token, settings) {
-    this.locals.addProvider(token, settings);
+    this.injector.addProvider(token, settings);
     return this;
   }
 
+  async bootstrap() {
+    return this.runLifecycle();
+  }
+
+  diff() {
+    const ms = colors.yellow(`+${new Date().getTime() - this.current.getTime()}ms`);
+    this.current = new Date();
+    return ms;
+  }
+
   async importProviders() {
     this.injector.logger.debug("Scan components");
     const providers = await importProviders(this.injector.settings, ["imports", "mount", "componentsScan"]);
@@ -2730,6 +2764,7 @@ class PlatformBuilder {
       token
     }));
     this.settings.set("routes", routes);
+    this.log("Providers loaded...");
   }
   /**
    * Load middlewares from configuration for the given hook
@@ -2754,25 +2789,6 @@ class PlatformBuilder {
     return this;
   }
 
-  async bootstrap(module, settings = {}) {
-    var _settings$logger;
-
-    // istanbul ignore next
-    if ((_settings$logger = settings.logger) != null && _settings$logger.perf) {
-      start();
-      bind(this);
-      settings.logger = _extends({}, settings.logger, {
-        level: "off"
-      });
-    }
-
-    this.createInjector(module, _extends({}, settings, {
-      PLATFORM_NAME: this.name
-    }));
-    await this.runLifecycle();
-    return this;
-  }
-
   async listenServers() {
     await Promise.all([listenHttpServer(this.injector), listenHttpsServer(this.injector)]);
   }
@@ -2784,9 +2800,9 @@ class PlatformBuilder {
       logger,
       platform
     } = this;
+    this.log("Routes mounted...");
 
     if (!((_this$settings$logger2 = this.settings.logger) != null && _this$settings$logger2.disableRoutesSummary) && !this.disableBootstrapLog) {
-      logger.info("Routes mounted :");
       logger.info(printRoutes(await this.injector.alterAsync("$logRoutes", platform.getRoutes())));
     }
   }
@@ -2816,17 +2832,18 @@ class PlatformBuilder {
     await this.callHook("$afterRoutesInit");
   }
 
-  createInjector(module, settings) {
-    _classPrivateFieldLooseBase(this, _rootModule)[_rootModule] = module;
-    const configuration = getConfiguration(module, settings);
-    _classPrivateFieldLooseBase(this, _injector)[_injector] = createInjector(configuration); // configure locals providers
-
-    this.locals.forEach(provider => {
-      this.injector.addProvider(provider.token, provider);
+  createInjector(module, providers, settings) {
+    const configuration = getConfiguration(settings, module);
+    configuration.PLATFORM_NAME = this.name;
+    _classPrivateFieldLooseBase(this, _injector)[_injector] = createInjector(configuration);
+    providers = [...DEFAULT_PROVIDERS, ...providers];
+    toMap(providers, "provide").forEach((provider, token) => {
+      this.injector.addProvider(token, provider);
     });
     createPlatformApplication(this.injector);
     createHttpsServer(this.injector);
     createHttpServer(this.injector);
+    this.log("Injector created...");
   }
 
 }
@@ -3202,7 +3219,7 @@ function mapReturnedResponse(_ref) {
 
 class PlatformTest extends DITest {
   static async create(options = {}) {
-    DITest.injector = PlatformTest.createInjector(options);
+    DITest.injector = PlatformTest.createInjector(getConfiguration(options, null));
     const container = createContainer();
     await DITest.injector.load(container);
   }
@@ -3234,7 +3251,8 @@ class PlatformTest extends DITest {
       } // @ts-ignore
 
 
-      instance = await PlatformBuilder.build(platform).bootstrap(mod, DITest.configure(settings));
+      settings = DITest.configure(settings);
+      instance = await PlatformBuilder.build(platform, mod, settings).bootstrap();
 
       if (!settings.listen) {
         await instance.callHook("$beforeListen");