ts-ioc-container 35.5.0 → 35.6.1

package/cjm/TypedEvent.js

@@ -1,9 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TypedEvent = void 0;
+exports.TypedEvent = exports.EventDisposedError = void 0;
+class EventDisposedError extends Error {
+    static assert(condition, message) {
+        if (!condition) {
+            throw new EventDisposedError(message);
+        }
+    }
+}
+exports.EventDisposedError = EventDisposedError;
 class TypedEvent {
     constructor() {
         this.observerStorage = [];
+        this.isDisposed = false;
     }
     static fromPromise(promise) {
         const event = new TypedEvent();
@@ -14,10 +23,12 @@ class TypedEvent {
         return event;
     }
     on(observer) {
+        this.validate();
         this.observerStorage.push(observer);
         return () => this.off(observer);
     }
     once(observer) {
+        this.validate();
         const onceObserver = (data) => {
             observer(data);
             this.off(onceObserver);
@@ -26,16 +37,25 @@ class TypedEvent {
         return () => this.off(onceObserver);
     }
     off(observer) {
+        this.validate();
         this.observerStorage = this.observerStorage.filter((o) => o !== observer);
     }
     emit(data) {
+        this.validate();
         this.observerStorage.forEach((o) => o(data));
     }
     toPromise() {
         return new Promise((resolve) => this.once(resolve));
     }
     dispose() {
+        this.validate();
+        this.isDisposed = true;
         this.observerStorage = [];
     }
+    validate() {
+        if (this.isDisposed) {
+            throw new EventDisposedError('Event is disposed');
+        }
+    }
 }
 exports.TypedEvent = TypedEvent;

package/cjm/container/AutoMockedContainer.js

@@ -12,6 +12,8 @@ class AutoMockedContainer {
         this.isDisposed = false;
         this.onConstruct = new TypedEvent_1.TypedEvent();
         this.onDispose = new TypedEvent_1.TypedEvent();
+        this.onScopeCreated = new TypedEvent_1.TypedEvent();
+        this.onScopeRemoved = new TypedEvent_1.TypedEvent();
     }
     findChild(matchFn) {
         return undefined;

package/cjm/container/Container.js

@@ -25,6 +25,12 @@ class Container {
     get onDispose() {
         return this.parent.onDispose;
     }
+    get onScopeCreated() {
+        return this.parent.onScopeCreated;
+    }
+    get onScopeRemoved() {
+        return this.parent.onScopeRemoved;
+    }
     add(registration) {
         this.registrations.push(registration);
         registration.applyTo(this);
@@ -63,13 +69,12 @@ class Container {
         const scope = new Container(this.injector, { parent: this, tags, counter: this.counter });
         scope.applyRegistrationsFrom(this);
         this.scopes.add(scope);
+        this.onScopeCreated.emit(scope);
         return scope;
     }
     dispose() {
         this.validateContainer();
-        this.onConstruct.dispose();
         this.onDispose.emit(this);
-        this.onDispose.dispose();
         this.isDisposed = true;
         this.parent.removeScope(this);
         this.parent = new EmptyContainer_1.EmptyContainer();
@@ -162,6 +167,7 @@ class Container {
      */
     removeScope(child) {
         this.scopes.delete(child);
+        this.onScopeRemoved.emit(child);
     }
     validateContainer() {
         ContainerDisposedError_1.ContainerDisposedError.assert(!this.isDisposed, 'Container is already disposed');

package/cjm/container/EmptyContainer.js

@@ -12,6 +12,8 @@ class EmptyContainer {
         this.isDisposed = false;
         this.onConstruct = new TypedEvent_1.TypedEvent();
         this.onDispose = new TypedEvent_1.TypedEvent();
+        this.onScopeCreated = new TypedEvent_1.TypedEvent();
+        this.onScopeRemoved = new TypedEvent_1.TypedEvent();
     }
     hasInstance(value) {
         throw new MethodNotImplementedError_1.MethodNotImplementedError();
@@ -52,7 +54,12 @@ class EmptyContainer {
     getOwnInstances() {
         return [];
     }
-    removeScope() { }
+    removeScope() {
+        this.onConstruct.dispose();
+        this.onDispose.dispose();
+        this.onScopeCreated.dispose();
+        this.onScopeRemoved.dispose();
+    }
     use(module) {
         throw new MethodNotImplementedError_1.MethodNotImplementedError();
     }

package/esm/TypedEvent.js

@@ -1,6 +1,14 @@
+export class EventDisposedError extends Error {
+    static assert(condition, message) {
+        if (!condition) {
+            throw new EventDisposedError(message);
+        }
+    }
+}
 export class TypedEvent {
     constructor() {
         this.observerStorage = [];
+        this.isDisposed = false;
     }
     static fromPromise(promise) {
         const event = new TypedEvent();
@@ -11,10 +19,12 @@ export class TypedEvent {
         return event;
     }
     on(observer) {
+        this.validate();
         this.observerStorage.push(observer);
         return () => this.off(observer);
     }
     once(observer) {
+        this.validate();
         const onceObserver = (data) => {
             observer(data);
             this.off(onceObserver);
@@ -23,15 +33,24 @@ export class TypedEvent {
         return () => this.off(onceObserver);
     }
     off(observer) {
+        this.validate();
         this.observerStorage = this.observerStorage.filter((o) => o !== observer);
     }
     emit(data) {
+        this.validate();
         this.observerStorage.forEach((o) => o(data));
     }
     toPromise() {
         return new Promise((resolve) => this.once(resolve));
     }
     dispose() {
+        this.validate();
+        this.isDisposed = true;
         this.observerStorage = [];
     }
+    validate() {
+        if (this.isDisposed) {
+            throw new EventDisposedError('Event is disposed');
+        }
+    }
 }

package/esm/container/AutoMockedContainer.js

@@ -9,6 +9,8 @@ export class AutoMockedContainer {
         this.isDisposed = false;
         this.onConstruct = new TypedEvent();
         this.onDispose = new TypedEvent();
+        this.onScopeCreated = new TypedEvent();
+        this.onScopeRemoved = new TypedEvent();
     }
     findChild(matchFn) {
         return undefined;

package/esm/container/Container.js

@@ -22,6 +22,12 @@ export class Container {
     get onDispose() {
         return this.parent.onDispose;
     }
+    get onScopeCreated() {
+        return this.parent.onScopeCreated;
+    }
+    get onScopeRemoved() {
+        return this.parent.onScopeRemoved;
+    }
     add(registration) {
         this.registrations.push(registration);
         registration.applyTo(this);
@@ -60,13 +66,12 @@ export class Container {
         const scope = new Container(this.injector, { parent: this, tags, counter: this.counter });
         scope.applyRegistrationsFrom(this);
         this.scopes.add(scope);
+        this.onScopeCreated.emit(scope);
         return scope;
     }
     dispose() {
         this.validateContainer();
-        this.onConstruct.dispose();
         this.onDispose.emit(this);
-        this.onDispose.dispose();
         this.isDisposed = true;
         this.parent.removeScope(this);
         this.parent = new EmptyContainer();
@@ -159,6 +164,7 @@ export class Container {
      */
     removeScope(child) {
         this.scopes.delete(child);
+        this.onScopeRemoved.emit(child);
     }
     validateContainer() {
         ContainerDisposedError.assert(!this.isDisposed, 'Container is already disposed');

package/esm/container/EmptyContainer.js

@@ -9,6 +9,8 @@ export class EmptyContainer {
         this.isDisposed = false;
         this.onConstruct = new TypedEvent();
         this.onDispose = new TypedEvent();
+        this.onScopeCreated = new TypedEvent();
+        this.onScopeRemoved = new TypedEvent();
     }
     hasInstance(value) {
         throw new MethodNotImplementedError();
@@ -49,7 +51,12 @@ export class EmptyContainer {
     getOwnInstances() {
         return [];
     }
-    removeScope() { }
+    removeScope() {
+        this.onConstruct.dispose();
+        this.onDispose.dispose();
+        this.onScopeCreated.dispose();
+        this.onScopeRemoved.dispose();
+    }
     use(module) {
         throw new MethodNotImplementedError();
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ts-ioc-container",
-  "version": "35.5.0",
+  "version": "35.6.1",
   "description": "Typescript IoC container",
   "publishConfig": {
     "access": "public",
@@ -59,5 +59,5 @@
     "ts-node": "^10.9.1",
     "typescript": "5.4.3"
   },
-  "gitHead": "cad5efe78c49477ed0b69e9f381649c6b339f58a"
+  "gitHead": "7dae31e88ea99e92905ad1bd5ef2f2587a6d86ba"
 }

package/typings/TypedEvent.d.ts

@@ -1,12 +1,17 @@
 export type IObserver<T> = (data: T) => void;
 export type IUnsubscribe = () => void;
+export declare class EventDisposedError extends Error {
+    static assert(condition: boolean, message: string): void;
+}
 export declare class TypedEvent<T> {
     static fromPromise<T>(promise: Promise<T>): TypedEvent<unknown>;
     private observerStorage;
+    private isDisposed;
     on(observer: IObserver<T>): IUnsubscribe;
     once(observer: IObserver<T>): IUnsubscribe;
     off(observer: IObserver<T>): void;
     emit(data: T): void;
     toPromise(): Promise<T>;
     dispose(): void;
+    private validate;
 }

package/typings/container/AutoMockedContainer.d.ts

@@ -8,6 +8,8 @@ export declare abstract class AutoMockedContainer implements IContainer {
     isDisposed: boolean;
     onConstruct: TypedEvent<Instance>;
     onDispose: TypedEvent<IContainer>;
+    onScopeCreated: TypedEvent<IContainer>;
+    onScopeRemoved: TypedEvent<IContainer>;
     findChild(matchFn: (s: IContainer) => boolean): IContainer | undefined;
     findParent(matchFn: (s: IContainer) => boolean): IContainer | undefined;
     hasDependency(key: string): boolean;

package/typings/container/Container.d.ts

@@ -23,6 +23,8 @@ export declare class Container implements IContainer {
     });
     get onConstruct(): TypedEvent<Instance>;
     get onDispose(): TypedEvent<IContainer>;
+    get onScopeCreated(): TypedEvent<IContainer>;
+    get onScopeRemoved(): TypedEvent<IContainer>;
     add(registration: IRegistration): this;
     register(key: DependencyKey, provider: IProvider): this;
     resolve<T>(token: InjectionToken<T>, { args, child, lazy }?: ResolveOptions): T;

package/typings/container/EmptyContainer.d.ts

@@ -9,6 +9,8 @@ export declare class EmptyContainer implements IContainer {
     isDisposed: boolean;
     onConstruct: TypedEvent<Instance>;
     onDispose: TypedEvent<IContainer>;
+    onScopeCreated: TypedEvent<IContainer>;
+    onScopeRemoved: TypedEvent<IContainer>;
     hasInstance(value: object): boolean;
     reduceToRoot<TResult>(fn: ReduceScope<TResult>, initial: TResult): TResult;
     findChild(matchFn: (s: IContainer) => boolean): IContainer | undefined;

package/typings/container/IContainer.d.ts

@@ -39,6 +39,8 @@ export interface IContainer extends Resolvable, Tagged {
     readonly isDisposed: boolean;
     onDispose: TypedEvent<IContainer>;
     onConstruct: TypedEvent<Instance>;
+    onScopeCreated: TypedEvent<IContainer>;
+    onScopeRemoved: TypedEvent<IContainer>;
     createScope(options?: CreateScopeOptions): IContainer;
     register(key: DependencyKey, value: IProvider): this;
     add(registration: IRegistration): this;