ts-ioc-container 46.1.0 → 46.3.0

package/README.md

@@ -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.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.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 = 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; } });
@@ -69,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/registration/IRegistration.js

@@ -10,7 +10,10 @@ exports.scope = scope;
 const METADATA_KEY = 'registration';
 const getTransformers = (Target) => (0, metadata_1.getClassMetadata)(Target, METADATA_KEY) ?? [];
 exports.getTransformers = getTransformers;
-const register = (...mappers) => (0, metadata_1.setClassMetadata)(METADATA_KEY, () => mappers.map((m) => ((0, ProviderPipe_1.isProviderPipe)(m) ? (r) => m.mapRegistration(r) : m)));
+const register = (...mappers) => (0, metadata_1.setClassMetadata)(METADATA_KEY, (acc) => {
+    const result = mappers.map((m) => (0, ProviderPipe_1.isProviderPipe)(m) ? (r) => m.mapRegistration(r) : m);
+    return acc ? [...result, ...acc] : result;
+});
 exports.register = register;
 const bindTo = (...tokens) => (r) => {
     for (const token of tokens) {

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

@@ -27,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/registration/IRegistration.js

@@ -5,7 +5,10 @@ import { isBindToken } from '../token/BindToken';
 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)));
+export const register = (...mappers) => setClassMetadata(METADATA_KEY, (acc) => {
+    const result = mappers.map((m) => isProviderPipe(m) ? (r) => m.mapRegistration(r) : m);
+    return acc ? [...result, ...acc] : result;
+});
 export const bindTo = (...tokens) => (r) => {
     for (const token of tokens) {
         const targetToken = isBindToken(token) ? token : new SingleToken(token);

package/package.json

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

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

@@ -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';