ts-ioc-container 46.0.1 → 46.2.0

package/README.md

@@ -692,7 +692,7 @@ describe('Provider', () => {
 
   it('allows direct manipulation of visibility predicate', () => {
     const provider = Provider.fromClass(Logger);
-    provider.setAccessPredicate(({ invocationScope }) => invocationScope.hasTag('special'));
+    provider.setAccessRule(({ invocationScope }) => invocationScope.hasTag('special'));
     const container = new Container({ tags: ['root'] }).register('Logger', provider);
     const specialChild = container.createScope({ tags: ['special'] });
     const regularChild = container.createScope({ tags: ['regular'] });
@@ -1007,9 +1007,9 @@ describe('ArgsProvider', function () {
 ```
 
 ### Visibility
-Sometimes you want to hide dependency if somebody wants to resolve it from certain scope
-- `provider(visible(({ isParent, child }) => isParent || child.hasTag('root')))` - dependency will be accessible from scope `root` or from scope where it's registered
-- `Provider.fromClass(Logger).pipe(visible(({ isParent, child }) => isParent || child.hasTag('root')))`
+Sometimes you want to hide dependency if somebody wants to resolve it from certain scope. This uses `ScopeAccessRule` to control access.
+- `provider(scopeAccess(({ invocationScope, providerScope }) => invocationScope === providerScope))` - dependency will be accessible only from the scope where it's registered
+- `Provider.fromClass(Logger).pipe(scopeAccess(({ invocationScope, providerScope }) => invocationScope === providerScope))`
 
 ```typescript
 import {
@@ -1324,7 +1324,7 @@ describe('Registration module', function () {
 ```
 
 ### Scope
-Sometimes you need to register provider only in scope which matches to certain condition and their sub scopes. Especially if you want to register dependency as singleton for some tags, for example `root`
+Sometimes you need to register provider only in scope which matches to certain condition and their sub scopes. Especially if you want to register dependency as singleton for some tags, for example `root`. This uses `ScopeMatchRule` to determine which scopes should have the provider.
 - `@register(scope((container) => container.hasTag('root'))` - register provider only in root scope
 - `Registration.fromClass(Logger).when((container) => container.hasTag('root'))`
 
@@ -1392,9 +1392,16 @@ Sometimes you need to invoke methods after construct or dispose of class. This i
 
 ### OnConstruct
 ```typescript
-import { Container, HookContext, HookFn, HooksRunner, inject, onConstruct, Registration as R } from 'ts-ioc-container';
+import {
+  AddOnConstructHookModule,
+  Container,
+  HookContext,
+  HookFn,
+  inject,
+  onConstruct,
+  Registration as R,
+} from 'ts-ioc-container';
 
-const onConstructHooksRunner = new HooksRunner('onConstruct');
 const execute: HookFn = (ctx: HookContext) => {
   ctx.invokeMethod({ args: ctx.resolveArgs() });
 };
@@ -1415,9 +1422,7 @@ class Car {
 describe('onConstruct', function () {
   it('should run methods and resolve arguments from container', function () {
     const root = new Container()
-      .addOnConstructHook((instance, scope) => {
-        onConstructHooksRunner.execute(instance, { scope });
-      })
+      .useModule(new AddOnConstructHookModule())
       .addRegistration(R.fromValue('bmw').bindTo('engine'));
 
     const car = root.resolve(Car);
@@ -1431,19 +1436,17 @@ describe('onConstruct', function () {
 ### OnDispose
 ```typescript
 import {
+  AddOnDisposeHookModule,
   bindTo,
   Container,
-  hook,
   type HookFn,
-  HooksRunner,
   inject,
+  onDispose,
   register,
   Registration as R,
-  select,
   singleton,
 } from 'ts-ioc-container';
 
-const onDisposeHookRunner = new HooksRunner('onDispose');
 const execute: HookFn = (ctx) => {
   ctx.invokeMethod({ args: ctx.resolveArgs() });
 };
@@ -1459,7 +1462,7 @@ class LogsRepo {
 
 @register(bindTo('logger'))
 class Logger {
-  @hook('onDispose', ({ instance, methodName }) => {
+  @onDispose(({ instance, methodName }) => {
     // @ts-ignore
     instance[methodName].push('world');
   }) // <--- or extract it to @onDispose
@@ -1471,7 +1474,7 @@ class Logger {
     this.messages.push(message);
   }
 
-  @hook('onDispose', execute) // <--- or extract it to @onDispose
+  @onDispose(execute)
   save() {
     this.logsRepo.saveLogs(this.messages);
   }
@@ -1479,16 +1482,18 @@ class Logger {
 
 describe('onDispose', function () {
   it('should invoke hooks on all instances', function () {
-    const container = new Container().addRegistration(R.fromClass(Logger)).addRegistration(R.fromClass(LogsRepo));
+    const container = new Container()
+      .useModule(new AddOnDisposeHookModule())
+      .addRegistration(R.fromClass(Logger))
+      .addRegistration(R.fromClass(LogsRepo));
 
     const logger = container.resolve<Logger>('logger');
     logger.log('Hello');
+    const logsRepo = container.resolve<LogsRepo>('logsRepo');
 
-    for (const instance of select.instances().resolve(container)) {
-      onDisposeHookRunner.execute(instance, { scope: container });
-    }
+    container.dispose();
 
-    expect(container.resolve<LogsRepo>('logsRepo').savedLogs.join(',')).toBe('Hello,world');
+    expect(logsRepo.savedLogs.join(',')).toBe('Hello,world');
   });
 });
 

package/cjm/container/EmptyContainer.js

@@ -48,5 +48,11 @@ class EmptyContainer {
     resolveOneByAlias(alias, options) {
         throw new DependencyNotFoundError_1.DependencyNotFoundError(`Cannot find alias ${alias.toString()}`);
     }
+    addOnDisposeHook(...hooks) {
+        throw new MethodNotImplementedError_1.MethodNotImplementedError();
+    }
+    addOnConstructHook(...hooks) {
+        throw new MethodNotImplementedError_1.MethodNotImplementedError();
+    }
 }
 exports.EmptyContainer = EmptyContainer;

package/cjm/hooks/onConstruct.js

@@ -1,8 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.onConstruct = exports.onConstructHooksRunner = void 0;
+exports.AddOnConstructHookModule = 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 = (fn) => (0, hook_1.hook)('onConstruct', fn);
 exports.onConstruct = onConstruct;
+class AddOnConstructHookModule {
+    applyTo(container) {
+        container.addOnConstructHook((instance, scope) => {
+            exports.onConstructHooksRunner.execute(instance, { scope });
+        });
+    }
+}
+exports.AddOnConstructHookModule = AddOnConstructHookModule;

package/cjm/hooks/onDispose.js

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

package/cjm/index.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.toSingleAlias = exports.SingleAliasToken = exports.toGroupAlias = exports.GroupAliasToken = exports.InjectionToken = exports.getParameterMetadata = exports.getMethodMetadata = exports.setMethodMetadata = exports.setParameterMetadata = exports.getClassMetadata = exports.setClassMetadata = exports.HooksRunner = 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.EmptyContainer = exports.Container = exports.isDependencyKey = void 0;
-exports.Is = exports.select = exports.GroupInstanceToken = exports.ConstantToken = exports.FunctionToken = exports.SingleToken = exports.ClassToken = void 0;
+exports.GroupAliasToken = exports.InjectionToken = exports.getParameterMetadata = exports.getMethodMetadata = exports.setMethodMetadata = exports.setParameterMetadata = exports.getClassMetadata = exports.setClassMetadata = exports.HooksRunner = exports.AddOnDisposeHookModule = exports.onDispose = exports.onDisposeHooksRunner = exports.AddOnConstructHookModule = 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.Injector = exports.resolveArgs = exports.inject = exports.EmptyContainer = exports.Container = exports.isDependencyKey = void 0;
+exports.Is = exports.select = exports.GroupInstanceToken = exports.ConstantToken = exports.FunctionToken = exports.SingleToken = exports.ClassToken = exports.toSingleAlias = exports.SingleAliasToken = exports.toGroupAlias = void 0;
 // Containers
 var IContainer_1 = require("./container/IContainer");
 Object.defineProperty(exports, "isDependencyKey", { enumerable: true, get: function () { return IContainer_1.isDependencyKey; } });
@@ -13,6 +13,8 @@ Object.defineProperty(exports, "EmptyContainer", { enumerable: true, get: functi
 var inject_1 = require("./injector/inject");
 Object.defineProperty(exports, "inject", { enumerable: true, get: function () { return inject_1.inject; } });
 Object.defineProperty(exports, "resolveArgs", { enumerable: true, get: function () { return inject_1.resolveArgs; } });
+var IInjector_1 = require("./injector/IInjector");
+Object.defineProperty(exports, "Injector", { enumerable: true, get: function () { return IInjector_1.Injector; } });
 var MetadataInjector_1 = require("./injector/MetadataInjector");
 Object.defineProperty(exports, "MetadataInjector", { enumerable: true, get: function () { return MetadataInjector_1.MetadataInjector; } });
 var SimpleInjector_1 = require("./injector/SimpleInjector");
@@ -67,9 +69,11 @@ 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; } });
 var onDispose_1 = require("./hooks/onDispose");
 Object.defineProperty(exports, "onDisposeHooksRunner", { enumerable: true, get: function () { return onDispose_1.onDisposeHooksRunner; } });
 Object.defineProperty(exports, "onDispose", { enumerable: true, get: function () { return onDispose_1.onDispose; } });
+Object.defineProperty(exports, "AddOnDisposeHookModule", { enumerable: true, get: function () { return onDispose_1.AddOnDisposeHookModule; } });
 var HooksRunner_1 = require("./hooks/HooksRunner");
 Object.defineProperty(exports, "HooksRunner", { enumerable: true, get: function () { return HooksRunner_1.HooksRunner; } });
 // Metadata

package/cjm/provider/IProvider.js

@@ -18,7 +18,7 @@ const resolveByArgs = (s, ...deps) => deps.map((d) => {
     return d;
 });
 exports.resolveByArgs = resolveByArgs;
-const scopeAccess = (predicate) => (0, ProviderPipe_1.registerPipe)((p) => p.setAccessPredicate(predicate));
+const scopeAccess = (rule) => (0, ProviderPipe_1.registerPipe)((p) => p.setAccessRule(rule));
 exports.scopeAccess = scopeAccess;
 const lazy = () => (0, ProviderPipe_1.registerPipe)((p) => p.lazy());
 exports.lazy = lazy;
@@ -27,8 +27,8 @@ class ProviderDecorator {
     constructor(decorated) {
         this.decorated = decorated;
     }
-    setAccessPredicate(predicate) {
-        this.decorated.setAccessPredicate(predicate);
+    setAccessRule(rule) {
+        this.decorated.setAccessRule(rule);
         return this;
     }
     hasAccess(options) {

package/cjm/provider/Provider.js

@@ -30,7 +30,7 @@ class Provider {
             lazy: lazy ?? this.isLazy,
         });
     }
-    setAccessPredicate(predicate) {
+    setAccessRule(predicate) {
         this.checkAccess = predicate;
         return this;
     }

package/cjm/registration/IRegistration.js

@@ -5,7 +5,7 @@ const metadata_1 = require("../metadata");
 const ProviderPipe_1 = require("../provider/ProviderPipe");
 const SingleToken_1 = require("../token/SingleToken");
 const BindToken_1 = require("../token/BindToken");
-const scope = (...predicates) => (r) => r.when(...predicates);
+const scope = (...rules) => (r) => r.when(...rules);
 exports.scope = scope;
 const METADATA_KEY = 'registration';
 const getTransformers = (Target) => (0, metadata_1.getClassMetadata)(Target, METADATA_KEY) ?? [];

package/cjm/registration/Registration.js

@@ -11,7 +11,7 @@ const SingleToken_1 = require("../token/SingleToken");
 class Registration {
     createProvider;
     key;
-    scopePredicates;
+    scopeRules;
     static fromClass(Target) {
         const transform = (0, utils_1.pipe)(...(0, IRegistration_1.getTransformers)(Target));
         return transform(new Registration(() => Provider_1.Provider.fromClass(Target), Target.name));
@@ -31,10 +31,10 @@ class Registration {
     }
     mappers = [];
     aliases = new Set();
-    constructor(createProvider, key, scopePredicates = []) {
+    constructor(createProvider, key, scopeRules = []) {
         this.createProvider = createProvider;
         this.key = key;
-        this.scopePredicates = scopePredicates;
+        this.scopeRules = scopeRules;
     }
     bindToKey(key) {
         this.key = key;
@@ -50,7 +50,7 @@ class Registration {
         return this;
     }
     when(...predicates) {
-        this.scopePredicates.push(...predicates);
+        this.scopeRules.push(...predicates);
         return this;
     }
     bindTo(key) {
@@ -62,10 +62,10 @@ class Registration {
         return this;
     }
     matchScope(container) {
-        if (this.scopePredicates.length === 0) {
+        if (this.scopeRules.length === 0) {
             return true;
         }
-        const [first, ...rest] = this.scopePredicates;
+        const [first, ...rest] = this.scopeRules;
         return rest.reduce((prev, curr) => curr(container, prev), first(container));
     }
     applyTo(container) {

package/esm/container/EmptyContainer.js

@@ -45,4 +45,10 @@ export class EmptyContainer {
     resolveOneByAlias(alias, options) {
         throw new DependencyNotFoundError(`Cannot find alias ${alias.toString()}`);
     }
+    addOnDisposeHook(...hooks) {
+        throw new MethodNotImplementedError();
+    }
+    addOnConstructHook(...hooks) {
+        throw new MethodNotImplementedError();
+    }
 }

package/esm/hooks/onConstruct.js

@@ -2,3 +2,10 @@ import { hook } from './hook';
 import { HooksRunner } from './HooksRunner';
 export const onConstructHooksRunner = new HooksRunner('onConstruct');
 export const onConstruct = (fn) => hook('onConstruct', fn);
+export class AddOnConstructHookModule {
+    applyTo(container) {
+        container.addOnConstructHook((instance, scope) => {
+            onConstructHooksRunner.execute(instance, { scope });
+        });
+    }
+}

package/esm/hooks/onDispose.js

@@ -2,3 +2,12 @@ import { hook } from './hook';
 import { HooksRunner } from './HooksRunner';
 export const onDisposeHooksRunner = new HooksRunner('onDispose');
 export const onDispose = (fn) => hook('onDispose', fn);
+export class AddOnDisposeHookModule {
+    applyTo(container) {
+        container.addOnDisposeHook((scope) => {
+            for (const instance of scope.getInstances()) {
+                onDisposeHooksRunner.execute(instance, { scope });
+            }
+        });
+    }
+}

package/esm/index.js

@@ -4,6 +4,7 @@ export { Container } from './container/Container';
 export { EmptyContainer } from './container/EmptyContainer';
 // Injectors
 export { inject, resolveArgs } from './injector/inject';
+export { Injector } from './injector/IInjector';
 export { MetadataInjector } from './injector/MetadataInjector';
 export { SimpleInjector } from './injector/SimpleInjector';
 export { ProxyInjector } from './injector/ProxyInjector';
@@ -26,8 +27,8 @@ export { UnexpectedHookResultError } from './errors/UnexpectedHookResultError';
 export { getHooks, hook, hasHooks } from './hooks/hook';
 export { HookContext } from './hooks/HookContext';
 export { injectProp } from './hooks/injectProp';
-export { onConstructHooksRunner, onConstruct } from './hooks/onConstruct';
-export { onDisposeHooksRunner, onDispose } from './hooks/onDispose';
+export { onConstructHooksRunner, onConstruct, AddOnConstructHookModule } from './hooks/onConstruct';
+export { onDisposeHooksRunner, onDispose, AddOnDisposeHookModule } from './hooks/onDispose';
 export { HooksRunner } from './hooks/HooksRunner';
 // Metadata
 export { setClassMetadata, getClassMetadata, setParameterMetadata, setMethodMetadata, getMethodMetadata, getParameterMetadata, } from './metadata';

package/esm/provider/IProvider.js

@@ -12,15 +12,15 @@ export const resolveByArgs = (s, ...deps) => deps.map((d) => {
     }
     return d;
 });
-export const scopeAccess = (predicate) => registerPipe((p) => p.setAccessPredicate(predicate));
+export const scopeAccess = (rule) => registerPipe((p) => p.setAccessRule(rule));
 export const lazy = () => registerPipe((p) => p.lazy());
 export class ProviderDecorator {
     decorated;
     constructor(decorated) {
         this.decorated = decorated;
     }
-    setAccessPredicate(predicate) {
-        this.decorated.setAccessPredicate(predicate);
+    setAccessRule(rule) {
+        this.decorated.setAccessRule(rule);
         return this;
     }
     hasAccess(options) {

package/esm/provider/Provider.js

@@ -27,7 +27,7 @@ export class Provider {
             lazy: lazy ?? this.isLazy,
         });
     }
-    setAccessPredicate(predicate) {
+    setAccessRule(predicate) {
         this.checkAccess = predicate;
         return this;
     }

package/esm/registration/IRegistration.js

@@ -2,7 +2,7 @@ import { getClassMetadata, setClassMetadata } from '../metadata';
 import { isProviderPipe } from '../provider/ProviderPipe';
 import { SingleToken } from '../token/SingleToken';
 import { isBindToken } from '../token/BindToken';
-export const scope = (...predicates) => (r) => r.when(...predicates);
+export const scope = (...rules) => (r) => r.when(...rules);
 const METADATA_KEY = 'registration';
 export const getTransformers = (Target) => getClassMetadata(Target, METADATA_KEY) ?? [];
 export const register = (...mappers) => setClassMetadata(METADATA_KEY, () => mappers.map((m) => (isProviderPipe(m) ? (r) => m.mapRegistration(r) : m)));

package/esm/registration/Registration.js

@@ -8,7 +8,7 @@ import { SingleToken } from '../token/SingleToken';
 export class Registration {
     createProvider;
     key;
-    scopePredicates;
+    scopeRules;
     static fromClass(Target) {
         const transform = pipe(...getTransformers(Target));
         return transform(new Registration(() => Provider.fromClass(Target), Target.name));
@@ -28,10 +28,10 @@ export class Registration {
     }
     mappers = [];
     aliases = new Set();
-    constructor(createProvider, key, scopePredicates = []) {
+    constructor(createProvider, key, scopeRules = []) {
         this.createProvider = createProvider;
         this.key = key;
-        this.scopePredicates = scopePredicates;
+        this.scopeRules = scopeRules;
     }
     bindToKey(key) {
         this.key = key;
@@ -47,7 +47,7 @@ export class Registration {
         return this;
     }
     when(...predicates) {
-        this.scopePredicates.push(...predicates);
+        this.scopeRules.push(...predicates);
         return this;
     }
     bindTo(key) {
@@ -59,10 +59,10 @@ export class Registration {
         return this;
     }
     matchScope(container) {
-        if (this.scopePredicates.length === 0) {
+        if (this.scopeRules.length === 0) {
             return true;
         }
-        const [first, ...rest] = this.scopePredicates;
+        const [first, ...rest] = this.scopeRules;
         return rest.reduce((prev, curr) => curr(container, prev), first(container));
     }
     applyTo(container) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ts-ioc-container",
-  "version": "46.0.1",
+  "version": "46.2.0",
   "description": "Typescript IoC container",
   "publishConfig": {
     "access": "public",
@@ -51,6 +51,7 @@
     "format": "prettier --write \"**/*.ts\"",
     "lint": "eslint lib/**/*.ts  __tests__/**/*.ts scripts/**/*.ts",
     "lint:fix": "npm run lint --fix",
+    "audit": "npm audit",
     "prepare": "husky",
     "release": "npm run build && npm test && npm publish",
     "docs:install": "cd docs && npm install",

package/typings/container/EmptyContainer.d.ts

@@ -2,6 +2,8 @@ import { type DependencyKey, type IContainer, type IContainerModule, type Resolv
 import { type IProvider } from '../provider/IProvider';
 import { type IRegistration } from '../registration/IRegistration';
 import { constructor, Instance } from '../types';
+import { OnDisposeHook } from '../hooks/onDispose';
+import { OnConstructHook } from '../hooks/onConstruct';
 export declare class EmptyContainer implements IContainer {
     get isDisposed(): boolean;
     addInstance(instance: Instance): void;
@@ -19,4 +21,6 @@ export declare class EmptyContainer implements IContainer {
     resolve<T>(key: constructor<T> | DependencyKey, options?: ResolveOneOptions): T;
     resolveByAlias<T>(alias: DependencyKey, options?: ResolveManyOptions): T[];
     resolveOneByAlias<T>(alias: DependencyKey, options?: ResolveOneOptions): T;
+    addOnDisposeHook(...hooks: OnDisposeHook[]): this;
+    addOnConstructHook(...hooks: OnConstructHook[]): this;
 }

package/typings/container/IContainer.d.ts

@@ -1,6 +1,8 @@
 import { type IProvider, ProviderOptions } from '../provider/IProvider';
 import { type IRegistration } from '../registration/IRegistration';
 import { constructor, Instance } from '../types';
+import { OnConstructHook } from '../hooks/onConstruct';
+import { OnDisposeHook } from '../hooks/onDispose';
 export type DependencyKey = string | symbol;
 export declare function isDependencyKey(target: unknown): target is DependencyKey;
 export type Tag = string;
@@ -30,6 +32,8 @@ export type RegisterOptions = {
 };
 export interface IContainer extends Tagged {
     readonly isDisposed: boolean;
+    addOnConstructHook(...hooks: OnConstructHook[]): this;
+    addOnDisposeHook(...hooks: OnDisposeHook[]): this;
     register(key: DependencyKey, value: IProvider, options?: RegisterOptions): this;
     addRegistration(registration: IRegistration): this;
     getRegistrations(): IRegistration[];

package/typings/hooks/onConstruct.d.ts

@@ -1,7 +1,10 @@
 import { HookClass, HookFn } from './hook';
-import type { IContainer } from '../container/IContainer';
+import type { IContainer, IContainerModule } from '../container/IContainer';
 import { constructor, Instance } from '../types';
 import { HooksRunner } from './HooksRunner';
 export declare const onConstructHooksRunner: HooksRunner;
 export declare const onConstruct: (fn: HookFn | constructor<HookClass>) => (target: object, propertyKey: string | symbol) => void;
 export type OnConstructHook = (instance: Instance, scope: IContainer) => void;
+export declare class AddOnConstructHookModule implements IContainerModule {
+    applyTo(container: IContainer): void;
+}

package/typings/hooks/onDispose.d.ts

@@ -1,7 +1,10 @@
 import { HookClass, HookFn } from './hook';
-import type { IContainer } from '../container/IContainer';
+import type { IContainer, IContainerModule } from '../container/IContainer';
 import { constructor } from '../types';
 import { HooksRunner } from './HooksRunner';
 export declare const onDisposeHooksRunner: HooksRunner;
 export declare const onDispose: (fn: HookFn | constructor<HookClass>) => (target: object, propertyKey: string | symbol) => void;
 export type OnDisposeHook = (scope: IContainer) => void;
+export declare class AddOnDisposeHookModule implements IContainerModule {
+    applyTo(container: IContainer): void;
+}

package/typings/index.d.ts

@@ -2,7 +2,7 @@ export { type IContainer, type Resolvable, type IContainerModule, type Dependenc
 export { Container } from './container/Container';
 export { EmptyContainer } from './container/EmptyContainer';
 export { inject, resolveArgs } from './injector/inject';
-export { type IInjector, type InjectOptions, type IInjectFnResolver } from './injector/IInjector';
+export { type IInjector, type InjectOptions, type IInjectFnResolver, Injector } from './injector/IInjector';
 export { MetadataInjector } from './injector/MetadataInjector';
 export { SimpleInjector } from './injector/SimpleInjector';
 export { ProxyInjector } from './injector/ProxyInjector';
@@ -12,7 +12,7 @@ export { singleton, SingletonProvider } from './provider/SingletonProvider';
 export { type Cache, multiCache, MultiCache } from './provider/Cache';
 export { decorate, type DecorateFn } from './provider/DecoratorProvider';
 export { type ProviderPipe } from './provider/ProviderPipe';
-export { type IRegistration, type ReturnTypeOfRegistration, scope, register, type ScopePredicate, bindTo, } from './registration/IRegistration';
+export { type IRegistration, type ReturnTypeOfRegistration, scope, register, type ScopeMatchRule, bindTo, } from './registration/IRegistration';
 export { Registration } from './registration/Registration';
 export { DependencyNotFoundError } from './errors/DependencyNotFoundError';
 export { DependencyMissingKeyError } from './errors/DependencyMissingKeyError';
@@ -22,8 +22,8 @@ export { UnexpectedHookResultError } from './errors/UnexpectedHookResultError';
 export { getHooks, hook, hasHooks, type HookFn, type HookClass } from './hooks/hook';
 export { HookContext, type IHookContext } from './hooks/HookContext';
 export { injectProp } from './hooks/injectProp';
-export { onConstructHooksRunner, onConstruct } from './hooks/onConstruct';
-export { onDisposeHooksRunner, onDispose } from './hooks/onDispose';
+export { onConstructHooksRunner, onConstruct, AddOnConstructHookModule } from './hooks/onConstruct';
+export { onDisposeHooksRunner, onDispose, AddOnDisposeHookModule } from './hooks/onDispose';
 export type { HooksRunnerContext } from './hooks/HooksRunner';
 export { HooksRunner } from './hooks/HooksRunner';
 export { setClassMetadata, getClassMetadata, setParameterMetadata, setMethodMetadata, getMethodMetadata, getParameterMetadata, } from './metadata';

package/typings/provider/IProvider.d.ts

@@ -11,7 +11,7 @@ export type ScopeAccessOptions = {
     invocationScope: Tagged;
     providerScope: Tagged;
 };
-export type ScopeAccessFn = (options: ScopeAccessOptions) => boolean;
+export type ScopeAccessRule = (options: ScopeAccessOptions) => boolean;
 export type ArgsFn = (l: IContainer, ...args: unknown[]) => unknown[];
 export interface IMapper {
     mapItem<T>(target: IProvider<T>): IProvider<T>;
@@ -20,19 +20,19 @@ export interface IProvider<T = any> {
     resolve(container: IContainer, options: ProviderOptions): T;
     hasAccess(options: ScopeAccessOptions): boolean;
     pipe(...mappers: (MapFn<IProvider<T>> | ProviderPipe<T>)[]): IProvider<T>;
-    setAccessPredicate(hasAccessWhen: ScopeAccessFn): this;
+    setAccessRule(hasAccessWhen: ScopeAccessRule): this;
     setArgs(argsFn: ArgsFn): this;
     lazy(): this;
 }
 export declare const args: <T>(...extraArgs: unknown[]) => ProviderPipe<T>;
 export declare const argsFn: <T>(fn: ArgsFn) => ProviderPipe<T>;
 export declare const resolveByArgs: (s: IContainer, ...deps: unknown[]) => any[];
-export declare const scopeAccess: <T>(predicate: ScopeAccessFn) => ProviderPipe<T>;
+export declare const scopeAccess: <T>(rule: ScopeAccessRule) => ProviderPipe<T>;
 export declare const lazy: <T>() => ProviderPipe<T>;
 export declare abstract class ProviderDecorator<T> implements IProvider<T> {
     private decorated;
     protected constructor(decorated: IProvider<T>);
-    setAccessPredicate(predicate: ScopeAccessFn): this;
+    setAccessRule(rule: ScopeAccessRule): this;
     hasAccess(options: ScopeAccessOptions): boolean;
     resolve(container: IContainer, options: ProviderOptions): T;
     pipe(...mappers: (MapFn<IProvider<T>> | ProviderPipe<T>)[]): IProvider<T>;

package/typings/provider/Provider.d.ts

@@ -1,4 +1,4 @@
-import { ArgsFn, IProvider, ProviderOptions, ResolveDependency, ScopeAccessFn, ScopeAccessOptions } from './IProvider';
+import { ArgsFn, IProvider, ProviderOptions, ResolveDependency, ScopeAccessRule, ScopeAccessOptions } from './IProvider';
 import type { DependencyKey, IContainer } from '../container/IContainer';
 import type { ProviderPipe } from './ProviderPipe';
 import { constructor, MapFn } from '../types';
@@ -13,7 +13,7 @@ export declare class Provider<T = any> implements IProvider<T> {
     constructor(resolveDependency: ResolveDependency<T>);
     pipe(...mappers: (MapFn<IProvider<T>> | ProviderPipe<T>)[]): IProvider<T>;
     resolve(container: IContainer, { args, lazy }?: ProviderOptions): T;
-    setAccessPredicate(predicate: ScopeAccessFn): this;
+    setAccessRule(predicate: ScopeAccessRule): this;
     lazy(): this;
     setArgs(argsFn: ArgsFn): this;
     hasAccess(options: ScopeAccessOptions): boolean;

package/typings/registration/IRegistration.d.ts

@@ -3,16 +3,16 @@ import type { IProvider } from '../provider/IProvider';
 import { ProviderPipe } from '../provider/ProviderPipe';
 import { BindToken } from '../token/BindToken';
 import { constructor, MapFn } from '../types';
-export type ScopePredicate = (s: IContainer, prev?: boolean) => boolean;
+export type ScopeMatchRule = (s: IContainer, prev?: boolean) => boolean;
 export interface IRegistration<T = any> extends IContainerModule {
-    when(...predicates: ScopePredicate[]): this;
+    when(...predicates: ScopeMatchRule[]): this;
     bindToKey(key: DependencyKey): this;
     bindTo(key: DependencyKey | BindToken): this;
     pipe(...mappers: (MapFn<IProvider<T>> | ProviderPipe<T>)[]): this;
     bindToAlias(alias: DependencyKey): this;
 }
 export type ReturnTypeOfRegistration<T> = T extends IRegistration<infer R> ? R : never;
-export declare const scope: (...predicates: ScopePredicate[]) => MapFn<IRegistration>;
+export declare const scope: (...rules: ScopeMatchRule[]) => MapFn<IRegistration>;
 export declare const getTransformers: (Target: constructor<unknown>) => MapFn<IRegistration<any>>[];
 export declare const register: (...mappers: Array<MapFn<IRegistration> | ProviderPipe>) => ClassDecorator;
 export declare const bindTo: (...tokens: (DependencyKey | BindToken)[]) => MapFn<IRegistration>;

package/typings/registration/Registration.d.ts

@@ -1,24 +1,24 @@
 import { DependencyKey, IContainer } from '../container/IContainer';
 import type { IProvider, ResolveDependency } from '../provider/IProvider';
-import type { IRegistration, ScopePredicate } from './IRegistration';
+import type { IRegistration, ScopeMatchRule } from './IRegistration';
 import type { ProviderPipe } from '../provider/ProviderPipe';
 import { BindToken } from '../token/BindToken';
 import { constructor, MapFn } from '../types';
 export declare class Registration<T = any> implements IRegistration<T> {
     private createProvider;
     private key?;
-    private scopePredicates;
+    private scopeRules;
     static fromClass<T>(Target: constructor<T>): IRegistration<any>;
     static fromValue<T>(value: T): IRegistration<any> | Registration<T>;
     static fromFn<T>(fn: ResolveDependency<T>): Registration<T>;
     static fromKey<T>(key: DependencyKey): Registration<T>;
     private mappers;
     private aliases;
-    constructor(createProvider: () => IProvider<T>, key?: DependencyKey | undefined, scopePredicates?: ScopePredicate[]);
+    constructor(createProvider: () => IProvider<T>, key?: DependencyKey | undefined, scopeRules?: ScopeMatchRule[]);
     bindToKey(key: DependencyKey): this;
     bindToAlias(alias: DependencyKey): this;
     pipe(...mappers: (MapFn<IProvider<T>> | ProviderPipe<T>)[]): this;
-    when(...predicates: ScopePredicate[]): this;
+    when(...predicates: ScopeMatchRule[]): this;
     bindTo(key: DependencyKey | BindToken): this;
     private matchScope;
     applyTo(container: IContainer): void;