ts-ioc-container 59.0.0 → 60.1.0

package/README.md

@@ -48,6 +48,7 @@ provider pipelines, aliases, and custom injector strategies.
   - [Visibility](#visibility) `visible`
   - [Alias](#alias) `asAlias`
   - [Decorator](#decorator) `decorate`
+  - [On resolve](#on-resolve) `onResolve`
 - [Registration](#registration) `@register`
   - [Token](#token) `bindTo`
   - [Scope](#scope) `scope`
@@ -2376,6 +2377,84 @@ describe('Decorator Pattern', () => {
 
 ```
 
+### On resolve
+
+Sometimes you don't want to change the dependency, only to react to it. Use the `onResolve(...)` pipe — it appends a `DependencyHook` that receives the resolved dependency and the resolving scope.
+
+- `provider(onResolve((instance, scope) => tracker.track(instance)))`
+
+Hooks run after the whole `decorate(...)` chain, so they always observe the fully decorated dependency, and their return value is ignored — `onResolve` can never swap the dependency out. They fire per resolution, which means a `singleton()` provider runs them only on the resolve that fills the cache.
+
+```typescript
+import 'reflect-metadata';
+import { Container, type IContainer, onResolve, register, Registration as R, singleton } from 'ts-ioc-container';
+
+/**
+ * Observability Domain - onResolve hooks
+ *
+ * `onResolve(...)` attaches side effects to a provider. Every time the provider
+ * hands a dependency back, each hook is called with that dependency and the
+ * resolving scope.
+ *
+ * Unlike `decorate(...)`, a hook cannot replace the dependency - its return
+ * value is ignored. Use `decorate` to change what the caller gets, and
+ * `onResolve` to react to what the caller got: tracking, metrics, registering
+ * the instance with an external bus.
+ *
+ * Hooks always run after the whole `decorate` chain, so they observe the fully
+ * decorated dependency no matter where `onResolve` sits in the pipe list.
+ */
+describe('onResolve', () => {
+  it('should observe every resolved dependency without changing it', () => {
+    const resolved: Array<{ name: string; fromRequest: boolean }> = [];
+
+    const track = (dependency: unknown, scope: IContainer) => {
+      resolved.push({ name: (dependency as Connection).name, fromRequest: scope.hasTag('request') });
+    };
+
+    @register(onResolve(track))
+    class Connection {
+      readonly name = 'Connection';
+    }
+
+    const app = new Container({ tags: ['application'] }).addRegistration(R.fromClass(Connection));
+    const request = app.createScope({ tags: ['request'] });
+
+    const connection = request.resolve<Connection>('Connection');
+
+    // The caller still receives the untouched instance
+    expect(connection).toBeInstanceOf(Connection);
+    // ...and the hook saw it, together with the scope it was resolved from
+    expect(resolved).toEqual([{ name: 'Connection', fromRequest: true }]);
+  });
+
+  it('should run once for a singleton and on every resolve otherwise', () => {
+    let poolCount = 0;
+    let sessionCount = 0;
+
+    @register(singleton(), onResolve(() => poolCount++))
+    class ConnectionPool {}
+
+    @register(onResolve(() => sessionCount++))
+    class Session {}
+
+    const app = new Container({ tags: ['application'] })
+      .addRegistration(R.fromClass(ConnectionPool))
+      .addRegistration(R.fromClass(Session));
+
+    app.resolve('ConnectionPool');
+    app.resolve('ConnectionPool');
+    app.resolve('Session');
+    app.resolve('Session');
+
+    // A singleton caches the dependency, so hooks fire on the resolve that filled the cache
+    expect(poolCount).toBe(1);
+    expect(sessionCount).toBe(2);
+  });
+});
+
+```
+
 ## Registration
 
 Registration is provider factory which registers provider in container.
@@ -2759,7 +2838,7 @@ runs `h1` before `h2`.
 ```typescript
 import 'reflect-metadata';
 import {
-  AddOnConstructHookModule,
+  OnConstructModule,
   Container,
   type ExecutionContext,
   type HookFn,
@@ -2787,7 +2866,7 @@ describe('onConstruct', function () {
     }
 
     const container = new Container()
-      .useModule(new AddOnConstructHookModule())
+      .useModule(new OnConstructModule())
       .addRegistration(R.fromValue('postgres://localhost:5432').bindTo('ConnectionString'));
 
     const db = container.resolve(DatabaseConnection);
@@ -2808,7 +2887,7 @@ describe('onConstruct', function () {
 
     let captured: { ex: unknown; context: ExecutionContext } | undefined;
     const container = new Container().useModule(
-      new AddOnConstructHookModule((ex, context) => {
+      new OnConstructModule((ex, context) => {
         captured = { ex, context };
       }),
     );
@@ -2828,7 +2907,7 @@ describe('onConstruct', function () {
       init() {}
     }
 
-    const container = new Container().useModule(new AddOnConstructHookModule());
+    const container = new Container().useModule(new OnConstructModule());
 
     expect(() => container.resolve(BrokenService)).toThrow(failure);
   });
@@ -2843,7 +2922,7 @@ describe('onConstruct', function () {
 
     let scope: IContainer | undefined;
     const container = new Container().useModule(
-      new AddOnConstructHookModule((_ex, context) => {
+      new OnConstructModule((_ex, context) => {
         scope = context.scope;
       }),
     );
@@ -2860,13 +2939,13 @@ describe('onConstruct', function () {
 ### OnConstructAsync
 
 `@onConstructAsync` runs promise-returning initialization. Resolution stays
-synchronous: `AddOnConstructAsyncHookModule` starts the hooks when the instance
+synchronous: `OnConstructAsyncModule` starts the hooks when the instance
 is created and they settle afterwards, so `resolve` returns before they finish.
 
 ```typescript
 import 'reflect-metadata';
 import {
-  AddOnConstructAsyncHookModule,
+  OnConstructAsyncModule,
   Container,
   type ExecutionContext,
   type HookFn,
@@ -2904,7 +2983,7 @@ describe('onConstructAsync', function () {
     }
 
     const container = new Container()
-      .useModule(new AddOnConstructAsyncHookModule())
+      .useModule(new OnConstructAsyncModule())
       .addRegistration(R.fromValue('postgres://localhost:5432').bindTo('ConnectionString'));
 
     const db = container.resolve(DatabaseConnection);
@@ -2928,7 +3007,7 @@ describe('onConstructAsync', function () {
 
     let captured: { ex: unknown; context: ExecutionContext } | undefined;
     const container = new Container().useModule(
-      new AddOnConstructAsyncHookModule((ex, context) => {
+      new OnConstructAsyncModule((ex, context) => {
         captured = { ex, context };
       }),
     );
@@ -2950,7 +3029,7 @@ describe('onConstructAsync', function () {
 ```typescript
 import 'reflect-metadata';
 import {
-  AddOnDisposeHookModule,
+  OnDisposeModule,
   bindTo,
   Container,
   type HookFn,
@@ -2993,7 +3072,7 @@ class Logger {
 describe('onContainerDisposed', function () {
   it('should invoke hooks on all instances when container is disposed', function () {
     const container = new Container()
-      .useModule(new AddOnDisposeHookModule())
+      .useModule(new OnDisposeModule())
       .addRegistration(R.fromClass(Logger))
       .addRegistration(R.fromClass(LogsRepo));
 

package/cjm/container/AutoResolveModule.js

@@ -7,7 +7,7 @@ class AutoResolveModule {
         this.options = options;
     }
     applyTo(container) {
-        container.addOnScopeCreatedHook((scope) => scope.autoResolve(this.options));
+        container.onScopeCreated((scope) => scope.autoResolve(this.options));
     }
 }
 exports.AutoResolveModule = AutoResolveModule;

package/cjm/container/Container.js

@@ -5,6 +5,7 @@ const EmptyContainer_1 = require("./EmptyContainer");
 const ContainerDisposedError_1 = require("../errors/ContainerDisposedError");
 const MetadataInjector_1 = require("../injector/MetadataInjector");
 const AliasMap_1 = require("./AliasMap");
+const ProxyRegistry_1 = require("../utils/ProxyRegistry");
 const DependencyNotFoundError_1 = require("../errors/DependencyNotFoundError");
 const basic_1 = require("../utils/basic");
 const array_1 = require("../utils/array");
@@ -73,9 +74,9 @@ class Container {
     createScope({ tags } = {}) {
         this.validateContainer();
         const scope = new Container({ injector: this.injector, parent: this, tags })
-            .addOnConstructHook(...this.onConstructHookList)
-            .addOnDisposeHook(...this.onDisposeHookList)
-            .addOnScopeCreatedHook(...this.onScopeCreatedHookList);
+            .onConstruct(...this.onConstructHookList)
+            .onInstanceDisposed(...this.onDisposeHookList)
+            .onScopeCreated(...this.onScopeCreatedHookList);
         for (const registration of this.getRegistrations()) {
             registration.applyTo(scope);
         }
@@ -97,9 +98,8 @@ class Container {
     dispose() {
         this.validateContainer();
         this.isDisposed = true;
-        while (this.onDisposeHookList.length) {
-            const onDispose = this.onDisposeHookList.shift();
-            onDispose(this);
+        for (const hook of this.onDisposeHookList) {
+            hook(this);
         }
         this.parent.removeScope(this);
         this.parent = new EmptyContainer_1.EmptyContainer();
@@ -111,6 +111,7 @@ class Container {
         this.instances.clear();
         this.registrations = [];
         this.onConstructHookList.length = 0;
+        this.onDisposeHookList.length = 0;
         this.onScopeCreatedHookList.length = 0;
     }
     addRegistration(registration) {
@@ -124,15 +125,15 @@ class Container {
     hasRegistration(key) {
         return this.registrations.some((r) => r.getKeyOrFail() === key) || this.parent.hasRegistration(key);
     }
-    addOnConstructHook(...hooks) {
+    onConstruct(...hooks) {
         this.onConstructHookList.push(...hooks);
         return this;
     }
-    addOnDisposeHook(...hooks) {
+    onInstanceDisposed(...hooks) {
         this.onDisposeHookList.push(...hooks);
         return this;
     }
-    addOnScopeCreatedHook(...hooks) {
+    onScopeCreated(...hooks) {
         this.onScopeCreatedHookList.push(...hooks);
         return this;
     }
@@ -146,14 +147,7 @@ class Container {
         return [...this.scopes];
     }
     hasInstance(instance) {
-        return this.instances.has(instance);
-    }
-    getScopeByInstanceOrFail(instance) {
-        this.validateContainer();
-        if (this.hasInstance(instance)) {
-            return this;
-        }
-        return this.parent.getScopeByInstanceOrFail(instance);
+        return this.instances.has((0, ProxyRegistry_1.unwrapProxy)(instance));
     }
     removeScope(child) {
         this.scopes = this.scopes.filter((s) => s !== child);

package/cjm/container/EmptyContainer.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.EmptyContainer = void 0;
 const MethodNotImplementedError_1 = require("../errors/MethodNotImplementedError");
 const DependencyNotFoundError_1 = require("../errors/DependencyNotFoundError");
-const ContainerNotFoundError_1 = require("../errors/ContainerNotFoundError");
 class EmptyContainer {
     get isDisposed() {
         throw new MethodNotImplementedError_1.MethodNotImplementedError();
@@ -15,9 +14,6 @@ class EmptyContainer {
     getScopes() {
         return [];
     }
-    getScopeByInstanceOrFail(instance) {
-        throw new ContainerNotFoundError_1.ContainerNotFoundError('Cannot find scope for the given instance');
-    }
     getInstances() {
         return [];
     }
@@ -64,13 +60,13 @@ class EmptyContainer {
     resolveOneByAlias(alias, options) {
         throw new DependencyNotFoundError_1.DependencyNotFoundError(`Cannot find alias ${alias.toString()}`);
     }
-    addOnDisposeHook(...hooks) {
+    onInstanceDisposed(...hooks) {
         throw new MethodNotImplementedError_1.MethodNotImplementedError();
     }
-    addOnConstructHook(...hooks) {
+    onConstruct(...hooks) {
         throw new MethodNotImplementedError_1.MethodNotImplementedError();
     }
-    addOnScopeCreatedHook(...hooks) {
+    onScopeCreated(...hooks) {
         throw new MethodNotImplementedError_1.MethodNotImplementedError();
     }
 }

package/cjm/hooks/HookContext.js

@@ -13,7 +13,7 @@ class HookContext {
         this.methodName = methodName;
     }
     resolveArgs(...args) {
-        return (0, MetadataInjector_1.resolveArgs)(this.instance.constructor, this.methodName)(this.scope, {
+        return (0, MetadataInjector_1.resolveArgs)(this.instance, this.methodName)(this.scope, {
             args: [...this.initialArgs, ...args],
         });
     }

package/cjm/hooks/hook.js

@@ -4,6 +4,7 @@ exports.hook = exports.toHookFn = exports.prepend = exports.append = exports.pre
 exports.getHooks = getHooks;
 exports.hasHooks = hasHooks;
 const basic_1 = require("../utils/basic");
+const target_1 = require("../metadata/target");
 const appendHooks = (...fns) => (...prev) => [...prev, ...fns];
 exports.appendHooks = appendHooks;
 const prependHooks = (...fns) => (...prev) => [...fns, ...prev];
@@ -26,7 +27,7 @@ const getConstructorChain = (ctor) => {
 };
 function getHooks(target, key) {
     const merged = new Map();
-    for (const ctor of getConstructorChain(target.constructor).reverse()) {
+    for (const ctor of getConstructorChain((0, target_1.resolveConstructor)(target)).reverse()) {
         const ownHooks = Reflect.getOwnMetadata(key, ctor);
         if (ownHooks) {
             for (const [methodName, fns] of ownHooks) {
@@ -37,7 +38,7 @@ function getHooks(target, key) {
     return merged;
 }
 function hasHooks(target, key) {
-    return getConstructorChain(target.constructor).some((ctor) => Reflect.hasOwnMetadata(key, ctor));
+    return getConstructorChain((0, target_1.resolveConstructor)(target)).some((ctor) => Reflect.hasOwnMetadata(key, ctor));
 }
 const hook = (key, mapFn) => (target, propertyKey) => {
     const hooks = Reflect.hasOwnMetadata(key, target.constructor)

package/cjm/hooks/onConstruct.js

@@ -1,18 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AddOnConstructHookModule = exports.onConstruct = exports.onConstructHooksRunner = void 0;
+exports.OnConstructModule = exports.onConstruct = exports.onConstructHooksRunner = void 0;
 const hook_1 = require("./hook");
 const HooksRunner_1 = require("./HooksRunner");
 exports.onConstructHooksRunner = new HooksRunner_1.HooksRunner('onConstruct');
 const onConstruct = (...fns) => (0, hook_1.hook)('onConstruct', (0, hook_1.prependHooks)(...fns));
 exports.onConstruct = onConstruct;
-class AddOnConstructHookModule {
+class OnConstructModule {
     onException;
     constructor(onException) {
         this.onException = onException;
     }
     applyTo(container) {
-        container.addOnConstructHook((instance, scope) => {
+        container.onConstruct((instance, scope) => {
             try {
                 exports.onConstructHooksRunner.execute(instance, { scope });
             }
@@ -25,4 +25,4 @@ class AddOnConstructHookModule {
         });
     }
 }
-exports.AddOnConstructHookModule = AddOnConstructHookModule;
+exports.OnConstructModule = OnConstructModule;

package/cjm/hooks/onConstructAsync.js

@@ -1,18 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AddOnConstructAsyncHookModule = exports.onConstructAsync = exports.onConstructAsyncHooksRunner = void 0;
+exports.OnConstructAsyncModule = exports.onConstructAsync = exports.onConstructAsyncHooksRunner = void 0;
 const hook_1 = require("./hook");
 const HooksRunner_1 = require("./HooksRunner");
 exports.onConstructAsyncHooksRunner = new HooksRunner_1.HooksRunner('onConstructAsync');
 const onConstructAsync = (...fns) => (0, hook_1.hook)('onConstructAsync', (0, hook_1.prependHooks)(...fns));
 exports.onConstructAsync = onConstructAsync;
-class AddOnConstructAsyncHookModule {
+class OnConstructAsyncModule {
     onException;
     constructor(onException) {
         this.onException = onException;
     }
     applyTo(container) {
-        container.addOnConstructHook((instance, scope) => {
+        container.onConstruct((instance, scope) => {
             if (!exports.onConstructAsyncHooksRunner.hasHooks(instance)) {
                 return;
             }
@@ -25,4 +25,4 @@ class AddOnConstructAsyncHookModule {
         });
     }
 }
-exports.AddOnConstructAsyncHookModule = AddOnConstructAsyncHookModule;
+exports.OnConstructAsyncModule = OnConstructAsyncModule;

package/cjm/hooks/onContainerDisposed.js

@@ -1,18 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AddOnDisposeHookModule = exports.onContainerDisposed = exports.onContainerDisposedHooksRunner = void 0;
+exports.OnDisposeModule = exports.onContainerDisposed = exports.onContainerDisposedHooksRunner = void 0;
 const hook_1 = require("./hook");
 const HooksRunner_1 = require("./HooksRunner");
 exports.onContainerDisposedHooksRunner = new HooksRunner_1.HooksRunner('onContainerDisposed');
 const onContainerDisposed = (...fns) => (0, hook_1.hook)('onContainerDisposed', (0, hook_1.prependHooks)(...fns));
 exports.onContainerDisposed = onContainerDisposed;
-class AddOnDisposeHookModule {
+class OnDisposeModule {
     applyTo(container) {
-        container.addOnDisposeHook((scope) => {
+        container.onInstanceDisposed((scope) => {
             for (const instance of scope.getInstances()) {
                 exports.onContainerDisposedHooksRunner.execute(instance, { scope });
             }
         });
     }
 }
-exports.AddOnDisposeHookModule = AddOnDisposeHookModule;
+exports.OnDisposeModule = OnDisposeModule;

package/cjm/index.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createHookContext = exports.createHookContextFactory = exports.HookContext = exports.prepend = exports.append = exports.prependHooks = exports.appendHooks = exports.hasHooks = exports.hook = exports.getHooks = exports.UnsupportedTokenTypeError = exports.CannonSingletonApplyTwiceError = exports.UnexpectedHookResultError = exports.ProviderDisposedError = exports.ContainerDisposedError = exports.MethodNotImplementedError = exports.DependencyMissingKeyError = exports.ContainerNotFoundError = exports.DependencyNotFoundError = exports.ContainerError = exports.Registration = exports.appendArgsFn = exports.appendArgs = exports.decorate = exports.singleton = exports.autoResolve = exports.lazy = exports.scopeAccess = exports.scope = exports.bindTo = exports.register = exports.toRegistrationFn = exports.toProviderFn = exports.toBindToken = exports.registerPipe = exports.isProviderPipe = exports.Provider = exports.ProxyInjector = exports.SimpleInjector = exports.resolveArgs = exports.argsFn = exports.args = exports.arg = exports.inject = exports.MetadataInjector = exports.Injector = exports.EmptyContainer = exports.AutoResolveModule = exports.Container = exports.isDependencyKey = void 0;
-exports.pipe = exports.select = exports.once = exports.shallowCache = exports.debounce = exports.throttle = exports.handleAsyncError = exports.handleError = exports.getMethodTags = exports.addMethodTag = exports.getMethodLabels = exports.addMethodLabel = exports.getMethodMeta = exports.addMethodMeta = exports.getParamTags = exports.addParamTag = exports.getParamLabels = exports.addParamLabel = exports.getParamMeta = exports.addParamMeta = exports.getClassTags = exports.addClassTag = exports.getClassLabels = exports.addClassLabel = exports.getClassMeta = exports.addClassMeta = exports.GroupInstanceToken = exports.ConstantToken = exports.FunctionToken = exports.SingleToken = exports.ClassToken = exports.toSingleAlias = exports.SingleAliasToken = exports.toGroupAlias = exports.GroupAliasToken = exports.argToToken = exports.toMappedToken = exports.toToken = exports.InjectionToken = exports.HooksRunner = exports.AddOnDisposeHookModule = exports.onContainerDisposed = exports.onContainerDisposedHooksRunner = exports.AddOnConstructAsyncHookModule = exports.onConstructAsync = exports.onConstructAsyncHooksRunner = exports.AddOnConstructHookModule = exports.onConstruct = exports.onConstructHooksRunner = exports.injectProp = void 0;
-exports.resolveConstructor = exports.Is = exports.ProxyRegistry = void 0;
+exports.createHookContextFactory = exports.HookContext = exports.prepend = exports.append = exports.prependHooks = exports.appendHooks = exports.hasHooks = exports.hook = exports.getHooks = exports.UnsupportedTokenTypeError = exports.CannonSingletonApplyTwiceError = exports.UnexpectedHookResultError = exports.ProviderDisposedError = exports.ContainerDisposedError = exports.MethodNotImplementedError = exports.DependencyMissingKeyError = exports.ContainerNotFoundError = exports.DependencyNotFoundError = exports.ContainerError = exports.Registration = exports.onResolve = exports.appendArgsFn = exports.appendArgs = exports.decorate = exports.singleton = exports.autoResolve = exports.lazy = exports.scopeAccess = exports.scope = exports.bindTo = exports.register = exports.toRegistrationFn = exports.toProviderFn = exports.toBindToken = exports.registerPipe = exports.isProviderPipe = exports.Provider = exports.ProxyInjector = exports.SimpleInjector = exports.resolveArgs = exports.argsFn = exports.args = exports.arg = exports.inject = exports.MetadataInjector = exports.Injector = exports.EmptyContainer = exports.AutoResolveModule = exports.Container = exports.isDependencyKey = void 0;
+exports.once = exports.shallowCache = exports.debounce = exports.throttle = exports.handleAsyncError = exports.handleError = exports.getMethodTags = exports.addMethodTag = exports.getMethodLabels = exports.addMethodLabel = exports.getMethodMeta = exports.addMethodMeta = exports.getParamTags = exports.addParamTag = exports.getParamLabels = exports.addParamLabel = exports.getParamMeta = exports.addParamMeta = exports.getClassTags = exports.addClassTag = exports.getClassLabels = exports.addClassLabel = exports.getClassMeta = exports.addClassMeta = exports.resolveConstructor = exports.GroupInstanceToken = exports.ConstantToken = exports.FunctionToken = exports.SingleToken = exports.ClassToken = exports.toSingleAlias = exports.SingleAliasToken = exports.toGroupAlias = exports.GroupAliasToken = exports.argToToken = exports.toMappedToken = exports.toToken = exports.InjectionToken = exports.HooksRunner = exports.OnDisposeModule = exports.onContainerDisposed = exports.onContainerDisposedHooksRunner = exports.OnConstructAsyncModule = exports.onConstructAsync = exports.onConstructAsyncHooksRunner = exports.OnConstructModule = exports.onConstruct = exports.onConstructHooksRunner = exports.injectProp = exports.createHookContext = void 0;
+exports.Is = exports.unwrapProxy = exports.ProxyRegistry = exports.pipe = exports.select = void 0;
 var IContainer_1 = require("./container/IContainer");
 Object.defineProperty(exports, "isDependencyKey", { enumerable: true, get: function () { return IContainer_1.isDependencyKey; } });
 var Container_1 = require("./container/Container");
@@ -42,6 +42,7 @@ Object.defineProperty(exports, "singleton", { enumerable: true, get: function ()
 Object.defineProperty(exports, "decorate", { enumerable: true, get: function () { return IRegistration_1.decorate; } });
 Object.defineProperty(exports, "appendArgs", { enumerable: true, get: function () { return IRegistration_1.appendArgs; } });
 Object.defineProperty(exports, "appendArgsFn", { enumerable: true, get: function () { return IRegistration_1.appendArgsFn; } });
+Object.defineProperty(exports, "onResolve", { enumerable: true, get: function () { return IRegistration_1.onResolve; } });
 var Registration_1 = require("./registration/Registration");
 Object.defineProperty(exports, "Registration", { enumerable: true, get: function () { return Registration_1.Registration; } });
 var ContainerError_1 = require("./errors/ContainerError");
@@ -81,15 +82,15 @@ Object.defineProperty(exports, "injectProp", { enumerable: true, get: function (
 var onConstruct_1 = require("./hooks/onConstruct");
 Object.defineProperty(exports, "onConstructHooksRunner", { enumerable: true, get: function () { return onConstruct_1.onConstructHooksRunner; } });
 Object.defineProperty(exports, "onConstruct", { enumerable: true, get: function () { return onConstruct_1.onConstruct; } });
-Object.defineProperty(exports, "AddOnConstructHookModule", { enumerable: true, get: function () { return onConstruct_1.AddOnConstructHookModule; } });
+Object.defineProperty(exports, "OnConstructModule", { enumerable: true, get: function () { return onConstruct_1.OnConstructModule; } });
 var onConstructAsync_1 = require("./hooks/onConstructAsync");
 Object.defineProperty(exports, "onConstructAsyncHooksRunner", { enumerable: true, get: function () { return onConstructAsync_1.onConstructAsyncHooksRunner; } });
 Object.defineProperty(exports, "onConstructAsync", { enumerable: true, get: function () { return onConstructAsync_1.onConstructAsync; } });
-Object.defineProperty(exports, "AddOnConstructAsyncHookModule", { enumerable: true, get: function () { return onConstructAsync_1.AddOnConstructAsyncHookModule; } });
+Object.defineProperty(exports, "OnConstructAsyncModule", { enumerable: true, get: function () { return onConstructAsync_1.OnConstructAsyncModule; } });
 var onContainerDisposed_1 = require("./hooks/onContainerDisposed");
 Object.defineProperty(exports, "onContainerDisposedHooksRunner", { enumerable: true, get: function () { return onContainerDisposed_1.onContainerDisposedHooksRunner; } });
 Object.defineProperty(exports, "onContainerDisposed", { enumerable: true, get: function () { return onContainerDisposed_1.onContainerDisposed; } });
-Object.defineProperty(exports, "AddOnDisposeHookModule", { enumerable: true, get: function () { return onContainerDisposed_1.AddOnDisposeHookModule; } });
+Object.defineProperty(exports, "OnDisposeModule", { enumerable: true, get: function () { return onContainerDisposed_1.OnDisposeModule; } });
 var HooksRunner_1 = require("./hooks/HooksRunner");
 Object.defineProperty(exports, "HooksRunner", { enumerable: true, get: function () { return HooksRunner_1.HooksRunner; } });
 var InjectionToken_1 = require("./token/InjectionToken");
@@ -114,6 +115,8 @@ var ConstantToken_1 = require("./token/ConstantToken");
 Object.defineProperty(exports, "ConstantToken", { enumerable: true, get: function () { return ConstantToken_1.ConstantToken; } });
 var GroupInstanceToken_1 = require("./token/GroupInstanceToken");
 Object.defineProperty(exports, "GroupInstanceToken", { enumerable: true, get: function () { return GroupInstanceToken_1.GroupInstanceToken; } });
+var target_1 = require("./metadata/target");
+Object.defineProperty(exports, "resolveConstructor", { enumerable: true, get: function () { return target_1.resolveConstructor; } });
 var class_1 = require("./metadata/class");
 Object.defineProperty(exports, "addClassMeta", { enumerable: true, get: function () { return class_1.addClassMeta; } });
 Object.defineProperty(exports, "getClassMeta", { enumerable: true, get: function () { return class_1.getClassMeta; } });
@@ -152,6 +155,6 @@ var fp_1 = require("./utils/fp");
 Object.defineProperty(exports, "pipe", { enumerable: true, get: function () { return fp_1.pipe; } });
 var ProxyRegistry_1 = require("./utils/ProxyRegistry");
 Object.defineProperty(exports, "ProxyRegistry", { enumerable: true, get: function () { return ProxyRegistry_1.ProxyRegistry; } });
+Object.defineProperty(exports, "unwrapProxy", { enumerable: true, get: function () { return ProxyRegistry_1.unwrapProxy; } });
 var basic_1 = require("./utils/basic");
 Object.defineProperty(exports, "Is", { enumerable: true, get: function () { return basic_1.Is; } });
-Object.defineProperty(exports, "resolveConstructor", { enumerable: true, get: function () { return basic_1.resolveConstructor; } });

package/cjm/injector/MetadataInjector.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.resolveArgs = exports.args = exports.arg = exports.argsFn = exports.MetadataInjector = void 0;
 exports.inject = inject;
 const IInjector_1 = require("./IInjector");
-const basic_1 = require("../utils/basic");
+const target_1 = require("../metadata/target");
 const parameter_1 = require("../metadata/parameter");
 const toToken_1 = require("../token/toToken");
 class MetadataInjector extends IInjector_1.Injector {
@@ -16,7 +16,7 @@ exports.MetadataInjector = MetadataInjector;
 const hookMetaKey = (methodName = 'constructor') => `inject:${methodName}`;
 function inject(fn, ...mappers) {
     return (target, propertyKey, parameterIndex) => {
-        (0, parameter_1.addParamMeta)(hookMetaKey(propertyKey), () => (0, toToken_1.toMappedToken)(fn, mappers))(basic_1.Is.instance(target) ? target.constructor : target, propertyKey, parameterIndex);
+        (0, parameter_1.addParamMeta)(hookMetaKey(propertyKey), () => (0, toToken_1.toMappedToken)(fn, mappers))((0, target_1.resolveConstructor)(target), propertyKey, parameterIndex);
     };
 }
 const argsFn = (predicate) => (c, { args = [] }) => args.find((value, index) => predicate(value, index));
@@ -25,8 +25,8 @@ const arg = (index) => (0, exports.argsFn)((value, i) => i === index);
 exports.arg = arg;
 const args = (c, { args = [] }) => args;
 exports.args = args;
-const resolveArgs = (Target, methodName) => {
-    const tokens = (0, parameter_1.getParamMeta)(hookMetaKey(methodName), Target);
+const resolveArgs = (target, methodName) => {
+    const tokens = (0, parameter_1.getParamMeta)(hookMetaKey(methodName), target);
     return (scope, { args = [], lazy }) => tokens.map((fn) => fn.resolve(scope, { args: args.map(toToken_1.argToToken).map((t) => t.resolve(scope)), lazy }));
 };
 exports.resolveArgs = resolveArgs;

package/cjm/metadata/class.js

@@ -2,14 +2,14 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getClassTags = exports.addClassTag = exports.getClassLabels = exports.addClassLabel = exports.addClassMeta = void 0;
 exports.getClassMeta = getClassMeta;
-const basic_1 = require("../utils/basic");
+const target_1 = require("./target");
 const addClassMeta = (key, mapFn) => (target) => {
     const value = Reflect.getOwnMetadata(key, target);
     Reflect.defineMetadata(key, mapFn(value), target);
 };
 exports.addClassMeta = addClassMeta;
 function getClassMeta(target, key) {
-    return Reflect.getOwnMetadata(key, (0, basic_1.resolveConstructor)(target));
+    return Reflect.getOwnMetadata(key, (0, target_1.resolveConstructor)(target));
 }
 const addClassLabel = (key, label) => (0, exports.addClassMeta)('label', (prev = new Map()) => prev.set(key, label));
 exports.addClassLabel = addClassLabel;

package/cjm/metadata/method.js

@@ -1,13 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getMethodTags = exports.addMethodTag = exports.getMethodLabels = exports.addMethodLabel = exports.getMethodMeta = exports.addMethodMeta = void 0;
-const basic_1 = require("../utils/basic");
+const target_1 = require("./target");
 const addMethodMeta = (key, mapFn) => (target, propertyKey) => {
     const metadata = Reflect.getMetadata(key, target.constructor, propertyKey);
     Reflect.defineMetadata(key, mapFn(metadata), target.constructor, propertyKey);
 };
 exports.addMethodMeta = addMethodMeta;
-const getMethodMeta = (key, target, propertyKey) => Reflect.getMetadata(key, (0, basic_1.resolveConstructor)(target), propertyKey);
+const getMethodMeta = (key, target, propertyKey) => Reflect.getMetadata(key, (0, target_1.resolveConstructor)(target), propertyKey);
 exports.getMethodMeta = getMethodMeta;
 const addMethodLabel = (key, label) => (0, exports.addMethodMeta)('label', (prev = new Map()) => prev.set(key, label));
 exports.addMethodLabel = addMethodLabel;

package/cjm/metadata/parameter.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getParamTags = exports.addParamTag = exports.getParamLabels = exports.addParamLabel = exports.getParamMeta = exports.addParamMeta = void 0;
-const basic_1 = require("../utils/basic");
+const target_1 = require("./target");
 const addParamMeta = (key, mapFn) => (target, _, parameterIndex) => {
     const metadata = Reflect.getOwnMetadata(key, target) ?? [];
     metadata[parameterIndex] = mapFn(metadata[parameterIndex]);
@@ -9,7 +9,7 @@ const addParamMeta = (key, mapFn) => (target, _, parameterIndex) => {
 };
 exports.addParamMeta = addParamMeta;
 const getParamMeta = (key, target) => {
-    return Reflect.getOwnMetadata(key, (0, basic_1.resolveConstructor)(target)) ?? [];
+    return Reflect.getOwnMetadata(key, (0, target_1.resolveConstructor)(target)) ?? [];
 };
 exports.getParamMeta = getParamMeta;
 const addParamLabel = (key, label) => (0, exports.addParamMeta)('label', (prev) => {

package/cjm/metadata/target.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.resolveConstructor = resolveConstructor;
+const basic_1 = require("../utils/basic");
+const ProxyRegistry_1 = require("../utils/ProxyRegistry");
+function resolveConstructor(target) {
+    const value = (0, ProxyRegistry_1.unwrapProxy)(target);
+    return basic_1.Is.constructor(value) ? value : value.constructor;
+}

package/cjm/provider/Provider.js

@@ -22,6 +22,7 @@ class Provider {
     cache = new Map();
     getKey;
     isDisposed = false;
+    onResolveHookList = [];
     constructor(resolveDependency) {
         this.resolveDependency = resolveDependency;
     }
@@ -37,11 +38,15 @@ class Provider {
         return this.cache.get(key);
     }
     resolveDep(scope, { args = [], lazy } = {}) {
-        const dependency = this.resolveDependency(scope, {
+        let dependency = this.resolveDependency(scope, {
             args: this.argsFnList.reduce((acc, current) => current(scope, { args: acc }), args),
             lazy: lazy ?? this.isLazy,
         });
-        return this.mappers.reduce((acc, current) => current(acc, scope), dependency);
+        dependency = this.mappers.reduce((acc, current) => current(acc, scope), dependency);
+        for (const onResolve of this.onResolveHookList) {
+            onResolve(dependency, scope);
+        }
+        return dependency;
     }
     map(...mappers) {
         this.mappers.push(...mappers);
@@ -76,6 +81,10 @@ class Provider {
         this.getKey = getCacheKey;
         return this;
     }
+    onResolve(...hooks) {
+        this.onResolveHookList.push(...hooks);
+        return this;
+    }
     dispose() {
         ProviderDisposedError_1.ProviderDisposedError.assert(!this.isDisposed, 'Provider is already disposed');
         this.isDisposed = true;
@@ -85,6 +94,7 @@ class Provider {
         this.accessRules.splice(0, this.accessRules.length);
         this.mappers.splice(0, this.mappers.length);
         this.argsFnList.splice(0, this.argsFnList.length);
+        this.onResolveHookList.splice(0, this.onResolveHookList.length);
     }
 }
 exports.Provider = Provider;

package/cjm/registration/IRegistration.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.singleton = exports.decorate = exports.autoResolve = exports.lazy = exports.scopeAccess = exports.appendArgsFn = exports.appendArgs = exports.scope = exports.bindTo = exports.register = exports.getTransformers = exports.toRegistrationFn = exports.toProviderFn = exports.toBindToken = exports.registerPipe = exports.isProviderPipe = void 0;
+exports.onResolve = exports.singleton = exports.decorate = exports.autoResolve = exports.lazy = exports.scopeAccess = exports.appendArgsFn = exports.appendArgs = exports.scope = exports.bindTo = exports.register = exports.getTransformers = exports.toRegistrationFn = exports.toProviderFn = exports.toBindToken = exports.registerPipe = exports.isProviderPipe = void 0;
 const IContainer_1 = require("../container/IContainer");
 const SingleToken_1 = require("../token/SingleToken");
 const class_1 = require("../metadata/class");
@@ -54,3 +54,5 @@ const decorate = (...fns) => (0, exports.registerPipe)((p) => p.map(...fns));
 exports.decorate = decorate;
 const singleton = (getCacheKey) => (0, exports.registerPipe)((p) => p.singleton(getCacheKey));
 exports.singleton = singleton;
+const onResolve = (...hooks) => (0, exports.registerPipe)((p) => p.onResolve(...hooks));
+exports.onResolve = onResolve;