ts-ioc-container 54.0.0 → 54.1.0

package/cjm/container/Container.js

@@ -6,6 +6,7 @@ const ContainerDisposedError_1 = require("../errors/ContainerDisposedError");
 const MetadataInjector_1 = require("../injector/MetadataInjector");
 const AliasMap_1 = require("./AliasMap");
 const DependencyNotFoundError_1 = require("../errors/DependencyNotFoundError");
+const ContainerNotFoundError_1 = require("../errors/ContainerNotFoundError");
 const basic_1 = require("../utils/basic");
 const array_1 = require("../utils/array");
 class Container {
@@ -131,6 +132,21 @@ class Container {
     getScopes() {
         return [...this.scopes];
     }
+    hasInstance(instance) {
+        return this.instances.includes(instance);
+    }
+    getScopeByInstanceOrFail(instance) {
+        this.validateContainer();
+        const queue = [this];
+        while (queue.length > 0) {
+            const scope = queue.shift();
+            if (scope.hasInstance(instance)) {
+                return scope;
+            }
+            queue.push(...scope.getScopes());
+        }
+        throw new ContainerNotFoundError_1.ContainerNotFoundError('Cannot find scope for the given instance');
+    }
     removeScope(child) {
         this.scopes = this.scopes.filter((s) => s !== child);
     }

package/cjm/container/EmptyContainer.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.EmptyContainer = void 0;
 const MethodNotImplementedError_1 = require("../errors/MethodNotImplementedError");
 const DependencyNotFoundError_1 = require("../errors/DependencyNotFoundError");
+const ContainerNotFoundError_1 = require("../errors/ContainerNotFoundError");
 class EmptyContainer {
     get isDisposed() {
         throw new MethodNotImplementedError_1.MethodNotImplementedError();
@@ -14,9 +15,15 @@ class EmptyContainer {
     getScopes() {
         return [];
     }
+    getScopeByInstanceOrFail(instance) {
+        throw new ContainerNotFoundError_1.ContainerNotFoundError('Cannot find scope for the given instance');
+    }
     getInstances() {
         return [];
     }
+    hasInstance(instance) {
+        return false;
+    }
     createScope() {
         throw new MethodNotImplementedError_1.MethodNotImplementedError();
     }

package/cjm/errors/ContainerNotFoundError.js

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ContainerNotFoundError = void 0;
+const ContainerError_1 = require("./ContainerError");
+class ContainerNotFoundError extends ContainerError_1.ContainerError {
+    name = 'ContainerNotFoundError';
+    constructor(message) {
+        super(message);
+        Object.setPrototypeOf(this, ContainerNotFoundError.prototype);
+    }
+}
+exports.ContainerNotFoundError = ContainerNotFoundError;

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/index.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SingleToken = exports.ClassToken = exports.toSingleAlias = exports.SingleAliasToken = exports.toGroupAlias = exports.GroupAliasToken = exports.InjectionToken = exports.HooksRunner = exports.AddOnDisposeHookModule = exports.onDispose = exports.onDisposeHooksRunner = 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.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.methodTag = exports.getMethodLabels = exports.methodLabel = exports.getMethodMeta = exports.methodMeta = exports.getParamTags = exports.paramTag = exports.getParamLabels = exports.paramLabel = exports.getParamMeta = exports.paramMeta = exports.getClassTags = exports.classTag = exports.getClassLabels = exports.classLabel = exports.getClassMeta = exports.classMeta = exports.GroupInstanceToken = exports.ConstantToken = exports.FunctionToken = void 0;
+exports.ClassToken = exports.toSingleAlias = exports.SingleAliasToken = exports.toGroupAlias = exports.GroupAliasToken = exports.InjectionToken = exports.HooksRunner = exports.AddOnDisposeHookModule = exports.onDispose = exports.onDisposeHooksRunner = 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.methodTag = exports.getMethodLabels = exports.methodLabel = exports.getMethodMeta = exports.methodMeta = exports.getParamTags = exports.paramTag = exports.getParamLabels = exports.paramLabel = exports.getParamMeta = exports.paramMeta = exports.getClassTags = exports.classTag = exports.getClassLabels = exports.classLabel = exports.getClassMeta = exports.classMeta = exports.GroupInstanceToken = exports.ConstantToken = exports.FunctionToken = exports.SingleToken = void 0;
 // Containers
 var IContainer_1 = require("./container/IContainer");
 Object.defineProperty(exports, "isDependencyKey", { enumerable: true, get: function () { return IContainer_1.isDependencyKey; } });
@@ -40,6 +40,8 @@ Object.defineProperty(exports, "Registration", { enumerable: true, get: function
 // Errors
 var DependencyNotFoundError_1 = require("./errors/DependencyNotFoundError");
 Object.defineProperty(exports, "DependencyNotFoundError", { enumerable: true, get: function () { return DependencyNotFoundError_1.DependencyNotFoundError; } });
+var ContainerNotFoundError_1 = require("./errors/ContainerNotFoundError");
+Object.defineProperty(exports, "ContainerNotFoundError", { enumerable: true, get: function () { return ContainerNotFoundError_1.ContainerNotFoundError; } });
 var DependencyMissingKeyError_1 = require("./errors/DependencyMissingKeyError");
 Object.defineProperty(exports, "DependencyMissingKeyError", { enumerable: true, get: function () { return DependencyMissingKeyError_1.DependencyMissingKeyError; } });
 var MethodNotImplementedError_1 = require("./errors/MethodNotImplementedError");

package/esm/container/Container.js

@@ -3,6 +3,7 @@ import { ContainerDisposedError } from '../errors/ContainerDisposedError';
 import { MetadataInjector } from '../injector/MetadataInjector';
 import { AliasMap } from './AliasMap';
 import { DependencyNotFoundError } from '../errors/DependencyNotFoundError';
+import { ContainerNotFoundError } from '../errors/ContainerNotFoundError';
 import { Is } from '../utils/basic';
 import { Filter as F } from '../utils/array';
 export class Container {
@@ -128,6 +129,21 @@ export class Container {
     getScopes() {
         return [...this.scopes];
     }
+    hasInstance(instance) {
+        return this.instances.includes(instance);
+    }
+    getScopeByInstanceOrFail(instance) {
+        this.validateContainer();
+        const queue = [this];
+        while (queue.length > 0) {
+            const scope = queue.shift();
+            if (scope.hasInstance(instance)) {
+                return scope;
+            }
+            queue.push(...scope.getScopes());
+        }
+        throw new ContainerNotFoundError('Cannot find scope for the given instance');
+    }
     removeScope(child) {
         this.scopes = this.scopes.filter((s) => s !== child);
     }

package/esm/container/EmptyContainer.js

@@ -1,5 +1,6 @@
 import { MethodNotImplementedError } from '../errors/MethodNotImplementedError';
 import { DependencyNotFoundError } from '../errors/DependencyNotFoundError';
+import { ContainerNotFoundError } from '../errors/ContainerNotFoundError';
 export class EmptyContainer {
     get isDisposed() {
         throw new MethodNotImplementedError();
@@ -11,9 +12,15 @@ export class EmptyContainer {
     getScopes() {
         return [];
     }
+    getScopeByInstanceOrFail(instance) {
+        throw new ContainerNotFoundError('Cannot find scope for the given instance');
+    }
     getInstances() {
         return [];
     }
+    hasInstance(instance) {
+        return false;
+    }
     createScope() {
         throw new MethodNotImplementedError();
     }

package/esm/errors/ContainerNotFoundError.js

@@ -0,0 +1,8 @@
+import { ContainerError } from './ContainerError';
+export class ContainerNotFoundError extends ContainerError {
+    name = 'ContainerNotFoundError';
+    constructor(message) {
+        super(message);
+        Object.setPrototypeOf(this, ContainerNotFoundError.prototype);
+    }
+}

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/index.js

@@ -13,6 +13,7 @@ export { register, bindTo, scope, scopeAccess, lazy, singleton, decorate, append
 export { Registration } from './registration/Registration';
 // Errors
 export { DependencyNotFoundError } from './errors/DependencyNotFoundError';
+export { ContainerNotFoundError } from './errors/ContainerNotFoundError';
 export { DependencyMissingKeyError } from './errors/DependencyMissingKeyError';
 export { MethodNotImplementedError } from './errors/MethodNotImplementedError';
 export { ContainerDisposedError } from './errors/ContainerDisposedError';

package/package.json

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

package/typings/container/Container.d.ts

@@ -35,6 +35,8 @@ export declare class Container implements IContainer {
     addOnDisposeHook(...hooks: OnDisposeHook[]): this;
     addInstance(instance: Instance): void;
     getScopes(): IContainer[];
+    hasInstance(instance: object): boolean;
+    getScopeByInstanceOrFail(instance: object): IContainer;
     removeScope(child: IContainer): void;
     useModule(module: IContainerModule): this;
     getParent(): IContainer;

package/typings/container/EmptyContainer.d.ts

@@ -9,7 +9,9 @@ export declare class EmptyContainer implements IContainer {
     addInstance(instance: Instance): void;
     getParent(): undefined;
     getScopes(): never[];
+    getScopeByInstanceOrFail(instance: object): IContainer;
     getInstances(): never[];
+    hasInstance(instance: object): boolean;
     createScope(): IContainer;
     dispose(): void;
     register(key: DependencyKey, value: IProvider): this;

package/typings/container/IContainer.d.ts

@@ -44,10 +44,12 @@ export interface IContainer extends Tagged {
     resolveOneByAlias<T>(alias: DependencyKey, options?: ResolveOneOptions): T;
     createScope(options?: CreateScopeOptions): IContainer;
     getScopes(): IContainer[];
+    getScopeByInstanceOrFail(instance: object): IContainer;
     removeScope(child: IContainer): void;
     useModule(module: IContainerModule): this;
     getParent(): IContainer | undefined;
     getInstances(cascade?: boolean): Instance[];
+    hasInstance(instance: object): boolean;
     dispose(): void;
     addInstance(instance: Instance): void;
 }

package/typings/errors/ContainerNotFoundError.d.ts

@@ -0,0 +1,5 @@
+import { ContainerError } from './ContainerError';
+export declare class ContainerNotFoundError extends ContainerError {
+    name: string;
+    constructor(message: string);
+}

package/typings/index.d.ts

@@ -10,6 +10,7 @@ export { Provider } from './provider/Provider';
 export { type IRegistration, type ReturnTypeOfRegistration, type ScopeMatchRule, type ProviderPipe, register, bindTo, scope, scopeAccess, lazy, singleton, decorate, appendArgs, appendArgsFn, } from './registration/IRegistration';
 export { Registration } from './registration/Registration';
 export { DependencyNotFoundError } from './errors/DependencyNotFoundError';
+export { ContainerNotFoundError } from './errors/ContainerNotFoundError';
 export { DependencyMissingKeyError } from './errors/DependencyMissingKeyError';
 export { MethodNotImplementedError } from './errors/MethodNotImplementedError';
 export { ContainerDisposedError } from './errors/ContainerDisposedError';