@tsed/platform-http 8.16.0-rc.1 → 8.16.0-rc.2

package/lib/esm/common/builder/PlatformBuilder.js

@@ -1,7 +1,6 @@
-import { isClass, isFunction, isString, nameOf } from "@tsed/core";
-import { colors, configuration, constant, createContainer, destroyInjector, injector, logger, ProviderScope, setLoggerConfiguration } from "@tsed/di";
-import { $asyncAlter, $asyncEmit } from "@tsed/hooks";
-import { getMiddlewaresForHook } from "@tsed/platform-middlewares";
+import "@tsed/platform-accept-mimes";
+import { colors, configuration, constant, createContainer, destroyInjector, injector, logger, ProviderScope } from "@tsed/di";
+import { $alter, $asyncAlter, $asyncEmit } from "@tsed/hooks";
 import { application } from "../fn/application.js";
 import { Platform } from "../services/Platform.js";
 import { PlatformAdapter } from "../services/PlatformAdapter.js";
@@ -133,9 +132,6 @@ export class PlatformBuilder {
     async runLifecycle() {
         // init adapter (Express, Koa, etc...)
         await this.adapter.onInit();
-        setLoggerConfiguration();
-        // create the middleware mapping to be executed to the expected hook
-        await this.mapTokenMiddlewares();
         await this.loadInjector();
         // add the context middleware to the application
         this.log("Mount app context");
@@ -244,7 +240,8 @@ export class PlatformBuilder {
      * @protected
      */
     loadMiddlewaresFor(hook) {
-        return getMiddlewaresForHook(hook, this.settings, "$beforeRoutesInit").forEach(({ use }) => {
+        const middlewares = $alter("$alterMiddlewaresForHook", constant("middlewares", []), [hook]);
+        return middlewares.forEach(({ use }) => {
             this.app.use(use);
         });
     }
@@ -269,42 +266,4 @@ export class PlatformBuilder {
             logger().info(printRoutes(await $asyncAlter("$logRoutes", routes)));
         }
     }
-    async mapTokenMiddlewares() {
-        let middlewares = constant("middlewares", []);
-        const env = constant("env");
-        const defaultHook = "$beforeRoutesInit";
-        const promises = middlewares.map(async (middleware) => {
-            if (isFunction(middleware)) {
-                return {
-                    env,
-                    hook: defaultHook,
-                    use: middleware
-                };
-            }
-            if (isString(middleware)) {
-                middleware = { env, use: middleware, hook: defaultHook };
-            }
-            let { use, options } = middleware;
-            if (isString(use)) {
-                if (["text-parser", "raw-parser", "json-parser", "urlencoded-parser"].includes(use)) {
-                    use = this.adapter.bodyParser(use.replace("-parser", ""), options);
-                }
-                else {
-                    const mod = await import(use);
-                    use = (mod.default || mod)(options);
-                }
-            }
-            if (isClass(use) && ["$beforeInit", "$onInit", "$afterInit"].includes(middleware.hook)) {
-                throw new Error(`Ts.ED Middleware "${nameOf(use)}" middleware cannot be added on ${middleware.hook} hook. Use one of this hooks instead: $beforeRoutesInit, $onRoutesInit, $afterRoutesInit, $beforeListen, $afterListen, $onReady`);
-            }
-            return {
-                env,
-                hook: defaultHook,
-                ...middleware,
-                use
-            };
-        });
-        middlewares = await Promise.all(promises);
-        configuration().set("middlewares", middlewares.filter((middleware) => middleware.use));
-    }
 }

package/lib/esm/common/middlewares/PlatformAcceptMimesMiddleware.js

@@ -1,35 +1,5 @@
-import { __decorate, __metadata, __param } from "tslib";
-import { uniq } from "@tsed/core";
-import { constant, injectable, ProviderType } from "@tsed/di";
-import { NotAcceptable } from "@tsed/exceptions";
-import { Context } from "@tsed/platform-params";
+import { PlatformAcceptMimesMiddleware as M } from "@tsed/platform-accept-mimes";
 /**
- * @middleware
- * @platform
+ * @deprecated Since version 8.16. Use PlatformAcceptMiddleware from @tsed/platform-accept-mimes package
  */
-export class PlatformAcceptMimesMiddleware {
-    constructor() {
-        this.acceptMimes = constant("acceptMimes", []);
-    }
-    $alterEndpointHandlers(handlers, operationRoute) {
-        const hasAcceptMimes = operationRoute.endpoint.acceptMimes.length || this.acceptMimes.length;
-        return {
-            ...handlers,
-            before: [hasAcceptMimes && PlatformAcceptMimesMiddleware, ...handlers.before].filter(Boolean)
-        };
-    }
-    use(ctx) {
-        const { endpoint, request } = ctx;
-        const mimes = uniq((endpoint?.get("acceptMimes") || []).concat(this.acceptMimes));
-        if (mimes.length && !request.accepts(mimes)) {
-            throw new NotAcceptable(mimes.join(", "));
-        }
-    }
-}
-__decorate([
-    __param(0, Context()),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", [Object]),
-    __metadata("design:returntype", void 0)
-], PlatformAcceptMimesMiddleware.prototype, "use", null);
-injectable(PlatformAcceptMimesMiddleware).type(ProviderType.MIDDLEWARE).priority(-10);
+export const PlatformAcceptMimesMiddleware = M;

package/lib/types/common/builder/PlatformBuilder.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="node" resolution-mode="require"/>
+import "@tsed/platform-accept-mimes";
 import type { IncomingMessage, ServerResponse } from "node:http";
 import { Type } from "@tsed/core";
 import { InjectorService, ProviderOpts, TokenProvider } from "@tsed/di";
@@ -98,5 +99,4 @@ export declare class PlatformBuilder<App = TsED.Application> {
     protected createHttpServers(): void;
     protected listenServers(): Promise<void>;
     protected logRoutes(layers: PlatformLayer[]): Promise<void>;
-    protected mapTokenMiddlewares(): Promise<void>;
 }

package/lib/types/common/middlewares/PlatformAcceptMimesMiddleware.d.ts

@@ -1,17 +1,5 @@
-import { MiddlewareMethods } from "@tsed/platform-middlewares";
-import { Context } from "@tsed/platform-params";
-import type { AlterEndpointHandlersArg } from "@tsed/platform-router";
-import type { JsonOperationRoute } from "@tsed/schema";
+import { PlatformAcceptMimesMiddleware as M } from "@tsed/platform-accept-mimes";
 /**
- * @middleware
- * @platform
+ * @deprecated Since version 8.16. Use PlatformAcceptMiddleware from @tsed/platform-accept-mimes package
  */
-export declare class PlatformAcceptMimesMiddleware implements MiddlewareMethods {
-    protected acceptMimes: string[];
-    $alterEndpointHandlers(handlers: AlterEndpointHandlersArg, operationRoute: JsonOperationRoute): {
-        before: any[];
-        endpoint: import("@tsed/schema").JsonMethodStore;
-        after: (Function | import("@tsed/core").Type<any>)[];
-    };
-    use(ctx: Context): void;
-}
+export declare const PlatformAcceptMimesMiddleware: typeof M;

package/package.json

@@ -2,7 +2,7 @@
   "name": "@tsed/platform-http",
   "description": "A TypeScript Framework on top of Express",
   "type": "module",
-  "version": "8.16.0-rc.1",
+  "version": "8.16.0-rc.2",
   "source": "./src/common/index.ts",
   "main": "./lib/esm/common/index.js",
   "module": "./lib/esm/common/index.js",
@@ -70,30 +70,31 @@
     }
   ],
   "dependencies": {
-    "@tsed/core": "8.16.0-rc.1",
-    "@tsed/di": "8.16.0-rc.1",
-    "@tsed/exceptions": "8.16.0-rc.1",
-    "@tsed/hooks": "8.16.0-rc.1",
-    "@tsed/json-mapper": "8.16.0-rc.1",
+    "@tsed/core": "8.16.0-rc.2",
+    "@tsed/di": "8.16.0-rc.2",
+    "@tsed/exceptions": "8.16.0-rc.2",
+    "@tsed/hooks": "8.16.0-rc.2",
+    "@tsed/json-mapper": "8.16.0-rc.2",
     "@tsed/logger": "^8.0.0-rc.1",
     "@tsed/logger-std": "^8.0.0-rc.1",
-    "@tsed/platform-exceptions": "8.16.0-rc.1",
-    "@tsed/platform-middlewares": "8.16.0-rc.1",
-    "@tsed/platform-multer": "8.16.0-rc.1",
-    "@tsed/platform-params": "8.16.0-rc.1",
-    "@tsed/platform-response-filter": "8.16.0-rc.1",
-    "@tsed/platform-router": "8.16.0-rc.1",
-    "@tsed/platform-views": "8.16.0-rc.1",
-    "@tsed/schema": "8.16.0-rc.1",
+    "@tsed/platform-accept-mimes": "8.16.0-rc.2",
+    "@tsed/platform-exceptions": "8.16.0-rc.2",
+    "@tsed/platform-middlewares": "8.16.0-rc.2",
+    "@tsed/platform-multer": "8.16.0-rc.2",
+    "@tsed/platform-params": "8.16.0-rc.2",
+    "@tsed/platform-response-filter": "8.16.0-rc.2",
+    "@tsed/platform-router": "8.16.0-rc.2",
+    "@tsed/platform-views": "8.16.0-rc.2",
+    "@tsed/schema": "8.16.0-rc.2",
     "@types/json-schema": "7.0.15",
     "accepts": "^1.3.8",
     "tslib": "2.7.0",
     "uuid": "10.0.0"
   },
   "devDependencies": {
-    "@tsed/barrels": "8.16.0-rc.1",
-    "@tsed/engines": "8.16.0-rc.1",
-    "@tsed/typescript": "8.16.0-rc.1",
+    "@tsed/barrels": "8.16.0-rc.2",
+    "@tsed/engines": "8.16.0-rc.2",
+    "@tsed/typescript": "8.16.0-rc.2",
     "cross-env": "7.0.3",
     "eslint": "9.12.0",
     "typescript": "5.4.5",