@rs-x/state-manager 0.4.20 → 0.4.22

package/dist/index.d.ts

@@ -554,6 +554,7 @@ interface IState {
     value: unknown;
     valueCopy: unknown;
     watched: boolean;
+    ownerId: unknown;
 }
 interface IValueKey {
     key: unknown;
@@ -561,12 +562,13 @@ 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;
+    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;
+    replaceState(key: unknown, newContext: unknown, newValue: unknown, oldContext: unknown, watched: boolean, ownerId: unknown): void;
     isRegistered(context: unknown, key: unknown): boolean;
 }
 
@@ -575,7 +577,7 @@ declare class StateForObjectManager extends SingletonFactory<unknown, IValueWith
     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;
@@ -586,7 +588,7 @@ declare class ObjectStateManager extends SingletonFactory<unknown, unknown, ISta
     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;
 }
@@ -632,16 +634,20 @@ interface IStateChange extends IContextChanged {
     newValue?: unknown;
     watched?: boolean;
 }
+interface IStateOptions {
+    indexWatchRule?: IIndexWatchRule;
+    ownerId?: unknown;
+}
 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;
     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;
 }
 
@@ -662,11 +668,11 @@ 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;
     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;
@@ -682,7 +688,8 @@ declare class StateManager implements IStateManager {
     private setInitialValue;
     private getChainChanges;
     private getCurrentValue;
+    private getOwnerId;
     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 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 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, ProxyRegistry, RsXStateManagerInjectionTokens, RsXStateManagerModule, SetObserverProxyPairFactory, SetProxy, SetProxyFactory, type ShouldWatchIndexPredicate, StateChangeSubscriptionManager, StateForObjectManager, StateManager, defaultObjectObserverProxyPairFactoryList, defaultPropertyObserverProxyPairFactoryList, unloadRsXStateManagerModule, watchIndexRecursiveRule };

package/dist/index.js

@@ -2659,7 +2659,7 @@ var StateForObjectManager = class extends SingletonFactory11 {
   getId(data) {
     return data.key;
   }
-  set(key, value, watched) {
+  set(key, value, watched, ownerId) {
     const state = this.getFromId(key);
     if (state) {
       state.valueCopy = this.deepClone(key, value);
@@ -2668,7 +2668,8 @@ var StateForObjectManager = class extends SingletonFactory11 {
       this.create({
         key,
         value,
-        watched
+        watched,
+        ownerId
       });
     }
   }
@@ -2686,7 +2687,8 @@ var StateForObjectManager = class extends SingletonFactory11 {
     return {
       value: data.value,
       valueCopy: this.deepClone(data.key, data.value),
-      watched: data.watched
+      watched: data.watched,
+      ownerId: data.ownerId
     };
   }
   onReleased() {
@@ -2707,7 +2709,7 @@ var ObjectStateManager = class extends SingletonFactory11 {
   isRegistered(context, key) {
     return !!this.getFromId(context)?.has(key);
   }
-  replaceState(key, newContext, newValue, oldContext, watched) {
+  replaceState(key, newContext, newValue, oldContext, watched, ownerId) {
     let stateForObjectManagerForNewContext;
     const stateForObjectManagerForOldContext = this.getFromId(oldContext);
     if (newValue === void 0) {
@@ -2721,12 +2723,13 @@ var ObjectStateManager = class extends SingletonFactory11 {
       stateForObjectManagerForNewContext = stateForObjectManagerForOldContext;
     }
     if (stateForObjectManagerForNewContext) {
-      stateForObjectManagerForNewContext.set(key, newValue, watched);
+      stateForObjectManagerForNewContext.set(key, newValue, watched, ownerId);
     } else if (newValue !== void 0) {
       this.create(newContext).instance.create({
         key,
         value: newValue,
-        watched
+        watched,
+        ownerId
       });
     }
   }
@@ -2883,13 +2886,13 @@ var StateManager = class {
     });
     return id ? stateChangeSubscriptionsForContextManager.has(id) : false;
   }
-  watchState(context, index, indexWatchRule) {
-    if (!this.isWatched(context, index, indexWatchRule)) {
+  watchState(context, index, options) {
+    if (!this.isWatched(context, index, options?.indexWatchRule)) {
       const value = this.getState(context, index);
-      this.tryToSubscribeToChange(context, index, indexWatchRule);
+      this.tryToSubscribeToChange(context, index, options?.ownerId, options?.indexWatchRule);
       return value;
     } else {
-      return this.increaseStateReferenceCount(context, index, true);
+      return this.increaseStateReferenceCount(context, index, true, options?.ownerId);
     }
   }
   releaseState(context, index, indexWatchRule) {
@@ -2905,16 +2908,16 @@ var StateManager = class {
   getState(context, index) {
     return this._objectStateManager.getFromId(context)?.getFromId(index)?.value;
   }
-  setState(context, index, value) {
+  setState(context, index, value, ownerId) {
     this.internalSetState(context, index, value, {
       context,
       value: this.getState(context, index),
       shouldEmitChange: truePredicate6
-    });
+    }, ownerId);
   }
-  internalSetState(context, index, value, transferValue) {
-    this.tryRebindingNestedState(value, transferValue.value);
-    this._objectStateManager.replaceState(index, context, value, transferValue.context, false);
+  internalSetState(context, index, value, transferValue, ownerId) {
+    this.tryRebindingNestedState(value, transferValue.value, ownerId);
+    this._objectStateManager.replaceState(index, context, value, transferValue.context, false, ownerId);
     if (!transferValue?.shouldEmitChange || transferValue.shouldEmitChange(context, index)) {
       this.emitChange(context, index, value, transferValue.value, transferValue.context);
     }
@@ -2950,29 +2953,30 @@ var StateManager = class {
       newValue
     });
   }
-  updateState(newContext, oldContext, index, newValue, watched) {
-    this._objectStateManager.replaceState(index, newContext, newValue, oldContext, watched);
+  updateState(newContext, oldContext, index, newValue, watched, ownerId) {
+    this._objectStateManager.replaceState(index, newContext, newValue, oldContext, watched, ownerId);
   }
   canReleaseState(context, key) {
     return this._objectStateManager.getFromId(context)?.release(key).referenceCount === 0;
   }
-  increaseStateReferenceCount(context, index, watched) {
+  increaseStateReferenceCount(context, index, watched, ownerId) {
     const state = this.getState(context, index);
     this._objectStateManager.create(context).instance.create({
       value: state,
       key: index,
-      watched
+      watched,
+      ownerId
     });
     return state;
   }
-  tryToSubscribeToChange(context, index, indexWatchRule, transferedValue) {
+  tryToSubscribeToChange(context, index, ownerId, indexWatchRule, transferedValue) {
     this._stateChangeSubscriptionManager.create(context).instance.create({
       index,
       indexWatchRule,
-      onChanged: /* @__PURE__ */ __name((change) => this.onChange(change, true), "onChanged"),
+      onChanged: /* @__PURE__ */ __name((change) => this.onChange(change, true, ownerId), "onChanged"),
       init: /* @__PURE__ */ __name((observer) => {
         if (observer.value !== void 0) {
-          this.setInitialValue(context, index, observer.value, transferedValue, true);
+          this.setInitialValue(context, index, observer.value, transferedValue, true, ownerId);
         }
         observer.init();
       }, "init")
@@ -2985,13 +2989,16 @@ var StateManager = class {
       return this.getState(context, key);
     }
   }
-  getStateChanges(oldContext, newContext) {
+  getStateChanges(oldContext, newContext, parentOwnerId) {
     const oldState = this._objectStateManager.getFromId(oldContext);
     if (!oldState) {
       return [];
     }
     return Array.from(oldState.ids()).map((index) => {
-      const { value: oldValue, watched } = oldState.getFromId(index) ?? {};
+      const { value: oldValue, watched, ownerId } = oldState.getFromId(index) ?? {};
+      if (ownerId !== parentOwnerId) {
+        return [];
+      }
       const newValue = this.getValue(newContext, index);
       if (oldContext === newContext && this._equalityService.isEqual(oldValue, newValue)) {
         return [];
@@ -3011,12 +3018,12 @@ var StateManager = class {
         stateInfo
       ] : [
         stateInfo,
-        ...this.getStateChanges(oldValue, newValue)
+        ...this.getStateChanges(oldValue, newValue, ownerId)
       ];
     }).reduce((a, b) => a.concat(b), []);
   }
-  tryRebindingNestedState(newValue, oldValue) {
-    const stateChanges = this.getStateChanges(oldValue, newValue);
+  tryRebindingNestedState(newValue, oldValue, ownerId) {
+    const stateChanges = this.getStateChanges(oldValue, newValue, ownerId);
     if (stateChanges.length === 0) {
       return;
     }
@@ -3043,7 +3050,7 @@ var StateManager = class {
         this.internalSetState(stateChange.context, stateChange.index, stateChange.newValue, {
           context: stateChange.oldContext,
           value: stateChange.oldValue
-        });
+        }, ownerId);
         continue;
       }
       const instanceGroupInfos = this._stateChangeSubscriptionManager.instanceGroupInfoEntriesForContext(stateChange.oldContext);
@@ -3058,12 +3065,12 @@ var StateManager = class {
         if (indexWatchRule) {
           indexWatchRule.context = stateChange.context;
         }
-        this.tryToSubscribeToChange(stateChange.context, stateChange.index, indexWatchRule, rebindingOptions);
+        this.tryToSubscribeToChange(stateChange.context, stateChange.index, ownerId, indexWatchRule, rebindingOptions);
       }
     }
   }
-  setInitialValue(context, index, initialValue, transferedValue, watched) {
-    this.updateState(context, transferedValue?.context ?? context, index, initialValue, watched);
+  setInitialValue(context, index, initialValue, transferedValue, watched, ownerId) {
+    this.updateState(context, transferedValue?.context ?? context, index, initialValue, watched, ownerId);
     if (!transferedValue?.shouldEmitChange || transferedValue.shouldEmitChange(context, index)) {
       this.emitChange(context, index, initialValue, transferedValue?.value, transferedValue?.context);
     }
@@ -3079,15 +3086,18 @@ var StateManager = class {
       value: this.getValue(chainPart.context, chainPart.index)
     }));
   }
-  getCurrentValue(context, id) {
+  getCurrentValue(context, index) {
     const value = this._pending.get(context);
     if (value !== void 0) {
       this._pending.delete(context);
       return value;
     }
-    return this.getState(context, id);
+    return this.getState(context, index);
+  }
+  getOwnerId(context, index) {
+    return this._objectStateManager.getFromId(context)?.getFromId(index)?.ownerId;
   }
-  onChange(change, watched = false) {
+  onChange(change, watched = false, ownerId) {
     const chainChanges = this.getChainChanges(change.chain);
     if (chainChanges.length === 0) {
       return;
@@ -3096,8 +3106,8 @@ var StateManager = class {
     try {
       const chainLeaf = chainChanges[chainChanges.length - 1];
       const currentValue = this.getCurrentValue(chainLeaf.context, chainLeaf.index);
-      this.tryRebindingNestedState(change.newValue, currentValue);
-      this.updateState(chainLeaf.context, chainLeaf.context, chainLeaf.index, chainLeaf.value, watched);
+      this.tryRebindingNestedState(change.newValue, currentValue, ownerId);
+      this.updateState(chainLeaf.context, chainLeaf.context, chainLeaf.index, chainLeaf.value, watched, ownerId);
       chainChanges.forEach((chainChange) => this.emitChange(chainChange.context, chainChange.index, chainChange.value, chainChange.oldValue));
     } finally {
       this._endChangeCycle.next();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rs-x/state-manager",
-  "version": "0.4.20",
+  "version": "0.4.22",
   "description": "Reactive state management layer for the RS-X framework with fine-grained change tracking",
   "type": "module",
   "main": "./dist/index.js",
@@ -32,7 +32,7 @@
     "rxjs": "^7.8.0"
   },
   "dependencies": {
-    "@rs-x/core": "0.4.20"
+    "@rs-x/core": "0.4.22"
   },
   "devDependencies": {
     "tsup": "^8.5.1",