@tsed/di 7.0.0-beta.11 → 7.0.0-beta.14

package/lib/types/decorators/controller.d.ts

@@ -9,7 +9,6 @@ export interface ControllerMiddlewares {
 export interface ControllerOptions extends Partial<ProviderOpts<any>> {
     path?: PathType;
     children?: Type<any>[];
-    routerOptions?: any;
     middlewares?: Partial<ControllerMiddlewares>;
 }
 /**

package/lib/types/domain/ContextLogger.d.ts

@@ -1,28 +1,25 @@
+import { Hooks } from "@tsed/core";
 import { LogLevel } from "@tsed/logger";
+import { DILogger } from "../interfaces/DILogger";
+import type { DIContext } from "./DIContext";
 export interface ContextLoggerOptions extends Record<string, any> {
     id: string;
-    url?: string;
-    dateStart?: Date;
+    logger?: DILogger;
     level?: "debug" | "info" | "warn" | "error" | "off" | "all";
     maxStackSize?: number;
-    minimalRequestPicker?: (o: any) => any;
-    completeRequestPicker?: (o: any) => any;
-    ignoreLog?: (data: any) => boolean;
     additionalProps?: Record<any, any>;
 }
 export declare class ContextLogger {
-    private logger;
-    id: string;
-    url: string;
-    minimalRequestPicker: Function;
-    completeRequestPicker: Function;
-    maxStackSize: number;
-    private readonly additionalProps;
-    private readonly dateStart;
-    private readonly ignoreLog;
-    private stack;
-    private level;
-    constructor(logger: any, { id, url, dateStart, ignoreUrlPatterns, minimalRequestPicker, completeRequestPicker, level, maxStackSize, ignoreLog, additionalProps }: ContextLoggerOptions);
+    #private;
+    readonly $ctx: DIContext;
+    readonly dateStart: Date;
+    constructor($ctx: DIContext);
+    get id(): any;
+    set maxStackSize(maxStackSize: number);
+    get hooks(): Hooks;
+    private get stack();
+    alterLog(cb: (data: any, level: "debug" | "info" | "warn" | "error" | "off" | "all", withRequest: boolean) => any): Hooks;
+    alterIgnoreLog(cb: (ignore: boolean, data: any) => boolean): Hooks;
     info(obj: any): this;
     debug(obj: any, withRequest?: boolean): this;
     warn(obj: any): this;
@@ -37,5 +34,5 @@ export declare class ContextLogger {
      */
     protected getDuration(): number;
     protected getData(obj: any): any;
-    protected run(level: LogLevel, obj: any, mapper: (data: any) => any): void;
+    protected run(level: LogLevel, obj: any, withRequest?: boolean): void;
 }

package/lib/types/domain/ControllerProvider.d.ts

@@ -0,0 +1,17 @@
+import { ControllerMiddlewares } from "../decorators/controller";
+import { TokenProvider } from "../interfaces/TokenProvider";
+import { Provider } from "./Provider";
+export declare class ControllerProvider<T = any> extends Provider<T> {
+    tokenRouter: string;
+    constructor(provide: TokenProvider, options?: Partial<Provider>);
+    /**
+     *
+     * @returns {any[]}
+     */
+    get middlewares(): ControllerMiddlewares;
+    /**
+     *
+     * @param middlewares
+     */
+    set middlewares(middlewares: ControllerMiddlewares);
+}

package/lib/types/domain/DIContext.d.ts

@@ -12,11 +12,21 @@ export interface ContextMethods extends Map<any, any> {
 }
 export interface DIContextOptions extends Omit<ContextLoggerOptions, "dateStart"> {
     id: string;
+    injector: InjectorService;
     logger: any;
-    injector?: InjectorService;
 }
 export declare class DIContext extends Map<any, any> implements ContextMethods {
+    readonly options: DIContextOptions;
     [x: string]: any;
+    /**
+     * The request container used by the Ts.ED DI. It contain all services annotated with `@Scope(ProviderScope.REQUEST)`
+     */
+    container: LocalsContainer<any>;
+    /**
+     * Logger attached to the context request.
+     */
+    readonly logger: ContextLogger;
+    constructor(options: DIContextOptions);
     /**
      * Request id generated by @@contextMiddleware@@.
      *
@@ -41,26 +51,12 @@ export declare class DIContext extends Map<any, any> implements ContextMethods {
      * :::
      *
      */
-    readonly id: string;
-    /**
-     * Date when request have been handled by the server. @@RequestLogger@@ use this date to log request duration.
-     */
-    readonly dateStart: Date;
-    /**
-     * The request container used by the Ts.ED DI. It contain all services annotated with `@Scope(ProviderScope.REQUEST)`
-     */
-    container: LocalsContainer<any>;
-    /**
-     * Logger attached to the context request.
-     */
-    logger: ContextLogger;
-    /**
-     *
-     */
-    injector: InjectorService;
-    constructor({ id, injector, logger, ignoreLog, ...options }: DIContextOptions);
+    get id(): any;
+    get dateStart(): Date;
+    get injector(): InjectorService;
     get env(): any;
     destroy(): Promise<void>;
     emit(eventName: string, ...args: any[]): Promise<void>;
+    runInContext(next: Function): Promise<unknown>;
 }
 export declare type BaseContext = DIContext & TsED.Context;

package/lib/types/index.d.ts

@@ -19,6 +19,7 @@ export * from "./decorators/useOpts";
 export * from "./decorators/value";
 export * from "./domain/Container";
 export * from "./domain/ContextLogger";
+export * from "./domain/ControllerProvider";
 export * from "./domain/DIContext";
 export * from "./domain/InjectablePropertyType";
 export * from "./domain/LocalsContainer";
@@ -27,8 +28,10 @@ export * from "./domain/ProviderScope";
 export * from "./domain/ProviderType";
 export * from "./errors/InjectionError";
 export * from "./errors/UndefinedTokenError";
+export * from "./interfaces/AlterRunInContext";
 export * from "./interfaces/DIConfigurationOptions";
 export * from "./interfaces/DILogger";
+export * from "./interfaces/DILoggerOptions";
 export * from "./interfaces/DIResolver";
 export * from "./interfaces/InjectableProperties";
 export * from "./interfaces/InterceptorContext";
@@ -52,4 +55,6 @@ export * from "./utils/createContainer";
 export * from "./utils/getConfiguration";
 export * from "./utils/resolveControllers";
 export * from "./utils/runInContext";
+export * from "./utils/setLoggerConfiguration";
+export * from "./utils/setLoggerFormat";
 export * from "./utils/setLoggerLevel";

package/lib/types/interfaces/AlterRunInContext.d.ts

@@ -0,0 +1,4 @@
+import { DIContext } from "../domain/DIContext";
+export interface AlterRunInContext {
+    $alterRunInContext(next: (...args: unknown[]) => unknown, ctx: DIContext): () => unknown | Promise<() => unknown>;
+}

package/lib/types/interfaces/DIConfigurationOptions.d.ts

@@ -5,7 +5,7 @@ declare global {
     namespace TsED {
         interface Context {
         }
-        interface Configuration {
+        interface Configuration extends Record<string, any> {
             scopes: {
                 [key: string]: ProviderScope;
             };
@@ -21,7 +21,6 @@ declare global {
              * Mount controllers
              */
             mount: Record<string, TokenProvider[]>;
-            [key: string]: any;
         }
     }
 }

package/lib/types/interfaces/DILoggerOptions.d.ts

@@ -0,0 +1,44 @@
+export interface DILoggerOptions {
+    /**
+     * Enable debug mode. By default debug is false.
+     */
+    debug?: boolean;
+    /**
+     * Enable info mode. By default debug is false.
+     */
+    level?: "debug" | "info" | "warn" | "error" | "off";
+    /**
+     * Enable log performance tracker and disable log server.
+     */
+    perf?: boolean;
+    /**
+     * List of regexp to ignore log.
+     */
+    ignoreUrlPatterns?: (string | RegExp)[];
+    /**
+     * The number of space characters to use as white space in JSON output. Default is 2 (0 in production).
+     */
+    jsonIndentation?: number;
+    /**
+     * A function called for each incoming request to create a request id.
+     * @returns {number}
+     */
+    reqIdBuilder?: (req: any) => string;
+    /**
+     * Disable routes table displayed in the logger. By default debug is `false`.
+     */
+    disableRoutesSummary?: boolean;
+    /**
+     * Disable bootstrap log displayed in the logger. By default debug is `false`.
+     */
+    disableBootstrapLog?: boolean;
+    /**
+     * Specify log format. Example: `%[%d{[yyyy-MM-dd hh:mm:ss,SSS}] %p%] %m`. See [@tsed/logger configuration](https://tsedio.github.io/logger/).
+     */
+    format?: string;
+    /**
+     * Specify the log stack size for the context.logger. When the stack.length is reach, the logger is flushed during the request.
+     * Default size is set to 30.
+     */
+    maxStackSize?: number;
+}

package/lib/types/interfaces/InterceptorMethods.d.ts

@@ -1,4 +1,4 @@
 import type { InterceptorContext, InterceptorNext } from "./InterceptorContext";
 export interface InterceptorMethods {
-    intercept?(context: InterceptorContext, next?: InterceptorNext): any;
+    intercept(context: InterceptorContext, next?: InterceptorNext): any;
 }

package/lib/types/interfaces/TokenProvider.d.ts

@@ -1,2 +1,2 @@
 import type { Type } from "@tsed/core";
-export declare type TokenProvider = string | symbol | Type | Function | any;
+export declare type TokenProvider<T = any> = string | symbol | Type<T> | Function | any;

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

@@ -1,24 +1,31 @@
-import { ProviderScope } from "../domain/ProviderScope";
+import { Env } from "@tsed/core";
+import type { ProviderScope } from "../domain/ProviderScope";
+import type { DILoggerOptions } from "../interfaces/DILoggerOptions";
 import type { DIResolver } from "../interfaces/DIResolver";
 import type { TokenProvider } from "../interfaces/TokenProvider";
-import { TokenRoute } from "../interfaces/TokenRoute";
+import type { TokenRoute } from "../interfaces/TokenRoute";
 export declare class DIConfiguration {
     readonly default: Map<string, any>;
     protected map: Map<string, any>;
-    [key: string]: any;
     constructor(initialProps?: {});
-    get scopes(): {
-        [key: string]: ProviderScope;
-    };
-    set scopes(value: {
-        [key: string]: ProviderScope;
-    });
+    get version(): string;
+    set version(v: string);
+    get rootDir(): string;
+    set rootDir(value: string);
+    get env(): Env;
+    set env(value: Env);
+    get scopes(): Record<string, ProviderScope>;
+    set scopes(value: Record<string, ProviderScope>);
     get resolvers(): DIResolver[];
     set resolvers(resolvers: DIResolver[]);
     get imports(): TokenProvider[];
     set imports(imports: TokenProvider[]);
     get routes(): TokenRoute[];
     set routes(routes: TokenRoute[]);
+    get logger(): Partial<DILoggerOptions>;
+    set logger(value: Partial<DILoggerOptions>);
+    get debug(): boolean;
+    set debug(debug: boolean);
     /**
      *
      * @param callbackfn
@@ -39,13 +46,11 @@ export declare class DIConfiguration {
      * @returns {undefined|any}
      */
     get<T = any>(propertyKey: string, defaultValue?: T): T;
-    getRaw(propertyKey: string, defaultValue?: any): any;
-    merge(obj: Partial<TsED.Configuration>): void;
+    protected getRaw(propertyKey: string, defaultValue?: any): any;
     /**
      *
      * @param value
      * @returns {any}
      */
     resolve(value: any): any;
-    build(): void;
 }

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

@@ -1,12 +1,11 @@
 import { Container } from "../domain/Container";
-import { LocalsContainer } from "../domain/LocalsContainer";
 import { Provider } from "../domain/Provider";
-import { DIConfiguration } from "./DIConfiguration";
 import { ProviderScope } from "../domain/ProviderScope";
 import { DILogger } from "../interfaces/DILogger";
-import { TokenProvider } from "../interfaces/TokenProvider";
-import { InvokeOptions } from "../interfaces/InvokeOptions";
 import { InjectablePropertyOptions, InjectablePropertyValue } from "../interfaces/InjectableProperties";
+import { InvokeOptions } from "../interfaces/InvokeOptions";
+import { TokenProvider } from "../interfaces/TokenProvider";
+import { DIConfiguration } from "./DIConfiguration";
 /**
  * This service contain all services collected by `@Service` or services declared manually with `InjectorService.factory()` or `InjectorService.service()`.
  *
@@ -30,16 +29,12 @@ import { InjectablePropertyOptions, InjectablePropertyValue } from "../interface
  */
 export declare class InjectorService extends Container {
     #private;
-    settings: TsED.Configuration & DIConfiguration;
+    settings: DIConfiguration;
     logger: DILogger;
     private resolvedConfiguration;
     constructor();
     get resolvers(): import("..").DIResolver[];
-    get scopes(): {
-        [key: string]: ProviderScope;
-    } & {
-        [key: string]: ProviderScope;
-    };
+    get scopes(): Record<string, ProviderScope>;
     /**
      * Retrieve default scope for a given provider.
      * @param provider
@@ -69,7 +64,7 @@ export declare class InjectorService extends Container {
      * @param options
      * @returns {boolean}
      */
-    get<T = any>(token: TokenProvider, options?: any): T | undefined;
+    get<T = any>(token: TokenProvider<T>, options?: any): T | undefined;
     /**
      * Return all instance of the same provider type
      * @param type
@@ -102,12 +97,12 @@ export declare class InjectorService extends Container {
      * @param options
      * @returns {T} The class constructed.
      */
-    invoke<T>(token: TokenProvider, locals?: Map<TokenProvider, any>, options?: Partial<InvokeOptions<T>>): T;
+    invoke<T = any>(token: TokenProvider, locals?: Map<TokenProvider, any>, options?: Partial<InvokeOptions<T>>): T;
     /**
      * Build only providers which are asynchronous.
      */
-    loadAsync(locals?: LocalsContainer): Promise<LocalsContainer<any>>;
-    loadSync(locals?: LocalsContainer): LocalsContainer<any>;
+    loadAsync(): Promise<void>;
+    loadSync(): void;
     /**
      * Boostrap injector from container and resolve configuration.
      *
@@ -118,14 +113,13 @@ export declare class InjectorService extends Container {
      * Load injector from a given module
      * @param rootModule
      */
-    loadModule(rootModule: TokenProvider): Promise<LocalsContainer<any>>;
+    loadModule(rootModule: TokenProvider): Promise<void>;
     /**
      * Build all providers from given container (or GlobalProviders) and emit `$onInit` event.
      *
      * @param container
-     * @param rootModule
      */
-    load(container?: Container, rootModule?: TokenProvider): Promise<LocalsContainer<any>>;
+    load(container?: Container): Promise<void>;
     /**
      * Load all configurations registered on providers
      */

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

@@ -2,5 +2,6 @@
 import { AsyncLocalStorage } from "async_hooks";
 import { DIContext } from "../domain/DIContext";
 export declare function getAsyncStore(): AsyncLocalStorage<DIContext>;
-export declare function getContext(): DIContext | undefined;
+export declare function getContext<Context = DIContext>(): Context | undefined;
 export declare function runInContext(ctx: DIContext, cb: any): unknown;
+export declare function bindContext(cb: any): (...args: any) => any;

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

@@ -0,0 +1,2 @@
+import type { InjectorService } from "../services/InjectorService";
+export declare function setLoggerConfiguration(injector: InjectorService): void;

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

@@ -0,0 +1,6 @@
+import type { InjectorService } from "../services/InjectorService";
+/**
+ * @ignore
+ * @param injector
+ */
+export declare function setLoggerFormat(injector: InjectorService): void;

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

@@ -1,4 +1,4 @@
-import { InjectorService } from "../services/InjectorService";
+import type { InjectorService } from "../services/InjectorService";
 /**
  * @ignore
  * @param injector

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tsed/di",
-  "version": "7.0.0-beta.11",
+  "version": "7.0.0-beta.14",
   "description": "DI module for Ts.ED Framework",
   "private": false,
   "source": "./src/index.ts",
@@ -17,20 +17,21 @@
     "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__\""
+    "barrels": "yarn barrelsby --delete -d ./src -e \"\\.spec\\.ts\" -e \"__mock__\"",
+    "test": "cross-env NODE_ENV=test yarn jest --max-workers=2"
   },
   "dependencies": {
-    "tslib": "2.3.1"
+    "tslib": "2.4.0"
   },
   "devDependencies": {
-    "@tsed/core": "7.0.0-beta.11",
-    "@tsed/logger": ">=6.1.1",
-    "@tsed/schema": "7.0.0-beta.11"
+    "@tsed/core": "7.0.0-beta.14",
+    "@tsed/logger": ">=6.2.0",
+    "@tsed/schema": "7.0.0-beta.14"
   },
   "peerDependencies": {
-    "@tsed/core": "^7.0.0-beta.11",
-    "@tsed/logger": ">=6.1.1",
-    "@tsed/schema": "^7.0.0-beta.11"
+    "@tsed/core": "^7.0.0-beta.14",
+    "@tsed/logger": ">=6.2.0",
+    "@tsed/schema": "^7.0.0-beta.14"
   },
   "peerDependenciesMeta": {
     "@tsed/core": {
@@ -49,5 +50,8 @@
   },
   "homepage": "https://github.com/tsedio/tsed/tree/beta/packages/di",
   "author": "Romain Lenzotti",
-  "license": "MIT"
+  "license": "MIT",
+  "publishConfig": {
+    "tag": "beta"
+  }
 }

package/readme.md

@@ -11,7 +11,8 @@
 [![npm version](https://badge.fury.io/js/%40tsed%2Fcommon.svg)](https://badge.fury.io/js/%40tsed%2Fcommon)
 [![semantic-release](https://img.shields.io/badge/%20%20%F0%9F%93%A6%F0%9F%9A%80-semantic--release-e10079.svg)](https://github.com/semantic-release/semantic-release)
 [![code style: prettier](https://img.shields.io/badge/code_style-prettier-ff69b4.svg?style=flat-square)](https://github.com/prettier/prettier)
-[![backers](https://opencollective.com/tsed/tiers/badge.svg)](https://opencollective.com/tsed)
+[![github](https://img.shields.io/static/v1?label=Github%20sponsor&message=%E2%9D%A4&logo=GitHub&color=%23fe8e86)](https://github.com/sponsors/romakita)
+[![opencollective](https://img.shields.io/static/v1?label=OpenCollective%20sponsor&message=%E2%9D%A4&logo=OpenCollective&color=%23fe8e86)](https://opencollective.com/tsed)
 
 </div>