@fozy-labs/rx-toolkit 0.4.10 → 0.4.12

package/dist/common/devtools/reduxDevtools.js

@@ -22,7 +22,8 @@ export function reduxDevtools(options = {}) {
     };
     return {
         state(name, initState) {
-            state = { ...state, [name]: initState };
+            const keys = name.split('/');
+            state = applyState(keys, initState, state);
             scheduler.schedule(createFn());
             return (newState) => {
                 if (newState === '$COMPLETE' || newState === '$CLEANED') {
@@ -30,9 +31,23 @@ export function reduxDevtools(options = {}) {
                     clearFn();
                     return;
                 }
-                state = { ...state, [name]: newState };
+                state = applyState(keys, newState, state);
                 scheduler.schedule(updateFn);
             };
         }
     };
 }
+function applyState(keys, newState, state) {
+    const acc = { ...state };
+    let current = acc;
+    keys.forEach((key, i, arr) => {
+        if (i === arr.length - 1) {
+            current[key] = newState;
+        }
+        else {
+            current[key] = { ...(current[key] ?? {}) };
+            current = current[key];
+        }
+    });
+    return acc;
+}

package/dist/common/devtools/types.d.ts

@@ -4,3 +4,8 @@ export interface DevtoolsStateLike<T = any> {
 export interface DevtoolsLike {
     state<T>(name: string, initState: T): DevtoolsStateLike<T>;
 }
+export type StateDevtoolsOptions = {
+    isDisabled?: boolean;
+    name?: string;
+    base?: string;
+} | string;

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

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

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

@@ -3,7 +3,7 @@ export class OperationAgent {
     _operation;
     _operations$ = new Signal({
         current$: null,
-    }, { disableDevtools: true });
+    }, { isDisabled: true });
     state$ = new Computed(() => {
         const operations = this._operations$.value;
         const currState = operations.current$?.value$.value;
@@ -28,7 +28,7 @@ export class OperationAgent {
             data: currState.data ?? undefined,
             args: currState.arg,
         };
-    }, { disableDevtools: true });
+    }, { isDisabled: true });
     constructor(_operation) {
         this._operation = _operation;
     }

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

@@ -3,11 +3,12 @@ import { OnCacheEntryAdded, OnQueryStarted } from "../../query/types";
 type Options<ARGS, DATA> = {
     onCacheEntryAdded?: OnCacheEntryAdded<ARGS, DATA>;
     onQueryStarted?: OnQueryStarted<ARGS, DATA>;
+    devtoolsName?: string | false;
 };
 export declare class QueriesLifetimeHooks<ARGS, DATA> {
     private onCacheEntryAddedListeners;
     private onQueryStartedListeners;
-    constructor(options: Options<ARGS, DATA> | undefined, devtoolName: string | undefined);
+    constructor(options: Options<ARGS, DATA> | undefined);
     onCacheEntryAdded: (args: ARGS) => {
         cacheDataLoaded: () => void;
         cacheEntryRemoved: () => void;

package/dist/query/core/QueriesLifetimeHooks.js

@@ -1,35 +1,35 @@
 import { Subject } from "rxjs";
 import { SharedOptions } from "../../common/options/SharedOptions";
 import { PromiseResolver } from "../../common/utils";
-import { Indexer } from "../../signals/base/Indexer";
+import { Devtools } from "../../signals";
 export class QueriesLifetimeHooks {
     onCacheEntryAddedListeners = [];
     onQueryStartedListeners = [];
-    constructor(options, devtoolName) {
+    constructor(options) {
         if (options?.onCacheEntryAdded) {
             this.onCacheEntryAddedListeners.push(options.onCacheEntryAdded);
         }
         if (options?.onQueryStarted) {
             this.onQueryStartedListeners.push(options.onQueryStarted);
         }
-        if (devtoolName) {
-            const stateDevtools = SharedOptions.DEVTOOLS?.state;
-            if (stateDevtools) {
-                this.onCacheEntryAddedListeners.push(async (args, { $cacheEntryRemoved, dataChanged$ }) => {
-                    const key = `${devtoolName}:${JSON.stringify(args)}:i=${Indexer.getIndex()}`;
-                    let devtools = null;
-                    dataChanged$.subscribe((state) => {
-                        if (!devtools) {
-                            devtools = stateDevtools(key, state);
-                            return;
-                        }
-                        devtools(state);
-                    });
-                    $cacheEntryRemoved.then(() => {
-                        devtools('$CLEANED');
-                    });
+        const devtoolsName = options?.devtoolsName;
+        if (devtoolsName !== false && Devtools.hasDevtools) {
+            this.onCacheEntryAddedListeners.push(async (_, { $cacheEntryRemoved, dataChanged$ }) => {
+                let stateDevtools = null;
+                dataChanged$.subscribe((state) => {
+                    if (!stateDevtools) {
+                        stateDevtools = Devtools.createState(state, {
+                            base: 'Queries',
+                            name: devtoolsName || '',
+                        });
+                        return;
+                    }
+                    stateDevtools(state);
                 });
-            }
+                $cacheEntryRemoved.then(() => {
+                    stateDevtools('$CLEANED');
+                });
+            });
         }
         if (SharedOptions.onQueryError) {
             this.onQueryStartedListeners.push(async (_, { $queryFulfilled }) => {

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

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

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

@@ -4,7 +4,7 @@ export class ResourceAgent {
     _resources$ = new Signal({
         previous$: null,
         current$: null,
-    }, { disableDevtools: true });
+    }, { isDisabled: true });
     state$ = new Computed(() => {
         const resources = this._resources$.value;
         let prevState;
@@ -41,7 +41,7 @@ export class ResourceAgent {
             data: isShowPrev ? prevState.data ?? undefined : currState.data ?? undefined,
             args: currState.args ?? undefined,
         };
-    }, { disableDevtools: true });
+    }, { isDisabled: true });
     constructor(_resource) {
         this._resource = _resource;
     }

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

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

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

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

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

@@ -0,0 +1,5 @@
+import { StateDevtoolsOptions } from "../../common/devtools";
+export declare const Devtools: {
+    createState<T>(initialValue: T, optionsDry?: StateDevtoolsOptions): import("../../common/devtools").DevtoolsStateLike<T> | null;
+    readonly hasDevtools: boolean;
+};

package/dist/signals/base/Devtools.js

@@ -0,0 +1,31 @@
+import { SharedOptions } from "../../common/options/SharedOptions";
+import { Indexer } from "./Indexer";
+export const Devtools = {
+    createState(initialValue, optionsDry = {}) {
+        const options = typeof optionsDry === 'string'
+            ? { name: optionsDry }
+            : optionsDry;
+        if (options.isDisabled)
+            return null;
+        let createStateDevtools = SharedOptions.DEVTOOLS?.state;
+        if (!createStateDevtools)
+            return null;
+        const key = createKey(options.name, options.base);
+        return createStateDevtools(key, initialValue);
+    },
+    get hasDevtools() {
+        return !!SharedOptions.DEVTOOLS?.state;
+    },
+};
+function createKey(name, base) {
+    const i = Indexer.getIndex();
+    let key = '';
+    if (base && name)
+        key += name.replace('{base}', base);
+    else if (!base && name)
+        key += name;
+    else if (base && !name)
+        key += `${base}/`;
+    key += `#i=${i}`;
+    return key;
+}

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

@@ -1,8 +1,6 @@
 export * from './Batcher';
-export * from './Computed';
-export * from './Effect';
+export * from './Devtools';
 export * from './ReadonlySignal';
-export * from './Signal';
 export * from './SyncObservable';
 export * from './Tracker';
 export * from './types';

package/dist/signals/base/index.js

@@ -1,8 +1,6 @@
 export * from './Batcher';
-export * from './Computed';
-export * from './Effect';
+export * from './Devtools';
 export * from './ReadonlySignal';
-export * from './Signal';
 export * from './SyncObservable';
 export * from './Tracker';
 export * from './types';

package/dist/signals/index.d.ts

@@ -1,4 +1,4 @@
 export * from './base';
-export * from './extends';
 export * from './operators';
 export * from './react';
+export * from './signals';

package/dist/signals/index.js

@@ -1,4 +1,4 @@
 export * from './base';
-export * from './extends';
 export * from './operators';
 export * from './react';
+export * from './signals';

package/dist/signals/{base → signals}/Computed.d.ts

@@ -1,13 +1,11 @@
 import { SubscriptionLike } from "rxjs";
-import { ReadableSignalLike } from "./types";
+import { ReadableSignalLike } from "../base";
 import { Signal } from "./Signal";
+import { StateDevtoolsOptions } from "../../common/devtools";
 export declare class Computed<T> extends Signal<T> implements SubscriptionLike, ReadableSignalLike<T> {
     private static _EMPTY;
     private _effect;
-    constructor(computeFn: () => T, options?: {
-        disableDevtools?: boolean;
-        devtoolsName?: string;
-    });
+    constructor(computeFn: () => T, options?: StateDevtoolsOptions);
     complete(): void;
     /**
      * @deprecated use 'complete()' instead

package/dist/signals/{base → signals}/Computed.js

@@ -16,8 +16,8 @@ export class Computed extends Signal {
             this.complete();
         });
         super(initialValue, {
-            devtoolsName: 'Computed',
-            ...options,
+            base: 'Computed',
+            ...(typeof options === 'string' ? { name: options } : options)
         });
         this._effect = effect;
     }

package/dist/signals/{base → signals}/Effect.js

@@ -1,5 +1,4 @@
-import { Batcher } from "./Batcher";
-import { Tracker } from "./Tracker";
+import { Batcher, Tracker } from "../base";
 export class Effect {
     _onComplete;
     _subscriptions = [];

package/dist/signals/{extends → signals}/LocalSignal.d.ts

@@ -1,6 +1,6 @@
 import { ZodType } from "zod/v4";
 import { Observable } from "rxjs";
-import { Computed } from "../base";
+import { Computed } from "../signals";
 type Options<T> = {
     zodSchema?: ZodType<T>;
     key: string;
@@ -11,6 +11,7 @@ type Options<T> = {
     validator$?: Observable<(value: T) => boolean>;
     checkEffect?: (value: T) => boolean;
     defaultValue: T;
+    devtoolsName?: string | false;
 };
 export declare class LocalSignal<T = string | null | number | undefined> extends Computed<T> {
     private _options;

package/dist/signals/{extends → signals}/LocalSignal.js

@@ -1,5 +1,5 @@
 import { z } from "zod/v4";
-import { Computed } from "../base";
+import { Computed } from "../signals";
 import { signalize } from "../operators";
 const NullOrString = z.string().nullable();
 const NONE = Symbol('NONE');
@@ -41,6 +41,7 @@ export class LocalSignal extends Computed {
         const validator$ = _options.validator$;
         const checkEffect = _options.checkEffect;
         const defaultValue = _options.defaultValue;
+        const devtoolsName = _options.devtoolsName;
         const validatorSignal$ = validator$ && signalize(validator$);
         super(() => {
             const value = LocalSignal._getStorageValue(_options);
@@ -56,7 +57,11 @@ export class LocalSignal extends Computed {
                 return checkEffect(value) ? value : defaultValue;
             }
             return value;
-        }, { devtoolsName: 'LocalSignal' });
+        }, {
+            isDisabled: devtoolsName === false,
+            base: 'LocalSignals',
+            name: devtoolsName || undefined,
+        });
         this._options = _options;
     }
     _onChange(value) {

package/dist/signals/{base → signals}/Signal.d.ts

@@ -1,13 +1,10 @@
 import { BehaviorSubject, Observable, SubscriptionLike } from "rxjs";
-import type { ReadableSignalLike, SignalLike, UnaryFunction } from "./types";
-type SignalOptions = {
-    disableDevtools?: boolean;
-    devtoolsName?: string;
-};
+import { ReadableSignalLike, SignalLike, UnaryFunction } from "../base";
+import { StateDevtoolsOptions } from "../../common/devtools";
 export declare class Signal<T> extends BehaviorSubject<T> implements SubscriptionLike, SignalLike<T> {
-    private readonly _devtools;
+    private readonly _stateDevtools;
     protected _rang: number;
-    constructor(initialValue: T, options?: SignalOptions);
+    constructor(initialValue: T, options?: StateDevtoolsOptions);
     protected _onChange(value: T): void;
     get value(): T;
     set value(value: T);
@@ -43,4 +40,3 @@ export declare class Signal<T> extends BehaviorSubject<T> implements Subscriptio
     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>;
 }
-export {};

package/dist/signals/{base → signals}/Signal.js

@@ -1,23 +1,18 @@
 import { BehaviorSubject } from "rxjs";
-import { SharedOptions } from "../../common/options/SharedOptions";
-import { Batcher } from "./Batcher";
-import { Indexer } from "./Indexer";
-import { Tracker } from "./Tracker";
+import { Batcher, Tracker, Devtools } from "../base";
 export class Signal extends BehaviorSubject {
-    _devtools;
+    _stateDevtools;
     _rang = 0;
     constructor(initialValue, options) {
         super(initialValue);
-        const stateDevtools = SharedOptions.DEVTOOLS?.state;
-        if (stateDevtools && options?.disableDevtools !== true) {
-            const id = Indexer.getIndex();
-            const key = `${options?.devtoolsName || 'Signal'}:i=${id}`;
-            this._devtools = stateDevtools(key, initialValue);
-        }
+        this._stateDevtools = Devtools.createState(initialValue, {
+            base: 'Signals',
+            ...(typeof options === 'string' ? { name: options } : options)
+        });
     }
     _onChange(value) {
         Batcher.batch(() => {
-            this._devtools?.(value);
+            this._stateDevtools?.(value);
             super.next(value);
         });
     }
@@ -53,7 +48,7 @@ export class Signal extends BehaviorSubject {
         return this.next(value);
     }
     complete() {
-        this._devtools?.('$COMPLETE');
+        this._stateDevtools?.('$COMPLETE');
         super.complete();
     }
     /**

package/dist/signals/signals/index.d.ts

@@ -0,0 +1,4 @@
+export * from './Computed';
+export * from './Effect';
+export * from './LocalSignal';
+export * from './Signal';

package/dist/signals/signals/index.js

@@ -0,0 +1,4 @@
+export * from './Computed';
+export * from './Effect';
+export * from './LocalSignal';
+export * from './Signal';

package/package.json

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

package/dist/signals/extends/index.d.ts

@@ -1 +0,0 @@
-export * from './LocalSignal';

package/dist/signals/extends/index.js

@@ -1 +0,0 @@
-export * from './LocalSignal';