ts-ioc-container 32.11.0 → 32.12.0

package/README.md

@@ -1161,7 +1161,7 @@ class MyInjector implements IInjector {
 
   resolve<T>(container: IContainer, value: constructor<T>, options: InjectOptions): T {
     const instance = this.injector.resolve(container, value, options);
-    void runHooks(instance as object, 'onConstruct', { scope: container, handleError: jest.fn() });
+    runHooks(instance as object, 'onConstruct', { scope: container });
     return instance;
   }
 }
@@ -1255,7 +1255,7 @@ describe('onDispose', function () {
     logger.log('Hello');
 
     for (const instance of container.getInstances()) {
-      void runHooks(instance as object, 'onDispose', { scope: container, handleError: jest.fn() });
+      runHooks(instance as object, 'onDispose', { scope: container });
     }
 
     expect(container.resolve<LogsRepo>('logsRepo').savedLogs.join(',')).toBe('Hello,world');
@@ -1267,7 +1267,7 @@ describe('onDispose', function () {
 ### Inject property
 
 ```typescript
-import { by, Container, hook, injectProp, MetadataInjector, Registration, runHooks } from 'ts-ioc-container';
+import { by, Container, hook, injectProp, MetadataInjector, Registration, runHooksAsync } from 'ts-ioc-container';
 
 describe('inject property', () => {
   it('should inject property', () => {
@@ -1279,7 +1279,7 @@ describe('inject property', () => {
 
     const container = new Container(new MetadataInjector()).add(Registration.fromValue(expected).to('greeting'));
     const app = container.resolve(App);
-    runHooks(app as object, 'onInit', { scope: container, handleError: jest.fn() });
+    runHooksAsync(app as object, 'onInit', { scope: container });
 
     expect(app.greeting).toBe(expected);
   });
@@ -1290,7 +1290,7 @@ describe('inject property', () => {
 ### Inject method
     
 ```typescript
-import { by, Container, runHooks, hook, inject, invokeExecution, MetadataInjector, Registration } from 'ts-ioc-container';
+import { by, Container, hook, inject, invokeExecution, MetadataInjector, Registration, runHooksAsync } from 'ts-ioc-container';
 
 describe('inject method', () => {
   const sleep = (number: number) => new Promise((resolve) => setTimeout(resolve, number));
@@ -1308,7 +1308,7 @@ describe('inject method', () => {
 
     const container = new Container(new MetadataInjector()).add(Registration.fromValue(expected).to('greeting'));
     const app = container.resolve(App);
-    await runHooks(app, 'onInit', { scope: container, handleError: jest.fn() });
+    await runHooksAsync(app, 'onInit', { scope: container });
 
     expect(app.greeting).toBe(expected);
   });
@@ -1328,7 +1328,7 @@ describe('inject method', () => {
       .add(Registration.fromFn(() => sleep(25).then(() => 'world')).to('person'));
 
     const app = container.resolve(App);
-    await runHooks(app, 'onInit', { scope: container, handleError: jest.fn() });
+    await runHooksAsync(app, 'onInit', { scope: container });
 
     expect(app.greeting).toBe('Hello,world');
   });

package/cjm/hooks/hook.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.executeHooks = exports.invokeExecution = exports.injectProp = exports.runHooks = exports.hasHooks = exports.getHooks = exports.hook = void 0;
+exports.invokeExecution = exports.injectProp = exports.runHooksAsync = exports.runHooks = exports.hasHooks = exports.getHooks = exports.hook = void 0;
 const HookContext_1 = require("./HookContext");
 const utils_1 = require("../utils");
 const hook = (key, ...fns) => (target, propertyKey) => {
@@ -19,12 +19,21 @@ function hasHooks(target, key) {
     return Reflect.hasMetadata(key, target.constructor);
 }
 exports.hasHooks = hasHooks;
-const runHooks = (target, key, { scope, createContext = HookContext_1.createHookContext, handleError, }) => {
+const runHooks = (target, key, { scope, createContext = HookContext_1.createHookContext, }) => {
     const hooks = Array.from(getHooks(target, key).entries());
-    const runExecution = (execute, context) => (0, utils_1.promisify)(execute(context)).catch((e) => handleError(e, scope));
-    return Promise.all(hooks.flatMap(([methodName, executions]) => executions.map((execute) => runExecution(execute, createContext(target, scope, methodName)))));
+    for (const [methodName, executions] of hooks) {
+        for (const execute of executions) {
+            execute(createContext(target, scope, methodName));
+        }
+    }
 };
 exports.runHooks = runHooks;
+const runHooksAsync = (target, key, { scope, createContext = HookContext_1.createHookContext, }) => {
+    const hooks = Array.from(getHooks(target, key).entries());
+    const runExecution = (execute, context) => (0, utils_1.promisify)(execute(context));
+    return Promise.all(hooks.flatMap(([methodName, executions]) => executions.map((execute) => runExecution(execute, createContext(target, scope, methodName)))));
+};
+exports.runHooksAsync = runHooksAsync;
 const injectProp = (fn) => (context) => context.injectProperty(fn);
 exports.injectProp = injectProp;
 const invokeExecution = ({ handleResult }) => async (context) => {
@@ -32,8 +41,3 @@ const invokeExecution = ({ handleResult }) => async (context) => {
     return handleResult(context.invokeMethod({ args }), context);
 };
 exports.invokeExecution = invokeExecution;
-/**
- * @deprecated Use `runHooks` instead
- * @TODO: Remove in v33
- */
-exports.executeHooks = exports.runHooks;

package/cjm/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getParameterMetadata = exports.getMethodMetadata = exports.setMethodMetadata = exports.setParameterMetadata = exports.getMetadata = exports.setMetadata = exports.byAliases = exports.byAlias = exports.IMemoKey = exports.by = exports.HookContext = exports.invokeExecution = exports.injectProp = exports.runHooks = exports.executeHooks = exports.hasHooks = exports.hook = exports.getHooks = exports.ContainerDisposedError = exports.MethodNotImplementedError = exports.DependencyNotFoundError = exports.Registration = exports.register = exports.scope = exports.key = exports.decorate = exports.multiCache = exports.MultiCache = exports.SingletonProvider = exports.singleton = exports.Provider = exports.ProviderDecorator = exports.args = exports.argsFn = exports.alias = exports.visible = exports.provider = exports.ProxyInjector = exports.SimpleInjector = exports.MetadataInjector = exports.resolveArgs = exports.inject = exports.AutoMockedContainer = exports.EmptyContainer = exports.Container = exports.isDependencyKey = void 0;
+exports.getParameterMetadata = exports.getMethodMetadata = exports.setMethodMetadata = exports.setParameterMetadata = exports.getMetadata = exports.setMetadata = exports.byAliases = exports.byAlias = exports.IMemoKey = exports.by = exports.HookContext = exports.invokeExecution = exports.injectProp = exports.runHooksAsync = exports.runHooks = exports.hasHooks = exports.hook = exports.getHooks = exports.ContainerDisposedError = exports.MethodNotImplementedError = exports.DependencyNotFoundError = exports.Registration = exports.register = exports.scope = exports.key = exports.decorate = exports.multiCache = exports.MultiCache = exports.SingletonProvider = exports.singleton = exports.Provider = exports.ProviderDecorator = exports.args = exports.argsFn = exports.alias = exports.visible = exports.provider = exports.ProxyInjector = exports.SimpleInjector = exports.MetadataInjector = exports.resolveArgs = exports.inject = exports.AutoMockedContainer = exports.EmptyContainer = exports.Container = exports.isDependencyKey = void 0;
 // Containers
 var IContainer_1 = require("./container/IContainer");
 Object.defineProperty(exports, "isDependencyKey", { enumerable: true, get: function () { return IContainer_1.isDependencyKey; } });
@@ -57,8 +57,8 @@ var hook_1 = require("./hooks/hook");
 Object.defineProperty(exports, "getHooks", { enumerable: true, get: function () { return hook_1.getHooks; } });
 Object.defineProperty(exports, "hook", { enumerable: true, get: function () { return hook_1.hook; } });
 Object.defineProperty(exports, "hasHooks", { enumerable: true, get: function () { return hook_1.hasHooks; } });
-Object.defineProperty(exports, "executeHooks", { enumerable: true, get: function () { return hook_1.executeHooks; } });
 Object.defineProperty(exports, "runHooks", { enumerable: true, get: function () { return hook_1.runHooks; } });
+Object.defineProperty(exports, "runHooksAsync", { enumerable: true, get: function () { return hook_1.runHooksAsync; } });
 Object.defineProperty(exports, "injectProp", { enumerable: true, get: function () { return hook_1.injectProp; } });
 Object.defineProperty(exports, "invokeExecution", { enumerable: true, get: function () { return hook_1.invokeExecution; } });
 var HookContext_1 = require("./hooks/HookContext");

package/esm/hooks/hook.js

@@ -13,9 +13,17 @@ export function getHooks(target, key) {
 export function hasHooks(target, key) {
     return Reflect.hasMetadata(key, target.constructor);
 }
-export const runHooks = (target, key, { scope, createContext = createHookContext, handleError, }) => {
+export const runHooks = (target, key, { scope, createContext = createHookContext, }) => {
     const hooks = Array.from(getHooks(target, key).entries());
-    const runExecution = (execute, context) => promisify(execute(context)).catch((e) => handleError(e, scope));
+    for (const [methodName, executions] of hooks) {
+        for (const execute of executions) {
+            execute(createContext(target, scope, methodName));
+        }
+    }
+};
+export const runHooksAsync = (target, key, { scope, createContext = createHookContext, }) => {
+    const hooks = Array.from(getHooks(target, key).entries());
+    const runExecution = (execute, context) => promisify(execute(context));
     return Promise.all(hooks.flatMap(([methodName, executions]) => executions.map((execute) => runExecution(execute, createContext(target, scope, methodName)))));
 };
 export const injectProp = (fn) => (context) => context.injectProperty(fn);
@@ -23,8 +31,3 @@ export const invokeExecution = ({ handleResult }) => async (context) => {
     const args = await Promise.all(context.resolveArgs().map(promisify));
     return handleResult(context.invokeMethod({ args }), context);
 };
-/**
- * @deprecated Use `runHooks` instead
- * @TODO: Remove in v33
- */
-export const executeHooks = runHooks;

package/esm/index.js

@@ -22,7 +22,7 @@ export { DependencyNotFoundError } from './errors/DependencyNotFoundError';
 export { MethodNotImplementedError } from './errors/MethodNotImplementedError';
 export { ContainerDisposedError } from './errors/ContainerDisposedError';
 // Hooks
-export { getHooks, hook, hasHooks, executeHooks, runHooks, injectProp, invokeExecution } from './hooks/hook';
+export { getHooks, hook, hasHooks, runHooks, runHooksAsync, injectProp, invokeExecution } from './hooks/hook';
 export { HookContext } from './hooks/HookContext';
 // Others
 export { by, IMemoKey, byAlias, byAliases } from './by';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ts-ioc-container",
-  "version": "32.11.0",
+  "version": "32.12.0",
   "description": "Typescript IoC container",
   "publishConfig": {
     "access": "public",
@@ -59,5 +59,5 @@
     "ts-node": "^10.9.1",
     "typescript": "5.4.3"
   },
-  "gitHead": "75d723a20c55049f12bbc0cebe816edf4b4b30a1"
+  "gitHead": "0220f5ff8371041dc9c7a4642d3a0b41a1f9a5e6"
 }

package/typings/hooks/hook.d.ts

@@ -5,23 +5,17 @@ type HooksOfClass = Map<string, Hook[]>;
 export declare const hook: (key: string | symbol, ...fns: Hook[]) => (target: object, propertyKey: string | symbol) => void;
 export declare function getHooks(target: object, key: string | symbol): HooksOfClass;
 export declare function hasHooks(target: object, key: string | symbol): boolean;
-export declare const runHooks: (target: object, key: string | symbol, { scope, createContext, handleError, }: {
+export declare const runHooks: (target: object, key: string | symbol, { scope, createContext, }: {
+    scope: IContainer;
+    createContext?: ((Target: object, scope: IContainer, methodName?: string) => IHookContext) | undefined;
+}) => void;
+export declare const runHooksAsync: (target: object, key: string | symbol, { scope, createContext, }: {
     scope: IContainer;
     createContext?: ((Target: object, scope: IContainer, methodName?: string) => IHookContext) | undefined;
-    handleError: (e: Error, s: IContainer) => void;
 }) => Promise<void[]>;
 export declare const injectProp: (fn: InjectFn) => Hook;
 type HandleResult = (result: unknown, context: IHookContext) => void | Promise<void>;
 export declare const invokeExecution: ({ handleResult }: {
     handleResult: HandleResult;
 }) => Hook;
-/**
- * @deprecated Use `runHooks` instead
- * @TODO: Remove in v33
- */
-export declare const executeHooks: (target: object, key: string | symbol, { scope, createContext, handleError, }: {
-    scope: IContainer;
-    createContext?: ((Target: object, scope: IContainer, methodName?: string) => IHookContext) | undefined;
-    handleError: (e: Error, s: IContainer) => void;
-}) => Promise<void[]>;
 export {};

package/typings/index.d.ts

@@ -18,8 +18,8 @@ export { Registration } from './registration/Registration';
 export { DependencyNotFoundError } from './errors/DependencyNotFoundError';
 export { MethodNotImplementedError } from './errors/MethodNotImplementedError';
 export { ContainerDisposedError } from './errors/ContainerDisposedError';
-export { getHooks, hook, hasHooks, Hook, executeHooks, runHooks, injectProp, invokeExecution } from './hooks/hook';
-export { HookContext, InjectFn } from './hooks/HookContext';
+export { getHooks, hook, hasHooks, Hook, runHooks, runHooksAsync, injectProp, invokeExecution } from './hooks/hook';
+export { HookContext, InjectFn, IHookContext } from './hooks/HookContext';
 export { by, InstancePredicate, IMemo, IMemoKey, byAlias, byAliases } from './by';
 export { constructor } from './utils';
 export { setMetadata, getMetadata, setParameterMetadata, setMethodMetadata, getMethodMetadata, getParameterMetadata, } from './metadata';