@tsed/common 6.75.11 → 6.75.12

package/lib/index.modern.js

@@ -1,3 +1,6 @@
+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, setLoggerLevel, GlobalProviders, registerProvider, Configuration, createContainer, Container, getConfiguration, DITest } from '@tsed/di';
 export * from '@tsed/di';
 import { ParamTypes, ParamMetadata, PlatformParams, Context, UseParam, mapParamsOptions } from '@tsed/platform-params';
@@ -13,10 +16,8 @@ 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, classOf, prototypeOf, deepMerge, isFunction, DecoratorTypes, isStream, uniq, isBoolean, isNumber, isString, getValue, toMap, StoreMerge, Metadata, useDecorators, useMethodDecorators, 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';
@@ -2670,7 +2671,6 @@ function getStaticsOptions(statics) {
   }, []);
 }
 
-const SKIP_HOOKS = ["$beforeInit", "$afterInit", "$onInit", "$onMountingMiddlewares"];
 const {
   bind,
   start,
@@ -2681,26 +2681,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 +2717,7 @@ class PlatformBuilder {
   }
 
   get rootModule() {
-    return _classPrivateFieldLooseBase(this, _rootModule)[_rootModule];
+    return _classPrivateFieldLooseBase(this, _injector)[_injector].get(_classPrivateFieldLooseBase(this, _rootModule)[_rootModule]);
   }
 
   get app() {
@@ -2824,9 +2824,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 +2859,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 +2940,6 @@ class PlatformBuilder {
     this.createInjector(module, _extends({}, settings, {
       PLATFORM_NAME: this.name
     }));
-    this.createRootModule(module);
     await this.runLifecycle();
     return this;
   }
@@ -2994,6 +2988,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 +3000,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]));
-  }
-
 }
 
 /**