@tsed/common 7.0.0-alpha.1 → 7.0.0-beta.10

package/lib/{services → types/services}/Platform.d.ts

@@ -1,5 +1,5 @@
 import { InjectorService, TokenProvider } from "@tsed/di";
-import { PlatformRouteDetails } from "../domain";
+import { PlatformRouteDetails } from "../domain/PlatformRouteDetails";
 import { Route, RouteController } from "../interfaces/Route";
 import { PlatformApplication } from "./PlatformApplication";
 /**
@@ -8,24 +8,39 @@ import { PlatformApplication } from "./PlatformApplication";
  * @platform
  */
 export declare class Platform {
-    #private;
     readonly injector: InjectorService;
     readonly platformApplication: PlatformApplication;
+    private _routes;
+    private _controllers;
     constructor(injector: InjectorService, platformApplication: PlatformApplication);
     get app(): PlatformApplication<TsED.Application, TsED.Router>;
     get routes(): PlatformRouteDetails[];
     addRoutes(routes: Route[]): void;
-    addRoute(endpoint: string, token: TokenProvider): this;
+    addRoute(basePath: string, token: TokenProvider): this | undefined;
     /**
      * Get all routes built by TsExpressDecorators and mounted on Express application.
      * @returns {PlatformRouteDetails[]}
      */
     getRoutes(): PlatformRouteDetails[];
+    /**
+     * Get all controllers mounted on the application.
+     * @returns  {RouteController[]}
+     */
     getMountedControllers(): RouteController[];
+    protected $onInit(): void;
+    /**
+     * Create routers from the collected controllers.
+     * @private
+     */
+    private createRouters;
+    /**
+     * Get all router controllers from the controller token.
+     * @private
+     */
+    private getAllControllers;
     /**
-     *
-     * @param ctrl
-     * @param endpointUrl
+     * Create controllers from DI
+     * @private
      */
-    private buildRoutes;
+    private buildControllers;
 }

package/lib/types/services/PlatformAdapter.d.ts

@@ -0,0 +1,47 @@
+import { Type } from "@tsed/core";
+import { ProviderOpts } from "@tsed/di";
+import { PlatformMulter, PlatformMulterSettings } from "../config/interfaces/PlatformMulterSettings";
+import { PlatformStaticsOptions } from "../config/interfaces/PlatformStaticsSettings";
+import { RouterOptions } from "express";
+export declare abstract class PlatformAdapter<App = TsED.Application, Router = TsED.Router> {
+    /**
+     * Load providers in top priority
+     */
+    providers: ProviderOpts[];
+    /**
+     * Called after the injector instantiation
+     */
+    onInit?: () => any;
+    beforeLoadRoutes?: () => Promise<any>;
+    afterLoadRoutes?: () => Promise<any>;
+    useRouter?: () => any;
+    useContext?: () => any;
+    abstract app(): {
+        app: App;
+        callback(): any;
+    };
+    abstract router(routerOptions?: Partial<RouterOptions>): {
+        router: Router;
+        callback(): any;
+    };
+    /**
+     * Return the statics middlewares
+     * @param endpoint
+     * @param options
+     */
+    abstract statics(endpoint: string, options: PlatformStaticsOptions): any;
+    /**
+     * Return the multipart middleware
+     * @param options
+     */
+    abstract multipart(options: PlatformMulterSettings): PlatformMulter;
+    /**
+     * Return the body parser for the given
+     * @param type
+     * @param opts
+     */
+    abstract bodyParser(type: string, opts?: Record<string, any>): any;
+}
+export interface PlatformBuilderSettings<App = TsED.Application, Router = TsED.Router> extends Partial<TsED.Configuration> {
+    adapter?: Type<PlatformAdapter<App, Router>>;
+}

package/lib/{services → types/services}/PlatformApplication.d.ts

@@ -1,5 +1,6 @@
 import { PlatformHandler } from "./PlatformHandler";
 import { PlatformRouter } from "./PlatformRouter";
+import { PlatformAdapter } from "./PlatformAdapter";
 declare global {
     namespace TsED {
         interface Application {
@@ -11,11 +12,10 @@ declare global {
  *
  * @platform
  */
-export declare class PlatformApplication<App = TsED.Application, Router = TsED.Router> extends PlatformRouter<Router> {
+export declare class PlatformApplication<App = TsED.Application, Router = TsED.Router> extends PlatformRouter<App, Router> {
     raw: App;
     rawApp: App;
     rawRouter: Router;
-    constructor(platformHandler: PlatformHandler);
-    protected static createRawApp(): any;
+    constructor(platformHandler: PlatformHandler, adapter: PlatformAdapter<App, Router>);
     getApp(): App;
 }

package/lib/{services → types/services}/PlatformHandler.d.ts

@@ -1,6 +1,7 @@
 import { InjectorService, Provider } from "@tsed/di";
 import { ArgScope, HandlerWithScope, PlatformParams } from "@tsed/platform-params";
-import { EndpointMetadata } from "../domain/EndpointMetadata";
+import { PlatformResponseFilter } from "@tsed/platform-response-filter";
+import { EndpointMetadata } from "@tsed/schema";
 import { HandlerMetadata } from "../domain/HandlerMetadata";
 import { PlatformContext } from "../domain/PlatformContext";
 import { PlatformRouteWithoutHandlers } from "../interfaces/PlatformRouteOptions";
@@ -19,6 +20,7 @@ export interface OnRequestOptions {
 export declare class PlatformHandler {
     protected injector: InjectorService;
     protected params: PlatformParams;
+    protected responseFilter: PlatformResponseFilter;
     constructor(injector: InjectorService, params: PlatformParams);
     /**
      * Create a native middleware based on the given metadata and return an instance of AnyToPromiseWithCtx
@@ -46,7 +48,7 @@ export declare class PlatformHandler {
      * @param requestOptions
      */
     protected onRequest(requestOptions: OnRequestOptions): Promise<any>;
-    protected onError(er: unknown, requestOptions: OnRequestOptions): Promise<any>;
+    protected onError(er: Error, requestOptions: OnRequestOptions): Promise<any>;
     /**
      * Manage success scenario
      * @param data
@@ -62,13 +64,6 @@ export declare class PlatformHandler {
      * @protected
      */
     protected callReturnedMiddleware(middleware: any, ctx: PlatformContext, next: any): any;
-    /**
-     * Render the view if the endpoint has a configured view.
-     * @param data
-     * @param ctx
-     * @protected
-     */
-    protected render(data: any, ctx: PlatformContext): Promise<any>;
     /**
      * create Raw handler
      * @param metadata

package/lib/types/services/PlatformMiddlewaresChain.d.ts

@@ -0,0 +1,10 @@
+import { JsonOperationRoute } from "@tsed/schema";
+import { ControllerProvider } from "../domain/ControllerProvider";
+import { PlatformAdapter } from "../services/PlatformAdapter";
+export declare class PlatformMiddlewaresChain {
+    protected acceptMimes: string[];
+    protected adapter: PlatformAdapter;
+    get(provider: ControllerProvider, operationRoute: JsonOperationRoute, parentMiddlewares?: any[]): any[];
+    protected hasAcceptMimes(operationRoute: JsonOperationRoute): number;
+    protected getParamTypes(middlewares: any[], operationRoute: JsonOperationRoute): any;
+}

package/lib/{services → types/services}/PlatformRequest.d.ts

@@ -18,12 +18,13 @@ declare global {
 export declare class PlatformRequest<T extends {
     [key: string]: any;
 } = any> {
+    protected $ctx: PlatformContext;
     raw: T;
     /**
      * The current @@PlatformResponse@@.
      */
     response: PlatformResponse;
-    constructor({ request }: IncomingEvent);
+    constructor({ request }: IncomingEvent, $ctx: PlatformContext);
     get secure(): boolean;
     get host(): string;
     get protocol(): string;

package/lib/{services → types/services}/PlatformResponse.d.ts

@@ -1,8 +1,8 @@
 /// <reference types="node" />
-import { PlatformViews } from "@tsed/platform-views";
-import { ServerResponse } from "http";
+import { OutgoingHttpHeaders, ServerResponse } from "http";
 import { IncomingEvent } from "../interfaces/IncomingEvent";
 import type { PlatformRequest } from "./PlatformRequest";
+import type { PlatformContext } from "../domain/PlatformContext";
 declare global {
     namespace TsED {
         interface Response {
@@ -15,14 +15,14 @@ export declare type HeaderValue = Array<boolean | number | string> | boolean | n
  * @platform
  */
 export declare class PlatformResponse<T extends Record<string, any> = any> {
-    platformViews: PlatformViews;
+    protected $ctx: PlatformContext;
     /**
      * The current @@PlatformRequest@@.
      */
     request: PlatformRequest;
     data: any;
     raw: T;
-    constructor({ response }: IncomingEvent);
+    constructor({ response }: IncomingEvent, $ctx: PlatformContext);
     /**
      * Get the current statusCode
      */
@@ -41,7 +41,7 @@ export declare class PlatformResponse<T extends Record<string, any> = any> {
      * Return the original response node.js instance
      */
     get res(): ServerResponse;
-    static onFinished(res: any, cb: Function): void;
+    static onFinished(res: any, cb: (er: Error | null, message: string) => void): void;
     /**
      * Returns the HTTP response header specified by field. The match is case-insensitive.
      *
@@ -52,7 +52,7 @@ export declare class PlatformResponse<T extends Record<string, any> = any> {
      * @param name
      */
     get(name: string): any;
-    getHeaders(): Record<string, HeaderValue>;
+    getHeaders(): OutgoingHttpHeaders;
     /**
      * Return the Framework response object (express, koa, etc...)
      */
@@ -79,7 +79,7 @@ export declare class PlatformResponse<T extends Record<string, any> = any> {
      *
      * Aliased as `res.header()`.
      */
-    setHeaders(headers: Record<string, HeaderValue>): this;
+    setHeaders(headers: OutgoingHttpHeaders): this;
     setHeader(key: string, item: any): this;
     /**
      * Set `Content-Type` response header with `type` through `mime.lookup()`
@@ -132,14 +132,14 @@ export declare class PlatformResponse<T extends Record<string, any> = any> {
      *
      * @param data
      */
-    stream(data: ReadableStream | any): this;
+    stream(data: any): this;
     /**
      * Renders a view and sends the rendered HTML string to the client.
      *
      * @param path
      * @param options
      */
-    render(path: string, options?: any): Promise<string>;
+    render(path: string, options?: any): Promise<any>;
     /**
      * Send any data to your consumer.
      *
@@ -154,7 +154,7 @@ export declare class PlatformResponse<T extends Record<string, any> = any> {
      * Add a listener to handler the end of the request/response.
      * @param cb
      */
-    onEnd(cb: Function): this;
+    onEnd(cb: (er: Error | null, message: string) => void): this;
     isDone(): boolean;
     destroy(): void;
     isHeadersSent(): boolean;

package/lib/{services → types/services}/PlatformRouter.d.ts

@@ -1,7 +1,10 @@
-import { InjectorService } from "@tsed/di";
-import { PlatformMulter, PlatformMulterSettings, PlatformStaticsOptions } from "../config";
-import { PathType, PlatformRouteWithoutHandlers, PlatformRouteOptions } from "../interfaces";
+import { InjectorService, PathType } from "@tsed/di";
 import { PlatformHandler } from "./PlatformHandler";
+import { PlatformRouteOptions, PlatformRouteWithoutHandlers } from "../interfaces/PlatformRouteOptions";
+import { PlatformStaticsOptions } from "../config/interfaces/PlatformStaticsSettings";
+import { PlatformMulter, PlatformMulterSettings } from "../config/interfaces/PlatformMulterSettings";
+import { PlatformAdapter } from "./PlatformAdapter";
+import { RouterOptions } from "express";
 /**
  * @ignore
  */
@@ -16,23 +19,24 @@ declare global {
  * Platform Router abstraction layer.
  * @platform
  */
-export declare class PlatformRouter<Router = TsED.Router> {
+export declare class PlatformRouter<App = TsED.Application, Router = TsED.Router> {
     protected platformHandler: PlatformHandler;
+    readonly adapter: PlatformAdapter<App, Router>;
     rawRouter: Router;
     raw: any;
+    isBuilt: boolean;
     injector: InjectorService;
-    constructor(platformHandler: PlatformHandler);
+    callback: () => any;
+    constructor(platformHandler: PlatformHandler, adapter: PlatformAdapter<App, Router>, routerOptions?: Partial<RouterOptions>);
     /**
      * Create a new instance of PlatformRouter
      * @param injector
      * @param routerOptions
      */
-    static create(injector: InjectorService, routerOptions?: any): PlatformRouter<TsED.Router>;
-    protected static createRawRouter(): any;
-    callback(): any;
+    static create(injector: InjectorService, routerOptions?: any): PlatformRouter<TsED.Application, TsED.Router>;
     getRouter(): Router;
     use(...handlers: any[]): this;
-    addRoute(options: PlatformRouteOptions): this;
+    addRoute(options: Partial<PlatformRouteOptions>): this;
     all(path: PathType, ...handlers: any[]): this;
     get(path: PathType, ...handlers: any[]): this;
     post(path: PathType, ...handlers: any[]): this;

package/lib/{services → types/services}/PlatformTest.d.ts

@@ -1,13 +1,13 @@
+import { DITest, DITestOptions, InjectorService } from "@tsed/di";
 import { Type } from "@tsed/core";
-import { DITest, InjectorService } from "@tsed/di";
-import { PlatformBuilder } from "../builder/PlatformBuilder";
 import { PlatformContext, PlatformContextOptions } from "../domain/PlatformContext";
+import { PlatformAdapter, PlatformBuilderSettings } from "./PlatformAdapter";
 /**
  * @platform
  */
 export declare class PlatformTest extends DITest {
-    static platformBuilder: Type<PlatformBuilder<any, any>>;
-    static create(options?: Partial<TsED.Configuration>): Promise<void>;
+    static adapter: Type<PlatformAdapter>;
+    static create(settings?: DITestOptions): Promise<void>;
     /**
      * Create a new injector with the right default services
      */
@@ -16,10 +16,11 @@ export declare class PlatformTest extends DITest {
      * Load the server silently without listening port and configure it on test profile.
      * @decorator
      * @param mod
+     * @param listen
      * @param settings
      * @returns {Promise<void>}
      */
-    static bootstrap(mod: any, settings?: Partial<TsED.Configuration & {
+    static bootstrap(mod: any, { listen, ...settings }?: Partial<PlatformBuilderSettings & {
         listen: boolean;
     }>): () => Promise<void>;
     /**

package/lib/types/utils/__mock__/Test1.d.ts

@@ -0,0 +1,3 @@
+export declare const value1 = "value";
+export declare class Test1 {
+}

package/lib/types/utils/__mock__/Test2.d.ts

@@ -0,0 +1,3 @@
+export declare const value2 = "value";
+export declare class Test2 {
+}

package/lib/{utils → types/utils}/createHandlerMetadata.d.ts

@@ -1,5 +1,5 @@
 import { InjectorService } from "@tsed/di";
-import { EndpointMetadata } from "../domain/EndpointMetadata";
+import { EndpointMetadata } from "@tsed/schema";
 import { HandlerMetadata } from "../domain/HandlerMetadata";
 import { PlatformRouteWithoutHandlers } from "../interfaces/PlatformRouteOptions";
 /**

package/lib/types/utils/createHttpServer.d.ts

@@ -0,0 +1,4 @@
+/// <reference types="node" />
+import { InjectorService } from "@tsed/di";
+import Http from "http";
+export declare function createHttpServer(injector: InjectorService, requestListener: Http.RequestListener): (() => Promise<Http.Server>) | undefined;

package/lib/types/utils/createHttpsServer.d.ts

@@ -0,0 +1,5 @@
+/// <reference types="node" />
+import { InjectorService } from "@tsed/di";
+import Https from "https";
+import Http from "http";
+export declare function createHttpsServer(injector: InjectorService, requestListener?: Http.RequestListener): (() => Promise<Https.Server>) | undefined;

package/lib/types/utils/createInjector.d.ts

@@ -0,0 +1,9 @@
+import { InjectorService } from "@tsed/di";
+import { Type } from "@tsed/core";
+import { PlatformAdapter } from "../services/PlatformAdapter";
+interface CreateInjectorOptions {
+    adapter?: Type<PlatformAdapter<any, any>>;
+    settings?: Partial<TsED.Configuration>;
+}
+export declare function createInjector({ adapter, settings }: CreateInjectorOptions): InjectorService;
+export {};

package/lib/types/utils/getConfiguration.d.ts

@@ -0,0 +1,2 @@
+import { Type } from "@tsed/core";
+export declare function getConfiguration(configuration?: any, module?: Type<any> | null): any;

package/lib/types/utils/getStaticsOptions.d.ts

@@ -0,0 +1,5 @@
+import { PlatformStaticsOptions, PlatformStaticsSettings } from "../config/interfaces/PlatformStaticsSettings";
+export declare function getStaticsOptions(statics?: PlatformStaticsSettings): {
+    path: string;
+    options: PlatformStaticsOptions;
+}[];

package/lib/types/utils/importProviders.d.ts

@@ -0,0 +1,10 @@
+/**
+ * Import providers from given patterns.
+ *
+ * @param settings
+ * @param properties
+ */
+export declare function importProviders(settings: Partial<TsED.Configuration>, properties?: string[]): Promise<{
+    token: string;
+    route?: string;
+}[]>;

package/lib/types/utils/listenServer.d.ts

@@ -0,0 +1,7 @@
+/// <reference types="node" />
+import type Http from "http";
+import type Https from "https";
+import type Http2 from "http2";
+import { InjectorService } from "@tsed/di";
+import { getHostInfoFromPort } from "@tsed/core";
+export declare function listenServer(injector: InjectorService, server: Http.Server | Https.Server | Http2.Http2Server, hostInfo: ReturnType<typeof getHostInfoFromPort>): Promise<ReturnType<typeof getHostInfoFromPort>>;

package/package.json

@@ -1,14 +1,23 @@
 {
   "name": "@tsed/common",
-  "version": "7.0.0-alpha.1",
+  "version": "7.0.0-beta.10",
   "description": "A TypeScript Framework on top of Express",
   "private": false,
   "source": "./src/index.ts",
-  "main": "./lib/index.js",
-  "typings": "./lib/index.d.ts",
+  "main": "./lib/cjs/index.js",
+  "module": "./lib/esm/index.js",
+  "typings": "./lib/types/index.d.ts",
   "exports": {
-    "require": "./lib/index.js",
-    "default": "./lib/index.modern.js"
+    "types": "./lib/types/index.d.ts",
+    "import": "./lib/esm/index.js",
+    "require": "./lib/cjs/index.js",
+    "default": "./lib/esm/index.js"
+  },
+  "scripts": {
+    "build": "yarn barrels && yarn run build:esm && yarn run build:cjs",
+    "build:cjs": "tsc --build tsconfig.compile.json",
+    "build:esm": "tsc --build tsconfig.compile.esm.json",
+    "barrels": "yarn barrelsby --delete -d ./src -e \"\\.spec\\.ts\" -e \"__mock__\" -e \".benchmark.ts\" -e \"getConfiguration\""
   },
   "keywords": [
     "Express",
@@ -39,7 +48,7 @@
   "bugs": {
     "url": "https://github.com/tsedio/tsed/issues"
   },
-  "homepage": "https://github.com/tsedio/tsed/tree/alpha/packages/platform/common",
+  "homepage": "https://github.com/tsedio/tsed/tree/beta/packages/platform/common",
   "repository": "https://github.com/tsedio/tsed",
   "funding": [
     {
@@ -51,32 +60,40 @@
       "url": "https://opencollective.com/tsed"
     }
   ],
-  "scripts": {
-    "build": "microbundle --target node --no-compress --format modern,cjs --tsconfig ./tsconfig.compile.json"
-  },
   "dependencies": {
-    "@tsed/components-scan": "7.0.0-alpha.1",
-    "@tsed/core": "7.0.0-alpha.1",
-    "@tsed/di": "7.0.0-alpha.1",
-    "@tsed/exceptions": "7.0.0-alpha.1",
-    "@tsed/json-mapper": "7.0.0-alpha.1",
-    "@tsed/logger": "^5.16.0",
-    "@tsed/perf": "7.0.0-alpha.1",
-    "@tsed/platform-cache": "7.0.0-alpha.1",
-    "@tsed/platform-exceptions": "7.0.0-alpha.1",
-    "@tsed/platform-middlewares": "7.0.0-alpha.1",
-    "@tsed/platform-params": "7.0.0-alpha.1",
-    "@tsed/platform-response-filter": "7.0.0-alpha.1",
-    "@tsed/platform-views": "7.0.0-alpha.1",
-    "@tsed/schema": "7.0.0-alpha.1",
-    "@types/json-schema": "7.0.7",
-    "json-schema": "^0.2.3",
-    "on-finished": "2.3.0",
-    "tslib": "2.2.0",
+    "@tsed/components-scan": "7.0.0-beta.10",
+    "@tsed/core": "7.0.0-beta.10",
+    "@tsed/di": "7.0.0-beta.10",
+    "@tsed/exceptions": "7.0.0-beta.10",
+    "@tsed/json-mapper": "7.0.0-beta.10",
+    "@tsed/logger": ">=6.1.1",
+    "@tsed/logger-file": ">=6.1.0",
+    "@tsed/perf": "7.0.0-beta.10",
+    "@tsed/platform-cache": "7.0.0-beta.10",
+    "@tsed/platform-exceptions": "7.0.0-beta.10",
+    "@tsed/platform-log-middleware": "7.0.0-beta.10",
+    "@tsed/platform-middlewares": "7.0.0-beta.10",
+    "@tsed/platform-params": "7.0.0-beta.10",
+    "@tsed/platform-response-filter": "7.0.0-beta.10",
+    "@tsed/platform-views": "7.0.0-beta.10",
+    "@tsed/schema": "7.0.0-beta.10",
+    "@types/json-schema": "7.0.11",
+    "@types/on-finished": "2.3.1",
+    "on-finished": "2.4.1",
+    "tslib": "2.3.1",
     "uuid": "8.3.2"
   },
-  "devDependencies": {
-    "rxjs": "^6.5.2"
+  "peerDependencies": {
+    "@tsed/logger": ">=6.1.1",
+    "@tsed/logger-file": ">=6.1.0"
+  },
+  "peerDependenciesMeta": {
+    "@tsed/logger": {
+      "optional": false
+    },
+    "@tsed/logger-file": {
+      "optional": false
+    }
   },
-  "peerDependencies": {}
+  "devDependencies": {}
 }