ts-ioc-container 32.4.0 → 32.6.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;
   }
@@ -1199,13 +1195,13 @@ import {
   by,
   Container,
   key,
-  getHooks,
   hook,
   inject,
   provider,
   Registration as R,
   MetadataInjector,
   register,
+  executeHooks,
 } from 'ts-ioc-container';
 
 @register(key('logsRepo'))
@@ -1220,6 +1216,10 @@ class LogsRepo {
 
 @register(key('logger'))
 class Logger {
+  @hook('onDispose', ({ instance, methodName }) => {
+    // @ts-ignore
+    instance[methodName].push('world');
+  }) // <--- or extract it to @onDispose
   private messages: string[] = [];
 
   constructor(@inject(by.key('logsRepo')) private logsRepo: LogsRepo) {}
@@ -1228,10 +1228,13 @@ class Logger {
     this.messages.push(message);
   }
 
-  @hook('onDispose') // <--- or extract it to @onDispose
+  size(): number {
+    return this.messages.length;
+  }
+
+  @hook('onDispose', (c) => c.invokeMethod({ args: [] })) // <--- or extract it to @onDispose
   async save(): Promise<void> {
     this.logsRepo.saveLogs(this.messages);
-    this.messages = [];
   }
 }
 
@@ -1243,14 +1246,10 @@ 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');
+    expect(container.resolve<LogsRepo>('logsRepo').savedLogs.join(',')).toBe('Hello,world');
   });
 });
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ts-ioc-container",
-  "version": "32.4.0",
+  "version": "32.6.0",
   "description": "Typescript IoC container",
   "publishConfig": {
     "access": "public",
@@ -59,5 +59,5 @@
     "ts-node": "^10.9.1",
     "typescript": "5.4.3"
   },
-  "gitHead": "590a34c13ebc93437a8a368f6e1e39db25600126"
+  "gitHead": "991c10cb1fc85ecb8ac3b918ffcdd6bae3f100d4"
 }

package/typings/hooks/hook.d.ts

@@ -1,7 +1,7 @@
 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, ...fns: Execution[]) => MethodDecorator;
+export declare const hook: (key: string | symbol, ...fns: Execution[]) => (target: object, propertyKey: string | symbol) => void;
 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, }: {