@fozy-labs/rx-toolkit 0.4.14 → 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/signals/signals/Effect.js

@@ -3,7 +3,7 @@ import { SharedOptions } from "../../common/options/SharedOptions";
 export class Effect {
     _onComplete;
     _subscriptions = [];
-    _scopeDestroyedSub = SharedOptions.getScopeDestroyed$()?.subscribe(() => {
+    _scopeDestroyedSub = SharedOptions.getScopeDestroyed$?.()?.subscribe(() => {
         this.complete();
     });
     closed = false;

package/dist/signals/signals/Signal.js

@@ -4,7 +4,7 @@ import { SharedOptions } from "../../common/options/SharedOptions";
 export class Signal extends BehaviorSubject {
     _stateDevtools;
     _rang = 0;
-    _scopeDestroyedSub = SharedOptions.getScopeDestroyed$()?.subscribe(() => {
+    _scopeDestroyedSub = SharedOptions.getScopeDestroyed$?.()?.subscribe(() => {
         this.complete();
     });
     constructor(initialValue, options) {
@@ -52,7 +52,7 @@ 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.14",
+  "version": "0.4.15",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "type": "module",