ts-ioc-container 32.3.0 → 32.5.0

package/README.md

@@ -1141,13 +1141,13 @@ import {
   constructor,
   Container,
   key,
-  getHooks,
   hook,
   IContainer,
   IInjector,
   MetadataInjector,
   Registration as R,
   register,
+  executeHooks,
 } from 'ts-ioc-container';
 import { InjectOptions } from '../lib/injector/IInjector.ts';
 
@@ -1156,11 +1156,7 @@ class MyInjector implements IInjector {
 
   resolve<T>(container: IContainer, value: constructor<T>, options: InjectOptions): T {
     const instance = this.injector.resolve(container, value, options);
-    // eslint-disable-next-line @typescript-eslint/ban-types
-    for (const [h] of getHooks(instance as object, 'onConstruct')) {
-      // @ts-ignore
-      instance[h]();
-    }
+    executeHooks(instance as object, 'onConstruct', { scope: container });
     return instance;
   }
 }
@@ -1169,7 +1165,7 @@ class MyInjector implements IInjector {
 class Logger {
   isReady = false;
 
-  @hook('onConstruct') // <--- or extract it to @onConstruct
+  @hook('onConstruct', (context) => context.invokeMethod({ args: [] })) // <--- or extract it to @onConstruct
   initialize() {
     this.isReady = true;
   }
@@ -1206,6 +1202,7 @@ import {
   Registration as R,
   MetadataInjector,
   register,
+  executeHooks,
 } from 'ts-ioc-container';
 
 @register(key('logsRepo'))
@@ -1228,7 +1225,7 @@ class Logger {
     this.messages.push(message);
   }
 
-  @hook('onDispose') // <--- or extract it to @onDispose
+  @hook('onDispose', (c) => c.invokeMethod({ args: [] })) // <--- or extract it to @onDispose
   async save(): Promise<void> {
     this.logsRepo.saveLogs(this.messages);
     this.messages = [];
@@ -1243,11 +1240,7 @@ describe('onDispose', function () {
     logger.log('Hello');
 
     for (const instance of container.getInstances()) {
-      // eslint-disable-next-line @typescript-eslint/ban-types
-      for (const [h] of getHooks(instance as object, 'onDispose')) {
-        // @ts-ignore
-        await instance[h]();
-      }
+      executeHooks(instance as object, 'onDispose', { scope: container });
     }
 
     expect(container.resolve<LogsRepo>('logsRepo').savedLogs).toContain('Hello');

package/cjm/hooks/hook.js

@@ -3,11 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.executeHooks = exports.hasHooks = exports.getHooks = exports.hook = void 0;
 const ExecutionContext_1 = require("./ExecutionContext");
 const createStore = () => new Map();
-const hook = (key, fn) => (target, propertyKey) => {
+const hook = (key, ...fns) => (target, propertyKey) => {
     const hooks = Reflect.hasMetadata(key, target.constructor)
         ? Reflect.getMetadata(key, target.constructor)
         : createStore();
-    hooks.set(propertyKey, fn);
+    hooks.set(propertyKey, (hooks.get(propertyKey) ?? []).concat(fns));
     Reflect.defineMetadata(key, hooks, target.constructor); // eslint-disable-line @typescript-eslint/ban-types
 };
 exports.hook = hook;
@@ -20,8 +20,10 @@ function hasHooks(target, key) {
 }
 exports.hasHooks = hasHooks;
 const executeHooks = (target, key, { scope, createContext = (c) => c, }) => {
-    for (const [methodName, execute] of getHooks(target, key)) {
-        execute(createContext(new ExecutionContext_1.ExecutionContext(target, methodName, scope)));
+    for (const [methodName, executions] of getHooks(target, key)) {
+        for (const execute of executions) {
+            execute(createContext(new ExecutionContext_1.ExecutionContext(target, methodName, scope)));
+        }
     }
 };
 exports.executeHooks = executeHooks;

package/esm/hooks/hook.js

@@ -1,10 +1,10 @@
 import { ExecutionContext } from './ExecutionContext';
 const createStore = () => new Map();
-export const hook = (key, fn) => (target, propertyKey) => {
+export const hook = (key, ...fns) => (target, propertyKey) => {
     const hooks = Reflect.hasMetadata(key, target.constructor)
         ? Reflect.getMetadata(key, target.constructor)
         : createStore();
-    hooks.set(propertyKey, fn);
+    hooks.set(propertyKey, (hooks.get(propertyKey) ?? []).concat(fns));
     Reflect.defineMetadata(key, hooks, target.constructor); // eslint-disable-line @typescript-eslint/ban-types
 };
 export function getHooks(target, key) {
@@ -14,7 +14,9 @@ export function hasHooks(target, key) {
     return Reflect.hasMetadata(key, target.constructor);
 }
 export const executeHooks = (target, key, { scope, createContext = (c) => c, }) => {
-    for (const [methodName, execute] of getHooks(target, key)) {
-        execute(createContext(new ExecutionContext(target, methodName, scope)));
+    for (const [methodName, executions] of getHooks(target, key)) {
+        for (const execute of executions) {
+            execute(createContext(new ExecutionContext(target, methodName, scope)));
+        }
     }
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ts-ioc-container",
-  "version": "32.3.0",
+  "version": "32.5.0",
   "description": "Typescript IoC container",
   "publishConfig": {
     "access": "public",
@@ -59,5 +59,5 @@
     "ts-node": "^10.9.1",
     "typescript": "5.4.3"
   },
-  "gitHead": "9785342f77f8a8548837f5fe45f587adc6394797"
+  "gitHead": "464f1f083a81a9346e6a713373be32e204c03238"
 }

package/typings/hooks/hook.d.ts

@@ -1,8 +1,8 @@
 import { IContainer } from '../container/IContainer';
 import { ExecutionContext } from './ExecutionContext';
 export type Execution = <T extends ExecutionContext>(context: T) => void;
-export declare const hook: (key: string | symbol, fn: Execution) => MethodDecorator;
-export declare function getHooks(target: object, key: string | symbol): Map<string, Execution>;
+export declare const hook: (key: string | symbol, ...fns: Execution[]) => MethodDecorator;
+export declare function getHooks(target: object, key: string | symbol): Map<string, Execution[]>;
 export declare function hasHooks(target: object, key: string | symbol): boolean;
 export declare const executeHooks: <Context extends ExecutionContext>(target: object, key: string | symbol, { scope, createContext, }: {
     scope: IContainer;