ts-ioc-container 60.0.0 → 60.2.0

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");
@@ -21,6 +22,7 @@ class Container {
     onConstructHookList = [];
     onDisposeHookList = [];
     onScopeCreatedHookList = [];
+    onProviderRegisteredHookList = [];
     constructor(options = {}) {
         this.injector = options.injector ?? new MetadataInjector_1.MetadataInjector();
         this.parent = options.parent ?? new EmptyContainer_1.EmptyContainer();
@@ -30,6 +32,9 @@ class Container {
         this.validateContainer();
         this.providers.set(key, provider);
         this.aliases.setAliasesByKey(key, aliases);
+        for (const onProviderRegistered of this.onProviderRegisteredHookList) {
+            onProviderRegistered(provider, key, this);
+        }
         return this;
     }
     resolve(target, { args = [], child = this, lazy } = {}) {
@@ -75,7 +80,8 @@ class Container {
         const scope = new Container({ injector: this.injector, parent: this, tags })
             .onConstruct(...this.onConstructHookList)
             .onInstanceDisposed(...this.onDisposeHookList)
-            .onScopeCreated(...this.onScopeCreatedHookList);
+            .onScopeCreated(...this.onScopeCreatedHookList)
+            .onProviderRegistered(...this.onProviderRegisteredHookList);
         for (const registration of this.getRegistrations()) {
             registration.applyTo(scope);
         }
@@ -112,6 +118,7 @@ class Container {
         this.onConstructHookList.length = 0;
         this.onDisposeHookList.length = 0;
         this.onScopeCreatedHookList.length = 0;
+        this.onProviderRegisteredHookList.length = 0;
     }
     addRegistration(registration) {
         this.registrations.push(registration);
@@ -136,6 +143,10 @@ class Container {
         this.onScopeCreatedHookList.push(...hooks);
         return this;
     }
+    onProviderRegistered(...hooks) {
+        this.onProviderRegisteredHookList.push(...hooks);
+        return this;
+    }
     addInstance(instance) {
         this.instances.add(instance);
         for (const onConstruct of this.onConstructHookList) {
@@ -146,7 +157,7 @@ class Container {
         return [...this.scopes];
     }
     hasInstance(instance) {
-        return this.instances.has(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

@@ -69,5 +69,8 @@ class EmptyContainer {
     onScopeCreated(...hooks) {
         throw new MethodNotImplementedError_1.MethodNotImplementedError();
     }
+    onProviderRegistered(...hooks) {
+        throw new MethodNotImplementedError_1.MethodNotImplementedError();
+    }
 }
 exports.EmptyContainer = EmptyContainer;

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/index.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 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.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.OnDisposeModule = exports.onContainerDisposed = exports.onContainerDisposedHooksRunner = exports.OnConstructAsyncModule = exports.onConstructAsync = exports.onConstructAsyncHooksRunner = exports.OnConstructModule = exports.onConstruct = exports.onConstructHooksRunner = exports.injectProp = exports.createHookContext = void 0;
-exports.resolveConstructor = exports.Is = exports.ProxyRegistry = exports.pipe = 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");
@@ -115,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; } });
@@ -153,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/utils/ProxyRegistry.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ProxyRegistry = void 0;
+exports.unwrapProxy = exports.ProxyRegistry = void 0;
 class ProxyRegistry {
     static instance;
     states = new WeakMap();
@@ -53,3 +53,5 @@ class ProxyRegistry {
     }
 }
 exports.ProxyRegistry = ProxyRegistry;
+const unwrapProxy = (value) => ProxyRegistry.getInstance().unwrap(value);
+exports.unwrapProxy = unwrapProxy;

package/cjm/utils/basic.js

@@ -1,13 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Is = void 0;
-exports.resolveConstructor = resolveConstructor;
 exports.Is = {
     nullish: (value) => value === undefined || value === null,
     object: (target) => target !== null && typeof target === 'object',
     instance: (target) => Object.prototype.hasOwnProperty.call(target, 'constructor'),
     constructor: (target) => typeof target === 'function' && !!target.prototype,
 };
-function resolveConstructor(target) {
-    return exports.Is.constructor(target) ? target : target.constructor;
-}

package/cjm/utils/errorHandler.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.handleError = exports.handleAsyncError = void 0;
+const target_1 = require("../metadata/target");
 const handleAsyncError = (errorHandler) => (target, propertyKey, descriptor) => {
     const originalMethod = descriptor.value;
     descriptor.value = async function (...args) {
@@ -8,7 +9,7 @@ const handleAsyncError = (errorHandler) => (target, propertyKey, descriptor) =>
             return await originalMethod.apply(this, args);
         }
         catch (e) {
-            errorHandler(e, { target: target.constructor.name, method: propertyKey });
+            errorHandler(e, { target: (0, target_1.resolveConstructor)(target).name, method: propertyKey });
         }
     };
     return descriptor;
@@ -21,7 +22,7 @@ const handleError = (errorHandler) => (target, propertyKey, descriptor) => {
             return originalMethod.apply(this, args);
         }
         catch (e) {
-            errorHandler(e, { target: target.constructor.name, method: propertyKey });
+            errorHandler(e, { target: (0, target_1.resolveConstructor)(target).name, method: propertyKey });
         }
     };
     return descriptor;

package/esm/container/Container.js

@@ -2,6 +2,7 @@ import { EmptyContainer } from './EmptyContainer.js';
 import { ContainerDisposedError } from '../errors/ContainerDisposedError.js';
 import { MetadataInjector } from '../injector/MetadataInjector.js';
 import { AliasMap } from './AliasMap.js';
+import { unwrapProxy } from '../utils/ProxyRegistry.js';
 import { DependencyNotFoundError } from '../errors/DependencyNotFoundError.js';
 import { Is } from '../utils/basic.js';
 import { Filter as F } from '../utils/array.js';
@@ -18,6 +19,7 @@ export class Container {
     onConstructHookList = [];
     onDisposeHookList = [];
     onScopeCreatedHookList = [];
+    onProviderRegisteredHookList = [];
     constructor(options = {}) {
         this.injector = options.injector ?? new MetadataInjector();
         this.parent = options.parent ?? new EmptyContainer();
@@ -27,6 +29,9 @@ export class Container {
         this.validateContainer();
         this.providers.set(key, provider);
         this.aliases.setAliasesByKey(key, aliases);
+        for (const onProviderRegistered of this.onProviderRegisteredHookList) {
+            onProviderRegistered(provider, key, this);
+        }
         return this;
     }
     resolve(target, { args = [], child = this, lazy } = {}) {
@@ -72,7 +77,8 @@ export class Container {
         const scope = new Container({ injector: this.injector, parent: this, tags })
             .onConstruct(...this.onConstructHookList)
             .onInstanceDisposed(...this.onDisposeHookList)
-            .onScopeCreated(...this.onScopeCreatedHookList);
+            .onScopeCreated(...this.onScopeCreatedHookList)
+            .onProviderRegistered(...this.onProviderRegisteredHookList);
         for (const registration of this.getRegistrations()) {
             registration.applyTo(scope);
         }
@@ -109,6 +115,7 @@ export class Container {
         this.onConstructHookList.length = 0;
         this.onDisposeHookList.length = 0;
         this.onScopeCreatedHookList.length = 0;
+        this.onProviderRegisteredHookList.length = 0;
     }
     addRegistration(registration) {
         this.registrations.push(registration);
@@ -133,6 +140,10 @@ export class Container {
         this.onScopeCreatedHookList.push(...hooks);
         return this;
     }
+    onProviderRegistered(...hooks) {
+        this.onProviderRegisteredHookList.push(...hooks);
+        return this;
+    }
     addInstance(instance) {
         this.instances.add(instance);
         for (const onConstruct of this.onConstructHookList) {
@@ -143,7 +154,7 @@ export class Container {
         return [...this.scopes];
     }
     hasInstance(instance) {
-        return this.instances.has(instance);
+        return this.instances.has(unwrapProxy(instance));
     }
     removeScope(child) {
         this.scopes = this.scopes.filter((s) => s !== child);

package/esm/container/EmptyContainer.js

@@ -66,4 +66,7 @@ export class EmptyContainer {
     onScopeCreated(...hooks) {
         throw new MethodNotImplementedError();
     }
+    onProviderRegistered(...hooks) {
+        throw new MethodNotImplementedError();
+    }
 }

package/esm/hooks/HookContext.js

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

package/esm/hooks/hook.js

@@ -1,4 +1,5 @@
 import { Is } from '../utils/basic.js';
+import { resolveConstructor } from '../metadata/target.js';
 export const appendHooks = (...fns) => (...prev) => [...prev, ...fns];
 export const prependHooks = (...fns) => (...prev) => [...fns, ...prev];
 export const append = appendHooks;
@@ -18,7 +19,7 @@ const getConstructorChain = (ctor) => {
 };
 export function getHooks(target, key) {
     const merged = new Map();
-    for (const ctor of getConstructorChain(target.constructor).reverse()) {
+    for (const ctor of getConstructorChain(resolveConstructor(target)).reverse()) {
         const ownHooks = Reflect.getOwnMetadata(key, ctor);
         if (ownHooks) {
             for (const [methodName, fns] of ownHooks) {
@@ -29,7 +30,7 @@ export function getHooks(target, key) {
     return merged;
 }
 export function hasHooks(target, key) {
-    return getConstructorChain(target.constructor).some((ctor) => Reflect.hasOwnMetadata(key, ctor));
+    return getConstructorChain(resolveConstructor(target)).some((ctor) => Reflect.hasOwnMetadata(key, ctor));
 }
 export const hook = (key, mapFn) => (target, propertyKey) => {
     const hooks = Reflect.hasOwnMetadata(key, target.constructor)

package/esm/index.js

@@ -35,6 +35,7 @@ export { SingleToken } from './token/SingleToken.js';
 export { FunctionToken } from './token/FunctionToken.js';
 export { ConstantToken } from './token/ConstantToken.js';
 export { GroupInstanceToken } from './token/GroupInstanceToken.js';
+export { resolveConstructor } from './metadata/target.js';
 export { addClassMeta, getClassMeta, addClassLabel, getClassLabels, addClassTag, getClassTags } from './metadata/class.js';
 export { addParamMeta, getParamMeta, addParamLabel, getParamLabels, addParamTag, getParamTags, } from './metadata/parameter.js';
 export { addMethodMeta, getMethodMeta, addMethodLabel, getMethodLabels, addMethodTag, getMethodTags, } from './metadata/method.js';
@@ -45,5 +46,5 @@ export { shallowCache } from './utils/shallowCache.js';
 export { once } from './utils/once.js';
 export { select } from './select.js';
 export { pipe } from './utils/fp.js';
-export { ProxyRegistry } from './utils/ProxyRegistry.js';
-export { Is, resolveConstructor } from './utils/basic.js';
+export { ProxyRegistry, unwrapProxy } from './utils/ProxyRegistry.js';
+export { Is } from './utils/basic.js';

package/esm/injector/MetadataInjector.js

@@ -1,5 +1,5 @@
 import { Injector } from './IInjector.js';
-import { Is } from '../utils/basic.js';
+import { resolveConstructor } from '../metadata/target.js';
 import { getParamMeta, addParamMeta } from '../metadata/parameter.js';
 import { argToToken, toMappedToken } from '../token/toToken.js';
 export class MetadataInjector extends Injector {
@@ -11,13 +11,13 @@ export class MetadataInjector extends Injector {
 const hookMetaKey = (methodName = 'constructor') => `inject:${methodName}`;
 export function inject(fn, ...mappers) {
     return (target, propertyKey, parameterIndex) => {
-        addParamMeta(hookMetaKey(propertyKey), () => toMappedToken(fn, mappers))(Is.instance(target) ? target.constructor : target, propertyKey, parameterIndex);
+        addParamMeta(hookMetaKey(propertyKey), () => toMappedToken(fn, mappers))(resolveConstructor(target), propertyKey, parameterIndex);
     };
 }
 export const argsFn = (predicate) => (c, { args = [] }) => args.find((value, index) => predicate(value, index));
 export const arg = (index) => argsFn((value, i) => i === index);
 export const args = (c, { args = [] }) => args;
-export const resolveArgs = (Target, methodName) => {
-    const tokens = getParamMeta(hookMetaKey(methodName), Target);
+export const resolveArgs = (target, methodName) => {
+    const tokens = getParamMeta(hookMetaKey(methodName), target);
     return (scope, { args = [], lazy }) => tokens.map((fn) => fn.resolve(scope, { args: args.map(argToToken).map((t) => t.resolve(scope)), lazy }));
 };

package/esm/metadata/class.js

@@ -1,4 +1,4 @@
-import { resolveConstructor } from '../utils/basic.js';
+import { resolveConstructor } from './target.js';
 export const addClassMeta = (key, mapFn) => (target) => {
     const value = Reflect.getOwnMetadata(key, target);
     Reflect.defineMetadata(key, mapFn(value), target);

package/esm/metadata/method.js

@@ -1,4 +1,4 @@
-import { resolveConstructor } from '../utils/basic.js';
+import { resolveConstructor } from './target.js';
 export const addMethodMeta = (key, mapFn) => (target, propertyKey) => {
     const metadata = Reflect.getMetadata(key, target.constructor, propertyKey);
     Reflect.defineMetadata(key, mapFn(metadata), target.constructor, propertyKey);

package/esm/metadata/parameter.js

@@ -1,4 +1,4 @@
-import { resolveConstructor } from '../utils/basic.js';
+import { resolveConstructor } from './target.js';
 export const addParamMeta = (key, mapFn) => (target, _, parameterIndex) => {
     const metadata = Reflect.getOwnMetadata(key, target) ?? [];
     metadata[parameterIndex] = mapFn(metadata[parameterIndex]);

package/esm/metadata/target.js

@@ -0,0 +1,6 @@
+import { Is } from '../utils/basic.js';
+import { unwrapProxy } from '../utils/ProxyRegistry.js';
+export function resolveConstructor(target) {
+    const value = unwrapProxy(target);
+    return Is.constructor(value) ? value : value.constructor;
+}

package/esm/utils/ProxyRegistry.js

@@ -49,3 +49,4 @@ export class ProxyRegistry {
         return proxy;
     }
 }
+export const unwrapProxy = (value) => ProxyRegistry.getInstance().unwrap(value);

package/esm/utils/basic.js

@@ -4,6 +4,3 @@ export const Is = {
     instance: (target) => Object.prototype.hasOwnProperty.call(target, 'constructor'),
     constructor: (target) => typeof target === 'function' && !!target.prototype,
 };
-export function resolveConstructor(target) {
-    return Is.constructor(target) ? target : target.constructor;
-}

package/esm/utils/errorHandler.js

@@ -1,3 +1,4 @@
+import { resolveConstructor } from '../metadata/target.js';
 export const handleAsyncError = (errorHandler) => (target, propertyKey, descriptor) => {
     const originalMethod = descriptor.value;
     descriptor.value = async function (...args) {
@@ -5,7 +6,7 @@ export const handleAsyncError = (errorHandler) => (target, propertyKey, descript
             return await originalMethod.apply(this, args);
         }
         catch (e) {
-            errorHandler(e, { target: target.constructor.name, method: propertyKey });
+            errorHandler(e, { target: resolveConstructor(target).name, method: propertyKey });
         }
     };
     return descriptor;
@@ -17,7 +18,7 @@ export const handleError = (errorHandler) => (target, propertyKey, descriptor) =
             return originalMethod.apply(this, args);
         }
         catch (e) {
-            errorHandler(e, { target: target.constructor.name, method: propertyKey });
+            errorHandler(e, { target: resolveConstructor(target).name, method: propertyKey });
         }
     };
     return descriptor;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ts-ioc-container",
-  "version": "60.0.0",
+  "version": "60.2.0",
   "description": "Fast, lightweight TypeScript dependency injection container with a clean API, scoped lifecycles, decorators, tokens, hooks, lazy injection, customizable providers, and no global container objects.",
   "publishConfig": {
     "access": "public",

package/typings/container/Container.d.ts

@@ -1,4 +1,4 @@
-import { type AutoResolveOptions, type CreateScopeOptions, type DependencyKey, type IContainer, type IContainerModule, type InstanceHook, type RegisterOptions, ResolveManyOptions, type ResolveOneOptions, type ScopeHook, type Tag } from './IContainer.js';
+import { type AutoResolveOptions, type CreateScopeOptions, type DependencyKey, type IContainer, type IContainerModule, type InstanceHook, type ProviderHook, type RegisterOptions, ResolveManyOptions, type ResolveOneOptions, type ScopeHook, type Tag } from './IContainer.js';
 import { type IInjector } from '../injector/IInjector.js';
 import { type IProvider } from '../provider/IProvider.js';
 import { type IRegistration } from '../registration/IRegistration.js';
@@ -17,6 +17,7 @@ export declare class Container implements IContainer {
     private readonly onConstructHookList;
     private readonly onDisposeHookList;
     private readonly onScopeCreatedHookList;
+    private readonly onProviderRegisteredHookList;
     constructor(options?: {
         injector?: IInjector;
         parent?: IContainer;
@@ -35,6 +36,7 @@ export declare class Container implements IContainer {
     onConstruct(...hooks: InstanceHook[]): this;
     onInstanceDisposed(...hooks: OnDisposeHook[]): this;
     onScopeCreated(...hooks: ScopeHook[]): this;
+    onProviderRegistered(...hooks: ProviderHook[]): this;
     addInstance(instance: Instance): void;
     getScopes(): IContainer[];
     hasInstance(instance: Instance): boolean;

package/typings/container/EmptyContainer.d.ts

@@ -1,4 +1,4 @@
-import { type AutoResolveOptions, type DependencyKey, type IContainer, type IContainerModule, type ScopeHook, type ResolveManyOptions, type ResolveOneOptions, type Tag, type InstanceHook } from './IContainer.js';
+import { type AutoResolveOptions, type DependencyKey, type IContainer, type IContainerModule, type ScopeHook, type ProviderHook, type ResolveManyOptions, type ResolveOneOptions, type Tag, type InstanceHook } from './IContainer.js';
 import { type IProvider } from '../provider/IProvider.js';
 import { type IRegistration } from '../registration/IRegistration.js';
 import { OnDisposeHook } from '../hooks/onContainerDisposed.js';
@@ -27,4 +27,5 @@ export declare class EmptyContainer implements IContainer {
     onInstanceDisposed(...hooks: OnDisposeHook[]): this;
     onConstruct(...hooks: InstanceHook[]): this;
     onScopeCreated(...hooks: ScopeHook[]): this;
+    onProviderRegistered(...hooks: ProviderHook[]): this;
 }

package/typings/container/IContainer.d.ts

@@ -35,11 +35,13 @@ export type RegisterOptions = {
 export type ScopeHook = (scope: IContainer) => void;
 export type InstanceHook = (instance: Instance, scope: IContainer) => void;
 export type DependencyHook = (dependency: unknown, scope: IContainer) => void;
+export type ProviderHook = (provider: IProvider, key: DependencyKey, scope: IContainer) => void;
 export interface IContainer extends Tagged {
     readonly isDisposed: boolean;
     onConstruct(...hooks: InstanceHook[]): this;
     onInstanceDisposed(...hooks: OnDisposeHook[]): this;
     onScopeCreated(...hooks: ScopeHook[]): this;
+    onProviderRegistered(...hooks: ProviderHook[]): this;
     register(key: DependencyKey, value: IProvider, options?: RegisterOptions): this;
     addRegistration(registration: IRegistration): this;
     getRegistrations(): IRegistration[];

package/typings/hooks/hook.d.ts

@@ -15,6 +15,6 @@ export declare const prependHooks: (...fns: HookType[]) => MapHooksFn;
 export declare const append: (...fns: HookType[]) => MapHooksFn;
 export declare const prepend: (...fns: HookType[]) => MapHooksFn;
 export declare const toHookFn: <C extends IHookContext>(execute: HookFn<C> | constructor<HookClass<C>>) => HookFn<C>;
-export declare function getHooks(target: Instance, key: string | symbol): HooksOfClass;
-export declare function hasHooks(target: Instance, key: string | symbol): boolean;
+export declare function getHooks(target: Instance | constructor<unknown>, key: string | symbol): HooksOfClass;
+export declare function hasHooks(target: Instance | constructor<unknown>, key: string | symbol): boolean;
 export declare const hook: (key: string | symbol, mapFn: MapHooksFn) => (target: object, propertyKey: string | symbol) => void;

package/typings/index.d.ts

@@ -1,4 +1,4 @@
-export { type IContainer, type Resolvable, type IContainerModule, type DependencyKey, type Tag, type Tagged, type ResolveOneOptions, type ResolveManyOptions, type ScopeHook, type InstanceHook, type DependencyHook, type AutoResolveOptions, isDependencyKey, } from './container/IContainer.js';
+export { type IContainer, type Resolvable, type IContainerModule, type DependencyKey, type Tag, type Tagged, type ResolveOneOptions, type ResolveManyOptions, type ScopeHook, type InstanceHook, type DependencyHook, type ProviderHook, type AutoResolveOptions, isDependencyKey, } from './container/IContainer.js';
 export { Container } from './container/Container.js';
 export { AutoResolveModule } from './container/AutoResolveModule.js';
 export { EmptyContainer } from './container/EmptyContainer.js';
@@ -36,6 +36,7 @@ export { SingleToken } from './token/SingleToken.js';
 export { FunctionToken } from './token/FunctionToken.js';
 export { ConstantToken } from './token/ConstantToken.js';
 export { type InstancePredicate, GroupInstanceToken } from './token/GroupInstanceToken.js';
+export { resolveConstructor } from './metadata/target.js';
 export { addClassMeta, getClassMeta, addClassLabel, getClassLabels, addClassTag, getClassTags } from './metadata/class.js';
 export { addParamMeta, getParamMeta, addParamLabel, getParamLabels, addParamTag, getParamTags, } from './metadata/parameter.js';
 export { addMethodMeta, getMethodMeta, addMethodLabel, getMethodLabels, addMethodTag, getMethodTags, } from './metadata/method.js';
@@ -47,5 +48,5 @@ export { once } from './utils/once.js';
 export { type ExecutionContext } from './ExecutionContext.js';
 export { select } from './select.js';
 export { pipe, type MapFn } from './utils/fp.js';
-export { ProxyRegistry, type IProxyRegistry } from './utils/ProxyRegistry.js';
-export { type Branded, type constructor, type Instance, Is, resolveConstructor } from './utils/basic.js';
+export { ProxyRegistry, unwrapProxy, type IProxyRegistry } from './utils/ProxyRegistry.js';
+export { type Branded, type constructor, type Instance, Is } from './utils/basic.js';

package/typings/injector/MetadataInjector.d.ts

@@ -1,6 +1,6 @@
 import { IInjector, InjectOptions, Injector } from './IInjector.js';
 import type { IContainer } from '../container/IContainer.js';
-import { type constructor } from '../utils/basic.js';
+import { type constructor, type Instance } from '../utils/basic.js';
 import { ProviderOptions } from '../provider/IProvider.js';
 import { type Injectable } from '../token/toToken.js';
 import { InjectFn } from '../hooks/hook.js';
@@ -22,4 +22,4 @@ export declare function inject<T>(fn: Injectable<T>, ...mappers: MapFn<T>[]): Pa
 export declare const argsFn: <T = unknown>(predicate: (value: unknown, index: number) => boolean) => InjectFn<T>;
 export declare const arg: <T = unknown>(index: number) => InjectFn<T>;
 export declare const args: InjectFn<unknown[]>;
-export declare const resolveArgs: (Target: constructor<unknown>, methodName?: string) => (scope: IContainer, { args, lazy }: ProviderOptions) => unknown[];
+export declare const resolveArgs: (target: constructor<unknown> | Instance, methodName?: string) => (scope: IContainer, { args, lazy }: ProviderOptions) => unknown[];

package/typings/metadata/target.d.ts

@@ -0,0 +1,2 @@
+import { type constructor, type Instance } from '../utils/basic.js';
+export declare function resolveConstructor(target: constructor<unknown> | Instance): constructor<unknown>;

package/typings/utils/ProxyRegistry.d.ts

@@ -17,3 +17,4 @@ export declare class ProxyRegistry implements IProxyRegistry {
     private getTarget;
     private register;
 }
+export declare const unwrapProxy: <T extends object>(value: T) => T;

package/typings/utils/basic.d.ts

@@ -9,4 +9,3 @@ export declare const Is: {
     instance: (target: unknown) => target is Instance;
     constructor: (target: unknown) => target is constructor<unknown>;
 };
-export declare function resolveConstructor(target: object): object;