@rs-x/state-manager 0.4.21 → 1.0.1

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import { Observable, Subject, Subscription } from 'rxjs';
-import { IDisposable, IPropertyChange, IDisposableOwner, ISingletonFactory, SingletonFactoryWithGuid, IErrorLog, IGuidFactory, IIndexValueAccessor, IArrayIndexAccessor, IMapKeyAccessor, IPropertyValueAccessor, ISetKeyAccessor, SingletonFactory, IEqualityService, IValueMetadata, DateProperty, IDatePropertyAccessor, IObservableAccessor, IPromiseAccessor, IMultiInjectService, ContainerModule, IDeepClone, ISingletonFactoryWithIdGeneration, IInstanceGroupInfo } from '@rs-x/core';
+import { IDisposable, IPropertyChange, IDisposableOwner, IKeyedInstanceFactory, GuidKeyedInstanceFactory, IErrorLog, IGuidFactory, IIndexValueAccessor, IArrayIndexAccessor, IMapKeyAccessor, IPropertyValueAccessor, ISetKeyAccessor, IProxyRegistry, KeyedInstanceFactory, IEqualityService, IValueMetadata, DateProperty, IDatePropertyAccessor, IObservableAccessor, IPromiseAccessor, IMultiInjectService, ContainerModule, IDeepClone, IGroupedKeyedInstanceFactory, IInstanceGroupInfo } from '@rs-x/core';
 
 interface IObserver<T = unknown> extends IDisposable {
     target: T | undefined;
@@ -37,10 +37,10 @@ interface IChangeSubscriptionsCreateMethods {
     onChanged: (change: IPropertyChange) => void;
     init?: (observer: IObserver) => void;
 }
-interface IGroupedChangeSubscriptionsForContextManager<TSubsriptionData, TData, TIdData = TData> extends ISingletonFactory<string, TData, IObserver, TIdData> {
+interface IGroupedChangeSubscriptionsForContextManager<TSubsriptionData, TData, TIdData = TData> extends IKeyedInstanceFactory<string, TData, IObserver, TIdData> {
     getSubsriptionData(id: string): TSubsriptionData | undefined;
 }
-declare abstract class GroupedChangeSubscriptionsForContextManager<TSubsriptionData, TData extends TIdData & IChangeSubscriptionsCreateMethods, TIdData = TData> extends SingletonFactoryWithGuid<TData, IObserver> implements IGroupedChangeSubscriptionsForContextManager<TSubsriptionData, TData, TIdData> {
+declare abstract class GroupedChangeSubscriptionsForContextManager<TSubsriptionData, TData extends TIdData & IChangeSubscriptionsCreateMethods, TIdData = TData> extends GuidKeyedInstanceFactory<TData, IObserver> implements IGroupedChangeSubscriptionsForContextManager<TSubsriptionData, TData, TIdData> {
     private _context;
     private readonly releaseContext;
     protected readonly _errorLog: IErrorLog;
@@ -92,8 +92,8 @@ interface IPropertyInfo extends IIndexInfo {
     setValue?: (value: unknown) => boolean;
     initializeManually?: boolean;
 }
-type IPropertyObserverProxyPairManager = ISingletonFactory<unknown, IPropertyInfo, IObserverProxyPair, IIndexInfo>;
-type IObjectPropertyObserverProxyPairManager = ISingletonFactory<unknown, unknown, IPropertyObserverProxyPairManager>;
+type IPropertyObserverProxyPairManager = IKeyedInstanceFactory<unknown, IPropertyInfo, IObserverProxyPair, IIndexInfo>;
+type IObjectPropertyObserverProxyPairManager = IKeyedInstanceFactory<unknown, unknown, IPropertyObserverProxyPairManager>;
 
 declare class ObserverGroup extends AbstractObserver {
     private readonly _errorLog;
@@ -123,7 +123,7 @@ interface IProxyTarget<TTarget> {
     target: TTarget;
     indexWatchRule?: IIndexWatchRule;
 }
-type IObjectObserverProxyPairManager<TTarget = unknown> = ISingletonFactory<unknown, IProxyTarget<TTarget>, IObserverProxyPair<TTarget>>;
+type IObjectObserverProxyPairManager<TTarget = unknown> = IKeyedInstanceFactory<unknown, IProxyTarget<TTarget>, IObserverProxyPair<TTarget>>;
 
 interface IObjectObserverProxyPairFactory<TTarget = unknown> {
     readonly priority: number;
@@ -152,7 +152,7 @@ interface IArrayProxyData extends IArrayProxyIdData {
     owner?: IDisposableOwner;
 }
 type IArrayObserverProxyPair = IObserverProxyPair<unknown[]>;
-type IArrayProxyFactory = ISingletonFactory<unknown, IArrayProxyData, IArrayObserverProxyPair, IArrayProxyIdData>;
+type IArrayProxyFactory = IKeyedInstanceFactory<unknown, IArrayProxyData, IArrayObserverProxyPair, IArrayProxyIdData>;
 
 type IArrayObserverProxyPairFactory = IObjectObserverProxyPairFactory<unknown[]>;
 
@@ -171,7 +171,7 @@ interface IDateProxyData extends IDateProxyIdData {
     owner?: IDisposableOwner;
 }
 type IDateObserverProxyPair = IObserverProxyPair<Date>;
-type IDateProxyFactory = ISingletonFactory<string, IDateProxyData, IDateObserverProxyPair>;
+type IDateProxyFactory = IKeyedInstanceFactory<string, IDateProxyData, IDateObserverProxyPair>;
 
 type IDateOserverProxyPair = IObserverProxyPair<Date>;
 type IDateObserverProxyPairFactory = IObjectObserverProxyPairFactory<Date>;
@@ -191,7 +191,7 @@ interface IMapProxifyData extends IMapProxifyIdData {
     owner?: IDisposableOwner;
 }
 type IMapObserverProxyPair = IObserverProxyPair<Map<unknown, unknown>>;
-type IMapProxyFactory = ISingletonFactory<Map<unknown, unknown>, IMapProxifyData, IMapObserverProxyPair>;
+type IMapProxyFactory = IKeyedInstanceFactory<Map<unknown, unknown>, IMapProxifyData, IMapObserverProxyPair>;
 
 type IMapObserverProxyPairFactory = IObjectObserverProxyPairFactory<Map<unknown, unknown>>;
 
@@ -207,7 +207,7 @@ interface IObservableProxyData {
     observable: Observable<unknown>;
 }
 type IObservableObserverProxyPair = IObserverProxyPair<Observable<unknown>>;
-type IObservableProxyFactory = ISingletonFactory<Observable<unknown>, IObservableProxyData, IObservableObserverProxyPair>;
+type IObservableProxyFactory = IKeyedInstanceFactory<Observable<unknown>, IObservableProxyData, IObservableObserverProxyPair>;
 
 declare class ObservableObserverProxyPairFactory implements IObjectObserverProxyPairFactory<Observable<unknown>> {
     private readonly _observableProxyFactory;
@@ -230,7 +230,7 @@ interface IPromiseProxyData {
     promise: Promise<unknown>;
 }
 type IPromiseObserverProxyPair = IObserverProxyPair<Promise<unknown>>;
-type IPromiseProxyFactory = ISingletonFactory<Promise<unknown>, IPromiseProxyData, IPromiseObserverProxyPair>;
+type IPromiseProxyFactory = IKeyedInstanceFactory<Promise<unknown>, IPromiseProxyData, IPromiseObserverProxyPair>;
 
 declare class PromiseObserverProxyPairFactory implements IObjectObserverProxyPairFactory<Promise<unknown>> {
     private readonly _promiseProxyFactory;
@@ -247,7 +247,7 @@ interface ISetProxifyData extends ISetProxifyIdData {
     owner?: IDisposableOwner;
 }
 type ISetObserverProxyPair = IObserverProxyPair<Set<unknown>>;
-type ISetProxyFactory = ISingletonFactory<Set<unknown>, ISetProxifyData, ISetObserverProxyPair, ISetProxifyIdData>;
+type ISetProxyFactory = IKeyedInstanceFactory<Set<unknown>, ISetProxifyData, ISetObserverProxyPair, ISetProxifyIdData>;
 
 type ISetObserverProxyPairFactory = IObjectObserverProxyPairFactory<Set<unknown>>;
 
@@ -267,15 +267,7 @@ declare class ObjectObserverProxyPairFactoryProvider implements IObjectObserverP
     constructor(factories: readonly IObjectObserverProxyPairFactory[]);
 }
 
-interface IProxyRegistry {
-    getProxyTarget<T>(proxyToFind: unknown): T;
-    getProxy<T>(proxyTarget: unknown): T;
-    register(proxyTarget: unknown, proxy: unknown): void;
-    unregister(proxyTarget: unknown): void;
-    isProxy(object: unknown): boolean;
-}
-
-declare class ObjectObserverProxyPairManager extends SingletonFactoryWithGuid<IProxyTarget<unknown>, IObserverProxyPair> implements IObjectObserverProxyPairManager {
+declare class ObjectObserverProxyPairManager extends GuidKeyedInstanceFactory<IProxyTarget<unknown>, IObserverProxyPair> implements IObjectObserverProxyPairManager {
     private readonly getObserverFactoryProvider;
     private readonly _proxyRegistry;
     constructor(getObserverFactoryProvider: () => IObjectObserverProxyPairFactoryProvider, _proxyRegistry: IProxyRegistry, guidFactory: IGuidFactory);
@@ -295,7 +287,7 @@ interface IIndexObserverProxyPairFactory<TProxy = unknown> extends IDisposable {
     applies(object: unknown, propertyInfo: IPropertyInfo): boolean;
 }
 
-declare class ObjectPropertyObserverProxyPairManager extends SingletonFactory<unknown, unknown, IPropertyObserverProxyPairManager> implements IObjectPropertyObserverProxyPairManager {
+declare class ObjectPropertyObserverProxyPairManager extends KeyedInstanceFactory<unknown, unknown, IPropertyObserverProxyPairManager> implements IObjectPropertyObserverProxyPairManager {
     private readonly _factories;
     private readonly _guidFactory;
     constructor(_factories: IIndexObserverProxyPairFactory[], _guidFactory: IGuidFactory);
@@ -313,10 +305,10 @@ interface IIndexObserverInfo<TIndex = unknown> extends IIndexObserverIdInfo<TInd
 
 type Collection = Map<unknown, unknown> | Array<unknown> | Set<unknown>;
 type ICollectionIdexObserverIdInfo = IIndexObserverIdInfo<unknown>;
-type ICollectionIndexObserverManager = ISingletonFactory<unknown, IIndexObserverInfo, IObserver>;
-type ICollectionItemObserverManager = ISingletonFactory<Collection, Collection, ICollectionIndexObserverManager>;
+type ICollectionIndexObserverManager = IKeyedInstanceFactory<unknown, IIndexObserverInfo, IObserver>;
+type ICollectionItemObserverManager = IKeyedInstanceFactory<Collection, Collection, ICollectionIndexObserverManager>;
 
-declare class CollectionItemObserverManager extends SingletonFactory<Collection, Collection, ICollectionIndexObserverManager> implements ICollectionItemObserverManager {
+declare class CollectionItemObserverManager extends KeyedInstanceFactory<Collection, Collection, ICollectionIndexObserverManager> implements ICollectionItemObserverManager {
     private readonly _errorLog;
     private readonly _equalityService;
     private readonly _indexValueAccessor;
@@ -343,9 +335,9 @@ interface IndexChangeSubscriptionForContext<TIndex> {
     context: unknown;
     index: TIndex;
 }
-type IIndexSetObserverManager<TIndex> = ISingletonFactory<unknown, unknown, ISingletonFactory<IIndexWatchRule | TIndex, IIndexObserverInfo<TIndex>, IObserver, ISubscriptionIdInfo<TIndex>>>;
+type IIndexSetObserverManager<TIndex> = IKeyedInstanceFactory<unknown, unknown, IKeyedInstanceFactory<IIndexWatchRule | TIndex, IIndexObserverInfo<TIndex>, IObserver, ISubscriptionIdInfo<TIndex>>>;
 type IIndexChangeSubscriptionsForContextManager<TIndex> = IGroupedChangeSubscriptionsForContextManager<ObserverGroup, ISubscriptionInfo<TIndex>, ISubscriptionIdInfo<TIndex>>;
-declare class IndexChangeSubscriptionManager<TIndex> extends SingletonFactory<unknown, unknown, IIndexChangeSubscriptionsForContextManager<TIndex>> {
+declare class IndexChangeSubscriptionManager<TIndex> extends KeyedInstanceFactory<unknown, unknown, IIndexChangeSubscriptionsForContextManager<TIndex>> {
     private readonly _indexSetObserverManager;
     private readonly _errorLog;
     private readonly _guidFactory;
@@ -383,10 +375,10 @@ type ICollectionItemObserverProxyPairFactory = IIndexObserverProxyPairFactory<Co
 
 type IDatePropertyObserverIdInfo = IIndexObserverIdInfo<DateProperty>;
 type IDatePropertyObserverInfo = IIndexObserverInfo<DateProperty>;
-type IProperForDataObserverManager = ISingletonFactory<DateProperty, IDatePropertyObserverInfo, IObserver>;
-type IDatePropertyObserverManager = ISingletonFactory<Date, Date, IProperForDataObserverManager>;
+type IProperForDataObserverManager = IKeyedInstanceFactory<DateProperty, IDatePropertyObserverInfo, IObserver>;
+type IDatePropertyObserverManager = IKeyedInstanceFactory<Date, Date, IProperForDataObserverManager>;
 
-declare class DatePropertyObserverManager extends SingletonFactory<Date, Date, IProperForDataObserverManager> implements IDatePropertyObserverManager {
+declare class DatePropertyObserverManager extends KeyedInstanceFactory<Date, Date, IProperForDataObserverManager> implements IDatePropertyObserverManager {
     private readonly _dateProxyFactory;
     private readonly _errorLog;
     private readonly _datePropertyAccessor;
@@ -406,8 +398,8 @@ declare class DatePropertyObserverProxyPairFactory extends IndexObserverProxyPai
 
 type IPropertyObserverIdInfo = IIndexObserverIdInfo<string>;
 type IPropertyObserverInfo = IIndexObserverInfo<string>;
-type IPropertyObserverManager = ISingletonFactory<string, IPropertyObserverInfo, IObserver>;
-type IObjectPropertyObserverManager = ISingletonFactory<object, object, IPropertyObserverManager>;
+type IPropertyObserverManager = IKeyedInstanceFactory<string, IPropertyObserverInfo, IObserver>;
+type IObjectPropertyObserverManager = IKeyedInstanceFactory<object, object, IPropertyObserverManager>;
 
 declare class NonIterableObjectPropertyObserverProxyPairFactory extends IndexObserverProxyPairFactory<object, string> {
     constructor(objectObserveryManager: IObjectObserverProxyPairManager, objectPropertyObserverManager: IObjectPropertyObserverManager, errorLog: IErrorLog, guidFactory: IGuidFactory, indexValueAccessor: IIndexValueAccessor, proxyRegister: IProxyRegistry, valueMetadata: IValueMetadata);
@@ -415,7 +407,7 @@ declare class NonIterableObjectPropertyObserverProxyPairFactory extends IndexObs
     protected setIndexValue(object: Record<string, unknown>, key: string, value: unknown): void;
 }
 
-declare class ObjectPropertyObserverManager extends SingletonFactory<object, object, IPropertyObserverManager> implements IObjectPropertyObserverManager {
+declare class ObjectPropertyObserverManager extends KeyedInstanceFactory<object, object, IPropertyObserverManager> implements IObjectPropertyObserverManager {
     private readonly _proxyRegister;
     constructor(_proxyRegister: IProxyRegistry);
     getId(context: object): object;
@@ -424,7 +416,7 @@ declare class ObjectPropertyObserverManager extends SingletonFactory<object, obj
     protected releaseInstance(propertyObserverManager: IPropertyObserverManager): void;
 }
 
-declare class ArrayProxyFactory extends SingletonFactory<unknown[], IArrayProxyData, IArrayObserverProxyPair, IArrayProxyIdData> implements IArrayProxyFactory {
+declare class ArrayProxyFactory extends KeyedInstanceFactory<unknown[], IArrayProxyData, IArrayObserverProxyPair, IArrayProxyIdData> implements IArrayProxyFactory {
     private readonly _proxyRegistry;
     constructor(_proxyRegistry: IProxyRegistry);
     getId(data: IArrayProxyIdData): unknown[];
@@ -433,7 +425,7 @@ declare class ArrayProxyFactory extends SingletonFactory<unknown[], IArrayProxyD
     protected releaseInstance(arrayObserverWithProxy: IArrayObserverProxyPair, id: unknown[]): void;
 }
 
-declare class DateProxyFactory extends SingletonFactoryWithGuid<IDateProxyData, IDateObserverProxyPair, IDateProxyIdData> implements IDateProxyFactory {
+declare class DateProxyFactory extends GuidKeyedInstanceFactory<IDateProxyData, IDateObserverProxyPair, IDateProxyIdData> implements IDateProxyFactory {
     private readonly _proxyRegistry;
     constructor(guidFactory: IGuidFactory, _proxyRegistry: IProxyRegistry);
     protected getGroupId(data: IDateProxyIdData): Date;
@@ -454,7 +446,7 @@ declare class MapProxy extends AbstractObserver<Map<unknown, unknown>, Map<unkno
     private deleteItem;
     private emitSet;
 }
-declare class MapProxyFactory extends SingletonFactory<Map<unknown, unknown>, IMapProxifyData, IMapObserverProxyPair> implements IMapProxyFactory {
+declare class MapProxyFactory extends KeyedInstanceFactory<Map<unknown, unknown>, IMapProxifyData, IMapObserverProxyPair> implements IMapProxyFactory {
     private readonly _proxyRegistry;
     constructor(_proxyRegistry: IProxyRegistry);
     getId(data: IMapProxifyData): Map<unknown, unknown>;
@@ -463,7 +455,7 @@ declare class MapProxyFactory extends SingletonFactory<Map<unknown, unknown>, IM
     protected releaseInstance(mapObserverWithProxy: IMapObserverProxyPair): void;
 }
 
-declare class ObservableProxyFactory extends SingletonFactory<Observable<unknown>, IObservableProxyData, IObservableObserverProxyPair> implements IObservableProxyFactory {
+declare class ObservableProxyFactory extends KeyedInstanceFactory<Observable<unknown>, IObservableProxyData, IObservableObserverProxyPair> implements IObservableProxyFactory {
     private readonly _observableAccessor;
     constructor(_observableAccessor: IObservableAccessor);
     getId(data: IObservableProxyData): Observable<unknown>;
@@ -472,7 +464,7 @@ declare class ObservableProxyFactory extends SingletonFactory<Observable<unknown
     protected releaseInstance(observableObserverWithProxy: IObservableObserverProxyPair): void;
 }
 
-declare class PromiseProxyFactory extends SingletonFactory<Promise<unknown>, IPromiseProxyData, IPromiseObserverProxyPair> implements IPromiseProxyFactory {
+declare class PromiseProxyFactory extends KeyedInstanceFactory<Promise<unknown>, IPromiseProxyData, IPromiseObserverProxyPair> implements IPromiseProxyFactory {
     private readonly _promiseAccessor;
     constructor(_promiseAccessor: IPromiseAccessor);
     getId(data: IPromiseProxyData): Promise<unknown>;
@@ -481,15 +473,6 @@ declare class PromiseProxyFactory extends SingletonFactory<Promise<unknown>, IPr
     protected releaseInstance(promiseObserverWithProxy: IPromiseObserverProxyPair): void;
 }
 
-declare class ProxyRegistry implements IProxyRegistry {
-    private readonly _proxies;
-    getProxyTarget<T>(proxyToFind: unknown): T;
-    getProxy<T>(proxyTarget: unknown): T;
-    register(proxyTarget: unknown, proxy: unknown): void;
-    unregister(proxyTarget: unknown): void;
-    isProxy(object: unknown): boolean;
-}
-
 declare class SetProxy extends AbstractObserver<Set<unknown>, Set<unknown>, undefined> {
     private readonly _proxyRegistry;
     private readonly updateSet;
@@ -502,7 +485,7 @@ declare class SetProxy extends AbstractObserver<Set<unknown>, Set<unknown>, unde
     private hasSet;
     private emitValueChange;
 }
-declare class SetProxyFactory extends SingletonFactory<Set<unknown>, ISetProxifyData, ISetObserverProxyPair, ISetProxifyIdData> implements ISetProxyFactory {
+declare class SetProxyFactory extends KeyedInstanceFactory<Set<unknown>, ISetProxifyData, ISetObserverProxyPair, ISetProxifyIdData> implements ISetProxyFactory {
     private readonly _proxyRegistry;
     constructor(_proxyRegistry: IProxyRegistry);
     getId(data: ISetProxifyIdData): Set<unknown>;
@@ -521,7 +504,6 @@ declare const RsXStateManagerInjectionTokens: {
     IMapProxyFactory: symbol;
     ISetProxyFactory: symbol;
     IDateProxyFactory: symbol;
-    IProxyRegistry: symbol;
     IPromiseProxyFactory: symbol;
     IObservableProxyFactory: symbol;
     IObjectPropertyObserverProxyPairManager: symbol;
@@ -554,6 +536,7 @@ interface IState {
     value: unknown;
     valueCopy: unknown;
     watched: boolean;
+    ownerId: unknown;
 }
 interface IValueKey {
     key: unknown;
@@ -561,32 +544,33 @@ interface IValueKey {
 interface IValueWithKey extends IValueKey {
     value: unknown;
     watched: boolean;
+    ownerId: unknown;
 }
-interface IStateForObjectManager extends ISingletonFactory<unknown, IValueWithKey, IState, IValueKey> {
-    set(key: unknown, value: unknown, watched: boolean): void;
+interface IStateForObjectManager extends IKeyedInstanceFactory<unknown, IValueWithKey, IState, IValueKey> {
+    set(key: unknown, value: unknown, watched: boolean, ownerId: unknown): void;
 }
-interface IObjectStateManager extends ISingletonFactory<unknown, unknown, IStateForObjectManager> {
-    replaceState(key: unknown, newContext: unknown, newValue: unknown, oldContext: unknown, watched: boolean): void;
+interface IObjectStateManager extends IKeyedInstanceFactory<unknown, unknown, IStateForObjectManager> {
+    replaceState(key: unknown, newContext: unknown, newValue: unknown, oldContext: unknown, watched: boolean, ownerId: unknown): void;
     isRegistered(context: unknown, key: unknown): boolean;
 }
 
-declare class StateForObjectManager extends SingletonFactory<unknown, IValueWithKey, IState, IValueKey> implements IStateForObjectManager {
+declare class StateForObjectManager extends KeyedInstanceFactory<unknown, IValueWithKey, IState, IValueKey> implements IStateForObjectManager {
     private readonly _deepClone;
     private readonly releaseContext;
     constructor(_deepClone: IDeepClone, releaseContext: VoidFunction);
     getId(data: IValueKey): unknown;
-    set(key: unknown, value: unknown, watched: boolean): void;
+    set(key: unknown, value: unknown, watched: boolean, ownerId: unknown): void;
     protected createId(data: IValueKey): unknown;
     private deepClone;
     protected createInstance(data: IValueWithKey): IState;
     protected onReleased(): void;
 }
-declare class ObjectStateManager extends SingletonFactory<unknown, unknown, IStateForObjectManager> implements IObjectStateManager {
+declare class ObjectStateManager extends KeyedInstanceFactory<unknown, unknown, IStateForObjectManager> implements IObjectStateManager {
     private readonly _deepClone;
     constructor(_deepClone: IDeepClone);
     getId(object: unknown): unknown;
     isRegistered(context: unknown, key: unknown): boolean;
-    replaceState(key: unknown, newContext: unknown, newValue: unknown, oldContext: unknown, watched: boolean): void;
+    replaceState(key: unknown, newContext: unknown, newValue: unknown, oldContext: unknown, watched: boolean, ownerId: unknown): void;
     protected createId(object: unknown): unknown;
     protected createInstance(context: unknown): IStateForObjectManager;
 }
@@ -603,13 +587,13 @@ interface IStateChangeSubscriptionInfo extends IStateChangeSubscriptionIdInfo {
     onChanged: (change: IPropertyChange) => void;
     init?: (observer: IObserver) => void;
 }
-type IStateChangeSubscriptionsForContextManager = ISingletonFactoryWithIdGeneration<string, IStateChangeSubscriptionInfo, IObserver, IStateChangeSubscriptionIdInfo>;
-interface IStateChangeSubscriptionManager extends ISingletonFactory<unknown, unknown, IStateChangeSubscriptionsForContextManager> {
+type IStateChangeSubscriptionsForContextManager = IGroupedKeyedInstanceFactory<string, IStateChangeSubscriptionInfo, IObserver, IStateChangeSubscriptionIdInfo>;
+interface IStateChangeSubscriptionManager extends IKeyedInstanceFactory<unknown, unknown, IStateChangeSubscriptionsForContextManager> {
     isRegistered(context: unknown, key: unknown): boolean;
     instanceGroupInfoEntriesForContext(context: unknown): IterableIterator<IInstanceGroupInfo<string, IObserver>>;
 }
 
-declare class StateChangeSubscriptionManager extends SingletonFactory<unknown, unknown, IStateChangeSubscriptionsForContextManager> implements IStateChangeSubscriptionManager {
+declare class StateChangeSubscriptionManager extends KeyedInstanceFactory<unknown, unknown, IStateChangeSubscriptionsForContextManager> implements IStateChangeSubscriptionManager {
     private readonly _objectObserverManager;
     private readonly _errorLog;
     private readonly _guidFactory;
@@ -632,16 +616,25 @@ interface IStateChange extends IContextChanged {
     newValue?: unknown;
     watched?: boolean;
 }
+interface IStateOptions {
+    indexWatchRule?: IIndexWatchRule;
+    ownerId?: unknown;
+}
+interface IStateEventListener {
+    onStateChange: (change: IStateChange) => void;
+    onContextChanged: (change: IContextChanged) => void;
+}
 interface IStateManager {
     readonly changed: Observable<IStateChange>;
     readonly contextChanged: Observable<IContextChanged>;
     readonly startChangeCycle: Observable<void>;
     readonly endChangeCycle: Observable<void>;
     isWatched(context: unknown, index: unknown, indexWatchRule?: IIndexWatchRule): boolean;
-    watchState(context: unknown, index: unknown, indexWatchRule?: IIndexWatchRule): unknown;
+    watchState(context: unknown, index: unknown, options?: IStateOptions): unknown;
+    subscribeStateEvents(context: unknown, index: unknown, listener: IStateEventListener): () => void;
     releaseState(oontext: unknown, index: unknown, indexWatchRule?: IIndexWatchRule): void;
     getState<T>(context: unknown, index: unknown): T;
-    setState<T>(context: unknown, index: unknown, value: T): void;
+    setState<T>(context: unknown, index: unknown, value: T, ownerId?: unknown): void;
     clear(): void;
 }
 
@@ -655,6 +648,8 @@ declare class StateManager implements IStateManager {
     private readonly _endChangeCycle;
     private readonly _stateChangeSubscriptionManager;
     private readonly _pending;
+    private readonly _stateEventSubscriptionsByContext;
+    private readonly _stateEventSubscriptionPool;
     constructor(objectObserverManager: IObjectPropertyObserverProxyPairManager, _objectStateManager: IObjectStateManager, errorLog: IErrorLog, guidFactory: IGuidFactory, _indexValueAccessor: IIndexValueAccessor, _equalityService: IEqualityService);
     get changed(): Observable<IStateChange>;
     get contextChanged(): Observable<IContextChanged>;
@@ -662,11 +657,12 @@ declare class StateManager implements IStateManager {
     get endChangeCycle(): Observable<void>;
     toString(): string;
     isWatched(context: unknown, index: unknown, indexWatchRule?: IIndexWatchRule): boolean;
-    watchState(context: unknown, index: unknown, indexWatchRule?: IIndexWatchRule): unknown;
+    watchState(context: unknown, index: unknown, options?: IStateOptions): unknown;
+    subscribeStateEvents(context: unknown, index: unknown, listener: IStateEventListener): () => void;
     releaseState(context: unknown, index: unknown, indexWatchRule?: IIndexWatchRule): void;
     clear(): void;
     getState<T>(context: unknown, index: unknown): T;
-    setState<T>(context: unknown, index: unknown, value: T): void;
+    setState<T>(context: unknown, index: unknown, value: T, ownerId?: unknown): void;
     private internalSetState;
     private getOldValue;
     private unnsubscribeToObserverEvents;
@@ -678,11 +674,19 @@ declare class StateManager implements IStateManager {
     private tryToSubscribeToChange;
     private getValue;
     private getStateChanges;
+    private collectStateChanges;
     private tryRebindingNestedState;
+    private addStateEventSubscription;
+    private removeStateEventSubscription;
+    private emitStateChangeEvents;
+    private emitContextChangedEvents;
+    private shouldPublish;
+    private acquireStateEventSubscription;
+    private releaseStateEventSubscription;
     private setInitialValue;
     private getChainChanges;
     private getCurrentValue;
     private onChange;
 }
 
-export { AbstractObjectObserverProxyPairFactory, AbstractObserver, ArrayObserverProxyPairFactory, ArrayProxyFactory, type Collection, CollectionItemObserverManager, CollectionItemObserverProxyPairFactory, DateObserverProxyPairFactory, DatePropertyObserverManager, DatePropertyObserverProxyPairFactory, DateProxyFactory, GroupedChangeSubscriptionsForContextManager, type IArrayObserverProxyPair, type IArrayObserverProxyPairFactory, type IArrayProxyData, type IArrayProxyFactory, type IArrayProxyIdData, type IChangeSubscriptionsCreateMethods, type ICollectionIdexObserverIdInfo, type ICollectionIndexObserverManager, type ICollectionItemObserverManager, type ICollectionItemObserverProxyPairFactory, type IContextChanged, type IDateObserverProxyPair, type IDateObserverProxyPairFactory, type IDateOserverProxyPair, type IDatePropertyObserverIdInfo, type IDatePropertyObserverInfo, type IDatePropertyObserverManager, type IDatePropertyObserverProxyPairFactory, type IDateProxyData, type IDateProxyFactory, type IDateProxyIdData, type IGroupedChangeSubscriptionsForContextManager, type IIndexChangeSubscriptionsForContextManager, type IIndexInfo, type IIndexObserverIdInfo, type IIndexObserverInfo, type IIndexObserverProxyPairFactory, type IIndexSetObserverManager, type IIndexWatchRule, type IMapObserverProxyPair, type IMapObserverProxyPairFactory, type IMapProxifyData, type IMapProxifyIdData, type IMapProxyFactory, type IObjectChange, type IObjectObserverProxyPairFactory, type IObjectObserverProxyPairFactoryProvider, type IObjectObserverProxyPairManager, type IObjectPropertyObserverManager, type IObjectPropertyObserverProxyPairManager, type IObjectStateManager, type IObservableObserverProxyPair, type IObservableProxyData, type IObservableProxyFactory, type IObserver, type IObserverProxyPair, type IPlainObjectObserverProxyPairFactory, type IPromiseObserverProxyPair, type IPromiseProxyData, type IPromiseProxyFactory, type IProperForDataObserverManager, type IPropertyInfo, type IPropertyObserverIdInfo, type IPropertyObserverInfo, type IPropertyObserverManager, type IPropertyObserverProxyPairManager, type IProxyRegistry, type IProxyTarget, type ISetObserverProxyPair, type ISetObserverProxyPairFactory, type ISetProxifyData, type ISetProxifyIdData, type ISetProxyFactory, type IState, type IStateChange, type IStateChangeObserverInfo, type IStateChangeSubscriptionIdInfo, type IStateChangeSubscriptionInfo, type IStateChangeSubscriptionManager, type IStateChangeSubscriptionsForContextManager, type IStateForObjectManager, type IStateManager, type ISubscriptionIdInfo, type ISubscriptionInfo, type ISubscriptionWithData, type IValueKey, type IValueWithKey, type IndexChangeSubscriptionForContext, IndexChangeSubscriptionManager, IndexObserverProxyPairFactory, IndexWatchRule, MapObserverProxyPairFactory, MapProxy, MapProxyFactory, NonIterableObjectPropertyObserverProxyPairFactory, ObjectObserverProxyPairFactoryProvider, ObjectObserverProxyPairManager, ObjectPropertyObserverManager, ObjectPropertyObserverProxyPairManager, ObjectStateManager, ObservableObserverProxyPairFactory, ObservableProxyFactory, ObserverGroup, PlainObjectObserverProxyPairFactory, PromiseObserverProxyPairFactory, PromiseProxyFactory, ProxyRegistry, RsXStateManagerInjectionTokens, RsXStateManagerModule, SetObserverProxyPairFactory, SetProxy, SetProxyFactory, type ShouldWatchIndexPredicate, StateChangeSubscriptionManager, StateForObjectManager, StateManager, defaultObjectObserverProxyPairFactoryList, defaultPropertyObserverProxyPairFactoryList, unloadRsXStateManagerModule, watchIndexRecursiveRule };
+export { AbstractObjectObserverProxyPairFactory, AbstractObserver, ArrayObserverProxyPairFactory, ArrayProxyFactory, type Collection, CollectionItemObserverManager, CollectionItemObserverProxyPairFactory, DateObserverProxyPairFactory, DatePropertyObserverManager, DatePropertyObserverProxyPairFactory, DateProxyFactory, GroupedChangeSubscriptionsForContextManager, type IArrayObserverProxyPair, type IArrayObserverProxyPairFactory, type IArrayProxyData, type IArrayProxyFactory, type IArrayProxyIdData, type IChangeSubscriptionsCreateMethods, type ICollectionIdexObserverIdInfo, type ICollectionIndexObserverManager, type ICollectionItemObserverManager, type ICollectionItemObserverProxyPairFactory, type IContextChanged, type IDateObserverProxyPair, type IDateObserverProxyPairFactory, type IDateOserverProxyPair, type IDatePropertyObserverIdInfo, type IDatePropertyObserverInfo, type IDatePropertyObserverManager, type IDatePropertyObserverProxyPairFactory, type IDateProxyData, type IDateProxyFactory, type IDateProxyIdData, type IGroupedChangeSubscriptionsForContextManager, type IIndexChangeSubscriptionsForContextManager, type IIndexInfo, type IIndexObserverIdInfo, type IIndexObserverInfo, type IIndexObserverProxyPairFactory, type IIndexSetObserverManager, type IIndexWatchRule, type IMapObserverProxyPair, type IMapObserverProxyPairFactory, type IMapProxifyData, type IMapProxifyIdData, type IMapProxyFactory, type IObjectChange, type IObjectObserverProxyPairFactory, type IObjectObserverProxyPairFactoryProvider, type IObjectObserverProxyPairManager, type IObjectPropertyObserverManager, type IObjectPropertyObserverProxyPairManager, type IObjectStateManager, type IObservableObserverProxyPair, type IObservableProxyData, type IObservableProxyFactory, type IObserver, type IObserverProxyPair, type IPlainObjectObserverProxyPairFactory, type IPromiseObserverProxyPair, type IPromiseProxyData, type IPromiseProxyFactory, type IProperForDataObserverManager, type IPropertyInfo, type IPropertyObserverIdInfo, type IPropertyObserverInfo, type IPropertyObserverManager, type IPropertyObserverProxyPairManager, type IProxyTarget, type ISetObserverProxyPair, type ISetObserverProxyPairFactory, type ISetProxifyData, type ISetProxifyIdData, type ISetProxyFactory, type IState, type IStateChange, type IStateChangeObserverInfo, type IStateChangeSubscriptionIdInfo, type IStateChangeSubscriptionInfo, type IStateChangeSubscriptionManager, type IStateChangeSubscriptionsForContextManager, type IStateEventListener, type IStateForObjectManager, type IStateManager, type IStateOptions, type ISubscriptionIdInfo, type ISubscriptionInfo, type ISubscriptionWithData, type IValueKey, type IValueWithKey, type IndexChangeSubscriptionForContext, IndexChangeSubscriptionManager, IndexObserverProxyPairFactory, IndexWatchRule, MapObserverProxyPairFactory, MapProxy, MapProxyFactory, NonIterableObjectPropertyObserverProxyPairFactory, ObjectObserverProxyPairFactoryProvider, ObjectObserverProxyPairManager, ObjectPropertyObserverManager, ObjectPropertyObserverProxyPairManager, ObjectStateManager, ObservableObserverProxyPairFactory, ObservableProxyFactory, ObserverGroup, PlainObjectObserverProxyPairFactory, PromiseObserverProxyPairFactory, PromiseProxyFactory, RsXStateManagerInjectionTokens, RsXStateManagerModule, SetObserverProxyPairFactory, SetProxy, SetProxyFactory, type ShouldWatchIndexPredicate, StateChangeSubscriptionManager, StateForObjectManager, StateManager, defaultObjectObserverProxyPairFactoryList, defaultPropertyObserverProxyPairFactoryList, unloadRsXStateManagerModule, watchIndexRecursiveRule };