ts-ioc-container 55.3.0 → 55.4.1

package/cjm/container/Container.js

@@ -6,7 +6,6 @@ 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 {
@@ -137,15 +136,10 @@ class Container {
     }
     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());
+        if (this.hasInstance(instance)) {
+            return this;
         }
-        throw new ContainerNotFoundError_1.ContainerNotFoundError('Cannot find scope for the given instance');
+        return this.parent.getScopeByInstanceOrFail(instance);
     }
     removeScope(child) {
         this.scopes = this.scopes.filter((s) => s !== child);

package/cjm/hooks/HooksRunner.js

@@ -10,6 +10,9 @@ class HooksRunner {
     constructor(key) {
         this.key = key;
     }
+    hasHooks(target) {
+        return (0, hook_1.hasHooks)(target, this.key);
+    }
     execute(target, { scope, createContext = HookContext_1.createHookContext, mapContext = (context) => context, predicate = () => true, }) {
         const hooks = Array.from((0, hook_1.getHooks)(target, this.key).entries()).filter(([methodName]) => predicate(methodName));
         const runMethodHooks = (methodName, executions) => {

package/esm/container/Container.js

@@ -3,7 +3,6 @@ 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 {
@@ -134,15 +133,10 @@ export class Container {
     }
     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());
+        if (this.hasInstance(instance)) {
+            return this;
         }
-        throw new ContainerNotFoundError('Cannot find scope for the given instance');
+        return this.parent.getScopeByInstanceOrFail(instance);
     }
     removeScope(child) {
         this.scopes = this.scopes.filter((s) => s !== child);

package/esm/hooks/HooksRunner.js

@@ -1,5 +1,5 @@
 import { createHookContext } from './HookContext';
-import { getHooks, toHookFn } from './hook';
+import { getHooks, hasHooks, toHookFn } from './hook';
 import { UnexpectedHookResultError } from '../errors/UnexpectedHookResultError';
 import { promisify } from '../utils/promise';
 export class HooksRunner {
@@ -7,6 +7,9 @@ export class HooksRunner {
     constructor(key) {
         this.key = key;
     }
+    hasHooks(target) {
+        return hasHooks(target, this.key);
+    }
     execute(target, { scope, createContext = createHookContext, mapContext = (context) => context, predicate = () => true, }) {
         const hooks = Array.from(getHooks(target, this.key).entries()).filter(([methodName]) => predicate(methodName));
         const runMethodHooks = (methodName, executions) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ts-ioc-container",
-  "version": "55.3.0",
+  "version": "55.4.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/hooks/HooksRunner.d.ts

@@ -10,6 +10,7 @@ export type HooksRunnerContext = {
 export declare class HooksRunner {
     private readonly key;
     constructor(key: string | symbol);
+    hasHooks(target: object): boolean;
     execute(target: object, { scope, createContext, mapContext, predicate, }: HooksRunnerContext): void;
     executeAsync(target: object, { scope, createContext, mapContext, predicate, }: HooksRunnerContext): Promise<void[]>;
 }