ts-ioc-container 53.0.0 → 54.0.1

package/cjm/hooks/hook.js

@@ -13,21 +13,40 @@ exports.toHookFn = toHookFn;
 const getReflectionTarget = (target) => {
     return (0, proxy_1.isProxy)(target) ? (0, proxy_1.getProxyTarget)(target) : target;
 };
-// Get hooks metadata
+// Walk the constructor's prototype chain (most-derived first) collecting each class.
+const getConstructorChain = (ctor) => {
+    const chain = [];
+    let current = ctor;
+    while (typeof current === 'function' && current !== Function.prototype) {
+        chain.push(current);
+        current = Object.getPrototypeOf(current);
+    }
+    return chain;
+};
+// Get hooks metadata, merging hooks declared on parent (extended-from) classes.
+// Hooks are collected from base to derived so a derived class's hooks for the same
+// method name take precedence over (replace) the parent's.
 function getHooks(target, key) {
     const reflectionTarget = getReflectionTarget(target);
-    return Reflect.hasMetadata(key, reflectionTarget.constructor)
-        ? Reflect.getMetadata(key, reflectionTarget.constructor)
-        : new Map();
+    const merged = new Map();
+    for (const ctor of getConstructorChain(reflectionTarget.constructor).reverse()) {
+        const ownHooks = Reflect.getOwnMetadata(key, ctor);
+        if (ownHooks) {
+            for (const [methodName, fns] of ownHooks) {
+                merged.set(methodName, fns);
+            }
+        }
+    }
+    return merged;
 }
 function hasHooks(target, key) {
     const reflectionTarget = getReflectionTarget(target);
-    return Reflect.hasMetadata(key, reflectionTarget.constructor);
+    return getConstructorChain(reflectionTarget.constructor).some((ctor) => Reflect.hasOwnMetadata(key, ctor));
 }
 // Hook decorator
 const hook = (key, ...fns) => (target, propertyKey) => {
-    const hooks = Reflect.hasMetadata(key, target.constructor)
-        ? Reflect.getMetadata(key, target.constructor)
+    const hooks = Reflect.hasOwnMetadata(key, target.constructor)
+        ? Reflect.getOwnMetadata(key, target.constructor)
         : new Map();
     hooks.set(propertyKey, (hooks.get(propertyKey) ?? []).concat(fns));
     Reflect.defineMetadata(key, hooks, target.constructor);

package/cjm/utils/once.js

@@ -1,11 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.once = void 0;
-const once = (target, propertyKey, descriptor) => {
+const once = ({ onRepeat } = {}) => (target, propertyKey, descriptor) => {
     const originalMethod = descriptor.value;
     const cacheMap = new WeakMap();
+    let index = 0;
     descriptor.value = function (...args) {
+        index++;
         if (cacheMap.has(this)) {
+            onRepeat?.({ index: index - 1, args });
             return cacheMap.get(this);
         }
         const result = originalMethod.apply(this, args);

package/esm/hooks/hook.js

@@ -7,21 +7,40 @@ export const toHookFn = (execute) => isHookClassConstructor(execute) ? (context)
 const getReflectionTarget = (target) => {
     return isProxy(target) ? getProxyTarget(target) : target;
 };
-// Get hooks metadata
+// Walk the constructor's prototype chain (most-derived first) collecting each class.
+const getConstructorChain = (ctor) => {
+    const chain = [];
+    let current = ctor;
+    while (typeof current === 'function' && current !== Function.prototype) {
+        chain.push(current);
+        current = Object.getPrototypeOf(current);
+    }
+    return chain;
+};
+// Get hooks metadata, merging hooks declared on parent (extended-from) classes.
+// Hooks are collected from base to derived so a derived class's hooks for the same
+// method name take precedence over (replace) the parent's.
 export function getHooks(target, key) {
     const reflectionTarget = getReflectionTarget(target);
-    return Reflect.hasMetadata(key, reflectionTarget.constructor)
-        ? Reflect.getMetadata(key, reflectionTarget.constructor)
-        : new Map();
+    const merged = new Map();
+    for (const ctor of getConstructorChain(reflectionTarget.constructor).reverse()) {
+        const ownHooks = Reflect.getOwnMetadata(key, ctor);
+        if (ownHooks) {
+            for (const [methodName, fns] of ownHooks) {
+                merged.set(methodName, fns);
+            }
+        }
+    }
+    return merged;
 }
 export function hasHooks(target, key) {
     const reflectionTarget = getReflectionTarget(target);
-    return Reflect.hasMetadata(key, reflectionTarget.constructor);
+    return getConstructorChain(reflectionTarget.constructor).some((ctor) => Reflect.hasOwnMetadata(key, ctor));
 }
 // Hook decorator
 export const hook = (key, ...fns) => (target, propertyKey) => {
-    const hooks = Reflect.hasMetadata(key, target.constructor)
-        ? Reflect.getMetadata(key, target.constructor)
+    const hooks = Reflect.hasOwnMetadata(key, target.constructor)
+        ? Reflect.getOwnMetadata(key, target.constructor)
         : new Map();
     hooks.set(propertyKey, (hooks.get(propertyKey) ?? []).concat(fns));
     Reflect.defineMetadata(key, hooks, target.constructor);

package/esm/utils/once.js

@@ -1,8 +1,11 @@
-export const once = (target, propertyKey, descriptor) => {
+export const once = ({ onRepeat } = {}) => (target, propertyKey, descriptor) => {
     const originalMethod = descriptor.value;
     const cacheMap = new WeakMap();
+    let index = 0;
     descriptor.value = function (...args) {
+        index++;
         if (cacheMap.has(this)) {
+            onRepeat?.({ index: index - 1, args });
             return cacheMap.get(this);
         }
         const result = originalMethod.apply(this, args);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ts-ioc-container",
-  "version": "53.0.0",
+  "version": "54.0.1",
   "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.",
   "workspaces": [
     "docs"

package/typings/utils/once.d.ts

@@ -1 +1,8 @@
-export declare const once: MethodDecorator;
+type RepeatOptions = {
+    index: number;
+    args: unknown[];
+};
+export declare const once: ({ onRepeat }?: {
+    onRepeat?: (options: RepeatOptions) => void;
+}) => MethodDecorator;
+export {};