@fozy-labs/rx-toolkit 0.4.14 → 0.4.16

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,30 @@ 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);
+    return acc;
+}

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

@@ -1,8 +1,10 @@
-import { DevtoolsLike } from "../../common/devtools";
 import { Observable } from "rxjs";
+import { DevtoolsLike } from "../../common/devtools";
+import { shallowEqual } from "../../common/utils";
 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;
+    static defaultCompareArgs: typeof shallowEqual;
 }

package/dist/common/options/SharedOptions.js

@@ -1,6 +1,8 @@
+import { shallowEqual } from "../../common/utils";
 export class SharedOptions {
     static DEVTOOLS = null;
     static onQueryError = null;
-    static getScopeName;
-    static getScopeDestroyed$;
+    static getScopeName = null;
+    static getScopeDestroyed$ = null;
+    static defaultCompareArgs = shallowEqual;
 }

package/dist/common/utils/deepEqual.d.ts

@@ -0,0 +1 @@
+export declare function deepEqual(a: unknown, b: unknown): boolean;

package/dist/common/utils/deepEqual.js

@@ -0,0 +1,21 @@
+export function deepEqual(a, b) {
+    if (a === b) {
+        return true;
+    }
+    if (typeof a !== "object" || a === null || typeof b !== "object" || b === null) {
+        return false;
+    }
+    const keysA = Object.keys(a);
+    const keysB = Object.keys(b);
+    if (keysA.length !== keysB.length) {
+        return false;
+    }
+    for (let i = 0; i < keysA.length; i++) {
+        const key = keysA[i];
+        // @ts-ignore
+        if (!Object.prototype.hasOwnProperty.call(b, key) || !deepEqual(a[key], b[key])) {
+            return false;
+        }
+    }
+    return true;
+}

package/dist/common/utils/index.d.ts

@@ -1 +1,3 @@
 export * from './PromiseResolver';
+export * from './deepEqual';
+export * from './shallowEqual';

package/dist/common/utils/index.js

@@ -1 +1,3 @@
 export * from './PromiseResolver';
+export * from './deepEqual';
+export * from './shallowEqual';

package/dist/index.d.ts

@@ -1,5 +1,7 @@
 export * from './common/devtools';
 export * from './common/options';
 export * from './common/react';
+export * from './common/utils/deepEqual';
+export * from './common/utils/shallowEqual';
 export * from './query';
 export * from './signals';

package/dist/index.js

@@ -1,5 +1,7 @@
 export * from './common/devtools';
 export * from './common/options';
 export * from './common/react';
+export * from './common/utils/deepEqual';
+export * from './common/utils/shallowEqual';
 export * from './query';
 export * from './signals';

package/dist/query/api/cleanAllResources.d.ts

@@ -0,0 +1 @@
+export declare function cleanAllResources(): void;

package/dist/query/api/cleanAllResources.js

@@ -0,0 +1,4 @@
+import { CleanAllResourcesSignal } from "../core/CleanAllResourcesSignal";
+export function cleanAllResources() {
+    CleanAllResourcesSignal.clean();
+}

package/dist/query/core/CleanAllResourcesSignal.d.ts

@@ -0,0 +1,6 @@
+import { Subject } from "rxjs";
+export declare class CleanAllResourcesSignal {
+    private static subject$;
+    static clean$: Subject<void>;
+    static clean(): void;
+}

package/dist/query/core/CleanAllResourcesSignal.js

@@ -0,0 +1,11 @@
+import { Subject } from "rxjs";
+import { Batcher } from "../../signals";
+export class CleanAllResourcesSignal {
+    static subject$ = new Subject();
+    static clean$ = CleanAllResourcesSignal.subject$;
+    static clean() {
+        Batcher.batch(() => {
+            CleanAllResourcesSignal.subject$.next();
+        });
+    }
+}

package/dist/query/core/QueriesCache.d.ts

@@ -1,8 +1,10 @@
 import { ReactiveCache } from "../../query/lib/ReactiveCache";
+import { shallowEqual } from "../../common/utils";
 export declare class QueriesCache<KEY, VALUE> {
     private _cacheLifeTime;
     private readonly _cache;
-    constructor(_cacheLifeTime?: number | false);
+    constructor(_cacheLifeTime?: number | false, compareArgsFn?: typeof shallowEqual);
     getQueryCache(args: KEY): ReactiveCache<VALUE> | undefined;
     createQueryCache(args: KEY, initialState: VALUE): ReactiveCache<VALUE>;
+    clear(): void;
 }

package/dist/query/core/QueriesCache.js

@@ -1,10 +1,12 @@
 import { IndirectMap } from "../../query/lib/IndirectMap";
 import { ReactiveCache } from "../../query/lib/ReactiveCache";
+import { shallowEqual } from "../../common/utils";
 export class QueriesCache {
     _cacheLifeTime;
-    _cache = new IndirectMap();
-    constructor(_cacheLifeTime = 60_000) {
+    _cache;
+    constructor(_cacheLifeTime = 60_000, compareArgsFn = shallowEqual) {
         this._cacheLifeTime = _cacheLifeTime;
+        this._cache = new IndirectMap(compareArgsFn);
     }
     getQueryCache(args) {
         return this._cache.get(args);
@@ -14,25 +16,17 @@ export class QueriesCache {
             initialState,
             cacheLifeTime: this._cacheLifeTime,
         });
-        // const stateDevtools = SharedOptions.DEVTOOLS?.state;
-        //
-        // if (stateDevtools) {
-        //     const key = `${this._logname}:${JSON.stringify(args)}:i=${Indexer.getIndex()}`;
-        //     let devtools = stateDevtools(key, initialState);
-        //
-        //     cache.spy$.subscribe((state) => {
-        //         if (state === initialState) return;
-        //         devtools(state);
-        //     });
-        //
-        //     cache.onClean$.subscribe(() => {
-        //         devtools('$CLEANED' as any);
-        //     });
-        // }
         cache.onClean$.subscribe(() => {
             this._cache.delete(args);
         });
         this._cache.set(args, cache);
         return cache;
     }
+    clear() {
+        // Делаем именно так, тк при очистке могут синхронно добавляться новые кеши
+        const values = Array.from(this._cache.values);
+        values.forEach(c => {
+            c.complete();
+        });
+    }
 }

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

@@ -4,7 +4,7 @@ import { ResourceAgent } from "./ResourceAgent";
 export type CoreResourceQueryState<D extends ResourceDefinition> = {
     transactions: ResourceTransaction[] | null;
     abortController: AbortController | null;
-    args: D['Args'] | null;
+    args: D['Args'];
     savedData: D['Data'] | null;
     data: D['Data'] | null;
     error: unknown | null;
@@ -47,4 +47,5 @@ export declare class Resource<D extends ResourceDefinition> implements ResourceI
     initiate(args: D['Args'], options?: {
         cache?: CoreResourceQueryCache<D>;
     }): CoreResourceQueryCache<D>;
+    compareArgs(args1: D['Args'], args2: D['Args']): boolean;
 }

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

@@ -1,14 +1,16 @@
 import { QueriesCache } from "../QueriesCache";
 import { QueriesLifetimeHooks } from "../QueriesLifetimeHooks";
+import { CleanAllResourcesSignal } from "../CleanAllResourcesSignal";
 import { ResourceAgent } from "./ResourceAgent";
 import { ResourceRef } from "./ResourceRef";
+import { SharedOptions } from "../../../common/options/SharedOptions";
 class ResourceQueryState {
-    static create() {
+    static create(args) {
         return {
             transactions: null,
             savedData: null,
             abortController: null,
-            args: null,
+            args,
             data: null,
             error: null,
             isError: false,
@@ -21,7 +23,8 @@ class ResourceQueryState {
             lockCount: 0
         };
     }
-    static load(state = ResourceQueryState.create(), args) {
+    static load(state, args) {
+        state = state ?? ResourceQueryState.create(args);
         return {
             ...state,
             abortController: new AbortController(),
@@ -114,6 +117,9 @@ export class Resource {
             devtoolsName: _options.devtoolsName,
         });
         this._queriesCache = new QueriesCache(_options.cacheLifetime ?? this._DEFAULT_CACHE_LIFETIME);
+        CleanAllResourcesSignal.clean$.subscribe(() => {
+            this._queriesCache.clear();
+        });
     }
     createAgent = () => {
         return new ResourceAgent(this);
@@ -124,7 +130,7 @@ export class Resource {
     getQueryCache(args) {
         return this._queriesCache.getQueryCache(args);
     }
-    createQueryCache(args, state = ResourceQueryState.create()) {
+    createQueryCache(args, state = ResourceQueryState.create(args)) {
         const cache = this._queriesCache.createQueryCache(args, state);
         const hookResolvers = this._hooks.onCacheEntryAdded(args);
         const spySub = cache.spy$.subscribe((state) => {
@@ -215,4 +221,8 @@ export class Resource {
         });
         return cache;
     }
+    compareArgs(args1, args2) {
+        const compareFn = this._options.compareArgsFn ?? SharedOptions.defaultCompareArgs;
+        return compareFn(args1, args2);
+    }
 }

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

@@ -4,6 +4,7 @@ import type { Resource } from "./Resource";
 export declare class ResourceAgent<D extends ResourceDefinition> implements ResourceAgentInstance<D> {
     private _resource;
     private _resources$;
+    private _effect;
     state$: Computed<{
         isInitiated: boolean;
         isLoading: boolean;
@@ -30,7 +31,8 @@ export declare class ResourceAgent<D extends ResourceDefinition> implements Reso
         args: NonNullable<D["Args"]> | undefined;
     }>;
     constructor(_resource: Resource<D>);
-    private _next;
     initiate(args: D["Args"], force?: boolean): void;
+    compareArgs(args: D["Args"], otherArgs: D["Args"]): boolean;
     complete(): void;
+    private _next;
 }

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

@@ -1,10 +1,25 @@
-import { Computed, Signal } from "../../../signals";
+import { Computed, Effect, Signal } from "../../../signals";
 export class ResourceAgent {
     _resource;
     _resources$ = new Signal({
         previous$: null,
         current$: null,
     }, { isDisabled: true });
+    _effect = new Effect(() => {
+        const current$ = this._resources$.value.current$;
+        const args = current$?.value.args;
+        // Если ресурс который мы слушаем очистился, то инициируем его заново с теми же аргументами
+        const sub = current$?.onClean$.subscribe(() => {
+            this._resources$.next({
+                previous$: null,
+                current$: null,
+            });
+            this.initiate(args);
+        });
+        return () => {
+            sub?.unsubscribe();
+        };
+    });
     state$ = new Computed(() => {
         const resources = this._resources$.value;
         let prevState;
@@ -47,6 +62,29 @@ export class ResourceAgent {
     constructor(_resource) {
         this._resource = _resource;
     }
+    initiate(args, force = false) {
+        const current = this._resources$.value.current$;
+        const cache = this._resource.getQueryCache(args);
+        if (!cache) {
+            const newCache = this._resource.initiate(args);
+            this._next(newCache);
+            return;
+        }
+        if (force || !(cache.value.isDone || cache.value.isLoading)) {
+            this._resource.initiate(args, { cache });
+        }
+        if (current !== cache) {
+            this._next(cache);
+        }
+    }
+    compareArgs(args, otherArgs) {
+        return this._resource.compareArgs(args, otherArgs);
+    }
+    complete() {
+        this._effect.complete();
+        this.state$.complete();
+        this._resources$.complete();
+    }
     _next(newCache) {
         const { previous$, current$ } = this._resources$.value;
         if (!current$) {
@@ -68,23 +106,4 @@ export class ResourceAgent {
             current$: newCache,
         });
     }
-    initiate(args, force = false) {
-        const current = this._resources$.value.current$;
-        const cache = this._resource.getQueryCache(args);
-        if (!cache) {
-            const newCache = this._resource.initiate(args);
-            this._next(newCache);
-            return;
-        }
-        if (force || !(cache.value.isDone || cache.value.isLoading)) {
-            this._resource.initiate(args, { cache });
-        }
-        if (current !== cache) {
-            this._next(cache);
-        }
-    }
-    complete() {
-        this.state$.complete();
-        this._resources$.complete();
-    }
 }

package/dist/query/index.d.ts

@@ -1,5 +1,6 @@
 export * from './api/createResource';
 export * from './api/createOperation';
+export * from './api/cleanAllResources';
 export * from './SKIP_TOKEN';
 export * from './react/useResourceAgent';
 export * from './react/useResourceRef';

package/dist/query/index.js

@@ -1,5 +1,6 @@
 export * from './api/createResource';
 export * from './api/createOperation';
+export * from './api/cleanAllResources';
 export * from './SKIP_TOKEN';
 export * from './react/useResourceAgent';
 export * from './react/useResourceRef';

package/dist/query/lib/IndirectMap.d.ts

@@ -14,5 +14,6 @@ export declare class IndirectMap<KEY, VALUE> {
      */
     delete(key: KEY): void;
     has(key: KEY): boolean;
+    get values(): IterableIterator<VALUE>;
 }
 export {};

package/dist/query/lib/IndirectMap.js

@@ -1,4 +1,4 @@
-import { shallowEqual } from "./shallowEqual";
+import { shallowEqual } from "../../common/utils";
 export class IndirectMap {
     _compareObjectsFn;
     _compareCache = new WeakMap();
@@ -82,4 +82,7 @@ export class IndirectMap {
         }
         return has;
     }
+    get values() {
+        return this._map.values();
+    }
 }

package/dist/query/lib/ReactiveCache.d.ts

@@ -37,6 +37,7 @@ export declare class ReactiveCache<VALUE> {
      * Subject, уведомляющий об очистке кэша.
      */
     onClean$: Subject<VALUE>;
+    closed: boolean;
     /**
      * Создает новый экземпляр `ReactiveCacheItem`.
      *

package/dist/query/lib/ReactiveCache.js

@@ -24,6 +24,7 @@ export class ReactiveCache {
      * Subject, уведомляющий об очистке кэша.
      */
     onClean$ = new Subject();
+    closed = false;
     /**
      * Создает новый экземпляр `ReactiveCacheItem`.
      *
@@ -69,6 +70,9 @@ export class ReactiveCache {
      * Завершает работу кэша, закрывая все потоки и уведомляя об очистке.
      */
     complete() {
+        if (this.closed)
+            return;
+        this.closed = true;
         this._state$.complete();
         this.onClean$.next(this._state$.value);
         this.onClean$.complete();

package/dist/query/react/useResourceAgent.js

@@ -1,7 +1,6 @@
 import React from "react";
 import { useConstant } from "../../common/react";
 import { useSignal } from "../../signals/react";
-import { shallowEqual } from "../../query/lib/shallowEqual";
 import { SKIP } from "../../query/SKIP_TOKEN";
 export function useResourceAgent(res, ...argss) {
     const args = (argss[0] === SKIP ? SKIP : argss[0]);
@@ -13,7 +12,7 @@ export function useResourceAgent(res, ...argss) {
         }
         return agent;
     });
-    if (args !== SKIP && !shallowEqual(args, prevArgsRef.current)) {
+    if (args !== SKIP && !agent.compareArgs(args, prevArgsRef.current)) {
         prevArgsRef.current = args;
         agent.initiate(args);
     }

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

@@ -35,6 +35,10 @@ export type ResourceCreateOptions<D extends ResourceDefinition> = {
      * Настройка отображения в devtools
      */
     devtoolsName?: string | false;
+    /**
+     * Сравнение аргументов между собой
+     */
+    compareArgsFn?: (args1: D["Args"], args2: D["Args"]) => boolean;
 };
 /**
  * Определение типов ресурса
@@ -69,6 +73,8 @@ export type ResourceAgentInstance<D extends ResourceDefinition> = {
     initiate(args: D["Args"], force?: boolean): void;
     /** Завершает работу агента, позволяя освободить ресурсы */
     complete(): void;
+    /** Сравнивает аргументы между собой */
+    compareArgs(args1: D["Args"], args2: D["Args"]): unknown;
 };
 /**
  * Состояние запроса ресурса

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

@@ -2,10 +2,11 @@ import { SubscriptionLike } from "rxjs";
 export declare class Effect implements SubscriptionLike {
     private _onComplete?;
     private _subscriptions;
+    private _teardown?;
     protected readonly _scopeDestroyedSub: import("rxjs").Subscription | undefined;
     closed: boolean;
     _rang: number;
-    constructor(effectFn: (ctx: (fn: () => void) => void) => void, _onComplete?: (() => void) | undefined);
+    constructor(effectFn: (ctx: (fn: () => void) => void) => void | (() => void), _onComplete?: (() => void) | undefined);
     /**
      * Выполняет функцию в tracked-контексте, подписываясь на Tracker.
      */

package/dist/signals/signals/Effect.js

@@ -3,7 +3,8 @@ import { SharedOptions } from "../../common/options/SharedOptions";
 export class Effect {
     _onComplete;
     _subscriptions = [];
-    _scopeDestroyedSub = SharedOptions.getScopeDestroyed$()?.subscribe(() => {
+    _teardown;
+    _scopeDestroyedSub = SharedOptions.getScopeDestroyed$?.()?.subscribe(() => {
         this.complete();
     });
     closed = false;
@@ -18,6 +19,9 @@ export class Effect {
     _runInTrackedContext(effectFn, isAsyncRun = false) {
         let prevSubscriptions;
         if (!isAsyncRun) {
+            // Вызываем teardown перед перезапуском эффекта
+            this._teardown?.();
+            this._teardown = undefined;
             this._rang = 0;
             prevSubscriptions = this._subscriptions;
             this._subscriptions = [];
@@ -51,9 +55,13 @@ export class Effect {
                 this.complete();
             },
         });
-        effectFn((fn) => {
+        const teardown = effectFn((fn) => {
             this._runInTrackedContext(fn, true);
         });
+        // Сохраняем teardown функцию, если она была возвращена
+        if (typeof teardown === 'function') {
+            this._teardown = teardown;
+        }
         trackerSub.unsubscribe();
         isTrackedContext = false;
         scheduler = Batcher.scheduler(this._rang);
@@ -63,6 +71,9 @@ export class Effect {
         if (this.closed)
             return;
         this.closed = true;
+        // Вызываем teardown перед завершением эффекта
+        this._teardown?.();
+        this._teardown = undefined;
         this._subscriptions.forEach((sub) => sub.unsubscribe());
         this._scopeDestroyedSub?.unsubscribe();
         this._onComplete?.();

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.16",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "type": "module",