@fozy-labs/rx-toolkit 0.4.5 → 0.4.7

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2025 fozykit
+Copyright (c) 2025 Vladimir Panev
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

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

@@ -137,6 +137,9 @@ export class Operation {
                     if (link.create && !ref.has) {
                         ref.create(link.create({ args, data }));
                     }
+                    if (link.invalidate) {
+                        ref.invalidate();
+                    }
                     state.patch?.commit();
                 });
                 hookResolvers.fulfilledSuccess(data);

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

@@ -41,6 +41,9 @@ export declare class Resource<D extends ResourceDefinition> implements ResourceI
     }, options?: {
         cache?: CoreResourceQueryCache<D>;
     }): CoreResourceQueryCache<D> | null;
+    createWithData(args: D['Args'], data: D['Data'], options?: {
+        cache?: CoreResourceQueryCache<D>;
+    }): CoreResourceQueryCache<D>;
     initiate(args: D['Args'], options?: {
         cache?: CoreResourceQueryCache<D>;
     }): CoreResourceQueryCache<D>;

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

@@ -24,6 +24,7 @@ class ResourceQueryState {
     static load(state = ResourceQueryState.create(), args) {
         return {
             ...state,
+            abortController: new AbortController(),
             args: args,
             isLoading: !state.isDone,
             isReloading: state.isDone,
@@ -33,6 +34,7 @@ class ResourceQueryState {
     static success(state, data) {
         return {
             ...state,
+            abortController: null,
             savedData: null,
             transactions: null,
             data,
@@ -47,6 +49,7 @@ class ResourceQueryState {
     static error(state, error) {
         return {
             ...state,
+            abortController: null,
             isLoading: false,
             isReloading: false,
             isDone: true,
@@ -79,14 +82,22 @@ class ResourceQueryState {
             data
         };
     }
-    /**
-     * @deprecated
-     */
-    static setData(state, data) {
+    static createWithData(data, args) {
         return {
-            ...state,
+            savedData: null,
             transactions: null,
-            data
+            data,
+            isLoading: false,
+            isReloading: false,
+            isDone: true,
+            isSuccess: true,
+            isError: false,
+            error: null,
+            abortController: null,
+            args,
+            isInitiated: false,
+            isLocked: false,
+            lockCount: 0
         };
     }
 }
@@ -155,8 +166,22 @@ export class Resource {
         cache.next(ResourceQueryState.update(cache.value, data, savedData, transactions));
         return cache;
     }
+    createWithData(args, data, options) {
+        let cache = options?.cache ?? this.getQueryCache(args);
+        const state = ResourceQueryState.createWithData(data, args);
+        if (!cache) {
+            cache = this.createQueryCache(args, state);
+            // Только обновляем кэш новыми данными, если он еще не был инициализирован.
+            // Это предотвращает перезапись уже инициализированного кэша.
+        }
+        else if (!cache.value.isInitiated) {
+            cache.next(state);
+        }
+        return cache;
+    }
     initiate(args, options) {
         let cache = options?.cache ?? this.getQueryCache(args);
+        const prevAbortController = cache?.value.abortController ?? null;
         const state = ResourceQueryState.load(cache?.value, args);
         if (!cache) {
             cache = this.createQueryCache(args, state);
@@ -164,9 +189,8 @@ export class Resource {
         else {
             cache.next(state);
         }
-        let abortController = state.abortController;
-        abortController?.abort();
-        abortController = new AbortController();
+        prevAbortController?.abort();
+        const abortController = state.abortController;
         const query = this._options.queryFn(args, { abortSignal: abortController.signal });
         const hookResolvers = this._hooks.onQueryStarted(args);
         query
@@ -174,7 +198,7 @@ export class Resource {
             if (abortController.signal.aborted) {
                 return;
             }
-            const data = this._options.select ? result._options.select(result) : result;
+            const data = this._options.select ? this._options.select(result) : result;
             cache.next(ResourceQueryState.success(state, data));
             hookResolvers.fulfilledSuccess(data);
         })

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

@@ -128,9 +128,9 @@ export class ResourceRef {
         return transaction;
     }
     create(data) {
-        throw new Error("Method not implemented.");
+        this._cacheItem = this._resource.createWithData(this._args, data, { cache: this._cacheItem ?? undefined });
     }
     invalidate() {
-        throw new Error("Method not implemented.");
+        this._cacheItem = this._resource.initiate(this._args, { cache: this._cacheItem ?? undefined });
     }
 }

package/dist/query/react/useResourceAgent.js

@@ -5,6 +5,7 @@ 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 prevArgsRef = React.useRef(args);
     const agent = useConstant(() => {
         const agent = res.createAgent();
         if (args !== SKIP) {
@@ -12,16 +13,11 @@ export function useResourceAgent(res, ...argss) {
         }
         return agent;
     });
-    React.useEffect(() => {
-        if (args === SKIP) {
-            return;
-        }
-        const state = agent.state$.peek();
-        if (state.isInitiated && shallowEqual(args, state.args)) {
-            return;
-        }
+    const state = agent.state$.peek();
+    if (state.isInitiated && args !== SKIP && !shallowEqual(args, prevArgsRef.current)) {
+        prevArgsRef.current = args;
         agent.initiate(args);
-    }, [args]);
+    }
     React.useEffect(() => () => {
         agent.complete();
     }, []);

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

@@ -1,5 +1,5 @@
 import { SKIP } from "../../query/SKIP_TOKEN";
 import type { Prettify, ResourceDefinition, ResourceInstance, ResourceRefInstanse } from "../../query/types";
-type Result<D extends ResourceDefinition> = Prettify<ResourceRefInstanse<D>> | null;
+type Result<D extends ResourceDefinition> = Prettify<ResourceRefInstanse<D>>;
 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/signals/react/useSignal.js

@@ -1,12 +1,23 @@
 import React from "react";
 import { useEventHandler } from "../../common/react";
 export function useSignal(signal$) {
+    const doUpdateRef = React.useRef(false);
     const subscribe = React.useCallback((update) => {
-        const subscription = signal$.subscribe(update);
+        const subscription = signal$.subscribe(() => {
+            doUpdateRef.current = true;
+            queueMicrotask(() => {
+                if (!doUpdateRef.current)
+                    return;
+                update();
+            });
+        });
         return () => {
             subscription.unsubscribe();
         };
     }, [signal$]);
-    const getSnapshot = useEventHandler(() => signal$.peek());
+    const getSnapshot = useEventHandler(() => {
+        doUpdateRef.current = false;
+        return signal$.peek();
+    });
     return React.useSyncExternalStore(subscribe, getSnapshot);
 }

package/package.json

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