@tsed/di 8.16.0-rc.1 → 8.16.0-rc.3

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

@@ -1,5 +1,4 @@
-import { ProviderType } from "../domain/ProviderType.js";
-import { Injectable } from "./injectable.js";
+import { interceptor } from "../fn/injectable.js";
 /**
  * The decorators `@Interceptor()` declare a new service can be injected in other service or controller on there `constructor`.
  * All services annotated with `@Interceptor()` are constructed one time.
@@ -10,7 +9,7 @@ import { Injectable } from "./injectable.js";
  * @decorator
  */
 export function Interceptor() {
-    return Injectable({
-        type: ProviderType.INTERCEPTOR
-    });
+    return (target) => {
+        interceptor(target);
+    };
 }

package/lib/esm/common/services/DIConfiguration.js

@@ -1,6 +1,7 @@
 import { getValue } from "@tsed/core/utils/getValue.js";
+import { isFunction } from "@tsed/core/utils/isFunction.js";
 import { setValue } from "@tsed/core/utils/setValue.js";
-export const CONFIGURATION = Symbol.for("CONFIGURATION");
+import { $alter } from "@tsed/hooks";
 export class DIConfiguration {
     constructor(initialProps = {}) {
         this.default = new Map();
@@ -8,6 +9,7 @@ export class DIConfiguration {
         Object.entries({
             imports: [],
             routes: [],
+            mount: {},
             logger: {},
             ...initialProps
         }).forEach(([key, value]) => {
@@ -57,6 +59,12 @@ export class DIConfiguration {
     set debug(debug) {
         this.logger = { ...this.logger, level: debug ? "debug" : "info" };
     }
+    get mount() {
+        return this.get("mount");
+    }
+    set mount(value) {
+        this.setRaw("mount", value);
+    }
     /**
      *
      * @param callbackfn
@@ -67,13 +75,9 @@ export class DIConfiguration {
             callbackfn(this.getRaw(key), key, this.map);
         }, thisArg);
     }
-    /**
-     *
-     * @param propertyKey
-     * @param value
-     */
     set(propertyKey, value) {
         if (typeof propertyKey === "string") {
+            value = $alter(`$alterConfig:${propertyKey}`, value);
             if (Reflect.has(this, propertyKey)) {
                 // @ts-ignore
                 this[propertyKey] = value;
@@ -102,6 +106,16 @@ export class DIConfiguration {
     get(propertyKey, defaultValue) {
         return this.getRaw(propertyKey, defaultValue);
     }
+    decorate(key, value) {
+        if (key in this) {
+            return this;
+        }
+        Object.defineProperty(DIConfiguration.prototype, key, isFunction(value)
+            ? {
+                value
+            }
+            : value);
+    }
     getRaw(propertyKey, defaultValue) {
         const value = getValue(this.map, propertyKey);
         if (value !== undefined) {

package/lib/esm/common/services/InjectorService.js

@@ -46,17 +46,13 @@ export class InjectorService extends Container {
     constructor() {
         super();
         this.logger = console;
+        /*readonly */
+        this.settings = new DIConfiguration();
         this.resolvedConfiguration = false;
         this.#cache = new LocalsContainer();
         this.#loaded = false;
         this.#cache.set(InjectorService, this);
-        this.#cache.set(DIConfiguration, new DIConfiguration());
-    }
-    get settings() {
-        return this.#cache.get(DIConfiguration);
-    }
-    set settings(settings) {
-        this.#cache.set(DIConfiguration, settings);
+        this.#cache.set(DIConfiguration, this.settings);
     }
     isLoaded() {
         return this.#loaded;

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

@@ -6,4 +6,4 @@ import { DIConfiguration } from "../services/DIConfiguration.js";
  */
 export declare function Configuration(): any;
 export declare function Configuration(settings: Partial<TsED.Configuration>): ClassDecorator;
-export type Configuration = TsED.DIConfiguration & DIConfiguration;
+export type Configuration = TsED.Configuration & DIConfiguration;

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

@@ -7,4 +7,4 @@
  * @returns {Function}
  * @decorator
  */
-export declare function Interceptor(): Function;
+export declare function Interceptor(): ClassDecorator;

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

@@ -1,5 +1,5 @@
 import type { TokenProvider } from "../interfaces/TokenProvider.js";
 import { DIConfiguration } from "../services/DIConfiguration.js";
-export declare function configuration(): TsED.DIConfiguration & DIConfiguration;
+export declare function configuration(): TsED.Configuration & DIConfiguration;
 export declare function configuration(token: TokenProvider): Partial<TsED.Configuration>;
 export declare function configuration(token: TokenProvider, configuration: Partial<TsED.Configuration>): Partial<TsED.Configuration>;

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

@@ -5,11 +5,6 @@ declare global {
     namespace TsED {
         interface Context {
         }
-        /**
-         * Here to allow extension on DIConfiguration base service
-         */
-        interface DIConfiguration {
-        }
         interface Configuration extends Record<string, any> {
             scopes: {
                 [key: string]: ProviderScope;
@@ -25,5 +20,3 @@ declare global {
         }
     }
 }
-export interface DIConfigurationOptions extends TsED.Configuration {
-}

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

@@ -3,7 +3,6 @@ import type { DILoggerOptions } from "../interfaces/DILoggerOptions.js";
 import type { ImportTokenProviderOpts } from "../interfaces/ImportTokenProviderOpts.js";
 import type { TokenProvider } from "../interfaces/TokenProvider.js";
 import type { TokenRoute } from "../interfaces/TokenRoute.js";
-export declare const CONFIGURATION: unique symbol;
 export declare class DIConfiguration {
     readonly default: Map<string, any>;
     protected map: Map<string, any>;
@@ -22,18 +21,16 @@ export declare class DIConfiguration {
     set logger(value: Partial<DILoggerOptions>);
     get debug(): boolean;
     set debug(debug: boolean);
+    get mount(): Record<string, TokenProvider[]>;
+    set mount(value: Record<string, TokenProvider[]>);
     /**
      *
      * @param callbackfn
      * @param thisArg
      */
     forEach(callbackfn: (value: any, index: string, map: Map<string, any>) => void, thisArg?: any): void;
-    /**
-     *
-     * @param propertyKey
-     * @param value
-     */
-    set(propertyKey: string | Partial<TsED.Configuration>, value?: any): this;
+    set(obj: Partial<TsED.Configuration>): this;
+    set(propertyKey: string, value?: unknown): this;
     setRaw(propertyKey: string, value: any): this;
     /**
      *
@@ -42,5 +39,6 @@ export declare class DIConfiguration {
      * @returns {undefined|any}
      */
     get<T = any>(propertyKey: string, defaultValue?: T): T;
+    decorate(key: string, value: ((...args: unknown[]) => unknown) | PropertyDescriptor): this | undefined;
     protected getRaw(propertyKey: string, defaultValue?: any): any;
 }

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

@@ -27,10 +27,9 @@ import { DIConfiguration } from "./DIConfiguration.js";
 export declare class InjectorService extends Container {
     #private;
     logger: DILogger;
+    settings: DIConfiguration;
     private resolvedConfiguration;
     constructor();
-    get settings(): DIConfiguration;
-    set settings(settings: DIConfiguration);
     isLoaded(): boolean;
     /**
      * Return a list of instance build by the injector.

package/package.json

@@ -2,7 +2,7 @@
   "name": "@tsed/di",
   "description": "DI module for Ts.ED Framework",
   "type": "module",
-  "version": "8.16.0-rc.1",
+  "version": "8.16.0-rc.3",
   "source": "./src/index.ts",
   "main": "./lib/esm/index.js",
   "module": "./lib/esm/index.js",
@@ -29,11 +29,11 @@
     "uuid": "^10.0.0"
   },
   "devDependencies": {
-    "@tsed/barrels": "8.16.0-rc.1",
-    "@tsed/core": "8.16.0-rc.1",
-    "@tsed/hooks": "8.16.0-rc.1",
-    "@tsed/logger": "^8.0.0-rc.1",
-    "@tsed/typescript": "8.16.0-rc.1",
+    "@tsed/barrels": "8.16.0-rc.3",
+    "@tsed/core": "8.16.0-rc.3",
+    "@tsed/hooks": "8.16.0-rc.3",
+    "@tsed/logger": "^8.0.0",
+    "@tsed/typescript": "8.16.0-rc.3",
     "cross-env": "7.0.3",
     "eslint": "9.12.0",
     "typescript": "5.4.5",
@@ -43,7 +43,7 @@
   "peerDependencies": {
     "@tsed/core": ">=8.0.0",
     "@tsed/hooks": ">=8.0.0",
-    "@tsed/logger": ">=8.0.0-rc.1"
+    "@tsed/logger": ">=8.0.0"
   },
   "peerDependenciesMeta": {
     "@tsed/core": {

package/readme.md

@@ -36,7 +36,9 @@
 <code><img height="20" src="https://raw.githubusercontent.com/github/explore/80688e429a7d4ef2fca1e82350fe8e3517d3494d/topics/chrome/chrome.png"></code>
 <code><img height="20" src="https://raw.githubusercontent.com/github/explore/80688e429a7d4ef2fca1e82350fe8e3517d3494d/topics/react/react.png"></code>
 
-A powerful and flexible Dependency Injection (DI) toolkit inspired by Angular, designed for both TypeScript and pure JavaScript applications. Use it standalone or as the foundation of Ts.ED. Supports both decorator-based and functional (decorator-less) APIs for maximum compatibility, even in non-TypeScript or pure JS projects.
+A powerful and flexible Dependency Injection (DI) toolkit inspired by Angular, designed for both TypeScript and pure
+JavaScript applications. Use it standalone or as the foundation of Ts.ED. Supports both decorator-based and functional (
+decorator-less) APIs for maximum compatibility, even in non-TypeScript or pure JS projects.
 
 ---
 
@@ -59,15 +61,26 @@ npm install --save @tsed/di @tsed/core @tsed/hooks @tsed/logger
 
 ## Features
 
-- **[Providers](https://tsed.dev/docs/providers.html):** Register and manage services, factories, values, interceptors, and more.
-- **[Functional API](https://tsed.dev/docs/providers.html#injectable):** Register providers and factories without decorators (for pure JS or decorator-less code).
-- **[Async Factories](https://tsed.dev/docs/custom-providers.html#register-async-factory):** Create providers that resolve asynchronously (e.g., database connections).
-- **[Constants Injection](https://tsed.dev/docs/providers.html#constant):** Use `@Constant()` or `constant()` to inject configuration or static values.
-- **[Value Injection](https://tsed.dev/docs/providers.html#value-refvalue):** Use `@Value()` or `refValue()` to inject resolved provider values.
-- **[InjectContext](https://tsed.dev/docs/providers.html#inject-context):** Access the injection context and advanced DI features.
-- **[Config Sources](https://tsed.dev/docs/configuration/configuration-sources.html):** Load and merge configuration from multiple sources (files, env, remote, etc.).
-- **[Lifecycle hooks](https://tsed.dev/docs/hooks.html):** Manage provider lifecycle with hooks like `$onInit`, `$onDestroy`.
-- **[Lazy loading](https://tsed.dev/docs/providers.html#lazy-load-provider):** Lazily load Node.js ESM modules. The lazy loading feature allows you to declare a provider that is only instantiated when it is first injected. The DI system will dynamically import the ESM module, discover injectable services within it, and instantiate them on demand—enabling efficient code splitting and reducing startup time.
+- **[Providers](https://tsed.dev/docs/providers.html):** Register and manage services, factories, values, interceptors,
+  and more.
+- **[Functional API](https://tsed.dev/docs/providers.html#injectable):** Register providers and factories without
+  decorators (for pure JS or decorator-less code).
+- **[Async Factories](https://tsed.dev/docs/custom-providers.html#register-async-factory):** Create providers that
+  resolve asynchronously (e.g., database connections).
+- **[Constants Injection](https://tsed.dev/docs/providers.html#constant):** Use `@Constant()` or `constant()` to inject
+  configuration or static values.
+- **[Value Injection](https://tsed.dev/docs/providers.html#value-refvalue):** Use `@Value()` or `refValue()` to inject
+  resolved provider values.
+- **[InjectContext](https://tsed.dev/docs/providers.html#inject-context):** Access the injection context and advanced DI
+  features.
+- **[Config Sources](https://tsed.dev/docs/configuration/configuration-sources.html):** Load and merge configuration
+  from multiple sources (files, env, remote, etc.).
+- **[Lifecycle hooks](https://tsed.dev/docs/hooks.html):** Manage provider lifecycle with hooks like `$onInit`,
+  `$onDestroy`.
+- **[Lazy loading](https://tsed.dev/docs/providers.html#lazy-load-provider):** Lazily load Node.js ESM modules. The lazy
+  loading feature allows you to declare a provider that is only instantiated when it is first injected. The DI system
+  will dynamically import the ESM module, discover injectable services within it, and instantiate them on
+  demand—enabling efficient code splitting and reducing startup time.
 - **Full TypeScript support:** Type inference with `inject()` and advanced tooling for type-safe DI.
 
 ---
@@ -118,7 +131,8 @@ You can use it in any JS/TS project (web, CLI, backend, etc) without Ts.ED.
 
 ## Stable & Recommended Initialization Example
 
-This is the recommended and most stable way to initialize and use the injector, especially when working with advanced scenarios (settings, async providers, custom loggers, etc):
+This is the recommended and most stable way to initialize and use the injector, especially when working with advanced
+scenarios (settings, async providers, custom loggers, etc):
 
 ```typescript
 import {injector, attachLogger, inject} from "@tsed/di";
@@ -127,12 +141,6 @@ import {CalendarCtrl} from "./CalendarCtrl.js";
 
 // Create a new InjectorService instance
 const inj = injector();
-
-// Register your configuration provider
-inj.addProvider(PlatformConfiguration);
-
-// Optionally invoke and set configuration
-inj.settings = inj.invoke(PlatformConfiguration);
 inj.settings.set(settings);
 
 // Attach a custom logger (optional)
@@ -198,11 +206,6 @@ import "./services/GetAllowerUsers.js"; // just add import is enough to discover
 // Create a new InjectorService instance
 const inj = injector();
 
-// Register your configuration provider
-inj.addProvider(PlatformConfiguration);
-
-// Optionally invoke and set configuration
-inj.settings = inj.invoke(PlatformConfiguration);
 inj.settings.set(settings);
 
 // Attach a custom logger (optional)
@@ -213,9 +216,11 @@ attachLogger($log); // Overriding the default logger is not recommended
 await inj.load();
 ```
 
-The example above is the main point to start the DI system. It should be placed in the main entry file of your application.
+The example above is the main point to start the DI system. It should be placed in the main entry file of your
+application.
 
-Now, you can use the `inject()` function to retrieve the instance of the class, injectable provider, or pure JavaScript function.
+Now, you can use the `inject()` function to retrieve the instance of the class, injectable provider, or pure JavaScript
+function.
 
 For example, if you want to use the `GET_ALLOWED_USERS` factory in your application, you can do it like this:
 
@@ -246,7 +251,8 @@ In summary:
 
 ## Async Factories
 
-You can register **async factories** to provide values/services that require asynchronous initialization (e.g., database connections):
+You can register **async factories** to provide values/services that require asynchronous initialization (e.g., database
+connections):
 
 ```typescript
 import {injectable, inject} from "@tsed/di";
@@ -269,7 +275,8 @@ db.query("SELECT * FROM users");
 
 ## Injecting Constants with `@Constant()` and `@Value()`
 
-You can inject constant values or configuration using the `@Constant()` decorator (or `constant()` function in the Functional API):
+You can inject constant values or configuration using the `@Constant()` decorator (or `constant()` function in the
+Functional API):
 
 ```typescript
 import {Injectable, Constant} from "@tsed/di";
@@ -284,7 +291,8 @@ export class MyService {
 }
 ```
 
-You can also use `@Value()` to inject the resolved value of a provider (by token), or `refValue()` for the functional API:
+You can also use `@Value()` to inject the resolved value of a provider (by token), or `refValue()` for the functional
+API:
 
 ```typescript
 import {Injectable, Value} from "@tsed/di";
@@ -331,6 +339,77 @@ See [Providers documentation](https://tsed.dev/docs/providers.html).
 
 ---
 
+## Extending DIConfiguration
+
+The `DIConfiguration` class provides a `decorate` method that allows you to extend its functionality by adding new methods or properties. You can access this method through the `configuration()` function.
+
+```typescript
+import {configuration} from "@tsed/di";
+
+// Add a custom method to DIConfiguration
+configuration().decorate("myCustomMethod", function () {
+  // Your custom logic here
+  return "Custom result";
+});
+
+// Usage
+const result = configuration().myCustomMethod(); // "Custom result"
+```
+
+You can also add a property with a custom getter/setter:
+
+```typescript
+configuration().decorate("customProperty", {
+  get() {
+    return this.get("someInternalValue");
+  },
+  set(value) {
+    this.set("someInternalValue", value);
+  }
+});
+```
+
+This is particularly useful for plugin authors who want to extend the configuration capabilities without modifying the core code.
+
+---
+
+## Using the $alterConfig:propertyKey Hook
+
+The `$alterConfig:propertyKey` hook allows you to intercept and modify configuration values before they are assigned to a property. This is useful when you need to transform, validate, or augment configuration values dynamically.
+
+When a value is set in the configuration using the `set()` method, the DIConfiguration class internally calls the `$alter` hook with the pattern `$alterConfig:${propertyKey}`, passing the value as the second argument.
+
+Here's how to use this hook:
+
+```typescript
+import {$on} from "@tsed/hooks";
+
+// Register a hook to intercept and modify the 'jsonMapper' configuration
+$on("$alterConfig:jsonMapper", (options) => {
+  // Modify the options before they are assigned
+  options.strictGroups = Boolean(options.strictGroups);
+  options.disableUnsecureConstructor = Boolean(options.disableUnsecureConstructor);
+  options.additionalProperties = Boolean(
+    isBoolean(options.additionalProperties) ? options.additionalProperties : options.additionalProperties === "accept"
+  );
+
+  // Return the modified options
+  return options;
+});
+```
+
+This hook is particularly useful for:
+
+- Normalizing configuration values
+- Applying default values
+- Validating configuration before it's applied
+- Transforming configuration formats
+- Implementing cross-cutting concerns for configuration properties
+
+The hook is executed whenever the corresponding property is set, whether through direct assignment or through the `configuration().set()` method.
+
+---
+
 ## Documentation & Resources
 
 - **[Providers](https://tsed.dev/docs/providers.html)**
@@ -354,7 +433,8 @@ Thank you to all our backers! 🙏 [[Become a backer](https://opencollective.com
 
 ## Sponsors
 
-Support this project by becoming a sponsor. Your logo will show up here with a link to your website. [[Become a sponsor](https://opencollective.com/tsed#sponsor)]
+Support this project by becoming a sponsor. Your logo will show up here with a link to your
+website. [[Become a sponsor](https://opencollective.com/tsed#sponsor)]
 
 ## License
 
@@ -362,8 +442,15 @@ The MIT License (MIT)
 
 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:
+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:
 
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the
+Software.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.