ts-ioc-container 35.2.3 → 35.3.0

package/cjm/TypedEvent.js

@@ -0,0 +1,41 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TypedEvent = void 0;
+class TypedEvent {
+    constructor() {
+        this.observerStorage = [];
+    }
+    static fromPromise(promise) {
+        const event = new TypedEvent();
+        promise.then((value) => {
+            event.emit(value);
+            event.dispose();
+        });
+        return event;
+    }
+    on(observer) {
+        this.observerStorage.push(observer);
+        return () => this.off(observer);
+    }
+    once(observer) {
+        const onceObserver = (data) => {
+            observer(data);
+            this.off(onceObserver);
+        };
+        this.observerStorage.push(onceObserver);
+        return () => this.off(onceObserver);
+    }
+    off(observer) {
+        this.observerStorage = this.observerStorage.filter((o) => o !== observer);
+    }
+    emit(data) {
+        this.observerStorage.forEach((o) => o(data));
+    }
+    toPromise() {
+        return new Promise((resolve) => this.once(resolve));
+    }
+    dispose() {
+        this.observerStorage = [];
+    }
+}
+exports.TypedEvent = TypedEvent;

package/cjm/container/AutoMockedContainer.js

@@ -3,12 +3,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.AutoMockedContainer = void 0;
 const MethodNotImplementedError_1 = require("../errors/MethodNotImplementedError");
 const DependencyNotFoundError_1 = require("../errors/DependencyNotFoundError");
+const TypedEvent_1 = require("../TypedEvent");
 class AutoMockedContainer {
     constructor() {
         this.id = '0';
         this.level = 0;
         this.tags = new Set();
         this.isDisposed = false;
+        this.onConstruct = new TypedEvent_1.TypedEvent();
+        this.onDispose = new TypedEvent_1.TypedEvent();
     }
     findChild(matchFn) {
         return undefined;

package/cjm/container/Container.js

@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Container = void 0;
 const IContainer_1 = require("./IContainer");
 const EmptyContainer_1 = require("./EmptyContainer");
-const ContainerDisposedError_1 = require("../errors/ContainerDisposedError");
 const Counter_1 = require("./Counter");
+const ContainerDisposedError_1 = require("../errors/ContainerDisposedError");
 class Container {
     constructor(injector, { parent = new EmptyContainer_1.EmptyContainer(), tags = [], counter = new Counter_1.Counter(), } = {}) {
         this.injector = injector;
@@ -19,6 +19,12 @@ class Container {
         this.id = counter.next();
         this.level = this.parent.level + 1;
     }
+    get onConstruct() {
+        return this.parent.onConstruct;
+    }
+    get onDispose() {
+        return this.parent.onDispose;
+    }
     add(registration) {
         this.registrations.push(registration);
         registration.applyTo(this);
@@ -34,6 +40,7 @@ class Container {
         if ((0, IContainer_1.isConstructor)(token)) {
             const instance = this.injector.resolve(this, token, { args });
             this.instances.add(instance);
+            this.onConstruct.emit(instance);
             return instance;
         }
         const provider = this.providers.get(token);
@@ -60,6 +67,7 @@ class Container {
     }
     dispose() {
         this.validateContainer();
+        this.onDispose.emit(this);
         this.isDisposed = true;
         this.parent.removeScope(this);
         this.parent = new EmptyContainer_1.EmptyContainer();

package/cjm/container/EmptyContainer.js

@@ -3,12 +3,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.EmptyContainer = void 0;
 const MethodNotImplementedError_1 = require("../errors/MethodNotImplementedError");
 const DependencyNotFoundError_1 = require("../errors/DependencyNotFoundError");
+const TypedEvent_1 = require("../TypedEvent");
 class EmptyContainer {
     constructor() {
         this.level = -1;
         this.id = 'empty';
         this.tags = new Set();
         this.isDisposed = false;
+        this.onConstruct = new TypedEvent_1.TypedEvent();
+        this.onDispose = new TypedEvent_1.TypedEvent();
     }
     hasInstance(value) {
         throw new MethodNotImplementedError_1.MethodNotImplementedError();

package/cjm/hooks/hook.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.injectProp = exports.runHooksAsync = exports.runHooks = exports.hasHooks = exports.getHooks = exports.hook = void 0;
+exports.onDispose = exports.onConstruct = exports.injectProp = exports.runHooksAsync = exports.runHooks = exports.hasHooks = exports.getHooks = exports.hook = void 0;
 const HookContext_1 = require("./HookContext");
 const utils_1 = require("../utils");
 const UnexpectedHookResultError_1 = require("../errors/UnexpectedHookResultError");
@@ -49,3 +49,8 @@ const runHooksAsync = (target, key, { scope, createContext = HookContext_1.creat
 exports.runHooksAsync = runHooksAsync;
 const injectProp = (fn) => (context) => context.setProperty(fn);
 exports.injectProp = injectProp;
+const onConstruct = (fn) => (0, exports.hook)('onConstruct', fn);
+exports.onConstruct = onConstruct;
+exports.onDispose = (0, exports.hook)('onDispose', (context) => {
+    context.invokeMethod({});
+});

package/cjm/index.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getParameterMetadata = exports.getMethodMetadata = exports.setMethodMetadata = exports.setParameterMetadata = exports.getMetadata = exports.setMetadata = exports.depKey = exports.byAliases = exports.byAlias = exports.IMemoKey = exports.by = exports.HookContext = exports.injectProp = exports.runHooksAsync = exports.runHooks = exports.hasHooks = exports.hook = exports.getHooks = exports.UnexpectedHookResultError = exports.ContainerDisposedError = exports.MethodNotImplementedError = exports.DependencyNotFoundError = exports.Registration = exports.redirectFrom = exports.register = exports.scope = exports.key = exports.decorate = exports.multiCache = exports.MultiCache = exports.SingletonProvider = exports.singleton = exports.Provider = exports.ProviderDecorator = exports.args = exports.argsFn = exports.alias = exports.visible = exports.provider = exports.ProxyInjector = exports.SimpleInjector = exports.MetadataInjector = exports.resolveArgs = exports.inject = exports.AutoMockedContainer = exports.EmptyContainer = exports.Container = exports.isDependencyKey = void 0;
+exports.getParameterMetadata = exports.getMethodMetadata = exports.setMethodMetadata = exports.setParameterMetadata = exports.getMetadata = exports.setMetadata = exports.depKey = exports.byAliases = exports.byAlias = exports.IMemoKey = exports.by = exports.HookContext = exports.onConstruct = exports.onDispose = exports.injectProp = exports.runHooksAsync = exports.runHooks = exports.hasHooks = exports.hook = exports.getHooks = exports.UnexpectedHookResultError = exports.ContainerDisposedError = exports.MethodNotImplementedError = exports.DependencyNotFoundError = exports.Registration = exports.redirectFrom = exports.register = exports.scope = exports.key = exports.decorate = exports.multiCache = exports.MultiCache = exports.SingletonProvider = exports.singleton = exports.Provider = exports.ProviderDecorator = exports.args = exports.argsFn = exports.alias = exports.visible = exports.provider = exports.ProxyInjector = exports.SimpleInjector = exports.MetadataInjector = exports.resolveArgs = exports.inject = exports.AutoMockedContainer = exports.EmptyContainer = exports.Container = exports.isDependencyKey = void 0;
+exports.TypedEvent = void 0;
 // Containers
 var IContainer_1 = require("./container/IContainer");
 Object.defineProperty(exports, "isDependencyKey", { enumerable: true, get: function () { return IContainer_1.isDependencyKey; } });
@@ -63,6 +64,8 @@ Object.defineProperty(exports, "hasHooks", { enumerable: true, get: function ()
 Object.defineProperty(exports, "runHooks", { enumerable: true, get: function () { return hook_1.runHooks; } });
 Object.defineProperty(exports, "runHooksAsync", { enumerable: true, get: function () { return hook_1.runHooksAsync; } });
 Object.defineProperty(exports, "injectProp", { enumerable: true, get: function () { return hook_1.injectProp; } });
+Object.defineProperty(exports, "onDispose", { enumerable: true, get: function () { return hook_1.onDispose; } });
+Object.defineProperty(exports, "onConstruct", { enumerable: true, get: function () { return hook_1.onConstruct; } });
 var HookContext_1 = require("./hooks/HookContext");
 Object.defineProperty(exports, "HookContext", { enumerable: true, get: function () { return HookContext_1.HookContext; } });
 // Others
@@ -79,3 +82,5 @@ Object.defineProperty(exports, "setParameterMetadata", { enumerable: true, get:
 Object.defineProperty(exports, "setMethodMetadata", { enumerable: true, get: function () { return metadata_1.setMethodMetadata; } });
 Object.defineProperty(exports, "getMethodMetadata", { enumerable: true, get: function () { return metadata_1.getMethodMetadata; } });
 Object.defineProperty(exports, "getParameterMetadata", { enumerable: true, get: function () { return metadata_1.getParameterMetadata; } });
+var TypedEvent_1 = require("./TypedEvent");
+Object.defineProperty(exports, "TypedEvent", { enumerable: true, get: function () { return TypedEvent_1.TypedEvent; } });

package/esm/TypedEvent.js

@@ -0,0 +1,37 @@
+export class TypedEvent {
+    constructor() {
+        this.observerStorage = [];
+    }
+    static fromPromise(promise) {
+        const event = new TypedEvent();
+        promise.then((value) => {
+            event.emit(value);
+            event.dispose();
+        });
+        return event;
+    }
+    on(observer) {
+        this.observerStorage.push(observer);
+        return () => this.off(observer);
+    }
+    once(observer) {
+        const onceObserver = (data) => {
+            observer(data);
+            this.off(onceObserver);
+        };
+        this.observerStorage.push(onceObserver);
+        return () => this.off(onceObserver);
+    }
+    off(observer) {
+        this.observerStorage = this.observerStorage.filter((o) => o !== observer);
+    }
+    emit(data) {
+        this.observerStorage.forEach((o) => o(data));
+    }
+    toPromise() {
+        return new Promise((resolve) => this.once(resolve));
+    }
+    dispose() {
+        this.observerStorage = [];
+    }
+}

package/esm/container/AutoMockedContainer.js

@@ -1,11 +1,14 @@
 import { MethodNotImplementedError } from '../errors/MethodNotImplementedError';
 import { DependencyNotFoundError } from '../errors/DependencyNotFoundError';
+import { TypedEvent } from '../TypedEvent';
 export class AutoMockedContainer {
     constructor() {
         this.id = '0';
         this.level = 0;
         this.tags = new Set();
         this.isDisposed = false;
+        this.onConstruct = new TypedEvent();
+        this.onDispose = new TypedEvent();
     }
     findChild(matchFn) {
         return undefined;

package/esm/container/Container.js

@@ -1,7 +1,7 @@
 import { isConstructor, } from './IContainer';
 import { EmptyContainer } from './EmptyContainer';
-import { ContainerDisposedError } from '../errors/ContainerDisposedError';
 import { Counter } from './Counter';
+import { ContainerDisposedError } from '../errors/ContainerDisposedError';
 export class Container {
     constructor(injector, { parent = new EmptyContainer(), tags = [], counter = new Counter(), } = {}) {
         this.injector = injector;
@@ -16,6 +16,12 @@ export class Container {
         this.id = counter.next();
         this.level = this.parent.level + 1;
     }
+    get onConstruct() {
+        return this.parent.onConstruct;
+    }
+    get onDispose() {
+        return this.parent.onDispose;
+    }
     add(registration) {
         this.registrations.push(registration);
         registration.applyTo(this);
@@ -31,6 +37,7 @@ export class Container {
         if (isConstructor(token)) {
             const instance = this.injector.resolve(this, token, { args });
             this.instances.add(instance);
+            this.onConstruct.emit(instance);
             return instance;
         }
         const provider = this.providers.get(token);
@@ -57,6 +64,7 @@ export class Container {
     }
     dispose() {
         this.validateContainer();
+        this.onDispose.emit(this);
         this.isDisposed = true;
         this.parent.removeScope(this);
         this.parent = new EmptyContainer();

package/esm/container/EmptyContainer.js

@@ -1,11 +1,14 @@
 import { MethodNotImplementedError } from '../errors/MethodNotImplementedError';
 import { DependencyNotFoundError } from '../errors/DependencyNotFoundError';
+import { TypedEvent } from '../TypedEvent';
 export class EmptyContainer {
     constructor() {
         this.level = -1;
         this.id = 'empty';
         this.tags = new Set();
         this.isDisposed = false;
+        this.onConstruct = new TypedEvent();
+        this.onDispose = new TypedEvent();
     }
     hasInstance(value) {
         throw new MethodNotImplementedError();

package/esm/hooks/hook.js

@@ -40,3 +40,7 @@ export const runHooksAsync = (target, key, { scope, createContext = createHookCo
     }));
 };
 export const injectProp = (fn) => (context) => context.setProperty(fn);
+export const onConstruct = (fn) => hook('onConstruct', fn);
+export const onDispose = hook('onDispose', (context) => {
+    context.invokeMethod({});
+});

package/esm/index.js

@@ -23,8 +23,9 @@ export { MethodNotImplementedError } from './errors/MethodNotImplementedError';
 export { ContainerDisposedError } from './errors/ContainerDisposedError';
 export { UnexpectedHookResultError } from './errors/UnexpectedHookResultError';
 // Hooks
-export { getHooks, hook, hasHooks, runHooks, runHooksAsync, injectProp } from './hooks/hook';
+export { getHooks, hook, hasHooks, runHooks, runHooksAsync, injectProp, onDispose, onConstruct, } from './hooks/hook';
 export { HookContext } from './hooks/HookContext';
 // Others
 export { by, IMemoKey, byAlias, byAliases, depKey } from './by';
 export { setMetadata, getMetadata, setParameterMetadata, setMethodMetadata, getMethodMetadata, getParameterMetadata, } from './metadata';
+export { TypedEvent } from './TypedEvent';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ts-ioc-container",
-  "version": "35.2.3",
+  "version": "35.3.0",
   "description": "Typescript IoC container",
   "publishConfig": {
     "access": "public",
@@ -59,5 +59,5 @@
     "ts-node": "^10.9.1",
     "typescript": "5.4.3"
   },
-  "gitHead": "5c2d64e52655c92bbceb219595b882cadc44b2f6"
+  "gitHead": "f46b9c8b1501b9e74679fd0464c76a3ad1e3fb74"
 }

package/typings/TypedEvent.d.ts

@@ -0,0 +1,12 @@
+export type IObserver<T> = (data: T) => void;
+export type IUnsubscribe = () => void;
+export declare class TypedEvent<T> {
+    static fromPromise<T>(promise: Promise<T>): TypedEvent<unknown>;
+    private observerStorage;
+    on(observer: IObserver<T>): IUnsubscribe;
+    once(observer: IObserver<T>): IUnsubscribe;
+    off(observer: IObserver<T>): void;
+    emit(data: T): void;
+    toPromise(): Promise<T>;
+    dispose(): void;
+}

package/typings/container/AutoMockedContainer.d.ts

@@ -1,10 +1,13 @@
-import { AliasPredicate, DependencyKey, IContainer, InjectionToken, ReduceScope, ResolveOptions, Tag } from './IContainer';
+import { AliasPredicate, DependencyKey, IContainer, InjectionToken, Instance, ReduceScope, ResolveOptions, Tag } from './IContainer';
 import { IRegistration } from '../registration/IRegistration';
+import { TypedEvent } from '../TypedEvent';
 export declare abstract class AutoMockedContainer implements IContainer {
     id: string;
     level: number;
     tags: Set<string>;
     isDisposed: boolean;
+    onConstruct: TypedEvent<Instance>;
+    onDispose: 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

@@ -1,8 +1,9 @@
-import { AliasPredicate, CreateScopeOptions, DependencyKey, IContainer, IContainerModule, InjectionToken, ReduceScope, ResolveOptions, Tag } from './IContainer';
+import { AliasPredicate, CreateScopeOptions, DependencyKey, IContainer, IContainerModule, InjectionToken, Instance, ReduceScope, ResolveOptions, Tag } from './IContainer';
 import { IInjector } from '../injector/IInjector';
 import { IProvider } from '../provider/IProvider';
 import { IRegistration } from '../registration/IRegistration';
 import { Counter } from './Counter';
+import { TypedEvent } from '../TypedEvent';
 export declare class Container implements IContainer {
     private readonly injector;
     isDisposed: boolean;
@@ -20,6 +21,8 @@ export declare class Container implements IContainer {
         tags?: Tag[];
         counter?: Counter;
     });
+    get onConstruct(): TypedEvent<Instance>;
+    get onDispose(): TypedEvent<IContainer>;
     add(registration: IRegistration): this;
     register(key: DependencyKey, provider: IProvider): this;
     resolve<T>(token: InjectionToken<T>, { args, child, lazy }?: ResolveOptions): T;
@@ -36,7 +39,7 @@ export declare class Container implements IContainer {
     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;
+    hasInstance(value: Instance, direction: 'parent' | 'child'): boolean;
     /**
      * @private
      */

package/typings/container/EmptyContainer.d.ts

@@ -1,11 +1,14 @@
-import { AliasPredicate, DependencyKey, IContainer, IContainerModule, InjectionToken, ReduceScope, ResolveOptions, Tag } from './IContainer';
+import { AliasPredicate, DependencyKey, IContainer, IContainerModule, InjectionToken, Instance, ReduceScope, ResolveOptions, Tag } from './IContainer';
 import { IProvider } from '../provider/IProvider';
 import { IRegistration } from '../registration/IRegistration';
+import { TypedEvent } from '../TypedEvent';
 export declare class EmptyContainer implements IContainer {
     level: number;
     id: string;
     tags: Set<string>;
     isDisposed: boolean;
+    onConstruct: TypedEvent<Instance>;
+    onDispose: 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

@@ -1,6 +1,7 @@
 import { IProvider } from '../provider/IProvider';
 import { constructor, MapFn } from '../utils';
 import { IRegistration } from '../registration/IRegistration';
+import { TypedEvent } from '../TypedEvent';
 export type Tag = string;
 export type DependencyKey = string | symbol;
 export declare function isDependencyKey(token: constructor<any> | DependencyKey | MapFn<any>): token is DependencyKey;
@@ -29,9 +30,15 @@ export type CreateScopeOptions = {
     tags?: Tag[];
     idempotent?: boolean;
 };
+export type Branded<T, Brand> = T & {
+    _brand: Brand;
+};
+export type Instance = Branded<object, 'Instance'>;
 export interface IContainer extends Resolvable, Tagged {
     readonly tags: Set<Tag>;
     readonly isDisposed: boolean;
+    onDispose: TypedEvent<IContainer>;
+    onConstruct: TypedEvent<Instance>;
     createScope(options?: CreateScopeOptions): IContainer;
     register(key: DependencyKey, value: IProvider): this;
     add(registration: IRegistration): this;

package/typings/hooks/hook.d.ts

@@ -20,4 +20,6 @@ export declare const runHooksAsync: (target: object, key: string | symbol, { sco
     predicate?: ((methodName: string) => boolean) | undefined;
 }) => Promise<void[]>;
 export declare const injectProp: (fn: InjectFn) => HookFn;
+export declare const onConstruct: (fn: HookFn) => (target: object, propertyKey: string | symbol) => void;
+export declare const onDispose: (target: object, propertyKey: string | symbol) => void;
 export {};

package/typings/index.d.ts

@@ -1,4 +1,4 @@
-export { IContainer, Resolvable, IContainerModule, isDependencyKey, DependencyKey, InjectionToken, Tag, Tagged, } from './container/IContainer';
+export { IContainer, Resolvable, IContainerModule, isDependencyKey, DependencyKey, InjectionToken, Tag, Tagged, Instance, } from './container/IContainer';
 export { Container } from './container/Container';
 export { EmptyContainer } from './container/EmptyContainer';
 export { AutoMockedContainer } from './container/AutoMockedContainer';
@@ -19,8 +19,9 @@ export { DependencyNotFoundError } from './errors/DependencyNotFoundError';
 export { MethodNotImplementedError } from './errors/MethodNotImplementedError';
 export { ContainerDisposedError } from './errors/ContainerDisposedError';
 export { UnexpectedHookResultError } from './errors/UnexpectedHookResultError';
-export { getHooks, hook, hasHooks, HookFn, HookClass, runHooks, runHooksAsync, injectProp } from './hooks/hook';
+export { getHooks, hook, hasHooks, HookFn, HookClass, runHooks, runHooksAsync, injectProp, onDispose, onConstruct, } from './hooks/hook';
 export { HookContext, InjectFn, IHookContext } from './hooks/HookContext';
 export { by, InstancePredicate, IMemo, IMemoKey, byAlias, byAliases, depKey, DepKey } from './by';
-export { constructor } from './utils';
+export { constructor, Branded } from './utils';
 export { setMetadata, getMetadata, setParameterMetadata, setMethodMetadata, getMethodMetadata, getParameterMetadata, } from './metadata';
+export { TypedEvent } from './TypedEvent';

package/typings/utils.d.ts

@@ -1,5 +1,8 @@
 export type constructor<T> = new (...args: any[]) => T;
 export type MapFn<T> = (value: T) => T;
+export type Branded<T, Brand> = T & {
+    _brand: Brand;
+};
 export declare const pipe: <T>(...mappers: MapFn<T>[]) => MapFn<T>;
 export declare function fillEmptyIndexes<T>(baseArr: (T | undefined)[], insertArr: T[]): T[];
 export declare const constant: <T>(value: T) => () => T;