@tsed/di 8.0.0-rc.5 → 8.0.0

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

@@ -1,8 +1,5 @@
-import { Hooks } from "@tsed/core";
 import { Container } from "../domain/Container.js";
-import { LocalsContainer } from "../domain/LocalsContainer.js";
 import { Provider } from "../domain/Provider.js";
-import { ProviderScope } from "../domain/ProviderScope.js";
 import type { DILogger } from "../interfaces/DILogger.js";
 import type { InvokeOptions } from "../interfaces/InvokeOptions.js";
 import type { TokenProvider } from "../interfaces/TokenProvider.js";
@@ -21,27 +18,20 @@ import { DIConfiguration } from "./DIConfiguration.js";
  * import MyService3 from "./services/service3.js";
  *
  * // When all services are imported, you can load InjectorService.
- * const injector = new InjectorService()
  *
- * await injector.load();
+ * await injector().load();
  *
- * const myService1 = injector.get<MyService1>(MyServcice1);
+ * const myService1 = injector.get<MyService1>(MyService1);
  * ```
  */
 export declare class InjectorService extends Container {
     #private;
-    settings: DIConfiguration;
     logger: DILogger;
-    readonly hooks: Hooks;
     private resolvedConfiguration;
     constructor();
-    get resolvers(): import("../index.js").DIResolver[];
-    get scopes(): Record<string, ProviderScope>;
-    /**
-     * Retrieve default scope for a given provider.
-     * @param provider
-     */
-    scopeOf(provider: Provider): ProviderScope;
+    get settings(): DIConfiguration;
+    set settings(settings: DIConfiguration);
+    isLoaded(): boolean;
     /**
      * Return a list of instance build by the injector.
      */
@@ -65,11 +55,11 @@ export declare class InjectorService extends Container {
      * @param token The class or symbol registered in InjectorService.
      * @param options
      */
-    get<T = any>(token: TokenProvider<T>, options?: Record<string, unknown>): T | undefined;
+    get<T = any>(token: TokenProvider<T>, options?: Partial<InvokeOptions>): T;
     /**
      * Return all instance of the same provider type
      */
-    getMany<Type = any>(type: any, locals?: LocalsContainer, options?: Partial<InvokeOptions>): Type[];
+    getMany<Type = any>(type: any, options?: Partial<InvokeOptions>): Type[];
     /**
      * The has() method returns a boolean indicating whether an element with the specified key exists or not.
      */
@@ -79,7 +69,9 @@ export declare class InjectorService extends Container {
      */
     alias(token: TokenProvider, alias: TokenProvider): this;
     /**
-     * Invoke the class and inject all services that required by the class constructor.
+     * Resolve the token depending on his provider configuration.
+     *
+     * If the token isn't cached, the injector will invoke the provider and cache the result.
      *
      * #### Example
      *
@@ -95,11 +87,34 @@ export declare class InjectorService extends Container {
      * ```
      *
      * @param token The injectable class to invoke. Class parameters are injected according constructor signature.
-     * @param locals  Optional object. If preset then any argument Class are read from this object first, before the `InjectorService` is consulted.
-     * @param options
+     * @param options {InvokeOptions} Optional options to invoke the class.
      * @returns {Type} The class constructed.
      */
-    invoke<Type = any>(token: TokenProvider<Type>, locals?: LocalsContainer, options?: Partial<InvokeOptions>): Type;
+    resolve<Type = any>(token: TokenProvider<Type>, options?: Partial<InvokeOptions>): Type;
+    /**
+     * Resolve the token depending on his provider configuration.
+     *
+     * If the token isn't cached, the injector will invoke the provider and cache the result.
+     *
+     * #### Example
+     *
+     * ```typescript
+     * import {InjectorService} from "@tsed/di";
+     * import MyService from "./services.js";
+     *
+     * class OtherService {
+     *     constructor(injectorService: InjectorService) {
+     *          const myService = injectorService.invoke<MyService>(MyService);
+     *      }
+     *  }
+     * ```
+     *
+     * @param token The injectable class to invoke. Class parameters are injected according constructor signature.
+     * @param options {InvokeOptions} Optional options to invoke the class.
+     * @returns {Type} The class constructed.
+     * @alias InjectorService.resolve
+     */
+    invoke<Type = any>(token: TokenProvider<Type>, options?: Partial<InvokeOptions>): Type;
     /**
      * Build only providers which are asynchronous.
      */
@@ -108,17 +123,6 @@ export declare class InjectorService extends Container {
      * Build only providers which are synchronous.
      */
     loadSync(): void;
-    /**
-     * Boostrap injector from container and resolve configuration.
-     *
-     * @param container
-     */
-    bootstrap(container?: Container): this;
-    /**
-     * Load injector from a given module
-     * @param rootModule
-     */
-    loadModule(rootModule: TokenProvider): Promise<void>;
     /**
      * Build all providers from given container (or GlobalProviders) and emit `$onInit` event.
      *
@@ -126,7 +130,8 @@ export declare class InjectorService extends Container {
      */
     load(container?: Container): Promise<void>;
     /**
-     * Load all configurations registered on providers
+     * Load all configurations registered on providers via @Configuration decorator.
+     * It inspects for each provider some fields like imports, mount, etc. to resolve the configuration.
      */
     resolveConfiguration(): void;
     /**
@@ -134,13 +139,15 @@ export declare class InjectorService extends Container {
      * @param eventName The event name to emit at all services.
      * @param args List of the parameters to give to each service.
      * @returns A list of promises.
+     * @deprecated use $asyncEmit instead
      */
-    emit(eventName: string, ...args: any[]): Promise<void>;
+    emit(eventName: string, ...args: unknown[]): Promise<void>;
     /**
      * Alter value attached to an event.
      * @param eventName
      * @param value
      * @param args
+     * @deprecated use $alter instead
      */
     alter<T = any>(eventName: string, value: any, ...args: any[]): T;
     /**
@@ -148,12 +155,19 @@ export declare class InjectorService extends Container {
      * @param eventName
      * @param value
      * @param args
+     * @deprecated use $asyncAlter instead
      */
     alterAsync<T = any>(eventName: string, value: any, ...args: any[]): Promise<T>;
     /**
      * Destroy the injector and all services.
      */
     destroy(): Promise<void>;
+    /**
+     * Bootstrap injector from container, resolve configuration and providers.
+     *
+     * @param container
+     */
+    protected bootstrap(container?: Container): this;
     /**
      * Ensure that a provider is added to the container.
      * @protected
@@ -161,7 +175,6 @@ export declare class InjectorService extends Container {
     protected ensureProvider(token: TokenProvider, force: true): Provider;
     protected ensureProvider(token: TokenProvider, force: false): Provider | undefined;
     protected ensureProvider(token: TokenProvider): Provider | undefined;
-    protected getInstance(token: any): any;
     /**
      * Invoke a class method and inject service.
      *
@@ -175,18 +188,17 @@ export declare class InjectorService extends Container {
      * #### Example
      *
      * @param target
-     * @param locals
      * @param options
      * @private
      */
-    protected resolve<T>(target: TokenProvider, locals?: LocalsContainer, options?: Partial<InvokeOptions>): T | Promise<T>;
+    protected invokeToken<T>(target: TokenProvider, options?: Partial<InvokeOptions>): T | Promise<T>;
     private resolveImportsProviders;
     /**
      * Create options to invoke a provider or class.
      * @param token
-     * @param locals
      * @param options
      */
     private mapInvokeOptions;
     private registerHooks;
+    private setToCache;
 }

package/lib/types/common/utils/discoverHooks.d.ts

@@ -0,0 +1,2 @@
+import { type AbstractType, type Type } from "@tsed/core";
+export declare function discoverHooks(token: Type | AbstractType<any>): any;

package/lib/types/common/utils/providerBuilder.d.ts

@@ -0,0 +1,17 @@
+import "../registries/ProviderRegistry.js";
+import { Store, type Type } from "@tsed/core";
+import type { ProviderOpts } from "../interfaces/ProviderOpts.js";
+import type { TokenProvider } from "../interfaces/TokenProvider.js";
+type ProviderBuilder<Token extends TokenProvider, BaseProvider, T extends object> = {
+    [K in keyof T as T[K] extends (...args: any[]) => any ? never : K]: (value: T[K]) => ProviderBuilder<Token, BaseProvider, T>;
+} & {
+    inspect(): BaseProvider;
+    store(): Store;
+    token(): Token;
+    factory(f: (...args: unknown[]) => unknown): ProviderBuilder<Token, BaseProvider, T>;
+    asyncFactory(f: (...args: unknown[]) => Promise<unknown>): ProviderBuilder<Token, BaseProvider, T>;
+    value(v: unknown): ProviderBuilder<Token, BaseProvider, T>;
+    class(c: Type): ProviderBuilder<Token, BaseProvider, T>;
+};
+export declare function providerBuilder<Provider, Picked extends keyof Provider>(props: string[], baseOpts?: Partial<ProviderOpts<Provider>>): <Token extends TokenProvider>(token: Token, options?: Partial<ProviderOpts<Type>>) => ProviderBuilder<Token, Provider, Pick<Provider, Picked>>;
+export {};

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

@@ -1,4 +1,4 @@
-import { Hooks } from "@tsed/core";
+import { Hooks } from "@tsed/hooks";
 import { LogLevel } from "@tsed/logger";
 import { DILogger } from "../../common/index.js";
 export interface ContextLoggerOptions extends Record<string, any> {

package/lib/types/node/services/DITest.d.ts

@@ -24,9 +24,8 @@ export declare class DITest {
     /**
      * Return the instance from injector registry
      * @param target
-     * @param options
      */
-    static get<T = any>(target: TokenProvider, options?: any): T;
+    static get<T = any>(target: TokenProvider): T;
     static createDIContext(): DIContext;
     protected static configure(settings?: Partial<TsED.Configuration>): Partial<TsED.Configuration>;
 }

package/lib/types/node/utils/attachLogger.d.ts

@@ -1,2 +1,2 @@
-import { DILogger, InjectorService } from "../../common/index.js";
-export declare function attachLogger(injector: InjectorService, $log: DILogger): void;
+import { DILogger } from "../../common/index.js";
+export declare function attachLogger($log: DILogger): void;

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

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

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

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

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

@@ -1,6 +1,4 @@
-import type { InjectorService } from "../../common/index.js";
 /**
  * @ignore
- * @param injector
  */
-export declare function setLoggerLevel(injector: InjectorService): void;
+export declare function setLoggerLevel(): void;

package/package.json

@@ -2,7 +2,7 @@
   "name": "@tsed/di",
   "description": "DI module for Ts.ED Framework",
   "type": "module",
-  "version": "8.0.0-rc.5",
+  "version": "8.0.0",
   "source": "./src/index.ts",
   "main": "./lib/esm/index.js",
   "module": "./lib/esm/index.js",
@@ -29,11 +29,12 @@
     "uuid": "^10.0.0"
   },
   "devDependencies": {
-    "@tsed/barrels": "8.0.0-rc.5",
-    "@tsed/core": "8.0.0-rc.5",
+    "@tsed/barrels": "8.0.0",
+    "@tsed/core": "8.0.0",
+    "@tsed/hooks": "8.0.0",
     "@tsed/logger": "^6.7.8",
-    "@tsed/schema": "8.0.0-rc.5",
-    "@tsed/typescript": "8.0.0-rc.5",
+    "@tsed/schema": "8.0.0",
+    "@tsed/typescript": "8.0.0",
     "cross-env": "7.0.3",
     "eslint": "9.12.0",
     "typescript": "5.4.5",
@@ -41,14 +42,18 @@
     "webpack": "^5.75.0"
   },
   "peerDependencies": {
-    "@tsed/core": "8.0.0-rc.5",
+    "@tsed/core": "8.0.0",
+    "@tsed/hooks": "8.0.0",
     "@tsed/logger": ">=6.7.5",
-    "@tsed/schema": "8.0.0-rc.5"
+    "@tsed/schema": "8.0.0"
   },
   "peerDependenciesMeta": {
     "@tsed/core": {
       "optional": false
     },
+    "@tsed/hooks": {
+      "optional": false
+    },
     "@tsed/logger": {
       "optional": false
     },
@@ -62,8 +67,5 @@
   },
   "homepage": "https://github.com/tsedio/tsed/tree/production/packages/di",
   "author": "Romain Lenzotti",
-  "license": "MIT",
-  "publishConfig": {
-    "tag": "rc"
-  }
+  "license": "MIT"
 }

package/vitest.config.mts

@@ -10,10 +10,10 @@ export default defineConfig(
       coverage: {
         ...presets.test.coverage,
         thresholds: {
-          statements: 0,
-          branches: 0,
-          functions: 0,
-          lines: 0
+          statements: 98.69,
+          branches: 97.18,
+          functions: 96.62,
+          lines: 98.69
         }
       }
     }

package/lib/esm/common/fn/events.js

@@ -1,31 +0,0 @@
-import { injector } from "./injector.js";
-/**
- * Alter value attached to an event asynchronously.
- * @param eventName
- * @param value
- * @param args
- * @param callThis
- */
-export function $alterAsync(eventName, value, ...args) {
-    return injector().hooks.asyncAlter(eventName, value, args);
-}
-/**
- * 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 service.
- * @returns A list of promises.
- */
-export function $emit(eventName, ...args) {
-    return injector().hooks.asyncEmit(eventName, args);
-}
-/**
- * Alter value attached to an event.
- * @param eventName
- * @param value
- * @param args
- * @param callThis
- */
-export function $alter(eventName, value, ...args) {
-    return injector().hooks.alter(eventName, value, args);
-}
-//# sourceMappingURL=events.js.map

package/lib/esm/common/fn/events.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"events.js","sourceRoot":"","sources":["../../../../src/common/fn/events.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,QAAQ,EAAC,MAAM,eAAe,CAAC;AAEvC;;;;;;GAMG;AACH,MAAM,UAAU,WAAW,CAAU,SAAiB,EAAE,KAAU,EAAE,GAAG,IAAe;IACpF,OAAO,QAAQ,EAAE,CAAC,KAAK,CAAC,UAAU,CAAI,SAAS,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC;AAChE,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,KAAK,CAAC,SAAiB,EAAE,GAAG,IAAe;IACzD,OAAO,QAAQ,EAAE,CAAC,KAAK,CAAC,SAAS,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;AACrD,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,MAAM,CAAU,SAAiB,EAAE,KAAc,EAAE,GAAG,IAAe;IACnF,OAAO,QAAQ,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,SAAS,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC;AACxD,CAAC"}

package/lib/esm/common/interfaces/DIResolver.js

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=DIResolver.js.map

package/lib/esm/common/interfaces/DIResolver.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"DIResolver.js","sourceRoot":"","sources":["../../../../src/common/interfaces/DIResolver.ts"],"names":[],"mappings":""}

package/lib/esm/common/utils/resolveControllers.js

@@ -1,42 +0,0 @@
-import { isArray, isClass } from "@tsed/core";
-import { ProviderType } from "../domain/ProviderType.js";
-import { GlobalProviders } from "../registries/GlobalProviders.js";
-const lookupProperties = ["mount", "imports"];
-export function getTokens(config) {
-    if (!config) {
-        return [];
-    }
-    if (isArray(config)) {
-        return config.filter(isClass).map((value) => {
-            return { token: value };
-        });
-    }
-    return Object.keys(config).reduce((list, route) => {
-        return [
-            ...list,
-            ...[]
-                .concat(config[route])
-                .filter(isClass)
-                .map((token) => ({
-                route,
-                token
-            }))
-        ];
-    }, []);
-}
-function resolveRecursively(providers) {
-    return providers
-        .map(({ token }) => GlobalProviders.get(token))
-        .filter((provider) => provider?.type === ProviderType.MODULE && provider.configuration)
-        .flatMap((provider) => resolveControllers(provider.configuration));
-}
-/**
- * Return controllers and is base route according to his configuration in module configuration.
- *
- * @param settings
- */
-export function resolveControllers(settings) {
-    const providers = lookupProperties.flatMap((property) => getTokens(settings[property]));
-    return [...resolveRecursively(providers), ...providers].filter((provider) => !!provider.route);
-}
-//# sourceMappingURL=resolveControllers.js.map

package/lib/esm/common/utils/resolveControllers.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"resolveControllers.js","sourceRoot":"","sources":["../../../../src/common/utils/resolveControllers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAE,OAAO,EAAC,MAAM,YAAY,CAAC;AAG5C,OAAO,EAAC,YAAY,EAAC,MAAM,2BAA2B,CAAC;AAGvD,OAAO,EAAC,eAAe,EAAC,MAAM,kCAAkC,CAAC;AAEjE,MAAM,gBAAgB,GAAG,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;AAE9C,MAAM,UAAU,SAAS,CAAC,MAAW;IACnC,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,IAAI,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;QACpB,OAAO,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,KAAU,EAAE,EAAE;YAC/C,OAAO,EAAC,KAAK,EAAE,KAAK,EAAC,CAAC;QACxB,CAAC,CAAC,CAAC;IACL,CAAC;IAED,OAAO,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC,IAAW,EAAE,KAAa,EAAE,EAAE;QAC/D,OAAO;YACL,GAAG,IAAI;YACP,GAAG,EAAE;iBACF,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;iBACrB,MAAM,CAAC,OAAO,CAAC;iBACf,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;gBACf,KAAK;gBACL,KAAK;aACN,CAAC,CAAC;SACN,CAAC;IACJ,CAAC,EAAE,EAAE,CAAC,CAAC;AACT,CAAC;AAED,SAAS,kBAAkB,CAAC,SAAmD;IAC7E,OAAO,SAAS;SACb,GAAG,CAAC,CAAC,EAAC,KAAK,EAAC,EAAE,EAAE,CAAC,eAAe,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;SAC5C,MAAM,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,EAAE,IAAI,KAAK,YAAY,CAAC,MAAM,IAAI,QAAQ,CAAC,aAAa,CAAC;SACtF,OAAO,CAAC,CAAC,QAAkB,EAAE,EAAE,CAAC,kBAAkB,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC,CAAC;AACjF,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,kBAAkB,CAAC,QAAqC;IACtE,MAAM,SAAS,GAAG,gBAAgB,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;IAExF,OAAO,CAAC,GAAG,kBAAkB,CAAC,SAAS,CAAC,EAAE,GAAG,SAAS,CAAC,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAU,CAAC;AAC1G,CAAC"}

package/lib/types/common/fn/events.d.ts

@@ -1,23 +0,0 @@
-/**
- * Alter value attached to an event asynchronously.
- * @param eventName
- * @param value
- * @param args
- * @param callThis
- */
-export declare function $alterAsync<T = any>(eventName: string, value: any, ...args: unknown[]): Promise<T>;
-/**
- * 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 service.
- * @returns A list of promises.
- */
-export declare function $emit(eventName: string, ...args: unknown[]): Promise<void>;
-/**
- * Alter value attached to an event.
- * @param eventName
- * @param value
- * @param args
- * @param callThis
- */
-export declare function $alter<T = any>(eventName: string, value: unknown, ...args: unknown[]): T;

package/lib/types/common/interfaces/DIResolver.d.ts

@@ -1,5 +0,0 @@
-import type { TokenProvider } from "./TokenProvider.js";
-export interface DIResolver {
-    deps?: TokenProvider[];
-    get<T = any>(type: TokenProvider, options: any): T | undefined;
-}

package/lib/types/common/utils/resolveControllers.d.ts

@@ -1,12 +0,0 @@
-import { TokenProvider } from "../interfaces/TokenProvider.js";
-import { TokenRoute } from "../interfaces/TokenRoute.js";
-export declare function getTokens(config: any): {
-    route?: string;
-    token: TokenProvider;
-}[];
-/**
- * Return controllers and is base route according to his configuration in module configuration.
- *
- * @param settings
- */
-export declare function resolveControllers(settings: Partial<TsED.Configuration>): TokenRoute[];