ts-ioc-container 35.6.0 → 35.6.2

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

@@ -74,11 +74,7 @@ class Container {
     }
     dispose() {
         this.validateContainer();
-        this.onConstruct.dispose();
         this.onDispose.emit(this);
-        this.onDispose.dispose();
-        this.onScopeCreated.dispose();
-        this.onScopeRemoved.dispose();
         this.isDisposed = true;
         this.parent.removeScope(this);
         this.parent = new EmptyContainer_1.EmptyContainer();

package/cjm/container/EmptyContainer.js

@@ -54,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/cjm/registration/IRegistration.js

@@ -18,7 +18,7 @@ const getTransformers = (Target) => (0, metadata_1.getMetadata)(Target, METADATA
 exports.getTransformers = getTransformers;
 const register = (...mappers) => (0, metadata_1.setMetadata)(METADATA_KEY, mappers.map((m, index) => {
     if ((0, by_1.isDepKey)(m)) {
-        return index === 0 ? m.register : m.redirectFrom;
+        return index === 0 ? m.assignTo.bind(m) : m.redirectFrom.bind(m);
     }
     if ((0, IContainer_1.isDependencyKey)(m)) {
         return (r) => (index === 0 ? r.fromKey(m) : r.redirectFrom(m));

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

@@ -71,11 +71,7 @@ export class Container {
     }
     dispose() {
         this.validateContainer();
-        this.onConstruct.dispose();
         this.onDispose.emit(this);
-        this.onDispose.dispose();
-        this.onScopeCreated.dispose();
-        this.onScopeRemoved.dispose();
         this.isDisposed = true;
         this.parent.removeScope(this);
         this.parent = new EmptyContainer();

package/esm/container/EmptyContainer.js

@@ -51,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/esm/registration/IRegistration.js

@@ -11,7 +11,7 @@ const METADATA_KEY = 'registration';
 export const getTransformers = (Target) => getMetadata(Target, METADATA_KEY) ?? [];
 export const register = (...mappers) => setMetadata(METADATA_KEY, mappers.map((m, index) => {
     if (isDepKey(m)) {
-        return index === 0 ? m.register : m.redirectFrom;
+        return index === 0 ? m.assignTo.bind(m) : m.redirectFrom.bind(m);
     }
     if (isDependencyKey(m)) {
         return (r) => (index === 0 ? r.fromKey(m) : r.redirectFrom(m));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ts-ioc-container",
-  "version": "35.6.0",
+  "version": "35.6.2",
   "description": "Typescript IoC container",
   "publishConfig": {
     "access": "public",
@@ -59,5 +59,5 @@
     "ts-node": "^10.9.1",
     "typescript": "5.4.3"
   },
-  "gitHead": "91ca44d15bf3944172dcdf3e069cfdcd789ed24b"
+  "gitHead": "ad0b8fd07c4deeb317db9876ab77b0672b62a802"
 }

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;
 }