@fozy-labs/rx-toolkit 0.4.16 → 0.4.17

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

@@ -2,3 +2,4 @@ export * from './useConstant';
 export * from './useEventHandler';
 export * from './useObservable';
 export * from './useSyncObservable';
+export * from './useUnmount';

package/dist/common/react/index.js

@@ -2,3 +2,4 @@ export * from './useConstant';
 export * from './useEventHandler';
 export * from './useObservable';
 export * from './useSyncObservable';
+export * from './useUnmount';

package/dist/common/react/useSyncObservable.js

@@ -2,6 +2,7 @@ import React from 'react';
 import { BehaviorSubject } from 'rxjs';
 import { useConstant } from "./useConstant";
 import { useEventHandler } from "./useEventHandler";
+import { useUnmount } from "../../common/react/useUnmount";
 const NONE = Symbol('NONE');
 /**
  * Hook for automatically subscribing and unsubscribing from an Observable.
@@ -29,11 +30,9 @@ export function useSyncObservable(input$, initialValue = NONE) {
             subscription,
         };
     }, [input$]);
-    React.useEffect(() => {
-        return () => {
-            subscription.unsubscribe();
-            subject$.complete();
-        };
+    useUnmount(() => {
+        subscription.unsubscribe();
+        subject$.complete();
     }, [subject$]);
     const subscribe = React.useCallback((updateStore) => {
         const subjectSubscription = subject$.subscribe(updateStore);

package/dist/common/react/useUnmount.d.ts

@@ -0,0 +1 @@
+export declare function useUnmount(fn: () => void, deps?: any[]): void;

package/dist/common/react/useUnmount.js

@@ -0,0 +1,24 @@
+import React from "react";
+export function useUnmount(fn, deps = []) {
+    const preventUnmountRef = React.useRef(null);
+    React.useEffect(() => {
+        return () => {
+            let isPrevented = false;
+            preventUnmountRef.current = () => {
+                isPrevented = true;
+            };
+            new Promise((resolve) => {
+                resolve();
+            }).then(() => {
+                if (isPrevented)
+                    return;
+                preventUnmountRef.current = null;
+                fn();
+            });
+        };
+    }, deps);
+    React.useEffect(() => {
+        preventUnmountRef.current?.();
+        preventUnmountRef.current = null;
+    }, deps);
+}

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

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

package/dist/query/api/cleanAllQueriesCache.js

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

package/dist/query/core/{CleanAllResourcesSignal.d.ts → CleanAllQueriesSignal.d.ts}

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

package/dist/query/core/{CleanAllResourcesSignal.js → CleanAllQueriesSignal.js}

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

package/dist/query/core/Opertation/Operation.js

@@ -3,6 +3,7 @@ import { Batcher } from "../../../signals";
 import { QueriesCache } from "../QueriesCache";
 import { QueriesLifetimeHooks } from "../QueriesLifetimeHooks";
 import { OperationAgent } from "./OperationAgent";
+import { CleanAllQueriesSignal } from "../../../query/core/CleanAllQueriesSignal";
 class OperationQueryState {
     static create() {
         return {
@@ -65,6 +66,9 @@ export class Operation {
             devtoolsName: _options.devtoolsName,
         });
         this._createLinks();
+        CleanAllQueriesSignal.clean$.subscribe(() => {
+            this._queriesCache.clear();
+        });
     }
     _createLinks() {
         this._options.link?.((linkOptions) => {

package/dist/query/core/Opertation/OperationAgent.d.ts

@@ -4,6 +4,7 @@ import type { Operation } from "./Operation";
 export declare class OperationAgent<D extends OperationDefinition> implements OperationAgentInstanse<D> {
     private _operation;
     private _operations$;
+    private _effect;
     state$: Computed<{
         isLoading: boolean;
         isDone: boolean;
@@ -17,4 +18,5 @@ export declare class OperationAgent<D extends OperationDefinition> implements Op
     private _next;
     initiate(args: D["Args"]): void;
     createAgent(): OperationAgentInstanse<D>;
+    complete(): void;
 }

package/dist/query/core/Opertation/OperationAgent.js

@@ -1,9 +1,21 @@
-import { Computed, Signal } from "../../../signals";
+import { Computed, Effect, Signal } from "../../../signals";
 export class OperationAgent {
     _operation;
     _operations$ = new Signal({
         current$: null,
     }, { isDisabled: true });
+    _effect = new Effect(() => {
+        const current$ = this._operations$.value.current$;
+        // Если ресурс который мы слушаем очистился, то инициируем его заново с теми же аргументами
+        const sub = current$?.onClean$.subscribe(() => {
+            this._operations$.next({
+                current$: null,
+            });
+        });
+        return () => {
+            sub?.unsubscribe();
+        };
+    });
     state$ = new Computed(() => {
         const operations = this._operations$.value;
         const currState = operations.current$?.value$.value;
@@ -51,4 +63,9 @@ export class OperationAgent {
     createAgent() {
         return new OperationAgent(this._operation);
     }
+    complete() {
+        this._effect.complete();
+        this._operations$.complete();
+        this.state$.complete();
+    }
 }

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

@@ -1,9 +1,9 @@
+import { SharedOptions } from "../../../common/options/SharedOptions";
 import { QueriesCache } from "../QueriesCache";
 import { QueriesLifetimeHooks } from "../QueriesLifetimeHooks";
-import { CleanAllResourcesSignal } from "../CleanAllResourcesSignal";
+import { CleanAllQueriesSignal } from "../CleanAllQueriesSignal";
 import { ResourceAgent } from "./ResourceAgent";
 import { ResourceRef } from "./ResourceRef";
-import { SharedOptions } from "../../../common/options/SharedOptions";
 class ResourceQueryState {
     static create(args) {
         return {
@@ -117,7 +117,7 @@ export class Resource {
             devtoolsName: _options.devtoolsName,
         });
         this._queriesCache = new QueriesCache(_options.cacheLifetime ?? this._DEFAULT_CACHE_LIFETIME);
-        CleanAllResourcesSignal.clean$.subscribe(() => {
+        CleanAllQueriesSignal.clean$.subscribe(() => {
             this._queriesCache.clear();
         });
     }

package/dist/query/index.d.ts

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

package/dist/query/index.js

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

package/dist/query/react/useOperationAgent.js

@@ -1,4 +1,4 @@
-import { useConstant, useEventHandler } from "../../common/react";
+import { useConstant, useEventHandler, useUnmount } from "../../common/react";
 import { useSignal } from "../../signals/react";
 export function useOperationAgent(op) {
     const agent = useConstant(() => op.createAgent());
@@ -19,5 +19,8 @@ export function useOperationAgent(op) {
             });
         });
     });
+    useUnmount(() => {
+        agent.complete();
+    }, [agent]);
     return [trigger, state];
 }

package/dist/query/react/useResourceAgent.js

@@ -1,10 +1,10 @@
 import React from "react";
-import { useConstant } from "../../common/react";
+import { useConstant, useUnmount } from "../../common/react";
 import { useSignal } from "../../signals/react";
 import { SKIP } from "../../query/SKIP_TOKEN";
 export function useResourceAgent(res, ...argss) {
     const args = (argss[0] === SKIP ? SKIP : argss[0]);
-    const prevArgsRef = React.useRef(args);
+    const prevArgsRef = React.useRef(SKIP);
     const agent = useConstant(() => {
         const agent = res.createAgent();
         if (args !== SKIP) {
@@ -16,8 +16,8 @@ export function useResourceAgent(res, ...argss) {
         prevArgsRef.current = args;
         agent.initiate(args);
     }
-    React.useEffect(() => () => {
+    useUnmount(() => {
         agent.complete();
-    }, []);
+    });
     return useSignal(agent.state$);
 }

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

@@ -132,6 +132,8 @@ export type OperationAgentInstanse<D extends OperationDefinition> = {
     initiate(args: D["Args"]): void;
     /** Создает новый агент операции */
     createAgent(): OperationAgentInstanse<D>;
+    /** Завершает все текущие выполнения операции и очищает ресурсы */
+    complete(): void;
 };
 /**
  * Состояние выполнения операции

package/package.json

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

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

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

package/dist/query/api/cleanAllResources.js

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