@tsed/common 6.75.8 → 6.75.12

package/lib/builder/PlatformBuilder.d.ts

@@ -105,5 +105,4 @@ export declare abstract class PlatformBuilder<App = TsED.Application, Router = T
     protected logRoutes(): Promise<void>;
     protected loadRoutes(): Promise<void>;
     protected createInjector(module: Type<any>, settings: any): void;
-    protected createRootModule(module: Type<any>): void;
 }

package/lib/decorators/params/endpointInfo.d.ts

@@ -1,5 +1,4 @@
 import { EndpointMetadata } from "../../domain/EndpointMetadata";
-export declare type EndpointInfo = EndpointMetadata;
 /**
  * Get the current endpoint metadata.
  * @decorator
@@ -8,3 +7,7 @@ export declare type EndpointInfo = EndpointMetadata;
  * @deprecated Use `@Context() $ctx: Context` then `$ctx.endpoint` instead.
  */
 export declare function EndpointInfo(): Function;
+/**
+ * @deprecated
+ */
+export declare type EndpointInfo = EndpointMetadata;

package/lib/index.d.ts

@@ -1,3 +1,5 @@
+import "@tsed/logger";
+import "@tsed/logger-file";
 export * from "@tsed/di";
 export * from "@tsed/platform-params";
 export * from "@tsed/platform-exceptions";

package/lib/index.js

@@ -1,3 +1,5 @@
+var logger = require('@tsed/logger');
+require('@tsed/logger-file');
 var di = require('@tsed/di');
 var platformParams = require('@tsed/platform-params');
 var platformExceptions = require('@tsed/platform-exceptions');
@@ -7,7 +9,6 @@ var platformMiddlewares = require('@tsed/platform-middlewares');
 var platformViews = require('@tsed/platform-views');
 var componentsScan = require('@tsed/components-scan');
 var platformLogMiddleware = require('@tsed/platform-log-middleware');
-var logger = require('@tsed/logger');
 var tslib = require('tslib');
 var core = require('@tsed/core');
 var perf = require('@tsed/perf');
@@ -1565,7 +1566,7 @@ exports.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.
@@ -2679,7 +2680,6 @@ function getStaticsOptions(statics) {
   }, []);
 }
 
-const SKIP_HOOKS = ["$beforeInit", "$afterInit", "$onInit", "$onMountingMiddlewares"];
 const {
   bind,
   start,
@@ -2690,26 +2690,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
     });
@@ -2726,7 +2726,7 @@ class PlatformBuilder {
   }
 
   get rootModule() {
-    return _classPrivateFieldLooseBase(this, _rootModule)[_rootModule];
+    return _classPrivateFieldLooseBase(this, _injector)[_injector].get(_classPrivateFieldLooseBase(this, _rootModule)[_rootModule]);
   }
 
   get app() {
@@ -2833,9 +2833,12 @@ class PlatformBuilder {
     const {
       injector
     } = this;
-    await this.callHook("$beforeInit");
     this.log("Build providers");
-    const container = di.createContainer(core.constructorOf(this.rootModule));
+    const container = di.createContainer();
+    container.addProvider(_classPrivateFieldLooseBase(this, _rootModule)[_rootModule], {
+      type: "server:module",
+      scope: di.ProviderScope.SINGLETON
+    });
     await injector.load(container);
     this.log("Settings and injector loaded");
     await this.callHook("$afterInit");
@@ -2865,26 +2868,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) {
@@ -2954,7 +2949,6 @@ class PlatformBuilder {
     this.createInjector(module, _extends({}, settings, {
       PLATFORM_NAME: this.name
     }));
-    this.createRootModule(module);
     await this.runLifecycle();
     return this;
   }
@@ -3003,6 +2997,7 @@ class PlatformBuilder {
   }
 
   createInjector(module, settings) {
+    _classPrivateFieldLooseBase(this, _rootModule)[_rootModule] = module;
     const configuration = di.getConfiguration(module, settings);
     _classPrivateFieldLooseBase(this, _injector)[_injector] = createInjector(configuration); // configure locals providers
 
@@ -3014,12 +3009,6 @@ class PlatformBuilder {
     createHttpServer(this.injector);
   }
 
-  createRootModule(module) {
-    _classPrivateFieldLooseBase(this, _rootModule)[_rootModule] = this.injector.invoke(module);
-    this.injector.delete(core.constructorOf(_classPrivateFieldLooseBase(this, _rootModule)[_rootModule]));
-    this.injector.delete(core.classOf(_classPrivateFieldLooseBase(this, _rootModule)[_rootModule]));
-  }
-
 }
 
 /**