@tsed/di 7.0.0-beta.16 → 7.0.0-beta.19

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

@@ -1,7 +1,6 @@
 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;
     logger?: DILogger;
@@ -11,11 +10,11 @@ export interface ContextLoggerOptions extends Record<string, any> {
 }
 export declare class ContextLogger {
     #private;
-    protected readonly $ctx: DIContext;
     readonly dateStart: Date;
-    constructor($ctx: DIContext);
-    get id(): string;
-    set maxStackSize(maxStackSize: number);
+    readonly id: string;
+    maxStackSize: number;
+    level: LogLevel;
+    constructor({ id, logger, dateStart, level, maxStackSize, additionalProps }: ContextLoggerOptions);
     get hooks(): Hooks;
     private get stack();
     alterLog(cb: (data: any, level: "debug" | "info" | "warn" | "error" | "off" | "all", withRequest: boolean) => any): Hooks;
@@ -27,7 +26,6 @@ export declare class ContextLogger {
     trace(obj: any): this;
     flush(): void;
     isLevelEnabled(otherLevel: string | LogLevel): boolean;
-    destroy(): void;
     /**
      * Return the duration between the time when LogIncomingRequest has handle the request and now.
      * @returns {number}

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

@@ -1,33 +1,20 @@
-import type { Env } from "@tsed/core";
 import { InjectorService } from "../services/InjectorService";
 import { ContextLogger, ContextLoggerOptions } from "./ContextLogger";
 import { LocalsContainer } from "./LocalsContainer";
-export interface ContextMethods extends Map<any, any> {
-    readonly id: string;
-    readonly logger: ContextLogger;
-    readonly injector: InjectorService;
-    readonly container: LocalsContainer;
-    readonly env: Env;
-    destroy(): any;
-}
 export interface DIContextOptions extends Omit<ContextLoggerOptions, "dateStart"> {
     id: string;
     injector: InjectorService;
     logger: any;
 }
-export declare class DIContext extends Map<any, any> implements ContextMethods {
-    readonly options: DIContextOptions;
-    [x: string]: any;
+export declare class DIContext {
+    #private;
     opts: DIContextOptions;
-    /**
-     * The request container used by the Ts.ED DI. It contain all services annotated with `@Scope(ProviderScope.REQUEST)`
-     */
-    container: LocalsContainer<any>;
+    [x: string]: any;
+    constructor(opts: DIContextOptions);
     /**
      * Logger attached to the context request.
      */
-    readonly logger: ContextLogger;
-    constructor(options: DIContextOptions);
+    get logger(): ContextLogger;
     /**
      * Request id generated by @@contextMiddleware@@.
      *
@@ -56,8 +43,18 @@ export declare class DIContext extends Map<any, any> implements ContextMethods {
     get dateStart(): Date;
     get injector(): InjectorService;
     get env(): any;
-    destroy(): Promise<void>;
+    /**
+     * The request container used by the Ts.ED DI. It contains all services annotated with `@Scope(ProviderScope.REQUEST)`
+     */
+    get container(): LocalsContainer;
+    destroy(): Promise<any>;
     emit(eventName: string, ...args: any[]): Promise<void>;
-    runInContext(next: Function): Promise<unknown>;
+    runInContext(next: Function): Promise<any>;
+    cache<Value = any>(key: string, cb: () => Value): Value;
+    cacheAsync<Value = any>(key: string, cb: () => Promise<Value>): Promise<Value>;
+    delete(key: any): boolean;
+    get<T = any>(key: any): T;
+    has(key: any): boolean;
+    set(key: any, value: any): this;
 }
 export declare type BaseContext = DIContext & TsED.Context;

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

@@ -1,25 +1,6 @@
+import { Hooks } from "@tsed/core";
 import type { TokenProvider } from "../interfaces/TokenProvider";
-export declare class LocalsContainer<V = any> extends Map<TokenProvider, V> {
-    /**
-     * Emit an event to all service. See service [lifecycle hooks](/docs/services.md#lifecycle-hooks).
-     * @param eventName The event name to emit at all services.
-     * @param args List of the parameters to give to each services.
-     * @returns {Promise<any[]>} A list of promises.
-     */
-    emit(eventName: string, ...args: any[]): Promise<void>;
-    /**
-     * @param eventName
-     * @param value
-     * @param args
-     */
-    alter<T = any>(eventName: string, value: any, ...args: any[]): T;
-    /**
-     * @param eventName
-     * @param value
-     * @param args
-     */
-    alterAsync<T = any>(eventName: string, value: any, ...args: any[]): Promise<T>;
-    toArray(): V[];
+export declare class LocalsContainer extends Map<TokenProvider, any> {
+    readonly hooks: Hooks;
     destroy(): Promise<void>;
-    protected getListeners(event: string): any[];
 }

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

@@ -3,6 +3,7 @@ import { ProviderOpts } from "../interfaces/ProviderOpts";
 import { TokenProvider } from "../interfaces/TokenProvider";
 import { ProviderScope } from "./ProviderScope";
 import { ProviderType } from "./ProviderType";
+export declare type ProviderHookCallback<T = any> = (instance: T, ...args: any[]) => Promise<void> | void;
 export declare class Provider<T = any> implements ProviderOpts<T> {
     type: ProviderType | any;
     deps: TokenProvider[];
@@ -10,7 +11,7 @@ export declare class Provider<T = any> implements ProviderOpts<T> {
     useFactory: Function;
     useAsyncFactory: Function;
     useValue: any;
-    hooks?: Record<string, (instance: T, ...args: any[]) => Promise<void> | void>;
+    hooks?: Record<string, ProviderHookCallback<T>>;
     private _useClass;
     private _provide;
     private _store;

package/lib/types/index.d.ts

@@ -50,11 +50,11 @@ export * from "./services/DIConfiguration";
 export * from "./services/DILogger";
 export * from "./services/DITest";
 export * from "./services/InjectorService";
+export * from "./utils/asyncHookContext";
 export * from "./utils/colors";
 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

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

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

@@ -1,4 +1,5 @@
 import type { InjectablePropertyType } from "../domain/InjectablePropertyType";
+import type { LocalsContainer } from "../domain/LocalsContainer";
 import type { TokenProvider } from "./TokenProvider";
 import type { InjectorService } from "../services/InjectorService";
 import type { InvokeOptions } from "./InvokeOptions";
@@ -9,7 +10,7 @@ export interface InjectablePropertyOptions extends InjectableProperty {
     bindingType: InjectablePropertyType.METHOD | InjectablePropertyType.PROPERTY | InjectablePropertyType.INTERCEPTOR;
     propertyType: string;
     useType?: TokenProvider;
-    resolver: (injector: InjectorService, locals: Map<TokenProvider, any>, options: Partial<InvokeOptions> & {
+    resolver: (injector: InjectorService, locals: LocalsContainer, options: Partial<InvokeOptions> & {
         options: any;
     }) => () => any;
     options?: any;

package/lib/types/registries/GlobalProviders.d.ts

@@ -1,10 +1,11 @@
 import { Type } from "@tsed/core";
+import type { LocalsContainer } from "../domain/LocalsContainer";
 import { Provider } from "../domain/Provider";
-import type { InjectorService } from "../services/InjectorService";
+import { ProviderOpts } from "../interfaces/ProviderOpts";
+import { RegistrySettings } from "../interfaces/RegistrySettings";
 import { ResolvedInvokeOptions } from "../interfaces/ResolvedInvokeOptions";
 import { TokenProvider } from "../interfaces/TokenProvider";
-import { RegistrySettings } from "../interfaces/RegistrySettings";
-import { ProviderOpts } from "../interfaces/ProviderOpts";
+import type { InjectorService } from "../services/InjectorService";
 export declare class GlobalProviderRegistry extends Map<TokenProvider, Provider> {
     #private;
     /**
@@ -30,7 +31,7 @@ export declare class GlobalProviderRegistry extends Map<TokenProvider, Provider>
      * @param target
      * @param options
      */
-    merge(target: TokenProvider, options: Partial<ProviderOpts>): void;
+    merge(target: TokenProvider, options: Partial<ProviderOpts>): Provider<any>;
     /**
      * The delete() method removes the specified element from a Map object.
      * @param key Required. The key of the element to remove from the Map object.
@@ -38,7 +39,7 @@ export declare class GlobalProviderRegistry extends Map<TokenProvider, Provider>
      */
     delete(key: TokenProvider): boolean;
     createRegistry(type: string, model: Type<Provider>, options?: Partial<RegistrySettings>): this;
-    onInvoke(provider: Provider, locals: Map<TokenProvider, any>, options: ResolvedInvokeOptions & {
+    onInvoke(provider: Provider, locals: LocalsContainer, options: ResolvedInvokeOptions & {
         injector: InjectorService;
     }): void;
     getRegistrySettings(target: string | TokenProvider): RegistrySettings;

package/lib/types/registries/ProviderRegistry.d.ts

@@ -1,9 +1,10 @@
+import { Provider } from "../domain/Provider";
 import type { ProviderOpts } from "../interfaces/ProviderOpts";
 /**
  * Register a provider configuration.
  * @param {ProviderOpts<any>} provider
  */
-export declare function registerProvider<Type = any>(provider: Partial<ProviderOpts<Type>>): void;
+export declare function registerProvider<Type = any>(provider: Partial<ProviderOpts<Type>>): Provider<any>;
 /**
  * Add a new value in the `ProviderRegistry`.
  *

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

@@ -1,4 +1,5 @@
 import { Container } from "../domain/Container";
+import { LocalsContainer } from "../domain/LocalsContainer";
 import { Provider } from "../domain/Provider";
 import { ProviderScope } from "../domain/ProviderScope";
 import { DILogger } from "../interfaces/DILogger";
@@ -97,7 +98,7 @@ export declare class InjectorService extends Container {
      * @param options
      * @returns {T} The class constructed.
      */
-    invoke<T = any>(token: TokenProvider, locals?: Map<TokenProvider, any>, options?: Partial<InvokeOptions<T>>): T;
+    invoke<T = any>(token: TokenProvider, locals?: LocalsContainer, options?: Partial<InvokeOptions<T>>): T;
     /**
      * Build only providers which are asynchronous.
      */
@@ -130,9 +131,8 @@ export declare class InjectorService extends Container {
      * @param locals
      * @param options
      */
-    bindInjectableProperties(instance: any, locals: Map<TokenProvider, any>, options: Partial<InvokeOptions>): void;
+    bindInjectableProperties(instance: any, locals: LocalsContainer, options: Partial<InvokeOptions>): void;
     /**
-     *
      * @param instance
      * @param {string} propertyKey
      */
@@ -148,7 +148,7 @@ export declare class InjectorService extends Container {
      * @param locals
      * @param invokeOptions
      */
-    bindProperty(instance: any, { propertyKey, resolver, options }: InjectablePropertyOptions, locals: Map<TokenProvider, any>, invokeOptions: Partial<InvokeOptions>): void;
+    bindProperty(instance: any, { propertyKey, resolver, options }: InjectablePropertyOptions, locals: LocalsContainer, invokeOptions: Partial<InvokeOptions>): void;
     /**
      *
      * @param instance
@@ -175,7 +175,7 @@ export declare class InjectorService extends Container {
     /**
      * Emit an event to all service. See service [lifecycle hooks](/docs/services.md#lifecycle-hooks).
      * @param eventName The event name to emit at all services.
-     * @param args List of the parameters to give to each services.
+     * @param args List of the parameters to give to each service.
      * @returns {Promise<any[]>} A list of promises.
      */
     emit(eventName: string, ...args: any[]): Promise<void>;
@@ -219,4 +219,5 @@ export declare class InjectorService extends Container {
      * @param options
      */
     private mapInvokeOptions;
+    private registerHooks;
 }

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

@@ -0,0 +1,14 @@
+/// <reference types="node" />
+import { AsyncLocalStorage } from "async_hooks";
+import type { DIContext } from "../domain/DIContext";
+import type { InjectorService } from "../services/InjectorService";
+export declare function getAsyncStore(): AsyncLocalStorage<{
+    current: DIContext | undefined;
+}>;
+export declare function useContextRef(): {
+    current: DIContext | undefined;
+} | undefined;
+export declare function getContext<Context = DIContext>(): Context | undefined;
+export declare function runInContext(ctx: DIContext | undefined, cb: any, injector?: InjectorService): Promise<any>;
+export declare function setContext(ctx: DIContext): void;
+export declare function bindContext(cb: any): any;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tsed/di",
-  "version": "7.0.0-beta.16",
+  "version": "7.0.0-beta.19",
   "description": "DI module for Ts.ED Framework",
   "private": false,
   "source": "./src/index.ts",
@@ -24,14 +24,14 @@
     "tslib": "2.4.0"
   },
   "devDependencies": {
-    "@tsed/core": "7.0.0-beta.16",
+    "@tsed/core": "7.0.0-beta.19",
     "@tsed/logger": ">=6.2.0",
-    "@tsed/schema": "7.0.0-beta.16"
+    "@tsed/schema": "7.0.0-beta.19"
   },
   "peerDependencies": {
-    "@tsed/core": "^7.0.0-beta.16",
+    "@tsed/core": "^7.0.0-beta.19",
     "@tsed/logger": ">=6.2.0",
-    "@tsed/schema": "^7.0.0-beta.16"
+    "@tsed/schema": "^7.0.0-beta.19"
   },
   "peerDependenciesMeta": {
     "@tsed/core": {

package/lib/cjs/utils/runInContext.js

@@ -1,32 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.bindContext = exports.runInContext = exports.getContext = exports.getAsyncStore = void 0;
-const async_hooks_1 = require("async_hooks");
-const storage = new async_hooks_1.AsyncLocalStorage();
-function getAsyncStore() {
-    return storage;
-}
-exports.getAsyncStore = getAsyncStore;
-function getContext() {
-    return getAsyncStore().getStore();
-}
-exports.getContext = getContext;
-function runInContext(ctx, cb) {
-    return storage.run(ctx, cb);
-}
-exports.runInContext = runInContext;
-function bindContext(cb) {
-    if (getContext()) {
-        let localArgs;
-        const newCB = async_hooks_1.AsyncResource.bind(() => cb(...localArgs));
-        // FIXME: remove this hack when the support of v14 will be removed
-        // see issue: https://github.com/nodejs/node/issues/36051
-        return (...args) => {
-            localArgs = args;
-            return newCB(...args);
-        };
-    }
-    return cb;
-}
-exports.bindContext = bindContext;
-//# sourceMappingURL=runInContext.js.map

package/lib/cjs/utils/runInContext.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"runInContext.js","sourceRoot":"","sources":["../../../src/utils/runInContext.ts"],"names":[],"mappings":";;;AAAA,6CAA6D;AAG7D,MAAM,OAAO,GAAiC,IAAI,+BAAiB,EAAE,CAAC;AAEtE,SAAgB,aAAa;IAC3B,OAAO,OAAO,CAAC;AACjB,CAAC;AAFD,sCAEC;AAED,SAAgB,UAAU;IACxB,OAAO,aAAa,EAAE,CAAC,QAAQ,EAAS,CAAC;AAC3C,CAAC;AAFD,gCAEC;AAED,SAAgB,YAAY,CAAC,GAAc,EAAE,EAAO;IAClD,OAAO,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;AAC9B,CAAC;AAFD,oCAEC;AAED,SAAgB,WAAW,CAAC,EAAO;IACjC,IAAI,UAAU,EAAE,EAAE;QAChB,IAAI,SAAc,CAAC;QACnB,MAAM,KAAK,GAAQ,2BAAa,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,GAAG,SAAS,CAAC,CAAC,CAAC;QAE9D,kEAAkE;QAClE,yDAAyD;QACzD,OAAO,CAAC,GAAG,IAAS,EAAE,EAAE;YACtB,SAAS,GAAG,IAAI,CAAC;YACjB,OAAO,KAAK,CAAC,GAAG,IAAI,CAAC,CAAC;QACxB,CAAC,CAAC;KACH;IAED,OAAO,EAAE,CAAC;AACZ,CAAC;AAdD,kCAcC","sourcesContent":["import {AsyncLocalStorage, AsyncResource} from \"async_hooks\";\nimport {DIContext} from \"../domain/DIContext\";\n\nconst storage: AsyncLocalStorage<DIContext> = new AsyncLocalStorage();\n\nexport function getAsyncStore() {\n  return storage;\n}\n\nexport function getContext<Context = DIContext>(): Context | undefined {\n  return getAsyncStore().getStore() as any;\n}\n\nexport function runInContext(ctx: DIContext, cb: any) {\n  return storage.run(ctx, cb);\n}\n\nexport function bindContext(cb: any) {\n  if (getContext()) {\n    let localArgs: any;\n    const newCB: any = AsyncResource.bind(() => cb(...localArgs));\n\n    // FIXME: remove this hack when the support of v14 will be removed\n    // see issue: https://github.com/nodejs/node/issues/36051\n    return (...args: any) => {\n      localArgs = args;\n      return newCB(...args);\n    };\n  }\n\n  return cb;\n}\n"]}

package/lib/esm/utils/runInContext.js

@@ -1,25 +0,0 @@
-import { AsyncLocalStorage, AsyncResource } from "async_hooks";
-const storage = new AsyncLocalStorage();
-export function getAsyncStore() {
-    return storage;
-}
-export function getContext() {
-    return getAsyncStore().getStore();
-}
-export function runInContext(ctx, cb) {
-    return storage.run(ctx, cb);
-}
-export function bindContext(cb) {
-    if (getContext()) {
-        let localArgs;
-        const newCB = AsyncResource.bind(() => cb(...localArgs));
-        // FIXME: remove this hack when the support of v14 will be removed
-        // see issue: https://github.com/nodejs/node/issues/36051
-        return (...args) => {
-            localArgs = args;
-            return newCB(...args);
-        };
-    }
-    return cb;
-}
-//# sourceMappingURL=runInContext.js.map

package/lib/esm/utils/runInContext.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"runInContext.js","sourceRoot":"","sources":["../../../src/utils/runInContext.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,iBAAiB,EAAE,aAAa,EAAC,MAAM,aAAa,CAAC;AAG7D,MAAM,OAAO,GAAiC,IAAI,iBAAiB,EAAE,CAAC;AAEtE,MAAM,UAAU,aAAa;IAC3B,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,MAAM,UAAU,UAAU;IACxB,OAAO,aAAa,EAAE,CAAC,QAAQ,EAAS,CAAC;AAC3C,CAAC;AAED,MAAM,UAAU,YAAY,CAAC,GAAc,EAAE,EAAO;IAClD,OAAO,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;AAC9B,CAAC;AAED,MAAM,UAAU,WAAW,CAAC,EAAO;IACjC,IAAI,UAAU,EAAE,EAAE;QAChB,IAAI,SAAc,CAAC;QACnB,MAAM,KAAK,GAAQ,aAAa,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,GAAG,SAAS,CAAC,CAAC,CAAC;QAE9D,kEAAkE;QAClE,yDAAyD;QACzD,OAAO,CAAC,GAAG,IAAS,EAAE,EAAE;YACtB,SAAS,GAAG,IAAI,CAAC;YACjB,OAAO,KAAK,CAAC,GAAG,IAAI,CAAC,CAAC;QACxB,CAAC,CAAC;KACH;IAED,OAAO,EAAE,CAAC;AACZ,CAAC","sourcesContent":["import {AsyncLocalStorage, AsyncResource} from \"async_hooks\";\nimport {DIContext} from \"../domain/DIContext\";\n\nconst storage: AsyncLocalStorage<DIContext> = new AsyncLocalStorage();\n\nexport function getAsyncStore() {\n  return storage;\n}\n\nexport function getContext<Context = DIContext>(): Context | undefined {\n  return getAsyncStore().getStore() as any;\n}\n\nexport function runInContext(ctx: DIContext, cb: any) {\n  return storage.run(ctx, cb);\n}\n\nexport function bindContext(cb: any) {\n  if (getContext()) {\n    let localArgs: any;\n    const newCB: any = AsyncResource.bind(() => cb(...localArgs));\n\n    // FIXME: remove this hack when the support of v14 will be removed\n    // see issue: https://github.com/nodejs/node/issues/36051\n    return (...args: any) => {\n      localArgs = args;\n      return newCB(...args);\n    };\n  }\n\n  return cb;\n}\n"]}

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

@@ -1,7 +0,0 @@
-/// <reference types="node" />
-import { AsyncLocalStorage } from "async_hooks";
-import { DIContext } from "../domain/DIContext";
-export declare function getAsyncStore(): AsyncLocalStorage<DIContext>;
-export declare function getContext<Context = DIContext>(): Context | undefined;
-export declare function runInContext(ctx: DIContext, cb: any): unknown;
-export declare function bindContext(cb: any): any;