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

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

@@ -8,24 +8,30 @@ 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[];
     getMountedControllers(): RouteController[];
+    protected $onInit(): void;
     /**
-     *
-     * @param ctrl
-     * @param endpointUrl
+     * Create routers from the collected controllers.
+     * @private
      */
-    private buildRoutes;
+    private createRouters;
+    /**
+     * Create controllers from DI
+     * @private
+     */
+    private buildControllers;
 }

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

@@ -0,0 +1,6 @@
+import { JsonOperationRoute } from "@tsed/schema";
+import { ControllerProvider } from "../domain/ControllerProvider";
+import { EndpointMetadata } from "../domain/EndpointMetadata";
+export declare class PlatformMiddlewaresChain {
+    get(provider: ControllerProvider, operationRoute: JsonOperationRoute<EndpointMetadata>): 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 { 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
      */
@@ -139,7 +139,7 @@ export declare class PlatformResponse<T extends Record<string, any> = any> {
      * @param path
      * @param options
      */
-    render(path: string, options?: any): Promise<string>;
+    render(path: string, options?: any): Promise<any>;
     /**
      * Send any data to your consumer.
      *

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

@@ -1,6 +1,6 @@
 import { InjectorService, PathType } from "@tsed/di";
 import { PlatformMulter, PlatformMulterSettings, PlatformStaticsOptions } from "../config";
-import { PlatformRouteWithoutHandlers, PlatformRouteOptions } from "../interfaces";
+import { PlatformRouteOptions, PlatformRouteWithoutHandlers } from "../interfaces";
 import { PlatformHandler } from "./PlatformHandler";
 /**
  * @ignore
@@ -20,6 +20,7 @@ export declare class PlatformRouter<Router = TsED.Router> {
     protected platformHandler: PlatformHandler;
     rawRouter: Router;
     raw: any;
+    isBuilt: boolean;
     injector: InjectorService;
     constructor(platformHandler: PlatformHandler);
     /**
@@ -32,7 +33,7 @@ export declare class PlatformRouter<Router = TsED.Router> {
     callback(): any;
     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 { Type } from "@tsed/core";
-import { DITest, InjectorService } from "@tsed/di";
-import { PlatformBuilder } from "../builder/PlatformBuilder";
+import { DITest, DITestOptions, InjectorService } from "@tsed/di";
 import { PlatformContext, PlatformContextOptions } from "../domain/PlatformContext";
+import { PlatformAdapter, PlatformBuilderSettings } from "../interfaces/PlatformAdapter";
+import { Type } from "@tsed/core";
 /**
  * @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/{services → types/services}/index.d.ts

@@ -5,3 +5,4 @@ export * from "./PlatformRequest";
 export * from "./PlatformResponse";
 export * from "./PlatformRouter";
 export * from "./PlatformTest";
+export * from "./PlatformMiddlewaresChain";

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<void>) | undefined;

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

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

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

@@ -0,0 +1,7 @@
+import { InjectorService, IProvider } from "@tsed/di";
+interface CreateInjectorOptions {
+    providers?: IProvider[];
+    settings?: Partial<TsED.Configuration>;
+}
+export declare function createInjector({ providers, 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/{utils → types/utils}/index.d.ts

@@ -1,5 +1,4 @@
 export * from "./createInjector";
-export * from "./createPlatformApplication";
 export * from "./createHttpServer";
 export * from "./createHttpsServer";
 export * from "./printRoutes";

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,21 @@
 {
   "name": "@tsed/common",
-  "version": "7.0.0-alpha.2",
+  "version": "7.0.0-beta.1",
   "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",
+  "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 run build:esm && yarn run build:cjs",
+    "build:cjs": "tsc --build tsconfig.compile.json",
+    "build:esm": "tsc --build tsconfig.compile.esm.json"
   },
   "keywords": [
     "Express",
@@ -51,27 +58,24 @@
       "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.2",
-    "@tsed/core": "7.0.0-alpha.2",
-    "@tsed/di": "7.0.0-alpha.2",
-    "@tsed/exceptions": "7.0.0-alpha.2",
-    "@tsed/json-mapper": "7.0.0-alpha.2",
-    "@tsed/logger": "^5.16.0",
-    "@tsed/perf": "7.0.0-alpha.2",
-    "@tsed/platform-cache": "7.0.0-alpha.2",
-    "@tsed/platform-exceptions": "7.0.0-alpha.2",
-    "@tsed/platform-log-middleware": "7.0.0-alpha.2",
-    "@tsed/platform-middlewares": "7.0.0-alpha.2",
-    "@tsed/platform-params": "7.0.0-alpha.2",
-    "@tsed/platform-response-filter": "7.0.0-alpha.2",
-    "@tsed/platform-views": "7.0.0-alpha.2",
-    "@tsed/schema": "7.0.0-alpha.2",
+    "@tsed/components-scan": "7.0.0-beta.1",
+    "@tsed/core": "7.0.0-beta.1",
+    "@tsed/di": "7.0.0-beta.1",
+    "@tsed/exceptions": "7.0.0-beta.1",
+    "@tsed/json-mapper": "7.0.0-beta.1",
+    "@tsed/logger": "^6.0.0",
+    "@tsed/logger-file": "^6.0.0",
+    "@tsed/perf": "7.0.0-beta.1",
+    "@tsed/platform-cache": "7.0.0-beta.1",
+    "@tsed/platform-exceptions": "7.0.0-beta.1",
+    "@tsed/platform-log-middleware": "7.0.0-beta.1",
+    "@tsed/platform-middlewares": "7.0.0-beta.1",
+    "@tsed/platform-params": "7.0.0-beta.1",
+    "@tsed/platform-response-filter": "7.0.0-beta.1",
+    "@tsed/platform-views": "7.0.0-beta.1",
+    "@tsed/schema": "7.0.0-beta.1",
     "@types/json-schema": "7.0.7",
-    "json-schema": "^0.2.3",
     "on-finished": "2.3.0",
     "tslib": "2.2.0",
     "uuid": "8.3.2"
@@ -79,8 +83,5 @@
   "devDependencies": {
     "rxjs": "^6.5.2"
   },
-  "peerDependencies": {},
-  "publishConfig": {
-    "tag": "alpha"
-  }
+  "peerDependencies": {}
 }

package/tsconfig.compile.esm.json

@@ -0,0 +1,23 @@
+{
+  "extends": "./tsconfig.compile.json",
+  "compilerOptions": {
+    "baseUrl": ".",
+    "module": "ES2020",
+    "rootDir": "src",
+    "outDir": "./lib/esm",
+    "declaration": true,
+    "declarationDir": "./lib/types"
+  },
+  "exclude": [
+    "node_modules",
+    "test",
+    "lib",
+    "benchmark",
+    "coverage",
+    "spec",
+    "**/*.benchmark.ts",
+    "**/*.spec.ts",
+    "keys",
+    "jest.config.js"
+  ]
+}

package/lib/PlatformModule.d.ts

@@ -1,15 +0,0 @@
-import { InjectorService } from "@tsed/di";
-import { Platform } from "./services/Platform";
-/**
- * @ignore
- */
-export declare class PlatformModule {
-    protected injector: InjectorService;
-    protected platform: Platform;
-    constructor(injector: InjectorService, platform: Platform);
-    /**
-     * Create routers from the collected controllers
-     */
-    createRoutersFromControllers(): (import("./interfaces").PlatformRouterMethods<any> | undefined)[];
-    $$loadRoutes(): void;
-}

package/lib/builder/PlatformControllerBuilder.d.ts

@@ -1,19 +0,0 @@
-import { InjectorService } from "@tsed/di";
-import { ControllerProvider } from "../domain/ControllerProvider";
-import { PlatformRouterMethods } from "../interfaces/PlatformRouterMethods";
-/**
- * @ignore
- */
-export declare class PlatformControllerBuilder {
-    private provider;
-    constructor(provider: ControllerProvider);
-    /**
-     *
-     * @returns {any}
-     */
-    build(injector: InjectorService): PlatformRouterMethods;
-    private buildEndpoints;
-    private buildEndpoint;
-    private buildChildrenCtrls;
-    private buildMiddlewares;
-}

package/lib/domain/ControllerProvider.d.ts

@@ -1,53 +0,0 @@
-import { ControllerMiddlewares, Provider, TokenProvider } from "@tsed/di";
-import { JsonEntityStore } from "@tsed/schema";
-import { PlatformRouterMethods } from "../interfaces/PlatformRouterMethods";
-import { EndpointMetadata } from "./EndpointMetadata";
-export declare class ControllerProvider<T = any> extends Provider<T> {
-    readonly entity: JsonEntityStore;
-    private router;
-    constructor(provide: TokenProvider, options?: Partial<Provider>);
-    get path(): string;
-    set path(path: string);
-    /**
-     *
-     * @returns {EndpointMetadata[]}
-     */
-    get endpoints(): EndpointMetadata[];
-    get children(): TokenProvider[];
-    /**
-     *
-     * @returns {ControllerProvider}
-     */
-    get parent(): TokenProvider | undefined;
-    /**
-     *
-     */
-    get routerOptions(): any;
-    /**
-     *
-     * @param value
-     */
-    set routerOptions(value: any);
-    /**
-     *
-     * @returns {any[]}
-     */
-    get middlewares(): ControllerMiddlewares;
-    /**
-     *
-     * @param middlewares
-     */
-    set middlewares(middlewares: ControllerMiddlewares);
-    /**
-     *
-     * @returns {boolean}
-     */
-    hasChildren(): boolean;
-    /**
-     *
-     * @returns {boolean}
-     */
-    hasParent(): boolean;
-    getRouter<T extends PlatformRouterMethods = any>(): T;
-    setRouter(router: PlatformRouterMethods): this;
-}