ts-ioc-container 33.0.0 → 33.0.2

package/cjm/container/AutoMockedContainer.js

@@ -5,9 +5,9 @@ const MethodNotImplementedError_1 = require("../errors/MethodNotImplementedError
 const DependencyNotFoundError_1 = require("../errors/DependencyNotFoundError");
 class AutoMockedContainer {
     constructor() {
-        this.tags = new Set();
         this.id = '0';
         this.level = 0;
+        this.tags = new Set();
         this.isDisposed = false;
     }
     findChild(matchFn) {
@@ -52,10 +52,7 @@ class AutoMockedContainer {
         throw new DependencyNotFoundError_1.DependencyNotFoundError(`Cannot find by alias`);
     }
     hasInstance(value) {
-        throw new Error('Method not implemented.');
-    }
-    hasOwnInstance(value) {
-        throw new Error('Method not implemented.');
+        throw new MethodNotImplementedError_1.MethodNotImplementedError();
     }
 }
 exports.AutoMockedContainer = AutoMockedContainer;

package/cjm/container/Container.js

@@ -62,9 +62,9 @@ class Container {
     }
     getInstances(direction = 'child') {
         if (direction === 'parent') {
-            return this.parent.getInstances('parent').concat([...this.instances.values()]);
+            return [...this.parent.getInstances('parent'), ...this.instances];
         }
-        const instances = [...this.instances.values()];
+        const instances = Array.from(this.instances);
         for (const scope of this.scopes) {
             instances.push(...scope.getInstances('child'));
         }
@@ -114,6 +114,12 @@ class Container {
     findParent(matchFn) {
         return matchFn(this) ? this : this.parent.findParent(matchFn);
     }
+    hasInstance(value, direction) {
+        if (direction === 'parent') {
+            return this.instances.has(value) || this.parent.hasInstance(value, 'parent');
+        }
+        return this.instances.has(value) || Array.from(this.scopes).some((scope) => scope.hasInstance(value, 'child'));
+    }
     /**
      * @private
      */
@@ -126,14 +132,7 @@ class Container {
      * @private
      */
     getRegistrations() {
-        const registrations = this.parent.getRegistrations();
-        return this.registrations.length > 0 ? registrations.concat(this.registrations) : registrations;
-    }
-    hasInstance(value) {
-        return this.instances.has(value) || this.parent.hasInstance(value);
-    }
-    hasOwnInstance(value) {
-        return this.instances.has(value);
+        return [...this.parent.getRegistrations(), ...this.registrations];
     }
     /**
      * @private

package/cjm/container/EmptyContainer.js

@@ -5,16 +5,13 @@ const MethodNotImplementedError_1 = require("../errors/MethodNotImplementedError
 const DependencyNotFoundError_1 = require("../errors/DependencyNotFoundError");
 class EmptyContainer {
     constructor() {
-        this.isDisposed = false;
         this.level = -1;
         this.id = 'empty';
         this.tags = new Set();
+        this.isDisposed = false;
     }
     hasInstance(value) {
-        throw new Error('Method not implemented.');
-    }
-    hasOwnInstance(value) {
-        throw new Error('Method not implemented.');
+        throw new MethodNotImplementedError_1.MethodNotImplementedError();
     }
     reduceToRoot(fn, initial) {
         return initial;

package/esm/container/AutoMockedContainer.js

@@ -2,9 +2,9 @@ import { MethodNotImplementedError } from '../errors/MethodNotImplementedError';
 import { DependencyNotFoundError } from '../errors/DependencyNotFoundError';
 export class AutoMockedContainer {
     constructor() {
-        this.tags = new Set();
         this.id = '0';
         this.level = 0;
+        this.tags = new Set();
         this.isDisposed = false;
     }
     findChild(matchFn) {
@@ -49,9 +49,6 @@ export class AutoMockedContainer {
         throw new DependencyNotFoundError(`Cannot find by alias`);
     }
     hasInstance(value) {
-        throw new Error('Method not implemented.');
-    }
-    hasOwnInstance(value) {
-        throw new Error('Method not implemented.');
+        throw new MethodNotImplementedError();
     }
 }

package/esm/container/Container.js

@@ -59,9 +59,9 @@ export class Container {
     }
     getInstances(direction = 'child') {
         if (direction === 'parent') {
-            return this.parent.getInstances('parent').concat([...this.instances.values()]);
+            return [...this.parent.getInstances('parent'), ...this.instances];
         }
-        const instances = [...this.instances.values()];
+        const instances = Array.from(this.instances);
         for (const scope of this.scopes) {
             instances.push(...scope.getInstances('child'));
         }
@@ -111,6 +111,12 @@ export class Container {
     findParent(matchFn) {
         return matchFn(this) ? this : this.parent.findParent(matchFn);
     }
+    hasInstance(value, direction) {
+        if (direction === 'parent') {
+            return this.instances.has(value) || this.parent.hasInstance(value, 'parent');
+        }
+        return this.instances.has(value) || Array.from(this.scopes).some((scope) => scope.hasInstance(value, 'child'));
+    }
     /**
      * @private
      */
@@ -123,14 +129,7 @@ export class Container {
      * @private
      */
     getRegistrations() {
-        const registrations = this.parent.getRegistrations();
-        return this.registrations.length > 0 ? registrations.concat(this.registrations) : registrations;
-    }
-    hasInstance(value) {
-        return this.instances.has(value) || this.parent.hasInstance(value);
-    }
-    hasOwnInstance(value) {
-        return this.instances.has(value);
+        return [...this.parent.getRegistrations(), ...this.registrations];
     }
     /**
      * @private

package/esm/container/EmptyContainer.js

@@ -2,16 +2,13 @@ import { MethodNotImplementedError } from '../errors/MethodNotImplementedError';
 import { DependencyNotFoundError } from '../errors/DependencyNotFoundError';
 export class EmptyContainer {
     constructor() {
-        this.isDisposed = false;
         this.level = -1;
         this.id = 'empty';
         this.tags = new Set();
+        this.isDisposed = false;
     }
     hasInstance(value) {
-        throw new Error('Method not implemented.');
-    }
-    hasOwnInstance(value) {
-        throw new Error('Method not implemented.');
+        throw new MethodNotImplementedError();
     }
     reduceToRoot(fn, initial) {
         return initial;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ts-ioc-container",
-  "version": "33.0.0",
+  "version": "33.0.2",
   "description": "Typescript IoC container",
   "publishConfig": {
     "access": "public",
@@ -59,5 +59,5 @@
     "ts-node": "^10.9.1",
     "typescript": "5.4.3"
   },
-  "gitHead": "9fa774ef445611ecf1b7c08c450c3d251e2e2171"
+  "gitHead": "2fc46f490e00dfdf60d77861dee309bdcf039d39"
 }

package/typings/container/AutoMockedContainer.d.ts

@@ -1,9 +1,9 @@
-import { AliasPredicate, DependencyKey, IContainer, InjectionToken, ReduceFn, ResolveOptions } from './IContainer';
+import { AliasPredicate, DependencyKey, IContainer, InjectionToken, ReduceScope, ResolveOptions } from './IContainer';
 import { IRegistration } from '../registration/IRegistration';
 export declare abstract class AutoMockedContainer implements IContainer {
-    tags: Set<string>;
     id: string;
     level: number;
+    tags: Set<string>;
     isDisposed: boolean;
     findChild(matchFn: (s: IContainer) => boolean): IContainer | undefined;
     findParent(matchFn: (s: IContainer) => boolean): IContainer | undefined;
@@ -13,7 +13,7 @@ export declare abstract class AutoMockedContainer implements IContainer {
     dispose(): void;
     register(): this;
     getInstances(): object[];
-    reduceToRoot<TResult>(fn: ReduceFn<TResult>, initial: TResult): TResult;
+    reduceToRoot<TResult>(fn: ReduceScope<TResult>, initial: TResult): TResult;
     removeScope(): void;
     use(): this;
     getRegistrations(): never[];
@@ -22,5 +22,4 @@ export declare abstract class AutoMockedContainer implements IContainer {
     resolveManyByAlias(predicate: AliasPredicate, options?: ResolveOptions, result?: Map<DependencyKey, unknown>): Map<DependencyKey, unknown>;
     resolveOneByAlias<T>(predicate: AliasPredicate, options?: ResolveOptions): [DependencyKey, T];
     hasInstance(value: object): boolean;
-    hasOwnInstance(value: object): boolean;
 }

package/typings/container/Container.d.ts

@@ -1,4 +1,4 @@
-import { AliasPredicate, DependencyKey, IContainer, IContainerModule, InjectionToken, ReduceFn, ResolveOptions, Tag } from './IContainer';
+import { AliasPredicate, DependencyKey, IContainer, IContainerModule, InjectionToken, ReduceScope, ResolveOptions, Tag } from './IContainer';
 import { IInjector } from '../injector/IInjector';
 import { IProvider } from '../provider/IProvider';
 import { IRegistration } from '../registration/IRegistration';
@@ -6,14 +6,14 @@ import { Counter } from './Counter';
 export declare class Container implements IContainer {
     private readonly injector;
     isDisposed: boolean;
-    private readonly providers;
+    readonly id: string;
     readonly tags: Set<Tag>;
+    readonly level: number;
     private parent;
-    private scopes;
-    private instances;
+    private readonly providers;
+    private readonly scopes;
+    private readonly instances;
     private readonly registrations;
-    readonly id: string;
-    readonly level: number;
     private readonly counter;
     constructor(injector: IInjector, { parent, tags, counter, }?: {
         parent?: IContainer;
@@ -31,9 +31,10 @@ export declare class Container implements IContainer {
     hasDependency(key: DependencyKey): boolean;
     resolveManyByAlias(predicate: AliasPredicate, { args, child, lazy }?: ResolveOptions, result?: Map<DependencyKey, unknown>): Map<DependencyKey, unknown>;
     resolveOneByAlias<T>(predicate: AliasPredicate, { args, child, lazy }?: ResolveOptions): [DependencyKey, T];
-    reduceToRoot<TResult>(fn: ReduceFn<TResult>, initial: TResult): TResult;
+    reduceToRoot<TResult>(fn: ReduceScope<TResult>, initial: TResult): TResult;
     findChild(matchFn: (s: IContainer) => boolean): IContainer | undefined;
     findParent(matchFn: (s: IContainer) => boolean): IContainer | undefined;
+    hasInstance(value: object, direction: 'parent' | 'child'): boolean;
     /**
      * @private
      */
@@ -42,8 +43,6 @@ export declare class Container implements IContainer {
      * @private
      */
     getRegistrations(): IRegistration[];
-    hasInstance(value: object): boolean;
-    hasOwnInstance(value: object): boolean;
     /**
      * @private
      */

package/typings/container/EmptyContainer.d.ts

@@ -1,14 +1,13 @@
-import { AliasPredicate, DependencyKey, IContainer, IContainerModule, InjectionToken, ReduceFn, ResolveOptions } from './IContainer';
+import { AliasPredicate, DependencyKey, IContainer, IContainerModule, InjectionToken, ReduceScope, ResolveOptions } from './IContainer';
 import { IProvider } from '../provider/IProvider';
 import { IRegistration } from '../registration/IRegistration';
 export declare class EmptyContainer implements IContainer {
-    hasInstance(value: object): boolean;
-    hasOwnInstance(value: object): boolean;
-    isDisposed: boolean;
     level: number;
     id: string;
     tags: Set<string>;
-    reduceToRoot<TResult>(fn: ReduceFn<TResult>, initial: TResult): TResult;
+    isDisposed: boolean;
+    hasInstance(value: object): boolean;
+    reduceToRoot<TResult>(fn: ReduceScope<TResult>, initial: TResult): TResult;
     findChild(matchFn: (s: IContainer) => boolean): IContainer | undefined;
     findParent(matchFn: (s: IContainer) => boolean): IContainer | undefined;
     hasDependency(key: string): boolean;

package/typings/container/IContainer.d.ts

@@ -24,10 +24,10 @@ export interface Tagged {
 }
 export type Alias = string;
 export type AliasPredicate = (aliases: Set<Alias>) => boolean;
-export type ReduceFn<TResult> = (acc: TResult, container: IContainer) => TResult;
+export type ReduceScope<TResult> = (acc: TResult, container: IContainer) => TResult;
 export interface IContainer extends Resolvable, Tagged {
+    readonly tags: Set<Tag>;
     readonly isDisposed: boolean;
-    tags: Set<Tag>;
     createScope(...tags: Tag[]): IContainer;
     register(key: DependencyKey, value: IProvider): this;
     add(registration: IRegistration): this;
@@ -37,11 +37,10 @@ export interface IContainer extends Resolvable, Tagged {
     use(module: IContainerModule): this;
     getRegistrations(): IRegistration[];
     hasDependency(key: DependencyKey): boolean;
-    reduceToRoot<TResult>(fn: ReduceFn<TResult>, initial: TResult): TResult;
+    reduceToRoot<TResult>(fn: ReduceScope<TResult>, initial: TResult): TResult;
     findChild(matchFn: (s: IContainer) => boolean): IContainer | undefined;
     findParent(matchFn: (s: IContainer) => boolean): IContainer | undefined;
     resolveManyByAlias(predicate: AliasPredicate, options?: ResolveOptions, result?: Map<DependencyKey, unknown>): Map<DependencyKey, unknown>;
     resolveOneByAlias<T>(predicate: AliasPredicate, options?: ResolveOptions): [DependencyKey, T];
-    hasInstance(value: object): boolean;
-    hasOwnInstance(value: object): boolean;
+    hasInstance(value: object, direction: 'parent' | 'child'): boolean;
 }