@fozy-labs/rx-toolkit 0.4.8 → 0.4.10

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

@@ -1,7 +1,7 @@
 import type { DevtoolsLike } from "../../common/devtools";
 type Update = Partial<{
     DEVTOOLS: DevtoolsLike | null;
-    onError: (error: unknown) => void;
+    onQueryError: (error: unknown) => void;
 }>;
 export declare class DefaultOptions {
     static update(part: Update): void;

package/dist/common/options/DefaultOptions.js

@@ -3,7 +3,7 @@ export class DefaultOptions {
     static update(part) {
         if (part.DEVTOOLS !== undefined)
             SharedOptions.DEVTOOLS = part.DEVTOOLS;
-        if (part.onError !== undefined)
-            SharedOptions.onError = part.onError;
+        if (part.onQueryError !== undefined)
+            SharedOptions.onQueryError = part.onQueryError;
     }
 }

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

@@ -1,5 +1,5 @@
 import { DevtoolsLike } from "../../common/devtools";
 export declare class SharedOptions {
     static DEVTOOLS: DevtoolsLike | null;
-    static onError: ((error: unknown) => void) | null;
+    static onQueryError: ((error: unknown) => void) | null;
 }

package/dist/common/options/SharedOptions.js

@@ -1,4 +1,4 @@
 export class SharedOptions {
     static DEVTOOLS = null;
-    static onError = null;
+    static onQueryError = null;
 }

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

@@ -59,7 +59,7 @@ export class Operation {
     constructor(_options) {
         this._options = _options;
         this._queriesCache = new QueriesCache(this._options.cacheLifetime ?? this._DEFAULT_CACHE_LIFETIME);
-        this._hooks = new QueriesLifetimeHooks(_options, 'Operation');
+        this._hooks = new QueriesLifetimeHooks(_options, _options.devtoolsName ?? 'Operation');
         this._createLinks();
     }
     _createLinks() {

package/dist/query/core/QueriesLifetimeHooks.js

@@ -31,14 +31,11 @@ export class QueriesLifetimeHooks {
                 });
             }
         }
-        if (SharedOptions.onError) {
-            this.onQueryStartedListeners.push(async (args, { $queryFulfilled }) => {
-                try {
-                    await $queryFulfilled;
-                }
-                catch (error) {
-                    SharedOptions.onError(error);
-                }
+        if (SharedOptions.onQueryError) {
+            this.onQueryStartedListeners.push(async (_, { $queryFulfilled }) => {
+                const result = await $queryFulfilled;
+                if (result.isError)
+                    SharedOptions.onQueryError(result.error);
             });
         }
     }

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

@@ -108,7 +108,7 @@ export class Resource {
     _DEFAULT_CACHE_LIFETIME = 60_000;
     constructor(_options) {
         this._options = _options;
-        this._hooks = new QueriesLifetimeHooks(_options, 'Resource');
+        this._hooks = new QueriesLifetimeHooks(_options, _options.devtoolsName ?? 'Resource');
         this._queriesCache = new QueriesCache(_options.cacheLifetime ?? this._DEFAULT_CACHE_LIFETIME);
     }
     createAgent = () => {

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

@@ -33,6 +33,10 @@ export type OperationCreateOptions<D extends OperationDefinition> = {
      * - завершение запроса с результатом или ошибкой
      */
     onQueryStarted?: OnQueryStarted<D["Args"], D["Result"]>;
+    /**
+     * Имя для инструментов разработчика (DevTools)
+     */
+    devtoolsName?: string | undefined | null;
 };
 /**
  * Настройки связи операции с ресурсом

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

@@ -31,6 +31,10 @@ export type ResourceCreateOptions<D extends ResourceDefinition> = {
      * - завершение запроса с результатом или ошибкой
      */
     onQueryStarted?: OnQueryStarted<D["Args"], D["Result"]>;
+    /**
+     * Имя ресурса в инструментах разработчика
+     */
+    devtoolsName?: string | undefined | null;
 };
 /**
  * Определение типов ресурса

package/dist/signals/base/Computed.d.ts

@@ -8,6 +8,9 @@ export declare class Computed<T> extends Signal<T> implements SubscriptionLike,
         disableDevtools?: boolean;
         devtoolsName?: string;
     });
-    unsubscribe(): void;
     complete(): void;
+    /**
+     * @deprecated use 'complete()' instead
+     */
+    unsubscribe(): void;
 }

package/dist/signals/base/Computed.js

@@ -21,13 +21,16 @@ export class Computed extends Signal {
         });
         this._effect = effect;
     }
-    unsubscribe() {
-        this.complete();
-    }
     complete() {
         if (this.closed)
             return;
-        this._effect.unsubscribe();
+        this._effect.complete();
         super.complete();
     }
+    /**
+     * @deprecated use 'complete()' instead
+     */
+    unsubscribe() {
+        this.complete();
+    }
 }

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

@@ -9,6 +9,9 @@ export declare class Effect implements SubscriptionLike {
      * Выполняет функцию в tracked-контексте, подписываясь на Tracker.
      */
     private _runInTrackedContext;
-    unsubscribe(): void;
     complete(): void;
+    /**
+     * @deprecated Use `complete()` method instead.
+     */
+    unsubscribe(): void;
 }

package/dist/signals/base/Effect.js

@@ -41,11 +41,11 @@ export class Effect {
                 }));
             },
             complete: () => {
-                this.unsubscribe();
+                this.complete();
             },
             error: (err) => {
                 console.error(err);
-                this.unsubscribe();
+                this.complete();
             },
         });
         effectFn((fn) => {
@@ -56,9 +56,6 @@ export class Effect {
         scheduler = Batcher.scheduler(this._rang);
         prevSubscriptions?.forEach((sub) => sub.unsubscribe());
     }
-    unsubscribe() {
-        this.complete();
-    }
     complete() {
         if (this.closed)
             return;
@@ -66,4 +63,10 @@ export class Effect {
         this._subscriptions.forEach((sub) => sub.unsubscribe());
         this._onComplete?.();
     }
+    /**
+     * @deprecated Use `complete()` method instead.
+     */
+    unsubscribe() {
+        this.complete();
+    }
 }

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

@@ -1,10 +1,10 @@
-import { BehaviorSubject, Observable } from "rxjs";
+import { BehaviorSubject, Observable, SubscriptionLike } from "rxjs";
 import type { ReadableSignalLike, SignalLike, UnaryFunction } from "./types";
 type SignalOptions = {
     disableDevtools?: boolean;
     devtoolsName?: string;
 };
-export declare class Signal<T> extends BehaviorSubject<T> implements SignalLike<T> {
+export declare class Signal<T> extends BehaviorSubject<T> implements SubscriptionLike, SignalLike<T> {
     private readonly _devtools;
     protected _rang: number;
     constructor(initialValue: T, options?: SignalOptions);
@@ -26,6 +26,11 @@ export declare class Signal<T> extends BehaviorSubject<T> implements SignalLike<
      */
     set(value: T): void;
     complete(): void;
+    /**
+     * @deprecated use `complete()` instead.
+     */
+    unsubscribe(): void;
+    asReadonly(): ReadableSignalLike<T>;
     pipe(): Signal<T>;
     pipe<A extends Observable<any>>(op1: UnaryFunction<ReadableSignalLike<T>, A>): A;
     pipe<A extends Observable<any>, B extends Observable<any>>(op1: UnaryFunction<Signal<T>, A>, op2: UnaryFunction<A, B>): B;
@@ -37,6 +42,5 @@ export declare class Signal<T> extends BehaviorSubject<T> implements SignalLike<
     pipe<A extends Observable<any>, B extends Observable<any>, C extends Observable<any>, D extends Observable<any>, E extends Observable<any>, F extends Observable<any>, G extends Observable<any>, H extends Observable<any>>(op1: UnaryFunction<Signal<T>, A>, op2: UnaryFunction<A, B>, op3: UnaryFunction<B, C>, op4: UnaryFunction<C, D>, op5: UnaryFunction<D, E>, op6: UnaryFunction<E, F>, op7: UnaryFunction<F, G>, op8: UnaryFunction<G, H>): H;
     pipe<A extends Observable<any>, B extends Observable<any>, C extends Observable<any>, D extends Observable<any>, E extends Observable<any>, F extends Observable<any>, G extends Observable<any>, H extends Observable<any>, I extends Observable<any>>(op1: UnaryFunction<Signal<T>, A>, op2: UnaryFunction<A, B>, op3: UnaryFunction<B, C>, op4: UnaryFunction<C, D>, op5: UnaryFunction<D, E>, op6: UnaryFunction<E, F>, op7: UnaryFunction<F, G>, op8: UnaryFunction<G, H>, op9: UnaryFunction<H, I>): I;
     pipe<A extends Observable<any>, B extends Observable<any>, C extends Observable<any>, D extends Observable<any>, E extends Observable<any>, F extends Observable<any>, G extends Observable<any>, H extends Observable<any>, I extends Observable<any>>(op1: UnaryFunction<Signal<T>, A>, op2: UnaryFunction<A, B>, op3: UnaryFunction<B, C>, op4: UnaryFunction<C, D>, op5: UnaryFunction<D, E>, op6: UnaryFunction<E, F>, op7: UnaryFunction<F, G>, op8: UnaryFunction<G, H>, op9: UnaryFunction<H, I>, ...operations: UnaryFunction<Observable<any>, Observable<any>>[]): Observable<unknown>;
-    asReadonly(): ReadableSignalLike<T>;
 }
 export {};

package/dist/signals/base/Signal.js

@@ -56,12 +56,18 @@ export class Signal extends BehaviorSubject {
         this._devtools?.('$COMPLETE');
         super.complete();
     }
-    pipe(...operations) {
-        return operations.reduce(pipeReducer, this);
+    /**
+     * @deprecated use `complete()` instead.
+     */
+    unsubscribe() {
+        this.complete();
     }
     asReadonly() {
         return this;
     }
+    pipe(...operations) {
+        return operations.reduce(pipeReducer, this);
+    }
 }
 function pipeReducer(prev, fn) {
     return fn(prev);

package/docs/release/README.md

@@ -0,0 +1,7 @@
+```shell
+ npm run ts-check 
+ npm run build     
+ npm version patch
+ npm publish 
+ git push origin develop --tag
+```

package/package.json

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