ts-ioc-container 37.2.0 → 37.3.0

package/cjm/container/AutoMockedContainer.js

@@ -14,6 +14,9 @@ class AutoMockedContainer {
         throw new MethodNotImplementedError_1.MethodNotImplementedError();
     }
     dispose() { }
+    detachFromParent() {
+        throw new MethodNotImplementedError_1.MethodNotImplementedError();
+    }
     register() {
         return this;
     }

package/cjm/container/Container.js

@@ -8,17 +8,17 @@ class Container {
     constructor(injector, options = {}) {
         this.injector = injector;
         this.isDisposed = false;
-        this.scopes = new Set();
-        this.instances = new Set();
+        this.scopes = [];
+        this.instances = [];
         this.providers = new Map();
-        this.registrations = new Set();
+        this.registrations = [];
         this.parent = options.parent ?? new EmptyContainer_1.EmptyContainer();
         this.tags = new Set(options.tags ?? []);
         this.onConstruct = options.onConstruct ?? (() => { });
         this.onDispose = options.onDispose ?? (() => { });
     }
     add(registration) {
-        this.registrations.add(registration);
+        this.registrations.push(registration);
         registration.applyTo(this);
         return this;
     }
@@ -31,8 +31,8 @@ class Container {
         this.validateContainer();
         if ((0, IContainer_1.isConstructor)(token)) {
             const instance = this.injector.resolve(this, token, { args });
-            this.instances.add(instance);
-            this.onConstruct(instance);
+            this.instances.push(instance);
+            this.onConstruct(instance, this);
             return instance;
         }
         const provider = this.providers.get(token);
@@ -44,7 +44,7 @@ class Container {
         this.validateContainer();
         const scope = new Container(this.injector, { parent: this, tags, onDispose: this.onDispose });
         scope.applyRegistrationsFrom(this);
-        this.scopes.add(scope);
+        this.scopes.push(scope);
         return scope;
     }
     dispose({ cascade = true } = {}) {
@@ -55,16 +55,24 @@ class Container {
         this.parent = new EmptyContainer_1.EmptyContainer();
         // Reset the state
         this.providers.clear();
-        this.instances.clear();
-        this.registrations.clear();
+        this.instances.splice(0, this.instances.length);
+        this.registrations.splice(0, this.registrations.length);
         this.onDispose(this);
-        if (cascade) {
-            // Dispose all scopes
-            for (const scope of this.scopes) {
-                scope.dispose({ cascade });
+        // Dispose all scopes
+        while (this.scopes.length > 0) {
+            const scope = this.scopes[0];
+            if (cascade) {
+                scope.dispose({ cascade: true });
+            }
+            else {
+                scope.detachFromParent();
             }
         }
     }
+    detachFromParent() {
+        this.parent.removeScope(this);
+        this.parent = new EmptyContainer_1.EmptyContainer();
+    }
     use(module) {
         module.applyTo(this);
         return this;
@@ -94,8 +102,16 @@ class Container {
     getScopes() {
         return [...this.scopes];
     }
-    getInstances() {
-        return [...this.instances];
+    getInstances({ cascade = true } = {}) {
+        const result = [...this.instances];
+        if (cascade) {
+            for (const scope of this.scopes) {
+                for (const instance of scope.getInstances({ cascade })) {
+                    result.push(instance);
+                }
+            }
+        }
+        return result;
     }
     hasTag(tag) {
         return this.tags.has(tag);
@@ -118,7 +134,8 @@ class Container {
      * @private
      */
     removeScope(child) {
-        this.scopes.delete(child);
+        const index = this.scopes.indexOf(child);
+        this.scopes.splice(index, 1);
     }
     validateContainer() {
         ContainerDisposedError_1.ContainerDisposedError.assert(!this.isDisposed, 'Container is already disposed');

package/cjm/container/EmptyContainer.js

@@ -7,6 +7,9 @@ class EmptyContainer {
     get isDisposed() {
         throw new MethodNotImplementedError_1.MethodNotImplementedError();
     }
+    detachFromParent() {
+        throw new MethodNotImplementedError_1.MethodNotImplementedError();
+    }
     hasProvider(key) {
         return false;
     }

package/cjm/hooks/HookContext.js

@@ -19,10 +19,6 @@ class HookContext {
         // @ts-ignore
         this.instance[this.methodName] = fn(this.scope);
     }
-    getProperty() {
-        // @ts-ignore
-        return this.instance[this.methodName];
-    }
 }
 exports.HookContext = HookContext;
 const createHookContext = (Target, scope, methodName = 'constructor') => new HookContext(Target, scope, methodName);

package/esm/container/AutoMockedContainer.js

@@ -11,6 +11,9 @@ export class AutoMockedContainer {
         throw new MethodNotImplementedError();
     }
     dispose() { }
+    detachFromParent() {
+        throw new MethodNotImplementedError();
+    }
     register() {
         return this;
     }

package/esm/container/Container.js

@@ -5,17 +5,17 @@ export class Container {
     constructor(injector, options = {}) {
         this.injector = injector;
         this.isDisposed = false;
-        this.scopes = new Set();
-        this.instances = new Set();
+        this.scopes = [];
+        this.instances = [];
         this.providers = new Map();
-        this.registrations = new Set();
+        this.registrations = [];
         this.parent = options.parent ?? new EmptyContainer();
         this.tags = new Set(options.tags ?? []);
         this.onConstruct = options.onConstruct ?? (() => { });
         this.onDispose = options.onDispose ?? (() => { });
     }
     add(registration) {
-        this.registrations.add(registration);
+        this.registrations.push(registration);
         registration.applyTo(this);
         return this;
     }
@@ -28,8 +28,8 @@ export class Container {
         this.validateContainer();
         if (isConstructor(token)) {
             const instance = this.injector.resolve(this, token, { args });
-            this.instances.add(instance);
-            this.onConstruct(instance);
+            this.instances.push(instance);
+            this.onConstruct(instance, this);
             return instance;
         }
         const provider = this.providers.get(token);
@@ -41,7 +41,7 @@ export class Container {
         this.validateContainer();
         const scope = new Container(this.injector, { parent: this, tags, onDispose: this.onDispose });
         scope.applyRegistrationsFrom(this);
-        this.scopes.add(scope);
+        this.scopes.push(scope);
         return scope;
     }
     dispose({ cascade = true } = {}) {
@@ -52,16 +52,24 @@ export class Container {
         this.parent = new EmptyContainer();
         // Reset the state
         this.providers.clear();
-        this.instances.clear();
-        this.registrations.clear();
+        this.instances.splice(0, this.instances.length);
+        this.registrations.splice(0, this.registrations.length);
         this.onDispose(this);
-        if (cascade) {
-            // Dispose all scopes
-            for (const scope of this.scopes) {
-                scope.dispose({ cascade });
+        // Dispose all scopes
+        while (this.scopes.length > 0) {
+            const scope = this.scopes[0];
+            if (cascade) {
+                scope.dispose({ cascade: true });
+            }
+            else {
+                scope.detachFromParent();
             }
         }
     }
+    detachFromParent() {
+        this.parent.removeScope(this);
+        this.parent = new EmptyContainer();
+    }
     use(module) {
         module.applyTo(this);
         return this;
@@ -91,8 +99,16 @@ export class Container {
     getScopes() {
         return [...this.scopes];
     }
-    getInstances() {
-        return [...this.instances];
+    getInstances({ cascade = true } = {}) {
+        const result = [...this.instances];
+        if (cascade) {
+            for (const scope of this.scopes) {
+                for (const instance of scope.getInstances({ cascade })) {
+                    result.push(instance);
+                }
+            }
+        }
+        return result;
     }
     hasTag(tag) {
         return this.tags.has(tag);
@@ -115,7 +131,8 @@ export class Container {
      * @private
      */
     removeScope(child) {
-        this.scopes.delete(child);
+        const index = this.scopes.indexOf(child);
+        this.scopes.splice(index, 1);
     }
     validateContainer() {
         ContainerDisposedError.assert(!this.isDisposed, 'Container is already disposed');

package/esm/container/EmptyContainer.js

@@ -4,6 +4,9 @@ export class EmptyContainer {
     get isDisposed() {
         throw new MethodNotImplementedError();
     }
+    detachFromParent() {
+        throw new MethodNotImplementedError();
+    }
     hasProvider(key) {
         return false;
     }

package/esm/hooks/HookContext.js

@@ -16,10 +16,6 @@ export class HookContext {
         // @ts-ignore
         this.instance[this.methodName] = fn(this.scope);
     }
-    getProperty() {
-        // @ts-ignore
-        return this.instance[this.methodName];
-    }
 }
 export const createHookContext = (Target, scope, methodName = 'constructor') => new HookContext(Target, scope, methodName);
 export const hookMetaKey = (methodName = 'constructor') => `inject:${methodName}`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ts-ioc-container",
-  "version": "37.2.0",
+  "version": "37.3.0",
   "description": "Typescript IoC container",
   "publishConfig": {
     "access": "public",
@@ -51,7 +51,8 @@
     "format": "prettier --write \"**/*.ts\"",
     "lint": "eslint lib/**/*.ts  __tests__/**/*.ts scripts/**/*.ts",
     "lint:fix": "npm run lint --fix",
-    "prepare": "husky"
+    "prepare": "husky",
+    "release": "npm run build && npm test && npm publish"
   },
   "devDependencies": {
     "@types/jest": "29.5.14",

package/typings/container/AutoMockedContainer.d.ts

@@ -6,6 +6,7 @@ export declare abstract class AutoMockedContainer implements IContainer {
     createScope(): IContainer;
     abstract resolve<T>(key: InjectionToken<T>, options?: ResolveOptions): T;
     dispose(): void;
+    detachFromParent(): void;
     register(): this;
     getParent(): undefined;
     getScopes(): never[];

package/typings/container/Container.d.ts

@@ -16,7 +16,7 @@ export declare class Container implements IContainer {
     constructor(injector: IInjector, options?: {
         parent?: IContainer;
         tags?: Tag[];
-        onConstruct?: (instance: Instance) => void;
+        onConstruct?: (instance: Instance, scope: IContainer) => void;
         onDispose?: (scope: IContainer) => void;
     });
     add(registration: IRegistration): this;
@@ -26,13 +26,16 @@ export declare class Container implements IContainer {
     dispose({ cascade }?: {
         cascade?: boolean;
     }): void;
+    detachFromParent(): void;
     use(module: IContainerModule): this;
     hasProvider(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];
     getParent(): IContainer;
     getScopes(): IContainer[];
-    getInstances(): Instance[];
+    getInstances({ cascade }?: {
+        cascade?: boolean;
+    }): Instance[];
     hasTag(tag: Tag): boolean;
     /**
      * @private

package/typings/container/EmptyContainer.d.ts

@@ -3,6 +3,7 @@ import { IProvider } from '../provider/IProvider';
 import { IRegistration } from '../registration/IRegistration';
 export declare class EmptyContainer implements IContainer {
     get isDisposed(): boolean;
+    detachFromParent(): void;
     hasProvider(key: string): boolean;
     getParent(): undefined;
     getScopes(): never[];

package/typings/container/IContainer.d.ts

@@ -43,7 +43,10 @@ export interface IContainer extends Resolvable, Tagged {
     hasProvider(key: DependencyKey): boolean;
     getParent(): IContainer | undefined;
     getScopes(): IContainer[];
-    getInstances(): Instance[];
+    getInstances(options?: {
+        cascade?: boolean;
+    }): Instance[];
     resolveManyByAlias(predicate: AliasPredicate, options?: ResolveOptions, result?: Map<DependencyKey, unknown>): Map<DependencyKey, unknown>;
     resolveOneByAlias<T>(predicate: AliasPredicate, options?: ResolveOptions): [DependencyKey, T];
+    detachFromParent(): void;
 }

package/typings/hooks/HookContext.d.ts

@@ -9,7 +9,6 @@ export interface IHookContext {
         args?: unknown[];
     }): unknown;
     setProperty(fn: InjectFn): void;
-    getProperty(): unknown;
 }
 export declare class HookContext implements IHookContext {
     instance: object;
@@ -21,7 +20,6 @@ export declare class HookContext implements IHookContext {
         args?: unknown[];
     }): unknown;
     setProperty(fn: InjectFn): void;
-    getProperty(): unknown;
 }
 export type CreateHookContext = (Target: object, scope: IContainer, methodName?: string) => IHookContext;
 export declare const createHookContext: CreateHookContext;