@tsed/platform-http 8.0.0 → 8.0.2

package/.barrelsby.json

@@ -1,5 +1,5 @@
 {
   "directory": ["./src/common", "./src/testing"],
-  "exclude": ["**/__mock__", "**/__mocks__", "**/*.spec.ts", "**/getConfiguration.ts", "FakeResponse.ts"],
+  "exclude": ["**/__mock__", "**/__fixtures__", "**/__mocks__", "**/*.spec.ts", "**/getConfiguration.ts", "FakeResponse.ts"],
   "delete": true
 }

package/lib/esm/common/index.js

@@ -1,7 +1,6 @@
 /**
  * @file Automatically generated by @tsed/barrels.
  */
-export * from "./builder/__fixtures__/PlatformCustom.js";
 export * from "./builder/PlatformBuilder.js";
 export * from "./config/interfaces/PlatformJsonMapperSettings.js";
 export * from "./config/interfaces/PlatformMulterSettings.js";

package/lib/esm/common/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/common/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,cAAc,0CAA0C,CAAC;AACzD,cAAc,8BAA8B,CAAC;AAC7C,cAAc,mDAAmD,CAAC;AAClE,cAAc,+CAA+C,CAAC;AAC9D,cAAc,+CAA+C,CAAC;AAC9D,cAAc,gDAAgD,CAAC;AAC/D,cAAc,4CAA4C,CAAC;AAC3D,cAAc,8BAA8B,CAAC;AAC7C,cAAc,uCAAuC,CAAC;AACtD,cAAc,sCAAsC,CAAC;AACrD,cAAc,sCAAsC,CAAC;AACrD,cAAc,8BAA8B,CAAC;AAC7C,cAAc,6BAA6B,CAAC;AAC5C,cAAc,gCAAgC,CAAC;AAC/C,cAAc,iCAAiC,CAAC;AAChD,cAAc,kCAAkC,CAAC;AACjD,cAAc,iCAAiC,CAAC;AAChD,cAAc,8BAA8B,CAAC;AAC7C,cAAc,6BAA6B,CAAC;AAC5C,cAAc,kCAAkC,CAAC;AACjD,cAAc,cAAc,CAAC;AAC7B,cAAc,iBAAiB,CAAC;AAChC,cAAc,qBAAqB,CAAC;AACpC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,6BAA6B,CAAC;AAC5C,cAAc,iCAAiC,CAAC;AAChD,cAAc,4BAA4B,CAAC;AAC3C,cAAc,8BAA8B,CAAC;AAC7C,cAAc,kCAAkC,CAAC;AACjD,cAAc,6BAA6B,CAAC;AAC5C,cAAc,+BAA+B,CAAC;AAC9C,cAAc,yBAAyB,CAAC;AACxC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,4BAA4B,CAAC;AAC3C,cAAc,8BAA8B,CAAC;AAC7C,cAAc,sCAAsC,CAAC;AACrD,cAAc,qCAAqC,CAAC;AACpD,cAAc,uBAAuB,CAAC;AACtC,cAAc,gDAAgD,CAAC;AAC/D,cAAc,2CAA2C,CAAC;AAC1D,cAAc,wBAAwB,CAAC;AACvC,cAAc,+BAA+B,CAAC;AAC9C,cAAc,mCAAmC,CAAC;AAClD,cAAc,+BAA+B,CAAC;AAC9C,cAAc,wCAAwC,CAAC;AACvD,cAAc,+BAA+B,CAAC;AAC9C,cAAc,gCAAgC,CAAC;AAC/C,cAAc,wBAAwB,CAAC;AACvC,cAAc,0BAA0B,CAAC;AACzC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,8BAA8B,CAAC;AAC7C,cAAc,2BAA2B,CAAC;AAC1C,cAAc,yBAAyB,CAAC;AACxC,cAAc,0BAA0B,CAAC;AACzC,cAAc,8BAA8B,CAAC;AAC7C,cAAc,yBAAyB,CAAC;AACxC,cAAc,gCAAgC,CAAC;AAC/C,cAAc,wBAAwB,CAAC;AACvC,cAAc,+BAA+B,CAAC;AAC9C,cAAc,+BAA+B,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/common/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,cAAc,8BAA8B,CAAC;AAC7C,cAAc,mDAAmD,CAAC;AAClE,cAAc,+CAA+C,CAAC;AAC9D,cAAc,+CAA+C,CAAC;AAC9D,cAAc,gDAAgD,CAAC;AAC/D,cAAc,4CAA4C,CAAC;AAC3D,cAAc,8BAA8B,CAAC;AAC7C,cAAc,uCAAuC,CAAC;AACtD,cAAc,sCAAsC,CAAC;AACrD,cAAc,sCAAsC,CAAC;AACrD,cAAc,8BAA8B,CAAC;AAC7C,cAAc,6BAA6B,CAAC;AAC5C,cAAc,gCAAgC,CAAC;AAC/C,cAAc,iCAAiC,CAAC;AAChD,cAAc,kCAAkC,CAAC;AACjD,cAAc,iCAAiC,CAAC;AAChD,cAAc,8BAA8B,CAAC;AAC7C,cAAc,6BAA6B,CAAC;AAC5C,cAAc,kCAAkC,CAAC;AACjD,cAAc,cAAc,CAAC;AAC7B,cAAc,iBAAiB,CAAC;AAChC,cAAc,qBAAqB,CAAC;AACpC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,6BAA6B,CAAC;AAC5C,cAAc,iCAAiC,CAAC;AAChD,cAAc,4BAA4B,CAAC;AAC3C,cAAc,8BAA8B,CAAC;AAC7C,cAAc,kCAAkC,CAAC;AACjD,cAAc,6BAA6B,CAAC;AAC5C,cAAc,+BAA+B,CAAC;AAC9C,cAAc,yBAAyB,CAAC;AACxC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,4BAA4B,CAAC;AAC3C,cAAc,8BAA8B,CAAC;AAC7C,cAAc,sCAAsC,CAAC;AACrD,cAAc,qCAAqC,CAAC;AACpD,cAAc,uBAAuB,CAAC;AACtC,cAAc,gDAAgD,CAAC;AAC/D,cAAc,2CAA2C,CAAC;AAC1D,cAAc,wBAAwB,CAAC;AACvC,cAAc,+BAA+B,CAAC;AAC9C,cAAc,mCAAmC,CAAC;AAClD,cAAc,+BAA+B,CAAC;AAC9C,cAAc,wCAAwC,CAAC;AACvD,cAAc,+BAA+B,CAAC;AAC9C,cAAc,gCAAgC,CAAC;AAC/C,cAAc,wBAAwB,CAAC;AACvC,cAAc,0BAA0B,CAAC;AACzC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,8BAA8B,CAAC;AAC7C,cAAc,2BAA2B,CAAC;AAC1C,cAAc,yBAAyB,CAAC;AACxC,cAAc,0BAA0B,CAAC;AACzC,cAAc,8BAA8B,CAAC;AAC7C,cAAc,yBAAyB,CAAC;AACxC,cAAc,gCAAgC,CAAC;AAC/C,cAAc,wBAAwB,CAAC;AACvC,cAAc,+BAA+B,CAAC;AAC9C,cAAc,+BAA+B,CAAC"}

package/lib/types/common/fn/adapter.d.ts

@@ -1,5 +1,5 @@
 import { Type } from "@tsed/core";
-import { PlatformAdapter } from "../services/PlatformAdapter.js";
+import type { PlatformAdapter } from "../services/PlatformAdapter.js";
 /**
  * Set the platform adapter
  */

package/lib/types/common/index.d.ts

@@ -1,7 +1,6 @@
 /**
  * @file Automatically generated by @tsed/barrels.
  */
-export * from "./builder/__fixtures__/PlatformCustom.js";
 export * from "./builder/PlatformBuilder.js";
 export * from "./config/interfaces/PlatformJsonMapperSettings.js";
 export * from "./config/interfaces/PlatformMulterSettings.js";

package/package.json

@@ -2,18 +2,20 @@
   "name": "@tsed/platform-http",
   "description": "A TypeScript Framework on top of Express",
   "type": "module",
-  "version": "8.0.0",
+  "version": "8.0.2",
   "source": "./src/common/index.ts",
   "main": "./lib/esm/common/index.js",
   "module": "./lib/esm/common/index.js",
   "typings": "./lib/types/common/index.d.ts",
   "exports": {
     ".": {
+      "@tsed/source": "./src/index.ts",
       "types": "./lib/types/common/index.d.ts",
       "import": "./lib/esm/common/index.js",
       "default": "./lib/esm/common/index.js"
     },
     "./testing": {
+      "@tsed/source": "./src/testing/index.ts",
       "types": "./lib/types/testing/index.d.ts",
       "import": "./lib/esm/testing/index.js",
       "default": "./lib/esm/testing/index.js"
@@ -21,7 +23,7 @@
   },
   "scripts": {
     "build": "yarn barrels && yarn build:ts",
-    "barrels": "barrels -e \"getConfiguration\"",
+    "barrels": "barrels",
     "test": "vitest run",
     "build:ts": "tsc --build tsconfig.json",
     "test:ci": "vitest run --coverage.thresholds.autoUpdate=true"
@@ -68,29 +70,29 @@
     }
   ],
   "dependencies": {
-    "@tsed/core": "8.0.0",
-    "@tsed/di": "8.0.0",
-    "@tsed/exceptions": "8.0.0",
-    "@tsed/hooks": "8.0.0",
-    "@tsed/json-mapper": "8.0.0",
+    "@tsed/core": "8.0.2",
+    "@tsed/di": "8.0.2",
+    "@tsed/exceptions": "8.0.2",
+    "@tsed/hooks": "8.0.2",
+    "@tsed/json-mapper": "8.0.2",
     "@tsed/logger": "^6.7.8",
     "@tsed/logger-file": "^6.7.8",
-    "@tsed/platform-exceptions": "8.0.0",
-    "@tsed/platform-middlewares": "8.0.0",
-    "@tsed/platform-params": "8.0.0",
-    "@tsed/platform-response-filter": "8.0.0",
-    "@tsed/platform-router": "8.0.0",
-    "@tsed/platform-views": "8.0.0",
-    "@tsed/schema": "8.0.0",
+    "@tsed/platform-exceptions": "8.0.2",
+    "@tsed/platform-middlewares": "8.0.2",
+    "@tsed/platform-params": "8.0.2",
+    "@tsed/platform-response-filter": "8.0.2",
+    "@tsed/platform-router": "8.0.2",
+    "@tsed/platform-views": "8.0.2",
+    "@tsed/schema": "8.0.2",
     "@types/json-schema": "7.0.15",
     "accepts": "^1.3.8",
     "tslib": "2.7.0",
     "uuid": "10.0.0"
   },
   "devDependencies": {
-    "@tsed/barrels": "8.0.0",
-    "@tsed/engines": "8.0.0",
-    "@tsed/typescript": "8.0.0",
+    "@tsed/barrels": "8.0.2",
+    "@tsed/engines": "8.0.2",
+    "@tsed/typescript": "8.0.2",
     "cross-env": "7.0.3",
     "eslint": "9.12.0",
     "typescript": "5.4.5",

package/src/common/builder/PlatformBuilder.spec.ts

@@ -0,0 +1,331 @@
+import {catchAsyncError} from "@tsed/core";
+import {Configuration, configuration, Controller, destroyInjector, Injectable, injector, Module} from "@tsed/di";
+import {$asyncEmit} from "@tsed/hooks";
+
+import {FakeAdapter} from "../../testing/index.js";
+import {AfterInit} from "../interfaces/AfterInit.js";
+import {AfterListen} from "../interfaces/AfterListen.js";
+import {AfterRoutesInit} from "../interfaces/AfterRoutesInit.js";
+import {BeforeInit} from "../interfaces/BeforeInit.js";
+import {BeforeListen} from "../interfaces/BeforeListen.js";
+import {BeforeRoutesInit} from "../interfaces/BeforeRoutesInit.js";
+import {OnReady} from "../interfaces/OnReady.js";
+import {Platform} from "../services/Platform.js";
+import {PlatformCustom} from "./__fixtures__/PlatformCustom.js";
+import {PlatformBuilder} from "./PlatformBuilder.js";
+
+vi.mock("@tsed/hooks", async (importOriginal) => {
+  const mod = await importOriginal<typeof import("@tsed/hooks")>();
+
+  return {
+    ...mod,
+    $asyncEmit: vi.fn()
+  };
+});
+
+@Controller("/")
+class RestCtrl {}
+
+@Controller("/")
+class HealthCtrl {}
+
+@Module({
+  mount: {
+    "/heath": [HealthCtrl]
+  }
+})
+class HealthModule {}
+
+const settings = {
+  logger: {
+    level: "off"
+  },
+  mount: {
+    "/rest": [RestCtrl]
+  },
+  acceptMimes: ["application/json"],
+  imports: [HealthModule]
+};
+
+@Configuration(settings as any)
+class ServerModule implements BeforeInit, AfterInit, BeforeRoutesInit, AfterRoutesInit, BeforeListen, AfterListen, OnReady {
+  constructor() {}
+
+  $beforeRoutesInit(): void | Promise<any> {
+    return undefined;
+  }
+
+  $afterRoutesInit(): void | Promise<any> {
+    return undefined;
+  }
+
+  $afterInit(): void | Promise<any> {
+    return undefined;
+  }
+
+  $afterListen(): void | Promise<any> {
+    return undefined;
+  }
+
+  $beforeInit(): void | Promise<any> {
+    return undefined;
+  }
+
+  $beforeListen(): void | Promise<any> {
+    return undefined;
+  }
+
+  $onReady(): void | Promise<any> {
+    return undefined;
+  }
+}
+
+describe("PlatformBuilder", () => {
+  describe("loadStatics()", () => {
+    it("should loadStatics", async () => {
+      // WHEN
+      const platform = await PlatformCustom.bootstrap(ServerModule, {
+        httpPort: false,
+        httpsPort: false,
+        statics: {
+          "/": ["/root", {root: "/root2", test: "test", hook: "$beforeRoutesInit"}]
+        }
+      });
+
+      vi.spyOn(platform.app, "statics").mockReturnValue(undefined as any);
+
+      await platform.loadStatics("$beforeRoutesInit");
+
+      expect(platform.app.statics).toHaveBeenCalledWith("/", {
+        hook: "$beforeRoutesInit",
+        root: "/root2",
+        test: "test"
+      });
+    });
+  });
+  describe("loadMiddlewaresFor()", () => {
+    it("should load middlewares", async () => {
+      const middlewares: any[] = [
+        {
+          hook: "$beforeRoutesInit",
+          use: vi.fn()
+        },
+        {
+          hook: "$afterRoutesInit",
+          use: vi.fn()
+        },
+        vi.fn()
+      ];
+      // WHEN
+      const platform = await PlatformCustom.bootstrap(ServerModule, {
+        httpPort: false,
+        httpsPort: false,
+        middlewares
+      });
+
+      vi.spyOn(platform.app, "use").mockReturnValue(undefined as any);
+
+      // @ts-ignore
+      platform.loadMiddlewaresFor("$beforeRoutesInit");
+
+      expect(platform.app.use).toHaveBeenCalledWith(middlewares[0].use);
+      expect(platform.app.use).toHaveBeenCalledWith(middlewares[2]);
+    });
+    it("should throw an error when a Ts.ED middleware is added on $afterInit hook", async () => {
+      const middlewares: any[] = [
+        {
+          hook: "$afterInit",
+          use: class TestMiddleware {}
+        }
+      ];
+      // WHEN
+      const error = await catchAsyncError(() =>
+        PlatformCustom.bootstrap(ServerModule, {
+          httpPort: false,
+          httpsPort: false,
+          middlewares
+        })
+      );
+
+      expect(error?.message).toEqual(
+        'Ts.ED Middleware "TestMiddleware" middleware cannot be added on $afterInit hook. Use one of this hooks instead: $beforeRoutesInit, $onRoutesInit, $afterRoutesInit, $beforeListen, $afterListen, $onReady'
+      );
+    });
+    it("should throw an error when a Ts.ED middleware is added on $beforeInit hook", async () => {
+      const middlewares: any[] = [
+        {
+          hook: "$beforeInit",
+          use: class TestMiddleware {}
+        }
+      ];
+      // WHEN
+      const error = await catchAsyncError(() =>
+        PlatformCustom.bootstrap(ServerModule, {
+          httpPort: false,
+          httpsPort: false,
+          middlewares
+        })
+      );
+
+      expect(error?.message).toEqual(
+        'Ts.ED Middleware "TestMiddleware" middleware cannot be added on $beforeInit hook. Use one of this hooks instead: $beforeRoutesInit, $onRoutesInit, $afterRoutesInit, $beforeListen, $afterListen, $onReady'
+      );
+    });
+    it("should throw an error when a Ts.ED middleware is added on $onInit hook", async () => {
+      const middlewares: any[] = [
+        {
+          hook: "$onInit",
+          use: class TestMiddleware {}
+        }
+      ];
+      // WHEN
+      const error = await catchAsyncError(() =>
+        PlatformCustom.bootstrap(ServerModule, {
+          httpPort: false,
+          httpsPort: false,
+          middlewares
+        })
+      );
+
+      expect(error?.message).toEqual(
+        'Ts.ED Middleware "TestMiddleware" middleware cannot be added on $onInit hook. Use one of this hooks instead: $beforeRoutesInit, $onRoutesInit, $afterRoutesInit, $beforeListen, $afterListen, $onReady'
+      );
+    });
+  });
+  describe("boostrap", () => {
+    beforeEach(() => {
+      destroyInjector();
+      const inj = injector();
+      vi.spyOn(ServerModule.prototype, "$beforeRoutesInit").mockReturnValue(undefined);
+      vi.spyOn(ServerModule.prototype, "$afterRoutesInit").mockReturnValue(undefined);
+      vi.spyOn(ServerModule.prototype, "$afterInit").mockReturnValue(undefined);
+      vi.spyOn(ServerModule.prototype, "$afterListen").mockReturnValue(undefined);
+      vi.spyOn(ServerModule.prototype, "$beforeInit").mockReturnValue(undefined);
+      vi.spyOn(ServerModule.prototype, "$beforeListen").mockReturnValue(undefined);
+      vi.spyOn(ServerModule.prototype, "$onReady").mockReturnValue(undefined);
+      vi.spyOn(PlatformBuilder.prototype, "loadStatics");
+      // @ts-ignore
+      vi.spyOn(PlatformBuilder.prototype, "listenServers");
+      vi.spyOn(Platform.prototype, "addRoutes").mockReturnValue(undefined);
+    });
+
+    describe("static boostrap()", () => {
+      it("should boostrap a custom platform", async () => {
+        const result = await PlatformBuilder.bootstrap(ServerModule, {
+          adapter: FakeAdapter
+        });
+
+        expect(result).toBeInstanceOf(PlatformBuilder);
+      });
+    });
+    describe("static create()", () => {
+      it("should boostrap a custom platform", () => {
+        PlatformBuilder.create(ServerModule, {
+          adapter: FakeAdapter
+        });
+
+        expect(configuration().get("httpPort")).toEqual(false);
+        expect(configuration().get("httpsPort")).toEqual(false);
+      });
+    });
+    describe("bootstrap()", () => {
+      it("should bootstrap platform", async () => {
+        // WHEN
+        vi.mocked($asyncEmit).mockResolvedValue(undefined);
+
+        const stub = ServerModule.prototype.$beforeRoutesInit;
+        const server = await PlatformCustom.bootstrap(ServerModule, {
+          httpPort: false,
+          httpsPort: false
+        });
+        // THEN
+        await server.listen();
+
+        // THEN
+        // @ts-ignore
+        expect(server.listenServers).toHaveBeenCalledWith();
+        expect(server.loadStatics).toHaveBeenCalledWith("$beforeRoutesInit");
+        expect(server.loadStatics).toHaveBeenCalledWith("$afterRoutesInit");
+        expect($asyncEmit).toHaveBeenCalledWith("$afterInit", []);
+        expect($asyncEmit).toHaveBeenCalledWith("$beforeRoutesInit", []);
+        expect($asyncEmit).toHaveBeenCalledWith("$afterRoutesInit", []);
+        expect($asyncEmit).toHaveBeenCalledWith("$afterListen", []);
+        expect($asyncEmit).toHaveBeenCalledWith("$beforeListen", []);
+        expect($asyncEmit).toHaveBeenCalledWith("$onReady", []);
+
+        // THEN
+        expect(server.rootModule).toBeInstanceOf(ServerModule);
+        expect(stub).toHaveBeenCalled();
+        expect(server.name).toEqual("custom");
+
+        await server.stop();
+        expect($asyncEmit).toHaveBeenCalledWith("$onDestroy", []);
+      });
+    });
+    describe("adapter()", () => {
+      it("should boostrap a custom platform", async () => {
+        const platformBuilder = await PlatformBuilder.bootstrap(ServerModule, {
+          adapter: FakeAdapter
+        });
+
+        expect(platformBuilder.callback()).toBeInstanceOf(Function);
+
+        expect(platformBuilder.adapter).toBeInstanceOf(FakeAdapter);
+      });
+
+      it("should listen a custom platform", async () => {
+        const platform = await PlatformBuilder.create(ServerModule, {
+          adapter: FakeAdapter
+        });
+
+        await platform.listen();
+      });
+    });
+  });
+  describe("useProvider()", () => {
+    it("should add provider", async () => {
+      // WHEN
+      const server = PlatformCustom.create(ServerModule, {
+        httpPort: false,
+        httpsPort: false
+      });
+
+      @Injectable()
+      class Token {}
+
+      server.useProvider(Token, {});
+
+      await server.bootstrap();
+
+      expect(server.injector.get(Token)).toBeInstanceOf(Token);
+    });
+  });
+  describe("addControllers", () => {
+    beforeEach(() => destroyInjector());
+    it("should add controllers", async () => {
+      // GIVEN
+      const server = await PlatformCustom.bootstrap(ServerModule, {});
+
+      class MyClass {}
+
+      // WHEN
+      server.addControllers("/test", MyClass);
+
+      // THEN
+      expect(server.injector.settings.routes).toEqual([
+        {
+          route: "/heath",
+          token: HealthCtrl
+        },
+        {
+          route: "/rest",
+          token: RestCtrl
+        },
+        {
+          route: "/test",
+          token: MyClass
+        }
+      ]);
+    });
+  });
+});