@tsed/di 7.0.0-beta.7 → 7.0.0-rc.1

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

@@ -1,13 +1,12 @@
 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 { DIContext } from "../domain/DIContext";
+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()`.
  *
@@ -21,7 +20,7 @@ import { DIContext } from "../domain/DIContext";
  * import MyService2 from "./services/service2";
  * import MyService3 from "./services/service3";
  *
- * // When all services is imported you can load InjectorService.
+ * // When all services are imported, you can load InjectorService.
  * const injector = new InjectorService()
  *
  * await injector.load();
@@ -31,16 +30,12 @@ import { DIContext } from "../domain/DIContext";
  */
 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
@@ -70,7 +65,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
@@ -103,25 +98,29 @@ 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?: LocalsContainer, 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.
      *
      * @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.
      *
      * @param container
-     * @param rootModule
      */
-    load(container?: Container, rootModule?: TokenProvider): Promise<LocalsContainer<any>>;
+    load(container?: Container): Promise<void>;
     /**
      * Load all configurations registered on providers
      */
@@ -132,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
      */
@@ -150,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
@@ -173,18 +171,11 @@ export declare class InjectorService extends Container {
      * @param options
      */
     bindInterceptor(instance: any, { propertyKey, useType, options }: InjectablePropertyOptions): void;
-    /**
-     * Allow handler hack for AsyncHookContext plugin.
-     * @param ctx
-     * @param cb
-     * @protected
-     */
-    runInContext(ctx: DIContext, cb: any): any;
     lazyInvoke<T = any>(token: TokenProvider): Promise<any>;
     /**
      * 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>;
@@ -228,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/lib/types/utils/getConfiguration.d.ts

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

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

@@ -0,0 +1,12 @@
+import { TokenProvider } from "../interfaces/TokenProvider";
+import { TokenRoute } from "../interfaces/TokenRoute";
+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[];

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.7",
+  "version": "7.0.0-rc.1",
   "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.7",
-    "@tsed/logger": ">=6.1.1",
-    "@tsed/schema": "7.0.0-beta.7"
+    "@tsed/core": "7.0.0-rc.1",
+    "@tsed/logger": ">=6.2.0",
+    "@tsed/schema": "7.0.0-rc.1"
   },
   "peerDependencies": {
-    "@tsed/core": "^7.0.0-beta.7",
-    "@tsed/logger": ">=6.1.1",
-    "@tsed/schema": "^7.0.0-beta.7"
+    "@tsed/core": "^7.0.0-rc.1",
+    "@tsed/logger": ">=6.2.0",
+    "@tsed/schema": "^7.0.0-rc.1"
   },
   "peerDependenciesMeta": {
     "@tsed/core": {
@@ -47,7 +48,10 @@
   "bugs": {
     "url": "https://github.com/tsedio/tsed/issues"
   },
-  "homepage": "https://github.com/tsedio/tsed/tree/production/packages/di",
+  "homepage": "https://github.com/tsedio/tsed/tree/rc/packages/di",
   "author": "Romain Lenzotti",
-  "license": "MIT"
+  "license": "MIT",
+  "publishConfig": {
+    "tag": "rc"
+  }
 }

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>
 
@@ -168,7 +169,7 @@ Support this project by becoming a sponsor. Your logo will show up here with a l
 
 The MIT License (MIT)
 
-Copyright (c) 2016 - 2018 Romain Lenzotti
+Copyright (c) 2016 - 2022 Romain Lenzotti
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: