@fozy-labs/rx-toolkit 0.4.2 → 0.4.3

package/README.md

@@ -41,11 +41,11 @@ RxToolkit решает эти проблемы, предоставляя сво
 
 ###### Создаем сигнал
 ```typescript
-// Описываете логику в обычном JavaScript
+// Описываем логику в обычном JavaScript
 const store = {
-  count$: new Signal(0),
-  doubled$: new Computed(() => store.count$.value * 2),
-  increment: () => store.count$.next(store.count$.value + 1)
+    count$: new Signal(0),
+    doubled$: new Computed(() => store.count$.value * 2),
+    increment: () => store.count$.value++,
 };
 ```
 
@@ -71,7 +71,6 @@ $: count = store.count$;
 
 ```typescript
 // Создаем Observable
-
 const clicker$ = fromEvent(document, 'click').pipe(
     debounceTime(300),
     scan(count => count + 1, 0),

package/dist/{devtools → common/devtools}/combineDevtools.d.ts

@@ -1,2 +1,2 @@
-import { DevtoolsLike } from "../query/types/devtools";
+import { DevtoolsLike } from "./types";
 export declare function combineDevtools(...devtools: DevtoolsLike[]): DevtoolsLike;

package/dist/{devtools → common/devtools}/index.d.ts

@@ -1,2 +1,3 @@
 export * from './reduxDevtools';
 export * from './combineDevtools';
+export * from './types';

package/dist/{devtools → common/devtools}/index.js

@@ -1,2 +1,3 @@
 export * from './reduxDevtools';
 export * from './combineDevtools';
+export * from './types';

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

@@ -0,0 +1,2 @@
+import { DevtoolsLike } from "./types";
+export declare function reduxDevtools(): DevtoolsLike;

package/dist/{devtools → common/devtools}/reduxDevtools.js

@@ -1,4 +1,4 @@
-import { Batcher } from "../signals";
+import { Batcher } from "../../signals";
 export function reduxDevtools() {
     let state = {};
     // @ts-ignore

package/dist/{query/api → common/options}/DefaultOptions.d.ts

@@ -1,4 +1,4 @@
-import { DevtoolsLike } from "../../query/types/devtools";
+import type { DevtoolsLike } from "../../common/devtools";
 type Update = Partial<{
     DEVTOOLS: DevtoolsLike | null;
     onError: (error: unknown) => void;

package/dist/{query/api → common/options}/DefaultOptions.js

@@ -1,4 +1,4 @@
-import { SharedOptions } from "../../query/core/SharedOptions";
+import { SharedOptions } from "./SharedOptions";
 export class DefaultOptions {
     static update(part) {
         if (part.DEVTOOLS !== undefined)

package/dist/{query/core → common/options}/SharedOptions.d.ts

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

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

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

package/dist/common/options/index.js

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

package/dist/{react-hooks → common/react}/index.d.ts

@@ -1,5 +1,4 @@
-export * from './useSignal';
+export * from './useConstant';
+export * from './useEventHandler';
 export * from './useObservable';
 export * from './useSyncObservable';
-export * from './useEventHandler';
-export * from './useConstant';

package/dist/{react-hooks → common/react}/index.js

@@ -1,5 +1,4 @@
-export * from './useSignal';
+export * from './useConstant';
+export * from './useEventHandler';
 export * from './useObservable';
 export * from './useSyncObservable';
-export * from './useEventHandler';
-export * from './useConstant';

package/dist/{react-hooks → common/react}/useObservable.js

@@ -1,7 +1,7 @@
 import React from 'react';
-import { useEventHandler } from "../react-hooks/useEventHandler";
 import { BehaviorSubject } from 'rxjs';
-import { useConstant } from "../react-hooks/useConstant";
+import { useConstant } from "./useConstant";
+import { useEventHandler } from "./useEventHandler";
 const NONE = Symbol('NONE');
 /**
  * Hook for automatically subscribing and unsubscribing from an Observable.

package/dist/{react-hooks → common/react}/useSyncObservable.js

@@ -1,6 +1,7 @@
 import React from 'react';
 import { BehaviorSubject } from 'rxjs';
-import { useConstant, useEventHandler } from "../react-hooks";
+import { useConstant } from "./useConstant";
+import { useEventHandler } from "./useEventHandler";
 const NONE = Symbol('NONE');
 /**
  * Hook for automatically subscribing and unsubscribing from an Observable.

package/dist/index.d.ts

@@ -1,4 +1,5 @@
+export * from './common/devtools';
+export * from './common/options';
+export * from './common/react';
 export * from './query';
 export * from './signals';
-export * from './react-hooks';
-export * from './devtools';

package/dist/index.js

@@ -1,4 +1,5 @@
+export * from './common/devtools';
+export * from './common/options';
+export * from './common/react';
 export * from './query';
 export * from './signals';
-export * from './react-hooks';
-export * from './devtools';

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

@@ -1,7 +1,3 @@
-import type { OperationCreateOptions, OperationDefinition } from "../../query/types/Operation.types";
+import type { OperationCreateOptions, OperationDefinition } from "../../query/types";
 import { Operation } from "../../query/core/Opertation/Operation";
 export declare const createOperation: <ARGS, RESULT, SELECTED = never>(options: OperationCreateOptions<OperationDefinition<ARGS, RESULT, SELECTED>>) => Operation<OperationDefinition<ARGS, RESULT, SELECTED>>;
-/**
- * @deprecated Use `createOperation` instead.
- */
-export declare const createMutationApi: <ARGS, RESULT, SELECTED = never>(options: OperationCreateOptions<OperationDefinition<ARGS, RESULT, SELECTED>>) => Operation<OperationDefinition<ARGS, RESULT, SELECTED>>;

package/dist/query/api/createOperation.js

@@ -1,6 +1,2 @@
 import { Operation } from "../../query/core/Opertation/Operation";
 export const createOperation = ((options) => new Operation(options));
-/**
- * @deprecated Use `createOperation` instead.
- */
-export const createMutationApi = createOperation;

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

@@ -1,3 +1,3 @@
-import type { ResourceCreateOptions, ResourceDefinition } from "../../query/types/Resource.types";
+import type { ResourceCreateOptions, ResourceDefinition } from "../../query/types";
 import { Resource } from "../../query/core/Resource/Resource";
 export declare const createResource: <ARGS, RESULT, SELECTED = never>(options: ResourceCreateOptions<ResourceDefinition<ARGS, RESULT, SELECTED>>) => Resource<ResourceDefinition<ARGS, RESULT, SELECTED>>;

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

@@ -1,6 +1,5 @@
-import { ReactiveCache } from "../../../query/lib/ReactiveCache";
-import { FallbackOnNever } from "../../../query/types/shared.types";
-import { OperationCreateOptions, OperationDefinition, OperationInstance } from "../../../query/types/Operation.types";
+import type { ReactiveCache } from "../../../query/lib/ReactiveCache";
+import type { FallbackOnNever, OperationCreateOptions, OperationDefinition, OperationInstance } from "../../../query/types";
 import { QueriesCache } from "../QueriesCache";
 import { OperationAgent } from "./OperationAgent";
 export type CoreOperationQueryState<D extends OperationDefinition> = {

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

@@ -1,5 +1,5 @@
+import { SharedOptions } from "../../../common/options/SharedOptions";
 import { QueriesCache } from "../QueriesCache";
-import { SharedOptions } from "../SharedOptions";
 import { OperationAgent } from "./OperationAgent";
 class OperationQueryState {
     static create() {

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

@@ -1,4 +1,4 @@
-import { OperationAgentInstanse, OperationDefinition } from "../../../query/types/Operation.types";
+import { OperationAgentInstanse, OperationDefinition } from "../../../query/types";
 import { Computed } from "../../../signals";
 import type { Operation } from "./Operation";
 export declare class OperationAgent<D extends OperationDefinition> implements OperationAgentInstanse<D> {
@@ -10,7 +10,7 @@ export declare class OperationAgent<D extends OperationDefinition> implements Op
         isSuccess: boolean;
         isError: boolean;
         error: {} | undefined;
-        data: NonNullable<import("../../types/shared.types").FallbackOnNever<D["Selected"], D["Result"]>> | undefined;
+        data: NonNullable<import("../../../query/types").FallbackOnNever<D["Selected"], D["Result"]>> | undefined;
         args: D["Args"];
     }>;
     constructor(_operation: Operation<D>);

package/dist/query/core/QueriesCache.js

@@ -1,7 +1,7 @@
+import { SharedOptions } from "../../common/options/SharedOptions";
+import { Indexer } from "../../signals/base/Indexer";
 import { IndirectMap } from "../../query/lib/IndirectMap";
 import { ReactiveCache } from "../../query/lib/ReactiveCache";
-import { Indexer } from "../../signals/base/Indexer";
-import { SharedOptions } from "./SharedOptions";
 export class QueriesCache {
     _logname;
     _cache = new IndirectMap();

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

@@ -1,6 +1,6 @@
 import { ReactiveCache } from "../../../query/lib/ReactiveCache";
-import type { ResourceCreateOptions, ResourceDefinition, ResourceInstance, ResourceRefInstanse, ResourceTransaction } from "../../../query/types/Resource.types";
-import { QueriesCache } from "../QueriesCache";
+import type { ResourceCreateOptions, ResourceDefinition, ResourceInstance, ResourceRefInstanse, ResourceTransaction } from "../../../query/types";
+import { QueriesCache } from "../../../query/core/QueriesCache";
 import { ResourceAgent } from "./ResourceAgent";
 export type CoreResourceQueryState<D extends ResourceDefinition> = {
     transactions: ResourceTransaction[] | null;

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

@@ -1,5 +1,5 @@
-import { QueriesCache } from "../QueriesCache";
-import { SharedOptions } from "../SharedOptions";
+import { SharedOptions } from "../../../common/options/SharedOptions";
+import { QueriesCache } from "../../../query/core/QueriesCache";
 import { ResourceAgent } from "./ResourceAgent";
 import { ResourceRef } from "./ResourceRef";
 class ResourceQueryState {

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

@@ -1,5 +1,5 @@
 import { Computed } from "../../../signals";
-import { ResourceAgentInstance, ResourceDefinition } from "../../../query/types/Resource.types";
+import { ResourceAgentInstance, ResourceDefinition } from "../../../query/types";
 import type { Resource } from "./Resource";
 export declare class ResourceAgent<D extends ResourceDefinition> implements ResourceAgentInstance<D> {
     private _resource;

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

@@ -1,5 +1,5 @@
+import { ResourceDefinition, ResourceRefInstanse, ResourceTransaction } from "../../../query/types";
 import { Resource } from "./Resource";
-import { ResourceDefinition, ResourceRefInstanse, ResourceTransaction } from "../../types/Resource.types";
 export declare class ResourceRef<D extends ResourceDefinition> implements ResourceRefInstanse<D> {
     private readonly _resource;
     private readonly _args;

package/dist/query/index.d.ts

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

package/dist/query/index.js

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

package/dist/query/lib/IndirectMap.js

@@ -1,4 +1,4 @@
-import { shallowEqual } from "../../query/lib/shallowEqual";
+import { shallowEqual } from "./shallowEqual";
 export class IndirectMap {
     _compareObjectsFn;
     _compareCache = new WeakMap();

package/dist/query/react/useOperationAgent.d.ts

@@ -1,5 +1,4 @@
-import { OperationAgentInstanse, OperationDefinition, OperationQueryState } from "../types/Operation.types";
-import { Prettify } from "../types/shared.types";
+import type { Prettify, OperationAgentInstanse, OperationDefinition, OperationQueryState } from "../../query/types";
 type WithAgent<D extends OperationDefinition> = {
     createAgent: () => OperationAgentInstanse<D>;
 };

package/dist/query/react/useOperationAgent.js

@@ -1,4 +1,5 @@
-import { useConstant, useEventHandler, useSignal } from "../../react-hooks";
+import { useConstant, useEventHandler } from "../../common/react";
+import { useSignal } from "../../signals/react";
 export function useOperationAgent(op) {
     const agent = useConstant(() => op.createAgent());
     const state = useSignal(agent.state$);

package/dist/query/react/useResourceAgent.d.ts

@@ -1,6 +1,5 @@
-import { ResourceAgentInstance, ResourceDefinition, ResourceQueryState } from "../types/Resource.types";
-import { Prettify } from "../types/shared.types";
-import { SKIP } from "../SKIP_TOKEN";
+import { Prettify, ResourceAgentInstance, ResourceDefinition, ResourceQueryState } from "../../query/types";
+import { SKIP } from "../../query/SKIP_TOKEN";
 type WithAgent<D extends ResourceDefinition> = {
     createAgent: () => ResourceAgentInstance<D>;
 };

package/dist/query/react/useResourceAgent.js

@@ -1,7 +1,8 @@
 import React from "react";
-import { useConstant, useSignal } from "../../react-hooks";
-import { shallowEqual } from "../lib/shallowEqual";
-import { SKIP } from "../SKIP_TOKEN";
+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]);
     const agent = useConstant(() => {

package/dist/query/react/useResourceRef.d.ts

@@ -1,6 +1,5 @@
 import { SKIP } from "../../query/SKIP_TOKEN";
-import { ResourceDefinition, ResourceInstance, ResourceRefInstanse } from "../../query/types/Resource.types";
-import { Prettify } from "../../query/types/shared.types";
+import type { Prettify, ResourceDefinition, ResourceInstance, ResourceRefInstanse } from "../../query/types";
 type Result<D extends ResourceDefinition> = Prettify<ResourceRefInstanse<D>> | null;
 export declare function useResourceRef<D extends ResourceDefinition>(res: ResourceInstance<D>, ...argss: D['Args'] extends void ? [] | [typeof SKIP] : [D['Args'] | typeof SKIP]): Result<D>;
 export {};

package/dist/query/react/useResourceRef.js

@@ -1,5 +1,5 @@
-import { SKIP } from "../../query/SKIP_TOKEN";
 import React from "react";
+import { SKIP } from "../../query/SKIP_TOKEN";
 export function useResourceRef(res, ...argss) {
     const args = (argss[0] === SKIP ? SKIP : argss[0]);
     return React.useMemo(() => {

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

@@ -1,5 +1,5 @@
 import { ReadableSignalLike } from "../../signals";
-import { FallbackOnNever } from "../../query/types/shared.types";
+import { FallbackOnNever } from "./shared.types";
 import { ResourceDefinition, ResourceInstance } from "./Resource.types";
 /**
  * Функция создания операции

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

@@ -1,6 +1,6 @@
-import { ReadableSignalLike } from "../../signals";
-import { FallbackOnNever } from "../../query/types/shared.types";
 import { Patch as ImmerPatch } from "immer";
+import { ReadableSignalLike } from "../../signals";
+import { FallbackOnNever } from "./shared.types";
 /**
  * Функция создания ресурса
  */

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

@@ -0,0 +1,3 @@
+export * from './Operation.types';
+export * from './Resource.types';
+export * from './shared.types';

package/dist/query/types/index.js

@@ -0,0 +1,3 @@
+export * from './Operation.types';
+export * from './Resource.types';
+export * from './shared.types';

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

@@ -1,7 +1,8 @@
 import { Observable, Subscriber, TeardownLogic } from "rxjs";
-import { SyncObservable } from "./SyncObservable";
 import type { ReadableSignalLike } from "./types";
+import { SyncObservable } from "./SyncObservable";
 export declare class ReadonlySignal<T> extends SyncObservable<T> implements ReadableSignalLike<T> {
+    protected rang: number;
     private readonly _devtools;
     private static _logIdIndex;
     constructor(subscribe?: (this: Observable<T>, subscriber: Subscriber<T>) => TeardownLogic);

package/dist/signals/base/ReadonlySignal.js

@@ -1,12 +1,28 @@
-import { SharedOptions } from "../../query/core/SharedOptions";
+import { Subscriber } from "rxjs";
+import { SharedOptions } from "../../common/options/SharedOptions";
 import { SyncObservable } from "./SyncObservable";
 import { Tracker } from "./Tracker";
 export class ReadonlySignal extends SyncObservable {
+    rang = 0;
     _devtools;
     static _logIdIndex = 0;
     constructor(subscribe) {
-        super(subscribe);
         const stateDevtools = SharedOptions.DEVTOOLS?.state;
+        const originalSubscribe = subscribe;
+        if (stateDevtools && originalSubscribe) {
+            subscribe = (subscriber) => {
+                const wrappedSubscriber = new Subscriber({
+                    next: (value) => {
+                        this._devtools?.(value);
+                        subscriber.next(value);
+                    },
+                    error: (err) => subscriber.error(err),
+                    complete: () => subscriber.complete()
+                });
+                return originalSubscribe.call(this, wrappedSubscriber);
+            };
+        }
+        super(subscribe);
         if (stateDevtools) {
             const id = ReadonlySignal._logIdIndex++;
             const key = `ReadonlySignal:i=${id}`;
@@ -15,7 +31,7 @@ export class ReadonlySignal extends SyncObservable {
         }
     }
     get value() {
-        Tracker.next_legacy(this);
+        Tracker.next(this.rang, this);
         return super.value;
     }
     peek() {

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

@@ -1,10 +1,10 @@
 import { BehaviorSubject, Observable } from "rxjs";
-import { type ReadableSignalLike, UnaryFunction } from "./types";
+import type { ReadableSignalLike, SignalLike, UnaryFunction } from "./types";
 type SignalOptions = {
     disableDevtools?: boolean;
     devtoolsName?: string;
 };
-export declare class Signal<T> extends BehaviorSubject<T> implements ReadableSignalLike<T> {
+export declare class Signal<T> extends BehaviorSubject<T> implements SignalLike<T> {
     private readonly _devtools;
     protected _rang: number;
     constructor(initialValue: T, options?: SignalOptions);

package/dist/signals/base/Signal.js

@@ -1,5 +1,5 @@
-import { SharedOptions } from "../../query/core/SharedOptions";
 import { BehaviorSubject } from "rxjs";
+import { SharedOptions } from "../../common/options/SharedOptions";
 import { Batcher } from "./Batcher";
 import { Indexer } from "./Indexer";
 import { Tracker } from "./Tracker";

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

@@ -4,10 +4,6 @@ type TrackedValue = {
     obsv$: Observable<unknown>;
 };
 export declare const Tracker: {
-    /** @deprecated */
-    tracked_legacy$: Subject<Observable<unknown>>;
-    /** @deprecated */
-    next_legacy(value: Observable<unknown>): void;
     tracked$: Subject<TrackedValue>;
     next(rang: number, observable: Observable<unknown>): void;
 };

package/dist/signals/base/Tracker.js

@@ -1,11 +1,5 @@
 import { Subject } from "rxjs";
 export const Tracker = {
-    /** @deprecated */
-    tracked_legacy$: new Subject(),
-    /** @deprecated */
-    next_legacy(value) {
-        Tracker.tracked_legacy$.next(value);
-    },
     tracked$: new Subject(),
     next(rang, observable) {
         Tracker.tracked$.next({ rang, obsv$: observable, });

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

@@ -7,6 +7,15 @@ export interface ReadableSignalLike<T = unknown> extends Observable<T> {
      */
     get(): T;
 }
+export interface SignalLike<T = unknown> extends ReadableSignalLike<T> {
+    set value(value: T);
+    next(value: T): void;
+    asReadonly(): ReadableSignalLike<T>;
+    /**
+     * @deprecated use `value` instead.
+     */
+    set(value: T): void;
+}
 export interface UnaryFunction<T, R> {
     (source: T): R;
 }

package/dist/signals/index.d.ts

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

package/dist/signals/index.js

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

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

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

package/dist/signals/react/index.js

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

package/dist/{react-hooks → signals/react}/useSignal.d.ts

@@ -1,2 +1,2 @@
-import { ReadableSignalLike } from "../signals";
+import { ReadableSignalLike } from "../../signals";
 export declare function useSignal<T>(signal$: ReadableSignalLike<T>): T;

package/dist/{react-hooks → signals/react}/useSignal.js

@@ -1,5 +1,5 @@
 import React from "react";
-import { useEventHandler } from "../react-hooks";
+import { useEventHandler } from "../../common/react";
 export function useSignal(signal$) {
     const subscribe = React.useCallback((update) => {
         const subscription = signal$.subscribe(update);

package/docs/signals/README.md

@@ -17,7 +17,7 @@ const age = new Signal(25);
 // Подписка на изменения
 const subscription = name.subscribe(newName => {
   console.log(`Name changed to: ${newName}`);
-});
+}); // Выведет: "Name changed to: John" при инициализации
 
 name.value = 'Jane'; // Выведет: "Name changed to: Jane"
 

package/package.json

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

package/dist/devtools/reduxDevtools.d.ts

@@ -1,2 +0,0 @@
-import { DevtoolsLike } from "../query/types/devtools";
-export declare function reduxDevtools(): DevtoolsLike;

package/dist/query/api/createSubResource.js

@@ -1 +0,0 @@
-"use strict";