@tsed/di 8.0.0-alpha.9 → 8.0.0-beta.2

package/lib/esm/node/decorators/injectContext.js

@@ -1,7 +1,5 @@
 import { catchError } from "@tsed/core";
-import { InjectorService } from "../../common/index.js";
-import { DIContext } from "../domain/DIContext.js";
-import { getContext } from "../utils/asyncHookContext.js";
+import { context } from "../fn/context.js";
 /**
  * Inject a context like PlatformContext or any BaseContext.
  *
@@ -21,13 +19,7 @@ export function InjectContext(transform = (o) => o) {
         catchError(() => Reflect.deleteProperty(target, propertyKey));
         Reflect.defineProperty(target, propertyKey, {
             get() {
-                return transform(getContext() ||
-                    new DIContext({
-                        id: "",
-                        logger: InjectorService.getInstance().logger,
-                        injector: InjectorService.getInstance(),
-                        maxStackSize: 0
-                    }));
+                return transform(context());
             }
         });
     };

package/lib/esm/node/decorators/injectContext.js.map

@@ -1 +1 @@
-{"version":3,"file":"injectContext.js","sourceRoot":"","sources":["../../../../src/node/decorators/injectContext.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAAC,MAAM,YAAY,CAAC;AAEtC,OAAO,EAAC,eAAe,EAAC,MAAM,uBAAuB,CAAC;AACtD,OAAO,EAAC,SAAS,EAAC,MAAM,wBAAwB,CAAC;AACjD,OAAO,EAAC,UAAU,EAAC,MAAM,8BAA8B,CAAC;AAExD;;;;;;;;;;;;;GAaG;AACH,MAAM,UAAU,aAAa,CAAC,YAA0C,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;IAC9E,OAAO,CAAC,MAAW,EAAE,WAAmB,EAAc,EAAE;QACtD,UAAU,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,cAAc,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC,CAAC;QAC9D,OAAO,CAAC,cAAc,CAAC,MAAM,EAAE,WAAW,EAAE;YAC1C,GAAG;gBACD,OAAO,SAAS,CACd,UAAU,EAAE;oBACV,IAAI,SAAS,CAAC;wBACZ,EAAE,EAAE,EAAE;wBACN,MAAM,EAAE,eAAe,CAAC,WAAW,EAAE,CAAC,MAAM;wBAC5C,QAAQ,EAAE,eAAe,CAAC,WAAW,EAAE;wBACvC,YAAY,EAAE,CAAC;qBAChB,CAAC,CACL,CAAC;YACJ,CAAC;SACF,CAAC,CAAC;IACL,CAAC,CAAC;AACJ,CAAC"}
+{"version":3,"file":"injectContext.js","sourceRoot":"","sources":["../../../../src/node/decorators/injectContext.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAAC,MAAM,YAAY,CAAC;AAGtC,OAAO,EAAC,OAAO,EAAC,MAAM,kBAAkB,CAAC;AAEzC;;;;;;;;;;;;;GAaG;AACH,MAAM,UAAU,aAAa,CAAC,YAA0C,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;IAC9E,OAAO,CAAC,MAAW,EAAE,WAAmB,EAAc,EAAE;QACtD,UAAU,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,cAAc,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC,CAAC;QAC9D,OAAO,CAAC,cAAc,CAAC,MAAM,EAAE,WAAW,EAAE;YAC1C,GAAG;gBACD,OAAO,SAAS,CAAC,OAAO,EAAE,CAAC,CAAC;YAC9B,CAAC;SACF,CAAC,CAAC;IACL,CAAC,CAAC;AACJ,CAAC"}

package/lib/esm/node/fn/context.js

@@ -0,0 +1,21 @@
+import { v4 } from "uuid";
+import { injector } from "../../common/index.js";
+import { DIContext } from "../domain/DIContext.js";
+import { getContext } from "../utils/asyncHookContext.js";
+/**
+ * Get the current DIContext instance using async hook node.js api.
+ *
+ * ::: warning
+ * This function isn't available in the browser context.
+ * :::
+ */
+export function context() {
+    return (getContext() ||
+        new DIContext({
+            id: v4(),
+            logger: injector().logger,
+            injector: injector(),
+            maxStackSize: 0
+        }));
+}
+//# sourceMappingURL=context.js.map

package/lib/esm/node/fn/context.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"context.js","sourceRoot":"","sources":["../../../../src/node/fn/context.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,EAAE,EAAC,MAAM,MAAM,CAAC;AAExB,OAAO,EAAC,QAAQ,EAAC,MAAM,uBAAuB,CAAC;AAC/C,OAAO,EAAC,SAAS,EAAC,MAAM,wBAAwB,CAAC;AACjD,OAAO,EAAC,UAAU,EAAC,MAAM,8BAA8B,CAAC;AAExD;;;;;;GAMG;AACH,MAAM,UAAU,OAAO;IACrB,OAAO,CACL,UAAU,EAAO;QAChB,IAAI,SAAS,CAAC;YACb,EAAE,EAAE,EAAE,EAAE;YACR,MAAM,EAAE,QAAQ,EAAE,CAAC,MAAM;YACzB,QAAQ,EAAE,QAAQ,EAAE;YACpB,YAAY,EAAE,CAAC;SAChB,CAAS,CACX,CAAC;AACJ,CAAC"}

package/lib/esm/node/fn/logger.js

@@ -0,0 +1,16 @@
+import { injector } from "../../common/index.js";
+import { context } from "./context.js";
+/**
+ * Get the current `injector.logger` instance.
+ */
+export function logger() {
+    return injector().logger;
+}
+/**
+ * Get the current logger instance. If the logger() function is invoked in Request context, it will return the logger instance attached to the request context.
+ * Otherwise, it will return the logger instance attached to the DI context.
+ */
+export function contextLogger() {
+    return context().logger;
+}
+//# sourceMappingURL=logger.js.map

package/lib/esm/node/fn/logger.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../../../src/node/fn/logger.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,QAAQ,EAAC,MAAM,uBAAuB,CAAC;AAC/C,OAAO,EAAC,OAAO,EAAC,MAAM,cAAc,CAAC;AAErC;;GAEG;AACH,MAAM,UAAU,MAAM;IACpB,OAAO,QAAQ,EAAE,CAAC,MAAM,CAAC;AAC3B,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,aAAa;IAC3B,OAAO,OAAO,EAAE,CAAC,MAAM,CAAC;AAC1B,CAAC"}

package/lib/esm/node/index.js

@@ -4,6 +4,8 @@
 export * from "./decorators/injectContext.js";
 export * from "./domain/ContextLogger.js";
 export * from "./domain/DIContext.js";
+export * from "./fn/context.js";
+export * from "./fn/logger.js";
 export * from "./interfaces/AlterRunInContext.js";
 export * from "./services/DILogger.js";
 export * from "./services/DITest.js";

package/lib/esm/node/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/node/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,cAAc,+BAA+B,CAAC;AAC9C,cAAc,2BAA2B,CAAC;AAC1C,cAAc,uBAAuB,CAAC;AACtC,cAAc,mCAAmC,CAAC;AAClD,cAAc,wBAAwB,CAAC;AACvC,cAAc,sBAAsB,CAAC;AACrC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,yBAAyB,CAAC;AACxC,cAAc,mCAAmC,CAAC;AAClD,cAAc,4BAA4B,CAAC;AAC3C,cAAc,2BAA2B,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/node/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,cAAc,+BAA+B,CAAC;AAC9C,cAAc,2BAA2B,CAAC;AAC1C,cAAc,uBAAuB,CAAC;AACtC,cAAc,iBAAiB,CAAC;AAChC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,mCAAmC,CAAC;AAClD,cAAc,wBAAwB,CAAC;AACvC,cAAc,sBAAsB,CAAC;AACrC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,yBAAyB,CAAC;AACxC,cAAc,mCAAmC,CAAC;AAClD,cAAc,4BAA4B,CAAC;AAC3C,cAAc,2BAA2B,CAAC"}

package/lib/esm/node/services/DILogger.js

@@ -1,10 +1,8 @@
 import { Logger } from "@tsed/logger";
-import { InjectorService, registerProvider } from "../../common/index.js";
-registerProvider({
+import { injectable } from "../../common/fn/injectable.js";
+import { logger } from "../fn/logger.js";
+injectable({
     provide: Logger,
-    deps: [InjectorService],
-    useFactory(injector) {
-        return injector.logger;
-    }
+    useFactory: logger
 });
 //# sourceMappingURL=DILogger.js.map

package/lib/esm/node/services/DILogger.js.map

@@ -1 +1 @@
-{"version":3,"file":"DILogger.js","sourceRoot":"","sources":["../../../../src/node/services/DILogger.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,MAAM,EAAC,MAAM,cAAc,CAAC;AAEpC,OAAO,EAAC,eAAe,EAAE,gBAAgB,EAAC,MAAM,uBAAuB,CAAC;AAExE,gBAAgB,CAAC;IACf,OAAO,EAAE,MAAM;IACf,IAAI,EAAE,CAAC,eAAe,CAAC;IACvB,UAAU,CAAC,QAAyB;QAClC,OAAO,QAAQ,CAAC,MAAM,CAAC;IACzB,CAAC;CACF,CAAC,CAAC"}
+{"version":3,"file":"DILogger.js","sourceRoot":"","sources":["../../../../src/node/services/DILogger.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,MAAM,EAAC,MAAM,cAAc,CAAC;AAEpC,OAAO,EAAC,UAAU,EAAC,MAAM,+BAA+B,CAAC;AACzD,OAAO,EAAC,MAAM,EAAC,MAAM,iBAAiB,CAAC;AAEvC,UAAU,CAAC;IACT,OAAO,EAAE,MAAM;IACf,UAAU,EAAE,MAAM;CACnB,CAAC,CAAC"}

package/lib/esm/node/services/DITest.js

@@ -1,65 +1,43 @@
-import { Env, getValue, isClass, isObject, setValue } from "@tsed/core";
+import { Env, getValue, isClass, isObject } from "@tsed/core";
 import { $log } from "@tsed/logger";
-import { createContainer, DI_INJECTABLE_PROPS, InjectorService } from "../../common/index.js";
+import { cleanAllLocalsContainer, detachLocalsContainer, localsContainer } from "../../common/fn/localsContainer.js";
+import { createContainer, destroyInjector, DI_INJECTABLE_PROPS, hasInjector, inject, injector } from "../../common/index.js";
 import { DIContext } from "../domain/DIContext.js";
+import { logger } from "../fn/logger.js";
 import { setLoggerConfiguration } from "../utils/setLoggerConfiguration.js";
 /**
  * Tool to run test with lightweight DI sandbox.
  */
 export class DITest {
-    static { this.options = {}; }
-    static { this._injector = null; }
     static get injector() {
-        if (DITest._injector) {
-            return DITest._injector;
-        }
-        /* istanbul ignore next */
-        throw new Error("PlatformTest.injector is not initialized. Use PlatformTest.create(): Promise before PlatformTest.invoke() or PlatformTest.injector.\n" +
-            "Example:\n" +
-            "before(async () => {\n" +
-            "   await PlatformTest.create()\n" +
-            "   await PlatformTest.invoke(MyService, [])\n" +
-            "})");
-    }
-    static set injector(injector) {
-        DITest._injector = injector;
-    }
-    static set(key, value) {
-        setValue(DITest.options, key, value);
-    }
-    static hasInjector() {
-        return !!DITest._injector;
+        return injector();
     }
     static async create(settings = {}) {
-        settings = {
-            ...DITest.options,
-            ...settings
-        };
-        DITest.injector = DITest.createInjector(settings);
+        DITest.createInjector(settings);
         await DITest.createContainer();
     }
     static async createContainer() {
-        await DITest.injector.load(createContainer());
+        await injector().load(createContainer());
     }
     /**
      * Create a new injector with the right default services
      */
     static createInjector(settings = {}) {
-        const injector = new InjectorService();
-        injector.logger = $log;
-        // @ts-ignore
-        injector.settings.set(DITest.configure(settings));
-        setLoggerConfiguration(injector);
-        return injector;
+        const inj = injector({
+            rebuild: true,
+            logger: $log,
+            settings: DITest.configure(settings)
+        });
+        setLoggerConfiguration(inj);
+        return inj;
     }
     /**
      * Resets the test injector of the test context, so it won't pollute your next test. Call this in your `tearDown` logic.
      */
     static async reset() {
-        if (DITest.hasInjector()) {
-            await DITest.injector.destroy();
-            InjectorService.unsetLocals();
-            DITest._injector = null;
+        if (hasInjector()) {
+            await destroyInjector();
+            cleanAllLocalsContainer();
         }
     }
     /**
@@ -68,12 +46,8 @@ export class DITest {
      * @param providers
      */
     static async invoke(target, providers = []) {
-        const locals = InjectorService.getLocals();
-        providers.forEach((p) => {
-            locals.set(p.token, p.use);
-        });
-        locals.set(InjectorService, DITest.injector);
-        const instance = DITest.injector.invoke(target, locals, { rebuild: true });
+        const locals = localsContainer({ providers, rebuild: true });
+        const instance = inject(target, { locals, rebuild: true });
         if (instance && isObject(instance) && "$onInit" in instance) {
             const result = instance.$onInit();
             if (result instanceof Promise) {
@@ -90,7 +64,7 @@ export class DITest {
                 await Promise.all([...keys.keys()].map((key) => instance[key]));
             }
         }
-        InjectorService.unsetLocals();
+        detachLocalsContainer();
         return instance;
     }
     /**
@@ -99,13 +73,13 @@ export class DITest {
      * @param options
      */
     static get(target, options = {}) {
-        return DITest.injector.get(target, options);
+        return injector().get(target, options);
     }
     static createDIContext() {
         return new DIContext({
             id: "id",
-            injector: DITest.injector,
-            logger: DITest.injector.logger
+            injector: injector(),
+            logger: logger()
         });
     }
     static configure(settings = {}) {

package/lib/esm/node/services/DITest.js.map

@@ -1 +1 @@
-{"version":3,"file":"DITest.js","sourceRoot":"","sources":["../../../../src/node/services/DITest.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"DITest.js","sourceRoot":"","sources":["../../../../src/node/services/DITest.ts"],"names":[],"mappings":"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"}

package/lib/esm/node/utils/asyncHookContext.js

@@ -6,10 +6,9 @@ export function getAsyncStore() {
 export function useContextRef() {
     return getAsyncStore().getStore();
 }
-export function useContext(initialValue) {
+export function getContext(initialValue) {
     return initialValue || useContextRef()?.current;
 }
-export const getContext = useContext;
 export async function runInContext(ctx, cb, injector) {
     const ref = useContextRef();
     if (ref) {

package/lib/esm/node/utils/asyncHookContext.js.map

@@ -1 +1 @@
-{"version":3,"file":"asyncHookContext.js","sourceRoot":"","sources":["../../../../src/node/utils/asyncHookContext.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,iBAAiB,EAAE,aAAa,EAAC,MAAM,aAAa,CAAC;AAK7D,MAAM,OAAO,GAAwD,IAAI,iBAAiB,EAAE,CAAC;AAE7F,MAAM,UAAU,aAAa;IAC3B,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,MAAM,UAAU,aAAa;IAC3B,OAAO,aAAa,EAAE,CAAC,QAAQ,EAAE,CAAC;AACpC,CAAC;AAED,MAAM,UAAU,UAAU,CAAsB,YAAwB;IACtE,OAAO,YAAY,IAAK,aAAa,EAAE,EAAE,OAAe,CAAC;AAC3D,CAAC;AAED,MAAM,CAAC,MAAM,UAAU,GAAG,UAAU,CAAC;AAErC,MAAM,CAAC,KAAK,UAAU,YAAY,CAChC,GAA0B,EAC1B,EAAkC,EAClC,QAA0B;IAE1B,MAAM,GAAG,GAAG,aAAa,EAAE,CAAC;IAE5B,IAAI,GAAG,EAAE,CAAC;QACR,GAAG,IAAI,UAAU,CAAC,GAAG,CAAC,CAAC;QACvB,OAAO,EAAE,EAAE,CAAC;IACd,CAAC;SAAM,CAAC;QACN,QAAQ,GAAG,GAAG,EAAE,QAAQ,IAAI,QAAQ,CAAC;QACrC,EAAE,GAAG,CAAC,MAAM,QAAQ,EAAE,UAAU,CAAC,oBAAoB,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;QAElE,OAAO,OAAO,CAAC,GAAG,CAAC,EAAC,OAAO,EAAE,GAAG,EAAC,EAAE,EAAE,CAAC,CAAC;IACzC,CAAC;AACH,CAAC;AAED,MAAM,UAAU,UAAU,CAAC,GAAc;IACvC,MAAM,GAAG,GAAG,aAAa,EAAE,CAAC;IAE5B,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC;QACxB,GAAG,CAAC,OAAO,GAAG,GAAG,CAAC;IACpB,CAAC;AACH,CAAC;AAED,MAAM,UAAU,WAAW,CAAC,EAAO;IACjC,OAAO,aAAa,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;AAChC,CAAC"}
+{"version":3,"file":"asyncHookContext.js","sourceRoot":"","sources":["../../../../src/node/utils/asyncHookContext.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,iBAAiB,EAAE,aAAa,EAAC,MAAM,aAAa,CAAC;AAK7D,MAAM,OAAO,GAAwD,IAAI,iBAAiB,EAAE,CAAC;AAE7F,MAAM,UAAU,aAAa;IAC3B,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,MAAM,UAAU,aAAa;IAC3B,OAAO,aAAa,EAAE,CAAC,QAAQ,EAAE,CAAC;AACpC,CAAC;AAED,MAAM,UAAU,UAAU,CAAsB,YAAwB;IACtE,OAAO,YAAY,IAAK,aAAa,EAAE,EAAE,OAAe,CAAC;AAC3D,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,YAAY,CAChC,GAA0B,EAC1B,EAAkC,EAClC,QAA0B;IAE1B,MAAM,GAAG,GAAG,aAAa,EAAE,CAAC;IAE5B,IAAI,GAAG,EAAE,CAAC;QACR,GAAG,IAAI,UAAU,CAAC,GAAG,CAAC,CAAC;QACvB,OAAO,EAAE,EAAE,CAAC;IACd,CAAC;SAAM,CAAC;QACN,QAAQ,GAAG,GAAG,EAAE,QAAQ,IAAI,QAAQ,CAAC;QACrC,EAAE,GAAG,CAAC,MAAM,QAAQ,EAAE,UAAU,CAAC,oBAAoB,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;QAElE,OAAO,OAAO,CAAC,GAAG,CAAC,EAAC,OAAO,EAAE,GAAG,EAAC,EAAE,EAAE,CAAC,CAAC;IACzC,CAAC;AACH,CAAC;AAED,MAAM,UAAU,UAAU,CAAC,GAAc;IACvC,MAAM,GAAG,GAAG,aAAa,EAAE,CAAC;IAE5B,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC;QACxB,GAAG,CAAC,OAAO,GAAG,GAAG,CAAC;IACpB,CAAC;AACH,CAAC;AAED,MAAM,UAAU,WAAW,CAAC,EAAO;IACjC,OAAO,aAAa,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;AAChC,CAAC"}

package/lib/types/common/decorators/constant.d.ts

@@ -1,5 +1,3 @@
-export declare function constant<Type>(expression: string): Type | undefined;
-export declare function constant<Type>(expression: string, defaultValue: Type | undefined): Type;
 export declare function bindConstant(target: any, propertyKey: string | symbol, expression: string, defaultValue?: any): void;
 /**
  * Return value from Configuration.

package/lib/types/common/decorators/inject.d.ts

@@ -1,8 +1,5 @@
 import { type Type } from "@tsed/core";
-import type { InvokeOptions } from "../interfaces/InvokeOptions.js";
 import { TokenProvider } from "../interfaces/TokenProvider.js";
-export declare function inject<T>(token: TokenProvider<T>, opts?: Partial<Pick<InvokeOptions, "useOpts" | "rebuild" | "locals">>): T;
-export declare function injectMany<T>(token: string | symbol, opts?: Partial<Pick<InvokeOptions, "useOpts" | "rebuild" | "locals">>): T[];
 export type TransformInjectedProviderCB<T, Klass = any> = (instance: T, { target, propertyKey }: {
     self: Klass;
     target: Type<Klass>;

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

@@ -0,0 +1,2 @@
+import { DIConfiguration } from "../services/DIConfiguration.js";
+export declare function configuration(): TsED.Configuration & DIConfiguration;

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

@@ -0,0 +1,2 @@
+export declare function constant<Type>(expression: string): Type | undefined;
+export declare function constant<Type>(expression: string, defaultValue: Type | undefined): Type;

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

@@ -0,0 +1,23 @@
+/**
+ * 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/fn/inject.d.ts

@@ -0,0 +1,20 @@
+import type { InvokeOptions } from "../interfaces/InvokeOptions.js";
+import { TokenProvider } from "../interfaces/TokenProvider.js";
+/**
+ * Inject a provider to another provider.
+ *
+ * Use this function to inject a custom provider on constructor parameter or property.
+ *
+ * ```typescript
+ * @Injectable()
+ * export class MyService {
+ *   connection = inject(CONNECTION);
+ * }
+ * ```
+ *
+ * @param token A token provider or token provider group
+ * @param opts
+ * @returns {Function}
+ * @decorator
+ */
+export declare function inject<T>(token: TokenProvider<T>, opts?: Partial<Pick<InvokeOptions, "useOpts" | "rebuild" | "locals">>): T;

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

@@ -0,0 +1,2 @@
+import type { InvokeOptions } from "../interfaces/InvokeOptions.js";
+export declare function injectMany<T>(token: string | symbol, opts?: Partial<Pick<InvokeOptions, "useOpts" | "rebuild" | "locals">>): T[];

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

@@ -0,0 +1,5 @@
+import { registerProvider } from "../registries/ProviderRegistry.js";
+/**
+ * @alias {registerProvider} Alias of registerProvider
+ */
+export declare const injectable: typeof registerProvider;

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

@@ -0,0 +1,24 @@
+import { InjectorService } from "../services/InjectorService.js";
+type InjectorFnOpts = {
+    rebuild?: boolean;
+    logger?: any;
+    settings?: Partial<TsED.Configuration>;
+};
+/**
+ * Create or return the existing injector service.
+ *
+ * Example:
+ *
+ * ```typescript
+ * import {injector, Injectable} from "@tsed/di";
+ *
+ * @Injectable()
+ * class MyService {
+ *   injector = injector();
+ * }
+ * ```
+ */
+export declare function injector(opts?: InjectorFnOpts): InjectorService;
+export declare function hasInjector(): boolean;
+export declare function destroyInjector(): Promise<void>;
+export {};

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

@@ -0,0 +1,15 @@
+import { LocalsContainer } from "../domain/LocalsContainer.js";
+import type { UseImportTokenProviderOpts } from "../interfaces/ImportTokenProviderOpts.js";
+/**
+ * Get the locals container initiated by DITest or .bootstrap() method.
+ */
+export declare function localsContainer({ providers, rebuild }?: {
+    providers?: UseImportTokenProviderOpts[];
+    rebuild?: boolean;
+}): LocalsContainer;
+export declare function invokeOptions(): any;
+/**
+ * Reset the locals container.
+ */
+export declare function detachLocalsContainer(): void;
+export declare function cleanAllLocalsContainer(): void;

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

@@ -0,0 +1,25 @@
+/**
+ * Get a value from the `injector.settings`.
+ *
+ * ## Example
+ *
+ * ```ts
+ * import {refValue, Injectable} from "@tsed/di";
+ *
+ * @Injectable()
+ * class Test {
+ *   test = refValue("logger.level", "default value");
+ *
+ *   constructor() {
+ *     console.log(this.test.value); // "off"
+ *   }
+ * }
+ *
+ * @param expression The expression to get the value from the `injector.settings`.
+ */
+export declare function refValue<Type>(expression: string): {
+    value: Type | undefined;
+};
+export declare function refValue<Type>(expression: string, defaultValue: Type | undefined): {
+    value: Type;
+};

package/lib/types/common/index.d.ts

@@ -27,6 +27,15 @@ export * from "./domain/ProviderScope.js";
 export * from "./domain/ProviderType.js";
 export * from "./errors/InjectionError.js";
 export * from "./errors/InvalidPropertyTokenError.js";
+export * from "./fn/configuration.js";
+export * from "./fn/constant.js";
+export * from "./fn/events.js";
+export * from "./fn/inject.js";
+export * from "./fn/injectable.js";
+export * from "./fn/injectMany.js";
+export * from "./fn/injector.js";
+export * from "./fn/localsContainer.js";
+export * from "./fn/refValue.js";
 export * from "./interfaces/DIConfigurationOptions.js";
 export * from "./interfaces/DILogger.js";
 export * from "./interfaces/DILoggerOptions.js";

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

@@ -1,3 +1,4 @@
+import { Hooks } from "@tsed/core";
 import { Container } from "../domain/Container.js";
 import { LocalsContainer } from "../domain/LocalsContainer.js";
 import { Provider } from "../domain/Provider.js";
@@ -32,21 +33,10 @@ export declare class InjectorService extends Container {
     settings: DIConfiguration;
     logger: DILogger;
     private resolvedConfiguration;
+    readonly hooks: Hooks;
     constructor();
     get resolvers(): import("../index.js").DIResolver[];
     get scopes(): Record<string, ProviderScope>;
-    /**
-     * Return the current injector service.
-     */
-    static getInstance(): InjectorService;
-    /**
-     * Get the locals container initiated by DITest or .bootstrap() method.
-     */
-    static getLocals(): LocalsContainer;
-    /**
-     * Reset the locals container.
-     */
-    static unsetLocals(): void;
     /**
      * Retrieve default scope for a given provider.
      * @param provider

package/lib/types/node/fn/context.d.ts

@@ -0,0 +1,9 @@
+import { DIContext } from "../domain/DIContext.js";
+/**
+ * Get the current DIContext instance using async hook node.js api.
+ *
+ * ::: warning
+ * This function isn't available in the browser context.
+ * :::
+ */
+export declare function context<Ctx = DIContext>(): Ctx;

package/lib/types/node/fn/logger.d.ts

@@ -0,0 +1,9 @@
+/**
+ * Get the current `injector.logger` instance.
+ */
+export declare function logger(): import("../../common/index.js").DILogger;
+/**
+ * Get the current logger instance. If the logger() function is invoked in Request context, it will return the logger instance attached to the request context.
+ * Otherwise, it will return the logger instance attached to the DI context.
+ */
+export declare function contextLogger(): import("../index.js").ContextLogger;

package/lib/types/node/index.d.ts

@@ -4,6 +4,8 @@
 export * from "./decorators/injectContext.js";
 export * from "./domain/ContextLogger.js";
 export * from "./domain/DIContext.js";
+export * from "./fn/context.js";
+export * from "./fn/logger.js";
 export * from "./interfaces/AlterRunInContext.js";
 export * from "./services/DILogger.js";
 export * from "./services/DITest.js";

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

@@ -4,12 +4,7 @@ import { DIContext } from "../domain/DIContext.js";
  * Tool to run test with lightweight DI sandbox.
  */
 export declare class DITest {
-    static options: Partial<TsED.Configuration>;
-    protected static _injector: InjectorService | null;
     static get injector(): InjectorService;
-    static set injector(injector: InjectorService);
-    static set(key: string, value: any): void;
-    static hasInjector(): boolean;
     static create(settings?: Partial<TsED.Configuration>): Promise<void>;
     static createContainer(): Promise<void>;
     /**

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

@@ -8,8 +8,7 @@ export declare function getAsyncStore(): AsyncLocalStorage<{
 export declare function useContextRef(): {
     current: DIContext | undefined;
 } | undefined;
-export declare function useContext<Context = DIContext>(initialValue?: DIContext): Context | undefined;
-export declare const getContext: typeof useContext;
+export declare function getContext<Context = DIContext>(initialValue?: DIContext): Context | undefined;
 export declare function runInContext<Result = unknown>(ctx: DIContext | undefined, cb: (...args: unknown[]) => Result, injector?: InjectorService): Promise<Result>;
 export declare function setContext(ctx: DIContext): void;
 export declare function bindContext(cb: any): any;

package/package.json

@@ -2,7 +2,7 @@
   "name": "@tsed/di",
   "description": "DI module for Ts.ED Framework",
   "type": "module",
-  "version": "8.0.0-alpha.9",
+  "version": "8.0.0-beta.2",
   "source": "./src/index.ts",
   "main": "./lib/esm/index.js",
   "module": "./lib/esm/index.js",
@@ -26,24 +26,24 @@
   },
   "dependencies": {
     "tslib": "2.7.0",
-    "uuid": "9.0.1"
+    "uuid": "^10.0.0"
   },
   "devDependencies": {
-    "@tsed/barrels": "8.0.0-alpha.9",
-    "@tsed/core": "8.0.0-alpha.9",
-    "@tsed/logger": ">=6.7.5",
-    "@tsed/schema": "8.0.0-alpha.9",
-    "@tsed/typescript": "8.0.0-alpha.9",
+    "@tsed/barrels": "8.0.0-beta.2",
+    "@tsed/core": "8.0.0-beta.2",
+    "@tsed/logger": "^6.7.8",
+    "@tsed/schema": "8.0.0-beta.2",
+    "@tsed/typescript": "8.0.0-beta.2",
     "cross-env": "7.0.3",
-    "eslint": "9.11.1",
+    "eslint": "9.12.0",
     "typescript": "5.4.5",
-    "vitest": "2.0.4",
+    "vitest": "2.1.2",
     "webpack": "^5.75.0"
   },
   "peerDependencies": {
-    "@tsed/core": "8.0.0-alpha.9",
+    "@tsed/core": "8.0.0-beta.2",
     "@tsed/logger": ">=6.7.5",
-    "@tsed/schema": "8.0.0-alpha.9"
+    "@tsed/schema": "8.0.0-beta.2"
   },
   "peerDependenciesMeta": {
     "@tsed/core": {
@@ -64,6 +64,6 @@
   "author": "Romain Lenzotti",
   "license": "MIT",
   "publishConfig": {
-    "tag": "alpha"
+    "tag": "beta"
   }
 }