@fozy-labs/rx-toolkit 0.4.13 → 0.4.15

package/dist/common/devtools/reduxDevtools.js

@@ -26,8 +26,8 @@ export function reduxDevtools(options = {}) {
             state = applyState(keys, initState, state);
             scheduler.schedule(createFn());
             return (newState) => {
-                if (newState === '$COMPLETE' || newState === '$CLEANED') {
-                    delete state[name];
+                if (newState === '$COMPLETED' || newState === '$CLEANED') {
+                    state = deleteState(keys, state);
                     clearFn();
                     return;
                 }
@@ -51,3 +51,31 @@ function applyState(keys, newState, state) {
     });
     return acc;
 }
+// Идем по ключам и удалаем последний, если оставется пустой объект, удаляем его рекурсивно
+function deleteState(keys, state) {
+    if (keys.length === 0)
+        return state;
+    const acc = { ...state };
+    // Рекурсивная функция для удаления с очисткой пустых объектов
+    const deleteRecursive = (obj, pathKeys, index) => {
+        const key = pathKeys[index];
+        if (!obj || !obj.hasOwnProperty(key)) {
+            return false;
+        }
+        if (index === pathKeys.length - 1) {
+            delete obj[key];
+        }
+        else {
+            obj[key] = { ...obj[key] };
+            deleteRecursive(obj[key], pathKeys, index + 1);
+            // Если объект стал пустым, удаляем его
+            if (Object.keys(obj[key]).length === 0) {
+                delete obj[key];
+            }
+        }
+        return true;
+    };
+    deleteRecursive(acc, keys, 0);
+    console.log('deleteState', keys, state, acc);
+    return acc;
+}

package/dist/common/options/SharedOptions.d.ts

@@ -3,6 +3,6 @@ import { Observable } from "rxjs";
 export declare class SharedOptions {
     static DEVTOOLS: DevtoolsLike | null;
     static onQueryError: ((error: unknown) => void) | null;
-    static getScopeName: () => string | null;
-    static getScopeDestroyed$: () => Observable<void> | null;
+    static getScopeName: (() => string | null) | null;
+    static getScopeDestroyed$: (() => Observable<void> | null) | null;
 }

package/dist/common/options/SharedOptions.js

@@ -1,6 +1,6 @@
 export class SharedOptions {
     static DEVTOOLS = null;
     static onQueryError = null;
-    static getScopeName;
-    static getScopeDestroyed$;
+    static getScopeName = null;
+    static getScopeDestroyed$ = null;
 }

package/dist/query/core/Resource/ResourceAgent.d.ts

@@ -7,6 +7,7 @@ export declare class ResourceAgent<D extends ResourceDefinition> implements Reso
     state$: Computed<{
         isInitiated: boolean;
         isLoading: boolean;
+        isInitialLoading: boolean;
         isDone: boolean;
         isSuccess: boolean;
         isError: boolean;
@@ -18,6 +19,7 @@ export declare class ResourceAgent<D extends ResourceDefinition> implements Reso
     } | {
         isInitiated: boolean;
         isLoading: boolean;
+        isInitialLoading: boolean;
         isDone: boolean;
         isSuccess: boolean;
         isError: boolean;

package/dist/query/core/Resource/ResourceAgent.js

@@ -17,6 +17,7 @@ export class ResourceAgent {
             return {
                 isInitiated: false,
                 isLoading: false,
+                isInitialLoading: false,
                 isDone: false,
                 isSuccess: false,
                 isError: false,
@@ -32,6 +33,7 @@ export class ResourceAgent {
         return {
             isInitiated: currState.isInitiated || !!prevState,
             isLoading: currState.isLoading,
+            isInitialLoading: currState.isLoading && !currState.isDone && !prevState?.isDone,
             isDone: currState.isDone,
             isSuccess: currState.isSuccess,
             isError: currState.isError,

package/dist/query/types/Resource.types.d.ts

@@ -76,8 +76,10 @@ export type ResourceAgentInstance<D extends ResourceDefinition> = {
 export type ResourceQueryState<D extends ResourceDefinition> = {
     /** Инициализирован ли хотя бы один запрос */
     isInitiated: boolean;
-    /** Первая загрузка */
+    /** Загрузка */
     isLoading: boolean;
+    /** Первая загрузка */
+    isInitialLoading: boolean;
     /** Завершен ли запрос */
     isDone: boolean;
     /** Успешно ли завершен последний запрос (false по умолчанию) */

package/dist/signals/signals/Effect.d.ts

@@ -2,6 +2,7 @@ import { SubscriptionLike } from "rxjs";
 export declare class Effect implements SubscriptionLike {
     private _onComplete?;
     private _subscriptions;
+    protected readonly _scopeDestroyedSub: import("rxjs").Subscription | undefined;
     closed: boolean;
     _rang: number;
     constructor(effectFn: (ctx: (fn: () => void) => void) => void, _onComplete?: (() => void) | undefined);

package/dist/signals/signals/Effect.js

@@ -1,7 +1,11 @@
 import { Batcher, Tracker } from "../base";
+import { SharedOptions } from "../../common/options/SharedOptions";
 export class Effect {
     _onComplete;
     _subscriptions = [];
+    _scopeDestroyedSub = SharedOptions.getScopeDestroyed$?.()?.subscribe(() => {
+        this.complete();
+    });
     closed = false;
     _rang = 0;
     constructor(effectFn, _onComplete) {
@@ -60,6 +64,7 @@ export class Effect {
             return;
         this.closed = true;
         this._subscriptions.forEach((sub) => sub.unsubscribe());
+        this._scopeDestroyedSub?.unsubscribe();
         this._onComplete?.();
     }
     /**

package/dist/signals/signals/Signal.d.ts

@@ -4,6 +4,7 @@ import { StateDevtoolsOptions } from "../../common/devtools";
 export declare class Signal<T> extends BehaviorSubject<T> implements SubscriptionLike, SignalLike<T> {
     private readonly _stateDevtools;
     protected _rang: number;
+    protected readonly _scopeDestroyedSub: import("rxjs").Subscription | undefined;
     constructor(initialValue: T, options?: StateDevtoolsOptions);
     protected _onChange(value: T): void;
     get value(): T;

package/dist/signals/signals/Signal.js

@@ -1,8 +1,12 @@
 import { BehaviorSubject } from "rxjs";
 import { Batcher, Tracker, Devtools } from "../base";
+import { SharedOptions } from "../../common/options/SharedOptions";
 export class Signal extends BehaviorSubject {
     _stateDevtools;
     _rang = 0;
+    _scopeDestroyedSub = SharedOptions.getScopeDestroyed$?.()?.subscribe(() => {
+        this.complete();
+    });
     constructor(initialValue, options) {
         super(initialValue);
         this._stateDevtools = Devtools.createState(initialValue, {
@@ -48,7 +52,8 @@ export class Signal extends BehaviorSubject {
         return this.next(value);
     }
     complete() {
-        this._stateDevtools?.('$COMPLETE');
+        this._stateDevtools?.('$COMPLETED');
+        this._scopeDestroyedSub?.unsubscribe();
         super.complete();
     }
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fozy-labs/rx-toolkit",
-  "version": "0.4.13",
+  "version": "0.4.15",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "type": "module",