ts-ioc-container 43.0.1 → 43.1.1

package/README.md

@@ -1261,8 +1261,16 @@ Sometimes you want to register provider with certain key. This is what `key` is
 - you can assign the same key to different registrations
 
 ```typescript
-import { bindTo, Container, register, Registration as R, scope, singleton, toAlias } from 'ts-ioc-container';
-import { DependencyMissingKeyError } from '../../lib/errors/DependencyMissingKeyError';
+import {
+  bindTo,
+  Container,
+  DependencyMissingKeyError,
+  register,
+  Registration as R,
+  scope,
+  singleton,
+  toAlias,
+} from 'ts-ioc-container';
 
 describe('Registration module', function () {
   const createContainer = () => new Container({ tags: ['root'] });

package/cjm/container/AliasMap.js

@@ -3,21 +3,21 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.AliasMap = void 0;
 class AliasMap {
     aliasToKeySet = new Map();
-    deleteKeyFromAliases(key) {
-        for (const [depKey, aliasSet] of [...this.aliasToKeySet].filter(([, aliasSet]) => aliasSet.has(key))) {
-            aliasSet.delete(key);
-            if (aliasSet.size === 0) {
-                this.aliasToKeySet.delete(depKey);
+    deleteAliasesByKey(key) {
+        for (const [alias, keySet] of this.aliasToKeySet) {
+            keySet.delete(key);
+            if (keySet.size === 0) {
+                this.aliasToKeySet.delete(alias);
             }
         }
     }
     findManyKeysByAlias(alias) {
         return [...(this.aliasToKeySet.get(alias) ?? [])];
     }
-    addAliases(key, aliases) {
+    setAliases(key, aliases) {
         for (const alias of aliases) {
-            const currentAliasKeys = this.aliasToKeySet.get(alias) ?? new Set();
-            this.aliasToKeySet.set(alias, currentAliasKeys.add(key));
+            const dependencyKeySet = this.aliasToKeySet.get(alias) ?? new Set();
+            this.aliasToKeySet.set(alias, dependencyKeySet.add(key));
         }
     }
     destroy() {

package/cjm/container/AutoMockedContainer.js

@@ -4,6 +4,7 @@ exports.AutoMockedContainer = void 0;
 const MethodNotImplementedError_1 = require("../errors/MethodNotImplementedError");
 class AutoMockedContainer {
     isDisposed = false;
+    onInstanceCreated(instance) { }
     createScope() {
         throw new MethodNotImplementedError_1.MethodNotImplementedError();
     }

package/cjm/container/Container.js

@@ -16,21 +16,34 @@ class Container {
     providers = new Map();
     aliases = new AliasMap_1.AliasMap();
     registrations = new Set();
-    onConstruct;
-    onDispose;
     injector;
+    onConstructHookList = [];
+    onDisposeHookList = [];
     constructor(options = {}) {
         this.injector = options.injector ?? new MetadataInjector_1.MetadataInjector();
         this.parent = options.parent ?? new EmptyContainer_1.EmptyContainer();
         this.tags = new Set(options.tags ?? []);
-        this.onConstruct = options.onConstruct ?? (() => { });
-        this.onDispose = options.onDispose ?? (() => { });
+    }
+    addOnConstructHook(...hooks) {
+        this.onConstructHookList.push(...hooks);
+        return this;
+    }
+    addOnDisposeHook(...hooks) {
+        this.onDisposeHookList.push(...hooks);
+        return this;
+    }
+    onInstanceCreated(instance) {
+        this.instances.add(instance);
+        // Execute onConstruct hooks
+        for (const onConstruct of this.onConstructHookList) {
+            onConstruct(instance, this);
+        }
     }
     register(key, provider, { aliases = [] } = {}) {
         this.validateContainer();
         this.providers.set(key, provider);
-        this.aliases.deleteKeyFromAliases(key);
-        this.aliases.addAliases(key, aliases);
+        this.aliases.deleteAliasesByKey(key);
+        this.aliases.setAliases(key, aliases);
         return this;
     }
     addRegistration(registration) {
@@ -44,19 +57,14 @@ class Container {
     resolve(keyOrAlias, { args = [], child = this, lazy } = {}) {
         this.validateContainer();
         if (utils_1.Is.constructor(keyOrAlias)) {
-            return (0, utils_1.toLazyIf)(() => {
-                const instance = this.injector.resolve(this, keyOrAlias, { args });
-                this.instances.add(instance);
-                this.onConstruct(instance, this);
-                return instance;
-            }, lazy);
+            return (0, utils_1.toLazyIf)(() => this.injector.resolve(this, keyOrAlias, { args }), lazy);
         }
         const provider = this.providers.get(keyOrAlias);
         return provider?.hasAccess({ invocationScope: child, providerScope: this })
             ? provider.resolve(this, { args, lazy })
             : this.parent.resolve(keyOrAlias, { args, child, lazy });
     }
-    resolveByAlias(alias, { args = [], child = this, lazy, excludedKeys = new Set(), takeFirst = -1 } = {}) {
+    resolveByAlias(alias, { args = [], child = this, lazy, excludedKeys = [], takeFirst = -1 } = {}) {
         this.validateContainer();
         let left = takeFirst;
         const keys = [];
@@ -78,7 +86,7 @@ class Container {
             args,
             child,
             lazy,
-            excludedKeys: new Set([...excludedKeys, ...keys]),
+            excludedKeys: [...excludedKeys, ...keys],
         });
         return [...deps, ...parentDeps];
     }
@@ -88,9 +96,9 @@ class Container {
             injector: this.injector,
             parent: this,
             tags,
-            onDispose: this.onDispose,
-            onConstruct: this.onConstruct,
-        });
+        })
+            .addOnConstructHook(...this.onConstructHookList)
+            .addOnDisposeHook(...this.onDisposeHookList);
         scope.applyRegistrationsFrom(this);
         this.scopes.add(scope);
         return scope;
@@ -125,7 +133,13 @@ class Container {
         this.aliases.destroy();
         this.instances.clear();
         this.registrations.clear();
-        this.onDispose(this);
+        // Clear hooks
+        this.onConstructHookList.splice(0, this.onConstructHookList.length);
+        // Execute onDispose hooks
+        while (this.onDisposeHookList.length) {
+            const onDispose = this.onDisposeHookList.shift();
+            onDispose(this);
+        }
     }
     /**
      * @private

package/cjm/container/EmptyContainer.js

@@ -7,6 +7,7 @@ class EmptyContainer {
     get isDisposed() {
         throw new MethodNotImplementedError_1.MethodNotImplementedError();
     }
+    onInstanceCreated(instance) { }
     getParent() {
         return undefined;
     }

package/cjm/index.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ConstantToken = exports.FunctionToken = exports.StringToken = exports.ClassToken = exports.toAlias = exports.AliasToken = exports.InjectionToken = exports.getParameterMetadata = exports.getMethodMetadata = exports.setMethodMetadata = exports.setParameterMetadata = exports.getMetadata = exports.setMetadata = exports.onDispose = exports.onDisposeHooksRunner = exports.onConstruct = exports.onConstructHooksRunner = exports.injectProp = exports.HookContext = exports.hasHooks = exports.hook = exports.getHooks = exports.UnexpectedHookResultError = exports.ContainerDisposedError = exports.MethodNotImplementedError = exports.DependencyNotFoundError = exports.Registration = exports.bindTo = exports.register = exports.scope = exports.decorate = exports.MultiCache = exports.multiCache = exports.SingletonProvider = exports.singleton = exports.Provider = exports.resolveByArgs = exports.ProviderDecorator = exports.args = exports.argsFn = exports.lazy = exports.scopeAccess = exports.ProxyInjector = exports.SimpleInjector = exports.MetadataInjector = exports.resolveArgs = exports.inject = exports.AutoMockedContainer = exports.EmptyContainer = exports.Container = void 0;
-exports.SyncHooksRunner = exports.AsyncHooksRunner = exports.toToken = exports.Is = exports.select = exports.InstanceListToken = void 0;
+exports.FunctionToken = exports.StringToken = exports.ClassToken = exports.toAlias = exports.AliasToken = exports.InjectionToken = exports.getParameterMetadata = exports.getMethodMetadata = exports.setMethodMetadata = exports.setParameterMetadata = exports.getMetadata = exports.setMetadata = exports.onDispose = exports.onDisposeHooksRunner = exports.onConstruct = exports.onConstructHooksRunner = exports.injectProp = exports.HookContext = exports.hasHooks = exports.hook = exports.getHooks = exports.UnexpectedHookResultError = exports.ContainerDisposedError = exports.MethodNotImplementedError = exports.DependencyMissingKeyError = exports.DependencyNotFoundError = exports.Registration = exports.bindTo = exports.register = exports.scope = exports.decorate = exports.MultiCache = exports.multiCache = exports.SingletonProvider = exports.singleton = exports.Provider = exports.resolveByArgs = exports.ProviderDecorator = exports.args = exports.argsFn = exports.lazy = exports.scopeAccess = exports.ProxyInjector = exports.SimpleInjector = exports.MetadataInjector = exports.resolveArgs = exports.inject = exports.AutoMockedContainer = exports.EmptyContainer = exports.Container = void 0;
+exports.SyncHooksRunner = exports.AsyncHooksRunner = exports.toToken = exports.Is = exports.select = exports.InstanceListToken = exports.ConstantToken = void 0;
 var Container_1 = require("./container/Container");
 Object.defineProperty(exports, "Container", { enumerable: true, get: function () { return Container_1.Container; } });
 var EmptyContainer_1 = require("./container/EmptyContainer");
@@ -46,6 +46,8 @@ Object.defineProperty(exports, "Registration", { enumerable: true, get: function
 // Errors
 var DependencyNotFoundError_1 = require("./errors/DependencyNotFoundError");
 Object.defineProperty(exports, "DependencyNotFoundError", { enumerable: true, get: function () { return DependencyNotFoundError_1.DependencyNotFoundError; } });
+var DependencyMissingKeyError_1 = require("./errors/DependencyMissingKeyError");
+Object.defineProperty(exports, "DependencyMissingKeyError", { enumerable: true, get: function () { return DependencyMissingKeyError_1.DependencyMissingKeyError; } });
 var MethodNotImplementedError_1 = require("./errors/MethodNotImplementedError");
 Object.defineProperty(exports, "MethodNotImplementedError", { enumerable: true, get: function () { return MethodNotImplementedError_1.MethodNotImplementedError; } });
 var ContainerDisposedError_1 = require("./errors/ContainerDisposedError");

package/cjm/injector/IInjector.js

@@ -3,7 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Injector = void 0;
 class Injector {
     resolve(scope, Target, options) {
-        return this.createInstance(scope, Target, options);
+        const instance = this.createInstance(scope, Target, options);
+        scope.onInstanceCreated(instance);
+        return instance;
     }
 }
 exports.Injector = Injector;

package/esm/container/AliasMap.js

@@ -1,20 +1,20 @@
 export class AliasMap {
     aliasToKeySet = new Map();
-    deleteKeyFromAliases(key) {
-        for (const [depKey, aliasSet] of [...this.aliasToKeySet].filter(([, aliasSet]) => aliasSet.has(key))) {
-            aliasSet.delete(key);
-            if (aliasSet.size === 0) {
-                this.aliasToKeySet.delete(depKey);
+    deleteAliasesByKey(key) {
+        for (const [alias, keySet] of this.aliasToKeySet) {
+            keySet.delete(key);
+            if (keySet.size === 0) {
+                this.aliasToKeySet.delete(alias);
             }
         }
     }
     findManyKeysByAlias(alias) {
         return [...(this.aliasToKeySet.get(alias) ?? [])];
     }
-    addAliases(key, aliases) {
+    setAliases(key, aliases) {
         for (const alias of aliases) {
-            const currentAliasKeys = this.aliasToKeySet.get(alias) ?? new Set();
-            this.aliasToKeySet.set(alias, currentAliasKeys.add(key));
+            const dependencyKeySet = this.aliasToKeySet.get(alias) ?? new Set();
+            this.aliasToKeySet.set(alias, dependencyKeySet.add(key));
         }
     }
     destroy() {

package/esm/container/AutoMockedContainer.js

@@ -1,6 +1,7 @@
 import { MethodNotImplementedError } from '../errors/MethodNotImplementedError';
 export class AutoMockedContainer {
     isDisposed = false;
+    onInstanceCreated(instance) { }
     createScope() {
         throw new MethodNotImplementedError();
     }

package/esm/container/Container.js

@@ -13,21 +13,34 @@ export class Container {
     providers = new Map();
     aliases = new AliasMap();
     registrations = new Set();
-    onConstruct;
-    onDispose;
     injector;
+    onConstructHookList = [];
+    onDisposeHookList = [];
     constructor(options = {}) {
         this.injector = options.injector ?? new MetadataInjector();
         this.parent = options.parent ?? new EmptyContainer();
         this.tags = new Set(options.tags ?? []);
-        this.onConstruct = options.onConstruct ?? (() => { });
-        this.onDispose = options.onDispose ?? (() => { });
+    }
+    addOnConstructHook(...hooks) {
+        this.onConstructHookList.push(...hooks);
+        return this;
+    }
+    addOnDisposeHook(...hooks) {
+        this.onDisposeHookList.push(...hooks);
+        return this;
+    }
+    onInstanceCreated(instance) {
+        this.instances.add(instance);
+        // Execute onConstruct hooks
+        for (const onConstruct of this.onConstructHookList) {
+            onConstruct(instance, this);
+        }
     }
     register(key, provider, { aliases = [] } = {}) {
         this.validateContainer();
         this.providers.set(key, provider);
-        this.aliases.deleteKeyFromAliases(key);
-        this.aliases.addAliases(key, aliases);
+        this.aliases.deleteAliasesByKey(key);
+        this.aliases.setAliases(key, aliases);
         return this;
     }
     addRegistration(registration) {
@@ -41,19 +54,14 @@ export class Container {
     resolve(keyOrAlias, { args = [], child = this, lazy } = {}) {
         this.validateContainer();
         if (Is.constructor(keyOrAlias)) {
-            return toLazyIf(() => {
-                const instance = this.injector.resolve(this, keyOrAlias, { args });
-                this.instances.add(instance);
-                this.onConstruct(instance, this);
-                return instance;
-            }, lazy);
+            return toLazyIf(() => this.injector.resolve(this, keyOrAlias, { args }), lazy);
         }
         const provider = this.providers.get(keyOrAlias);
         return provider?.hasAccess({ invocationScope: child, providerScope: this })
             ? provider.resolve(this, { args, lazy })
             : this.parent.resolve(keyOrAlias, { args, child, lazy });
     }
-    resolveByAlias(alias, { args = [], child = this, lazy, excludedKeys = new Set(), takeFirst = -1 } = {}) {
+    resolveByAlias(alias, { args = [], child = this, lazy, excludedKeys = [], takeFirst = -1 } = {}) {
         this.validateContainer();
         let left = takeFirst;
         const keys = [];
@@ -75,7 +83,7 @@ export class Container {
             args,
             child,
             lazy,
-            excludedKeys: new Set([...excludedKeys, ...keys]),
+            excludedKeys: [...excludedKeys, ...keys],
         });
         return [...deps, ...parentDeps];
     }
@@ -85,9 +93,9 @@ export class Container {
             injector: this.injector,
             parent: this,
             tags,
-            onDispose: this.onDispose,
-            onConstruct: this.onConstruct,
-        });
+        })
+            .addOnConstructHook(...this.onConstructHookList)
+            .addOnDisposeHook(...this.onDisposeHookList);
         scope.applyRegistrationsFrom(this);
         this.scopes.add(scope);
         return scope;
@@ -122,7 +130,13 @@ export class Container {
         this.aliases.destroy();
         this.instances.clear();
         this.registrations.clear();
-        this.onDispose(this);
+        // Clear hooks
+        this.onConstructHookList.splice(0, this.onConstructHookList.length);
+        // Execute onDispose hooks
+        while (this.onDisposeHookList.length) {
+            const onDispose = this.onDisposeHookList.shift();
+            onDispose(this);
+        }
     }
     /**
      * @private

package/esm/container/EmptyContainer.js

@@ -4,6 +4,7 @@ export class EmptyContainer {
     get isDisposed() {
         throw new MethodNotImplementedError();
     }
+    onInstanceCreated(instance) { }
     getParent() {
         return undefined;
     }

package/esm/index.js

@@ -17,6 +17,7 @@ export { scope, register, bindTo, } from './registration/IRegistration';
 export { Registration } from './registration/Registration';
 // Errors
 export { DependencyNotFoundError } from './errors/DependencyNotFoundError';
+export { DependencyMissingKeyError } from './errors/DependencyMissingKeyError';
 export { MethodNotImplementedError } from './errors/MethodNotImplementedError';
 export { ContainerDisposedError } from './errors/ContainerDisposedError';
 export { UnexpectedHookResultError } from './errors/UnexpectedHookResultError';

package/esm/injector/IInjector.js

@@ -1,5 +1,7 @@
 export class Injector {
     resolve(scope, Target, options) {
-        return this.createInstance(scope, Target, options);
+        const instance = this.createInstance(scope, Target, options);
+        scope.onInstanceCreated(instance);
+        return instance;
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ts-ioc-container",
-  "version": "43.0.1",
+  "version": "43.1.1",
   "description": "Typescript IoC container",
   "publishConfig": {
     "access": "public",

package/typings/container/AliasMap.d.ts

@@ -2,8 +2,8 @@ import { type DependencyKey } from './IContainer';
 export type Alias = DependencyKey;
 export declare class AliasMap {
     private readonly aliasToKeySet;
-    deleteKeyFromAliases(key: DependencyKey): void;
+    deleteAliasesByKey(key: DependencyKey): void;
     findManyKeysByAlias(alias: DependencyKey): DependencyKey[];
-    addAliases(key: DependencyKey, aliases: DependencyKey[]): void;
+    setAliases(key: DependencyKey, aliases: DependencyKey[]): void;
     destroy(): void;
 }

package/typings/container/AutoMockedContainer.d.ts

@@ -3,6 +3,7 @@ import { type IRegistration } from '../registration/IRegistration';
 import { type constructor } from '../utils';
 export declare abstract class AutoMockedContainer implements IContainer {
     isDisposed: boolean;
+    onInstanceCreated(instance: Instance): void;
     createScope(): IContainer;
     dispose(): void;
     register(): this;

package/typings/container/Container.d.ts

@@ -3,6 +3,8 @@ import { type IInjector } from '../injector/IInjector';
 import { type IProvider } from '../provider/IProvider';
 import { type IRegistration } from '../registration/IRegistration';
 import { type constructor } from '../utils';
+import { OnConstructHook } from '../hooks/onConstruct';
+import { OnDisposeHook } from '../hooks/onDispose';
 export declare class Container implements IContainer {
     isDisposed: boolean;
     private parent;
@@ -12,16 +14,17 @@ export declare class Container implements IContainer {
     private readonly providers;
     private readonly aliases;
     private readonly registrations;
-    private readonly onConstruct;
-    private readonly onDispose;
     private readonly injector;
+    private readonly onConstructHookList;
+    private readonly onDisposeHookList;
     constructor(options?: {
         injector?: IInjector;
         parent?: IContainer;
         tags?: Tag[];
-        onConstruct?: (instance: Instance, scope: IContainer) => void;
-        onDispose?: (scope: IContainer) => void;
     });
+    addOnConstructHook(...hooks: OnConstructHook[]): this;
+    addOnDisposeHook(...hooks: OnDisposeHook[]): this;
+    onInstanceCreated(instance: Instance): void;
     register(key: DependencyKey, provider: IProvider, { aliases }?: RegisterOptions): this;
     addRegistration(registration: IRegistration): this;
     getRegistrations(): IRegistration[];

package/typings/container/EmptyContainer.d.ts

@@ -1,9 +1,10 @@
-import { type DependencyKey, type IContainer, type IContainerModule, type ResolveManyOptions, type ResolveOneOptions, type Tag } from './IContainer';
+import { type DependencyKey, type IContainer, type IContainerModule, Instance, type ResolveManyOptions, type ResolveOneOptions, type Tag } from './IContainer';
 import { type IProvider } from '../provider/IProvider';
 import { type IRegistration } from '../registration/IRegistration';
 import { type constructor } from '../utils';
 export declare class EmptyContainer implements IContainer {
     get isDisposed(): boolean;
+    onInstanceCreated(instance: Instance): void;
     getParent(): undefined;
     getScopes(): never[];
     getInstances(): never[];

package/typings/container/IContainer.d.ts

@@ -8,7 +8,7 @@ type WithChild = {
 };
 export type ResolveOneOptions = ProviderOptions & Partial<WithChild>;
 type WithExcludedKeys = {
-    excludedKeys: Set<DependencyKey>;
+    excludedKeys: DependencyKey[];
 };
 type TakeFirst = {
     takeFirst: number;
@@ -47,5 +47,6 @@ export interface IContainer extends Tagged {
     getParent(): IContainer | undefined;
     getInstances(): Instance[];
     dispose(): void;
+    onInstanceCreated(instance: Instance): void;
 }
 export {};

package/typings/hooks/onConstruct.d.ts

@@ -1,4 +1,6 @@
 import { HookFn } from './hook';
 import { SyncHooksRunner } from './runner/SyncHooksRunner';
+import type { IContainer, Instance } from '../container/IContainer';
 export declare const onConstructHooksRunner: SyncHooksRunner;
 export declare const onConstruct: (fn: HookFn) => (target: object, propertyKey: string | symbol) => void;
+export type OnConstructHook = (instance: Instance, scope: IContainer) => void;

package/typings/hooks/onDispose.d.ts

@@ -1,3 +1,5 @@
 import { SyncHooksRunner } from './runner/SyncHooksRunner';
+import type { IContainer } from '../container/IContainer';
 export declare const onDisposeHooksRunner: SyncHooksRunner;
 export declare const onDispose: (target: object, propertyKey: string | symbol) => void;
+export type OnDisposeHook = (scope: IContainer) => void;

package/typings/index.d.ts

@@ -16,6 +16,7 @@ export { type ProviderPipe } from './provider/ProviderPipe';
 export { type IRegistration, type ReturnTypeOfRegistration, scope, register, type ScopePredicate, bindTo, } from './registration/IRegistration';
 export { Registration } from './registration/Registration';
 export { DependencyNotFoundError } from './errors/DependencyNotFoundError';
+export { DependencyMissingKeyError } from './errors/DependencyMissingKeyError';
 export { MethodNotImplementedError } from './errors/MethodNotImplementedError';
 export { ContainerDisposedError } from './errors/ContainerDisposedError';
 export { UnexpectedHookResultError } from './errors/UnexpectedHookResultError';