@tsed/di 8.14.0 → 8.14.2-rc.1

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

@@ -0,0 +1,26 @@
+import { catchError } from "@tsed/core/utils/catchError.js";
+import { context } from "../fn/context.js";
+/**
+ * Inject a context like PlatformContext or any BaseContext.
+ *
+ * ```typescript
+ * @Injectable()
+ * export class MyService {
+ *   @InjectContext()
+ *   ctx?: Context;
+ * }
+ * ```
+ *
+ * @returns {Function}
+ * @decorator
+ */
+export function InjectContext(transform = (o) => o) {
+    return (target, propertyKey) => {
+        catchError(() => Reflect.deleteProperty(target, propertyKey));
+        Reflect.defineProperty(target, propertyKey, {
+            get() {
+                return transform(context());
+            }
+        });
+    };
+}

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

@@ -0,0 +1,20 @@
+import { v4 } from "uuid";
+import { DIContext } from "../../common/domain/DIContext.js";
+import { injector } from "../../common/index.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
+        }));
+}

package/lib/esm/browser/fn/contextLogger.js

@@ -0,0 +1,8 @@
+import { context } from "./context.js";
+/**
+ * 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;
+}

package/lib/esm/browser/index.js

@@ -0,0 +1,5 @@
+/**
+ * @file Automatically generated by @tsed/barrels.
+ */
+export * from "../common/index.js";
+export * from "./utils/asyncHookContext.js";

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

@@ -0,0 +1,67 @@
+class AsyncContextStorage {
+    constructor() {
+        this.stack = [];
+    }
+    run(store, cb) {
+        this.stack.push(store);
+        this.store = store;
+        try {
+            return cb();
+        }
+        finally {
+            this.stack.pop();
+            this.store = this.stack[this.stack.length - 1];
+        }
+    }
+    getStore() {
+        return this.store;
+    }
+}
+const storage = new AsyncContextStorage();
+export function getAsyncStore() {
+    return storage;
+}
+export function useContextRef() {
+    return getAsyncStore().getStore();
+}
+export function getContext(initialValue) {
+    return initialValue || useContextRef()?.current;
+}
+export async function runInContext(ctx, cb, injector) {
+    const ref = useContextRef();
+    if (ref) {
+        ctx && setContext(ctx);
+        return cb();
+    }
+    else {
+        injector = ctx?.injector || injector;
+        cb = (injector && (await injector.alterAsync?.("$alterRunInContext", cb))) || cb;
+        return await Promise.resolve(storage.run({ current: ctx }, cb));
+    }
+}
+export function setContext(ctx) {
+    const ref = useContextRef();
+    if (ref && !ref.current) {
+        ref.current = ctx;
+    }
+}
+/**
+ * @deprecated
+ */
+export function bindContext(cb) {
+    return cb;
+}
+if (typeof window !== "undefined") {
+    // Patch Promise.then pour propager le contexte
+    const origThen = Promise.prototype.then;
+    Promise.prototype.then = function (onFulfilled, onRejected) {
+        const ctx = useContextRef();
+        return origThen.call(this, onFulfilled && ((v) => storage.run({ current: ctx?.current }, () => onFulfilled(v))), onRejected && ((e) => storage.run({ current: ctx?.current }, () => onRejected(e))));
+    };
+    // Patch setTimeout pour propager le contexte
+    const origSetTimeout = window.setTimeout;
+    window.setTimeout = function (fn, ...args) {
+        const ctx = useContextRef();
+        return origSetTimeout(() => storage.run({ current: ctx?.current }, fn), ...args);
+    };
+}

package/lib/esm/common/decorators/autoInjectable.js

@@ -14,7 +14,12 @@ function resolveAutoInjectableArgs(token, args) {
         }
         else {
             const value = deps[i];
-            const instance = isArray(value) ? inj.getMany(value[0], { locals, parent: token }) : inj.invoke(value, { locals, parent: token });
+            const instance = isArray(value)
+                ? inj.getMany(value[0], { locals, parent: token })
+                : inj.invoke(value, {
+                    locals,
+                    parent: token
+                });
             list.push(instance);
         }
     }

package/lib/esm/{node → common}/domain/DIContext.js

@@ -1,4 +1,4 @@
-import { injector, LocalsContainer } from "../../common/index.js";
+import { injector, LocalsContainer } from "../index.js";
 import { ContextLogger } from "./ContextLogger.js";
 export class DIContext {
     #container;

package/lib/esm/common/index.js

@@ -19,7 +19,9 @@ export * from "./decorators/service.js";
 export * from "./decorators/useOpts.js";
 export * from "./decorators/value.js";
 export * from "./domain/Container.js";
+export * from "./domain/ContextLogger.js";
 export * from "./domain/ControllerProvider.js";
+export * from "./domain/DIContext.js";
 export * from "./domain/InjectablePropertyType.js";
 export * from "./domain/LocalsContainer.js";
 export * from "./domain/Provider.js";
@@ -37,6 +39,7 @@ export * from "./fn/lazyInject.js";
 export * from "./fn/localsContainer.js";
 export * from "./fn/logger.js";
 export * from "./fn/refValue.js";
+export * from "./interfaces/AlterRunInContext.js";
 export * from "./interfaces/DIConfigurationOptions.js";
 export * from "./interfaces/DILogger.js";
 export * from "./interfaces/DILoggerOptions.js";
@@ -56,9 +59,13 @@ export * from "./registries/ProviderRegistry.js";
 export * from "./services/DIConfiguration.js";
 export * from "./services/DILogger.js";
 export * from "./services/InjectorService.js";
+export * from "./utils/attachLogger.js";
 export * from "./utils/colors.js";
 export * from "./utils/createContainer.js";
 export * from "./utils/discoverHooks.js";
 export * from "./utils/getConfiguration.js";
 export * from "./utils/getConstructorDependencies.js";
 export * from "./utils/providerBuilder.js";
+export * from "./utils/setLoggerConfiguration.js";
+export * from "./utils/setLoggerFormat.js";
+export * from "./utils/setLoggerLevel.js";

package/lib/esm/{node → common}/utils/attachLogger.js

@@ -1,4 +1,4 @@
-import { injector } from "../../common/index.js";
+import { injector } from "../index.js";
 import { setLoggerConfiguration } from "./setLoggerConfiguration.js";
 export function attachLogger($log) {
     injector().logger = $log;

package/lib/esm/{node → common}/utils/setLoggerFormat.js

@@ -1,5 +1,5 @@
-import { logger } from "../../common/fn/logger.js";
-import { injector } from "../../common/index.js";
+import { logger } from "../fn/logger.js";
+import { injector } from "../index.js";
 /**
  * @ignore
  */

package/lib/esm/{node → common}/utils/setLoggerLevel.js

@@ -1,4 +1,4 @@
-import { injector } from "../../common/index.js";
+import { injector } from "../index.js";
 /**
  * @ignore
  */

package/lib/esm/node/exports.js

@@ -0,0 +1 @@
+import "@tsed/logger-std";

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

@@ -1,6 +1,6 @@
 import { v4 } from "uuid";
+import { DIContext } from "../../common/domain/DIContext.js";
 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.

package/lib/esm/node/index.js

@@ -2,15 +2,9 @@
  * @file Automatically generated by @tsed/barrels.
  */
 export * from "./decorators/injectContext.js";
-export * from "./domain/ContextLogger.js";
-export * from "./domain/DIContext.js";
+export * from "./exports.js";
 export * from "./fn/context.js";
 export * from "./fn/contextLogger.js";
-export * from "./interfaces/AlterRunInContext.js";
 export * from "./services/DILogger.js";
 export * from "./services/DITest.js";
 export * from "./utils/asyncHookContext.js";
-export * from "./utils/attachLogger.js";
-export * from "./utils/setLoggerConfiguration.js";
-export * from "./utils/setLoggerFormat.js";
-export * from "./utils/setLoggerLevel.js";

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

@@ -3,11 +3,11 @@ import { getValue } from "@tsed/core/utils/getValue.js";
 import { isClass } from "@tsed/core/utils/isClass.js";
 import { isObject } from "@tsed/core/utils/isObject.js";
 import { $log } from "@tsed/logger";
+import { DIContext } from "../../common/domain/DIContext.js";
 import { cleanAllLocalsContainer, detachLocalsContainer, localsContainer } from "../../common/fn/localsContainer.js";
 import { logger } from "../../common/fn/logger.js";
 import { createContainer, destroyInjector, DI_INJECTABLE_PROPS, inject, injector } from "../../common/index.js";
-import { DIContext } from "../domain/DIContext.js";
-import { setLoggerConfiguration } from "../utils/setLoggerConfiguration.js";
+import { setLoggerConfiguration } from "../../common/utils/setLoggerConfiguration.js";
 /**
  * Tool to run test with lightweight DI sandbox.
  */

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

@@ -27,6 +27,9 @@ export function setContext(ctx) {
         ref.current = ctx;
     }
 }
+/**
+ * @deprecated
+ */
 export function bindContext(cb) {
     return AsyncResource.bind(cb);
 }

package/lib/types/browser/decorators/injectContext.d.ts

@@ -0,0 +1,16 @@
+import { DIContext } from "../../common/domain/DIContext.js";
+/**
+ * Inject a context like PlatformContext or any BaseContext.
+ *
+ * ```typescript
+ * @Injectable()
+ * export class MyService {
+ *   @InjectContext()
+ *   ctx?: Context;
+ * }
+ * ```
+ *
+ * @returns {Function}
+ * @decorator
+ */
+export declare function InjectContext(transform?: ($ctx: DIContext) => unknown): PropertyDecorator;

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

@@ -0,0 +1,9 @@
+import { DIContext } from "../../common/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/browser/fn/contextLogger.d.ts

@@ -0,0 +1,5 @@
+/**
+ * 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/browser/index.d.ts

@@ -0,0 +1,5 @@
+/**
+ * @file Automatically generated by @tsed/barrels.
+ */
+export * from "../common/index.js";
+export * from "./utils/asyncHookContext.js";

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

@@ -0,0 +1,22 @@
+import { DIContext } from "../../common/index.js";
+interface AsyncStore {
+    current: DIContext | undefined;
+}
+declare class AsyncContextStorage {
+    private store?;
+    private stack;
+    run(store: AsyncStore, cb: (...args: any[]) => any): any;
+    getStore(): AsyncStore | undefined;
+}
+export declare function getAsyncStore(): AsyncContextStorage;
+export declare function useContextRef(): AsyncStore | undefined;
+export declare function getContext<Context = DIContext>(initialValue?: DIContext): Context | undefined;
+export declare function runInContext<Result = unknown>(ctx: DIContext | undefined, cb: (...args: unknown[]) => Result, injector?: {
+    alterAsync?: (name: string, cb: any) => Promise<any>;
+}): Promise<Result>;
+export declare function setContext(ctx: DIContext): void;
+/**
+ * @deprecated
+ */
+export declare function bindContext(cb: any): any;
+export {};

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

@@ -1,4 +1,4 @@
-import { Type } from "@tsed/core/types/Type.js";
+import type { Type } from "@tsed/core/types/Type.js";
 import type { ControllerMiddlewares } from "../domain/ControllerProvider.js";
 import { ProviderOpts } from "../interfaces/ProviderOpts.js";
 export type PathType = string | RegExp | (string | RegExp)[];

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

@@ -1,4 +1,4 @@
-import { type Type } from "@tsed/core/types/Type.js";
+import type { Type } from "@tsed/core/types/Type.js";
 import { TokenProvider } from "../interfaces/TokenProvider.js";
 export type TransformInjectedProviderCB<T, Klass = any> = (instance: T, { target, propertyKey }: {
     self: Klass;

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

@@ -1,4 +1,4 @@
-import { Type } from "@tsed/core/types/Type.js";
+import type { Type } from "@tsed/core/types/Type.js";
 import type { InterceptorMethods } from "../interfaces/InterceptorMethods.js";
 import type { TokenProvider } from "../interfaces/TokenProvider.js";
 export declare function getInterceptorOptions<T>(target: Type<any>, propertyKey: string | symbol): T;

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

@@ -1,4 +1,4 @@
-import { Type } from "@tsed/core/types/Type.js";
+import type { Type } from "@tsed/core/types/Type.js";
 /**
  * Override a provider which is already registered in ProviderRegistry.
  * @returns {Function}

package/lib/types/{node → common}/domain/DIContext.d.ts

@@ -1,4 +1,4 @@
-import { InjectorService, LocalsContainer } from "../../common/index.js";
+import { InjectorService, LocalsContainer } from "../index.js";
 import { ContextLogger, ContextLoggerOptions } from "./ContextLogger.js";
 export interface DIContextOptions extends Omit<ContextLoggerOptions, "dateStart"> {
     id: string;

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

@@ -1,5 +1,5 @@
 import { Store } from "@tsed/core/types/Store.js";
-import { type AbstractType, Type } from "@tsed/core/types/Type.js";
+import type { AbstractType, Type } from "@tsed/core/types/Type.js";
 import type { ProviderOpts } from "../interfaces/ProviderOpts.js";
 import type { TokenProvider } from "../interfaces/TokenProvider.js";
 import { ProviderScope } from "./ProviderScope.js";

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

@@ -19,7 +19,9 @@ export * from "./decorators/service.js";
 export * from "./decorators/useOpts.js";
 export * from "./decorators/value.js";
 export * from "./domain/Container.js";
+export * from "./domain/ContextLogger.js";
 export * from "./domain/ControllerProvider.js";
+export * from "./domain/DIContext.js";
 export * from "./domain/InjectablePropertyType.js";
 export * from "./domain/LocalsContainer.js";
 export * from "./domain/Provider.js";
@@ -37,6 +39,7 @@ export * from "./fn/lazyInject.js";
 export * from "./fn/localsContainer.js";
 export * from "./fn/logger.js";
 export * from "./fn/refValue.js";
+export * from "./interfaces/AlterRunInContext.js";
 export * from "./interfaces/DIConfigurationOptions.js";
 export * from "./interfaces/DILogger.js";
 export * from "./interfaces/DILoggerOptions.js";
@@ -56,9 +59,13 @@ export * from "./registries/ProviderRegistry.js";
 export * from "./services/DIConfiguration.js";
 export * from "./services/DILogger.js";
 export * from "./services/InjectorService.js";
+export * from "./utils/attachLogger.js";
 export * from "./utils/colors.js";
 export * from "./utils/createContainer.js";
 export * from "./utils/discoverHooks.js";
 export * from "./utils/getConfiguration.js";
 export * from "./utils/getConstructorDependencies.js";
 export * from "./utils/providerBuilder.js";
+export * from "./utils/setLoggerConfiguration.js";
+export * from "./utils/setLoggerFormat.js";
+export * from "./utils/setLoggerLevel.js";

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

@@ -1,4 +1,4 @@
-import { Type } from "@tsed/core/types/Type.js";
+import type { Type } from "@tsed/core/types/Type.js";
 import type { Provider } from "../domain/Provider.js";
 /**
  * @ignore

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

@@ -1,4 +1,4 @@
-import { Type } from "@tsed/core/types/Type.js";
+import type { Type } from "@tsed/core/types/Type.js";
 import { Provider } from "../domain/Provider.js";
 import { ProviderOpts } from "../interfaces/ProviderOpts.js";
 import { RegistrySettings } from "../interfaces/RegistrySettings.js";

package/lib/types/{node → common}/utils/attachLogger.d.ts

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

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

@@ -1,3 +1,3 @@
-import { Type } from "@tsed/core/types/Type.js";
+import type { Type } from "@tsed/core/types/Type.js";
 import { Container } from "../domain/Container.js";
 export declare function createContainer(rootModule?: Type<any>): Container;

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

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

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

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

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

@@ -1,6 +1,6 @@
 import "../registries/ProviderRegistry.js";
 import { Store } from "@tsed/core/types/Store.js";
-import { type Type } from "@tsed/core/types/Type.js";
+import type { Type } from "@tsed/core/types/Type.js";
 import type { ProviderOpts } from "../interfaces/ProviderOpts.js";
 import type { FactoryTokenProvider, TokenProvider } from "../interfaces/TokenProvider.js";
 type BaseMethodsProvider<TypeOf, BaseProvider, T extends object> = {

package/lib/types/node/decorators/injectContext.d.ts

@@ -1,4 +1,4 @@
-import { DIContext } from "../domain/DIContext.js";
+import { DIContext } from "../../common/domain/DIContext.js";
 /**
  * Inject a context like PlatformContext or any BaseContext.
  *

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

@@ -0,0 +1 @@
+import "@tsed/logger-std";

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

@@ -1,4 +1,4 @@
-import { DIContext } from "../domain/DIContext.js";
+import { DIContext } from "../../common/domain/DIContext.js";
 /**
  * Get the current DIContext instance using async hook node.js api.
  *

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

@@ -2,4 +2,4 @@
  * 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;
+export declare function contextLogger(): import("../../index.js").ContextLogger;

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

@@ -2,15 +2,9 @@
  * @file Automatically generated by @tsed/barrels.
  */
 export * from "./decorators/injectContext.js";
-export * from "./domain/ContextLogger.js";
-export * from "./domain/DIContext.js";
+export * from "./exports.js";
 export * from "./fn/context.js";
 export * from "./fn/contextLogger.js";
-export * from "./interfaces/AlterRunInContext.js";
 export * from "./services/DILogger.js";
 export * from "./services/DITest.js";
 export * from "./utils/asyncHookContext.js";
-export * from "./utils/attachLogger.js";
-export * from "./utils/setLoggerConfiguration.js";
-export * from "./utils/setLoggerFormat.js";
-export * from "./utils/setLoggerLevel.js";

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

@@ -1,5 +1,5 @@
+import { DIContext } from "../../common/domain/DIContext.js";
 import { InjectorService, TokenProvider, type UseImportTokenProviderOpts } from "../../common/index.js";
-import { DIContext } from "../domain/DIContext.js";
 /**
  * Tool to run test with lightweight DI sandbox.
  */

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

@@ -1,7 +1,7 @@
 /// <reference types="node" resolution-mode="require"/>
 import { AsyncLocalStorage } from "node:async_hooks";
+import type { DIContext } from "../../common/domain/DIContext.js";
 import { InjectorService } from "../../common/index.js";
-import type { DIContext } from "../domain/DIContext.js";
 export declare function getAsyncStore(): AsyncLocalStorage<{
     current: DIContext | undefined;
 }>;
@@ -11,4 +11,7 @@ export declare function useContextRef(): {
 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;
+/**
+ * @deprecated
+ */
 export declare function bindContext(cb: any): any;

package/package.json

@@ -2,17 +2,17 @@
   "name": "@tsed/di",
   "description": "DI module for Ts.ED Framework",
   "type": "module",
-  "version": "8.14.0",
+  "version": "8.14.2-rc.1",
   "source": "./src/index.ts",
   "main": "./lib/esm/index.js",
   "module": "./lib/esm/index.js",
   "typings": "./lib/types/index.d.ts",
-  "browser": "./lib/esm/common/index.js",
+  "browser": "./lib/esm/browser/index.js",
   "exports": {
     ".": {
       "tsed-source": "./src/index.ts",
       "types": "./lib/types/index.d.ts",
-      "browser": "./lib/esm/common/index.js",
+      "browser": "./lib/esm/browser/index.js",
       "import": "./lib/esm/index.js",
       "default": "./lib/esm/index.js"
     }
@@ -29,11 +29,12 @@
     "uuid": "^10.0.0"
   },
   "devDependencies": {
-    "@tsed/barrels": "8.14.0",
-    "@tsed/core": "8.14.0",
-    "@tsed/hooks": "8.14.0",
-    "@tsed/logger": "^7.0.1",
-    "@tsed/typescript": "8.14.0",
+    "@tsed/barrels": "8.14.2-rc.1",
+    "@tsed/core": "8.14.2-rc.1",
+    "@tsed/hooks": "8.14.2-rc.1",
+    "@tsed/logger": "^8.0.0-rc.1",
+    "@tsed/logger-std": "^8.0.0-rc.1",
+    "@tsed/typescript": "8.14.2-rc.1",
     "cross-env": "7.0.3",
     "eslint": "9.12.0",
     "typescript": "5.4.5",
@@ -43,7 +44,7 @@
   "peerDependencies": {
     "@tsed/core": ">=8.0.0",
     "@tsed/hooks": ">=8.0.0",
-    "@tsed/logger": ">=7.0.1"
+    "@tsed/logger": ">=8.0.0-rc.1"
   },
   "peerDependenciesMeta": {
     "@tsed/core": {
@@ -62,5 +63,8 @@
   },
   "homepage": "https://github.com/tsedio/tsed/tree/production/packages/di",
   "author": "Romain Lenzotti",
-  "license": "MIT"
+  "license": "MIT",
+  "publishConfig": {
+    "tag": "rc"
+  }
 }