ts-ioc-container 55.9.0 → 56.0.0

package/README.md

@@ -2482,6 +2482,30 @@ describe('Container Modules', function () {
 
 Sometimes you need to invoke methods after construct or dispose of class. This is what hooks are for.
 
+The generic `@hook` decorator takes a hook key and a map function
+`(...prev: HookType[]) => HookType[]`, where `prev` is the list of hooks already
+registered on the class for the decorated member. Use `appendHooks` /
+`prependHooks` (exported as `append` / `prepend` too) to place new hooks around
+the existing ones:
+
+```typescript
+class OrderService {
+  @hook('actions', append(validate, persist))
+  @hook('actions', prepend(authorize))
+  submit() {}
+}
+```
+
+Decorators are applied bottom-up, so `authorize` runs first, then `validate` and
+`persist`. Any other map function works as well — for example
+`(...prev) => [...prev].reverse()` to reorder, or `() => [onlyThisOne]` to
+replace the accumulated hooks.
+
+`@onConstruct`, `@onConstructAsync` and `@onContainerDisposed` keep their
+variadic signature and compensate for the bottom-up application order, so
+stacked decorators run in declaration order: `@onConstruct(h1) @onConstruct(h2)`
+runs `h1` before `h2`.
+
 ### OnConstruct
 
 ```typescript
@@ -2741,7 +2765,7 @@ describe('onContainerDisposed', function () {
 
 ```typescript
 import 'reflect-metadata';
-import { Container, hook, HooksRunner, injectProp, Registration } from 'ts-ioc-container';
+import { append, Container, hook, HooksRunner, injectProp, Registration } from 'ts-ioc-container';
 
 /**
  * UI Components - Property Injection
@@ -2761,7 +2785,7 @@ describe('inject property', () => {
 
     class UserViewModel {
       // Inject 'GreetingService' into 'greeting' property during 'onInit'
-      @hook('onInit', injectProp('GreetingService'))
+      @hook('onInit', append(injectProp('GreetingService')))
       greetingService!: string;
 
       display(): string {
@@ -2787,9 +2811,12 @@ describe('inject property', () => {
     let injectedValue: unknown;
 
     class UserViewModel {
-      @hook('onInit', injectProp('GreetingService'), (context) => {
-        injectedValue = context.getProperty();
-      })
+      @hook(
+        'onInit',
+        append(injectProp('GreetingService'), (context) => {
+          injectedValue = context.getProperty();
+        }),
+      )
       greetingService!: string;
     }
 

package/cjm/hooks/hook.js

@@ -1,10 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.hook = exports.toHookFn = void 0;
+exports.hook = exports.toHookFn = exports.prepend = exports.append = exports.prependHooks = exports.appendHooks = void 0;
 exports.getHooks = getHooks;
 exports.hasHooks = hasHooks;
 const basic_1 = require("../utils/basic");
 const proxy_1 = require("../utils/proxy");
+const appendHooks = (...fns) => (...prev) => [...prev, ...fns];
+exports.appendHooks = appendHooks;
+const prependHooks = (...fns) => (...prev) => [...fns, ...prev];
+exports.prependHooks = prependHooks;
+exports.append = exports.appendHooks;
+exports.prepend = exports.prependHooks;
 const isHookClassConstructor = (execute) => {
     return basic_1.Is.constructor(execute) && execute.prototype.execute;
 };
@@ -39,11 +45,11 @@ function hasHooks(target, key) {
     const reflectionTarget = getReflectionTarget(target);
     return getConstructorChain(reflectionTarget.constructor).some((ctor) => Reflect.hasOwnMetadata(key, ctor));
 }
-const hook = (key, ...fns) => (target, propertyKey) => {
+const hook = (key, mapFn) => (target, propertyKey) => {
     const hooks = Reflect.hasOwnMetadata(key, target.constructor)
         ? Reflect.getOwnMetadata(key, target.constructor)
         : new Map();
-    hooks.set(propertyKey, (hooks.get(propertyKey) ?? []).concat(fns));
+    hooks.set(propertyKey, mapFn(...(hooks.get(propertyKey) ?? [])));
     Reflect.defineMetadata(key, hooks, target.constructor);
 };
 exports.hook = hook;

package/cjm/hooks/onConstruct.js

@@ -4,7 +4,7 @@ exports.AddOnConstructHookModule = exports.onConstruct = exports.onConstructHook
 const hook_1 = require("./hook");
 const HooksRunner_1 = require("./HooksRunner");
 exports.onConstructHooksRunner = new HooksRunner_1.HooksRunner('onConstruct');
-const onConstruct = (...fns) => (0, hook_1.hook)('onConstruct', ...fns);
+const onConstruct = (...fns) => (0, hook_1.hook)('onConstruct', (0, hook_1.prependHooks)(...fns));
 exports.onConstruct = onConstruct;
 class AddOnConstructHookModule {
     onException;

package/cjm/hooks/onConstructAsync.js

@@ -4,7 +4,7 @@ exports.AddOnConstructAsyncHookModule = exports.onConstructAsync = exports.onCon
 const hook_1 = require("./hook");
 const HooksRunner_1 = require("./HooksRunner");
 exports.onConstructAsyncHooksRunner = new HooksRunner_1.HooksRunner('onConstructAsync');
-const onConstructAsync = (...fns) => (0, hook_1.hook)('onConstructAsync', ...fns);
+const onConstructAsync = (...fns) => (0, hook_1.hook)('onConstructAsync', (0, hook_1.prependHooks)(...fns));
 exports.onConstructAsync = onConstructAsync;
 class AddOnConstructAsyncHookModule {
     onException;

package/cjm/hooks/onContainerDisposed.js

@@ -4,7 +4,7 @@ exports.AddOnDisposeHookModule = exports.onContainerDisposed = exports.onContain
 const hook_1 = require("./hook");
 const HooksRunner_1 = require("./HooksRunner");
 exports.onContainerDisposedHooksRunner = new HooksRunner_1.HooksRunner('onContainerDisposed');
-const onContainerDisposed = (...fns) => (0, hook_1.hook)('onContainerDisposed', ...fns);
+const onContainerDisposed = (...fns) => (0, hook_1.hook)('onContainerDisposed', (0, hook_1.prependHooks)(...fns));
 exports.onContainerDisposed = onContainerDisposed;
 class AddOnDisposeHookModule {
     applyTo(container) {

package/cjm/index.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.toGroupAlias = exports.GroupAliasToken = exports.InjectionToken = exports.HooksRunner = exports.AddOnDisposeHookModule = exports.onContainerDisposed = exports.onContainerDisposedHooksRunner = exports.AddOnConstructAsyncHookModule = exports.onConstructAsync = exports.onConstructAsyncHooksRunner = exports.AddOnConstructHookModule = exports.onConstruct = exports.onConstructHooksRunner = exports.injectProp = exports.createHookContext = exports.createHookContextFactory = exports.HookContext = exports.hasHooks = exports.hook = exports.getHooks = exports.CannonSingletonApplyTwiceError = exports.UnexpectedHookResultError = exports.ProviderDisposedError = exports.ContainerDisposedError = exports.MethodNotImplementedError = exports.DependencyMissingKeyError = exports.ContainerNotFoundError = exports.DependencyNotFoundError = exports.Registration = exports.appendArgsFn = exports.appendArgs = exports.decorate = exports.singleton = exports.lazy = exports.scopeAccess = exports.scope = exports.bindTo = exports.register = exports.Provider = exports.ProxyInjector = exports.SimpleInjector = exports.resolveArgs = exports.argsFn = exports.args = exports.inject = exports.MetadataInjector = exports.Injector = exports.EmptyContainer = exports.Container = exports.isDependencyKey = void 0;
-exports.resolveConstructor = exports.Is = exports.pipe = exports.select = exports.once = exports.shallowCache = exports.debounce = exports.throttle = exports.handleAsyncError = exports.handleError = exports.getMethodTags = exports.addMethodTag = exports.getMethodLabels = exports.addMethodLabel = exports.getMethodMeta = exports.addMethodMeta = exports.getParamTags = exports.addParamTag = exports.getParamLabels = exports.addParamLabel = exports.getParamMeta = exports.addParamMeta = exports.getClassTags = exports.addClassTag = exports.getClassLabels = exports.addClassLabel = exports.getClassMeta = exports.addClassMeta = exports.GroupInstanceToken = exports.ConstantToken = exports.FunctionToken = exports.SingleToken = exports.ClassToken = exports.toSingleAlias = exports.SingleAliasToken = void 0;
+exports.AddOnDisposeHookModule = exports.onContainerDisposed = exports.onContainerDisposedHooksRunner = exports.AddOnConstructAsyncHookModule = exports.onConstructAsync = exports.onConstructAsyncHooksRunner = exports.AddOnConstructHookModule = exports.onConstruct = exports.onConstructHooksRunner = exports.injectProp = exports.createHookContext = exports.createHookContextFactory = exports.HookContext = exports.prepend = exports.append = exports.prependHooks = exports.appendHooks = exports.hasHooks = exports.hook = exports.getHooks = exports.CannonSingletonApplyTwiceError = exports.UnexpectedHookResultError = exports.ProviderDisposedError = exports.ContainerDisposedError = exports.MethodNotImplementedError = exports.DependencyMissingKeyError = exports.ContainerNotFoundError = exports.DependencyNotFoundError = exports.Registration = exports.appendArgsFn = exports.appendArgs = exports.decorate = exports.singleton = exports.lazy = exports.scopeAccess = exports.scope = exports.bindTo = exports.register = exports.Provider = exports.ProxyInjector = exports.SimpleInjector = exports.resolveArgs = exports.argsFn = exports.args = exports.inject = exports.MetadataInjector = exports.Injector = exports.EmptyContainer = exports.Container = exports.isDependencyKey = void 0;
+exports.resolveConstructor = exports.Is = exports.pipe = exports.select = exports.once = exports.shallowCache = exports.debounce = exports.throttle = exports.handleAsyncError = exports.handleError = exports.getMethodTags = exports.addMethodTag = exports.getMethodLabels = exports.addMethodLabel = exports.getMethodMeta = exports.addMethodMeta = exports.getParamTags = exports.addParamTag = exports.getParamLabels = exports.addParamLabel = exports.getParamMeta = exports.addParamMeta = exports.getClassTags = exports.addClassTag = exports.getClassLabels = exports.addClassLabel = exports.getClassMeta = exports.addClassMeta = exports.GroupInstanceToken = exports.ConstantToken = exports.FunctionToken = exports.SingleToken = exports.ClassToken = exports.toSingleAlias = exports.SingleAliasToken = exports.toGroupAlias = exports.GroupAliasToken = exports.InjectionToken = exports.HooksRunner = void 0;
 var IContainer_1 = require("./container/IContainer");
 Object.defineProperty(exports, "isDependencyKey", { enumerable: true, get: function () { return IContainer_1.isDependencyKey; } });
 var Container_1 = require("./container/Container");
@@ -54,6 +54,10 @@ 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, "appendHooks", { enumerable: true, get: function () { return hook_1.appendHooks; } });
+Object.defineProperty(exports, "prependHooks", { enumerable: true, get: function () { return hook_1.prependHooks; } });
+Object.defineProperty(exports, "append", { enumerable: true, get: function () { return hook_1.append; } });
+Object.defineProperty(exports, "prepend", { enumerable: true, get: function () { return hook_1.prepend; } });
 var HookContext_1 = require("./hooks/HookContext");
 Object.defineProperty(exports, "HookContext", { enumerable: true, get: function () { return HookContext_1.HookContext; } });
 Object.defineProperty(exports, "createHookContextFactory", { enumerable: true, get: function () { return HookContext_1.createHookContextFactory; } });

package/esm/hooks/hook.js

@@ -1,5 +1,9 @@
 import { Is } from '../utils/basic.js';
 import { getProxyTarget, isProxy } from '../utils/proxy.js';
+export const appendHooks = (...fns) => (...prev) => [...prev, ...fns];
+export const prependHooks = (...fns) => (...prev) => [...fns, ...prev];
+export const append = appendHooks;
+export const prepend = prependHooks;
 const isHookClassConstructor = (execute) => {
     return Is.constructor(execute) && execute.prototype.execute;
 };
@@ -33,10 +37,10 @@ export function hasHooks(target, key) {
     const reflectionTarget = getReflectionTarget(target);
     return getConstructorChain(reflectionTarget.constructor).some((ctor) => Reflect.hasOwnMetadata(key, ctor));
 }
-export const hook = (key, ...fns) => (target, propertyKey) => {
+export const hook = (key, mapFn) => (target, propertyKey) => {
     const hooks = Reflect.hasOwnMetadata(key, target.constructor)
         ? Reflect.getOwnMetadata(key, target.constructor)
         : new Map();
-    hooks.set(propertyKey, (hooks.get(propertyKey) ?? []).concat(fns));
+    hooks.set(propertyKey, mapFn(...(hooks.get(propertyKey) ?? [])));
     Reflect.defineMetadata(key, hooks, target.constructor);
 };

package/esm/hooks/onConstruct.js

@@ -1,7 +1,7 @@
-import { hook } from './hook.js';
+import { hook, prependHooks } from './hook.js';
 import { HooksRunner } from './HooksRunner.js';
 export const onConstructHooksRunner = new HooksRunner('onConstruct');
-export const onConstruct = (...fns) => hook('onConstruct', ...fns);
+export const onConstruct = (...fns) => hook('onConstruct', prependHooks(...fns));
 export class AddOnConstructHookModule {
     onException;
     constructor(onException) {

package/esm/hooks/onConstructAsync.js

@@ -1,7 +1,7 @@
-import { hook } from './hook.js';
+import { hook, prependHooks } from './hook.js';
 import { HooksRunner } from './HooksRunner.js';
 export const onConstructAsyncHooksRunner = new HooksRunner('onConstructAsync');
-export const onConstructAsync = (...fns) => hook('onConstructAsync', ...fns);
+export const onConstructAsync = (...fns) => hook('onConstructAsync', prependHooks(...fns));
 export class AddOnConstructAsyncHookModule {
     onException;
     constructor(onException) {

package/esm/hooks/onContainerDisposed.js

@@ -1,7 +1,7 @@
-import { hook } from './hook.js';
+import { hook, prependHooks } from './hook.js';
 import { HooksRunner } from './HooksRunner.js';
 export const onContainerDisposedHooksRunner = new HooksRunner('onContainerDisposed');
-export const onContainerDisposed = (...fns) => hook('onContainerDisposed', ...fns);
+export const onContainerDisposed = (...fns) => hook('onContainerDisposed', prependHooks(...fns));
 export class AddOnDisposeHookModule {
     applyTo(container) {
         container.addOnDisposeHook((scope) => {

package/esm/index.js

@@ -16,7 +16,7 @@ export { ContainerDisposedError } from './errors/ContainerDisposedError.js';
 export { ProviderDisposedError } from './errors/ProviderDisposedError.js';
 export { UnexpectedHookResultError } from './errors/UnexpectedHookResultError.js';
 export { CannonSingletonApplyTwiceError } from './errors/CannonSingletonApplyTwiceError.js';
-export { getHooks, hook, hasHooks } from './hooks/hook.js';
+export { getHooks, hook, hasHooks, appendHooks, prependHooks, append, prepend, } from './hooks/hook.js';
 export { HookContext, createHookContextFactory, createHookContext } from './hooks/HookContext.js';
 export { injectProp } from './hooks/injectProp.js';
 export { onConstructHooksRunner, onConstruct, AddOnConstructHookModule, } from './hooks/onConstruct.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ts-ioc-container",
-  "version": "55.9.0",
+  "version": "56.0.0",
   "description": "Fast, lightweight TypeScript dependency injection container with a clean API, scoped lifecycles, decorators, tokens, hooks, lazy injection, customizable providers, and no global container objects.",
   "publishConfig": {
     "access": "public",
@@ -104,7 +104,7 @@
     "@swc/core": "^1.15.24",
     "@types/node": "^25.5.2",
     "@typescript-eslint/eslint-plugin": "8.32.1",
-    "@typescript-eslint/parser": "8.58.2",
+    "@typescript-eslint/parser": "8.59.1",
     "@vitest/coverage-v8": "^4.1.2",
     "cz-conventional-changelog": "^3.3.0",
     "eslint": "9.24.0",

package/typings/hooks/hook.d.ts

@@ -7,8 +7,14 @@ export type HookFn<T extends IHookContext = IHookContext> = (context: T) => void
 export interface HookClass<T extends IHookContext = IHookContext> {
     execute(context: Omit<T, 'scope'>): void | Promise<void>;
 }
-export type HooksOfClass = Map<string, (HookFn | constructor<HookClass>)[]>;
+export type HookType<T extends IHookContext = IHookContext> = HookFn<T> | constructor<HookClass<T>>;
+export type MapHooksFn = (...prev: HookType[]) => HookType[];
+export type HooksOfClass = Map<string, HookType[]>;
+export declare const appendHooks: (...fns: HookType[]) => MapHooksFn;
+export declare const prependHooks: (...fns: HookType[]) => MapHooksFn;
+export declare const append: (...fns: HookType[]) => MapHooksFn;
+export declare const prepend: (...fns: HookType[]) => MapHooksFn;
 export declare const toHookFn: <C extends IHookContext>(execute: HookFn<C> | constructor<HookClass<C>>) => HookFn<C>;
 export declare function getHooks(target: object, key: string | symbol): HooksOfClass;
 export declare function hasHooks(target: object, key: string | symbol): boolean;
-export declare const hook: (key: string | symbol, ...fns: (HookFn | constructor<HookClass>)[]) => (target: object, propertyKey: string | symbol) => void;
+export declare const hook: (key: string | symbol, mapFn: MapHooksFn) => (target: object, propertyKey: string | symbol) => void;

package/typings/hooks/onConstruct.d.ts

@@ -1,10 +1,10 @@
-import { HookClass, HookFn } from './hook.js';
+import { HookType } from './hook.js';
 import type { IContainer, IContainerModule } from '../container/IContainer.js';
-import { constructor, Instance } from '../utils/basic.js';
+import { Instance } from '../utils/basic.js';
 import { HooksRunner } from './HooksRunner.js';
 import type { ExecutionContext } from '../ExecutionContext.js';
 export declare const onConstructHooksRunner: HooksRunner;
-export declare const onConstruct: (...fns: (HookFn | constructor<HookClass>)[]) => (target: object, propertyKey: string | symbol) => void;
+export declare const onConstruct: (...fns: HookType[]) => (target: object, propertyKey: string | symbol) => void;
 export type OnConstructHook = (instance: Instance, scope: IContainer) => void;
 export type OnExceptionHandler = (ex: unknown, context: ExecutionContext) => void;
 export declare class AddOnConstructHookModule implements IContainerModule {

package/typings/hooks/onConstructAsync.d.ts

@@ -1,10 +1,9 @@
-import { HookClass, HookFn } from './hook.js';
+import { HookType } from './hook.js';
 import type { IContainer, IContainerModule } from '../container/IContainer.js';
-import { constructor } from '../utils/basic.js';
 import { HooksRunner } from './HooksRunner.js';
 import type { OnExceptionHandler } from './onConstruct.js';
 export declare const onConstructAsyncHooksRunner: HooksRunner;
-export declare const onConstructAsync: (...fns: (HookFn | constructor<HookClass>)[]) => (target: object, propertyKey: string | symbol) => void;
+export declare const onConstructAsync: (...fns: HookType[]) => (target: object, propertyKey: string | symbol) => void;
 export declare class AddOnConstructAsyncHookModule implements IContainerModule {
     private readonly onException?;
     constructor(onException?: OnExceptionHandler | undefined);

package/typings/hooks/onContainerDisposed.d.ts

@@ -1,9 +1,8 @@
-import { HookClass, HookFn } from './hook.js';
+import { HookType } from './hook.js';
 import type { IContainer, IContainerModule } from '../container/IContainer.js';
 import { HooksRunner } from './HooksRunner.js';
-import { type constructor } from '../utils/basic.js';
 export declare const onContainerDisposedHooksRunner: HooksRunner;
-export declare const onContainerDisposed: (...fns: (HookFn | constructor<HookClass>)[]) => (target: object, propertyKey: string | symbol) => void;
+export declare const onContainerDisposed: (...fns: HookType[]) => (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

@@ -17,7 +17,7 @@ export { ContainerDisposedError } from './errors/ContainerDisposedError.js';
 export { ProviderDisposedError } from './errors/ProviderDisposedError.js';
 export { UnexpectedHookResultError } from './errors/UnexpectedHookResultError.js';
 export { CannonSingletonApplyTwiceError } from './errors/CannonSingletonApplyTwiceError.js';
-export { getHooks, hook, hasHooks, type HookFn, type HookClass, type InjectFn, type HooksOfClass } from './hooks/hook.js';
+export { getHooks, hook, hasHooks, appendHooks, prependHooks, append, prepend, type HookFn, type HookClass, type HookType, type MapHooksFn, type InjectFn, type HooksOfClass, } from './hooks/hook.js';
 export { HookContext, createHookContextFactory, createHookContext, type IHookContext } from './hooks/HookContext.js';
 export { injectProp } from './hooks/injectProp.js';
 export { onConstructHooksRunner, onConstruct, AddOnConstructHookModule, type OnExceptionHandler, } from './hooks/onConstruct.js';