Do not skip _Query_ execution with .refresh with different params

igorkamyshev · Mar 15, 2023 · 0822244 · 0822244
1 parent 23ca062
commit 0822244
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 2 deletions.
diff --git a/.changeset/witty-spoons-invent.md b/.changeset/witty-spoons-invent.md
@@ -0,0 +1,5 @@
+---
+'@farfetched/core': patch
+---
+
+Do not skip _Query_ execution with `.refresh` with different params
diff --git a/packages/core/project.json b/packages/core/project.json
@@ -71,7 +71,7 @@
     "size": {
       "executor": "./tools/executors/size-limit:size-limit",
       "options": {
-        "limit": "18.2 kB",
+        "limit": "18.3 kB",
         "outputPath": "dist/packages/core"
       },
       "dependsOn": [

diff --git a/packages/core/src/query/__tests__/create_headless_query.test.ts b/packages/core/src/query/__tests__/create_headless_query.test.ts
@@ -376,4 +376,36 @@ describe('createHeadlessQuery#refresh', () => {
 
     expect(listener).toBeCalledTimes(2);
   });
+
+  test('skip query in case of same params', async () => {
+    const query = createHeadlessQuery({
+      contract: unknownContract,
+      mapData: ({ result }) => result,
+    });
+
+    const listener = vi.fn(() => 'data from query');
+
+    const scope = fork({ handlers: [[query.__.executeFx, listener]] });
+
+    await allSettled(query.refresh, { scope, params: 1 });
+    await allSettled(query.refresh, { scope, params: 1 });
+
+    expect(listener).toBeCalledTimes(1);
+  });
+
+  test('start query in case of changed params', async () => {
+    const query = createHeadlessQuery({
+      contract: unknownContract,
+      mapData: ({ result }) => result,
+    });
+
+    const listener = vi.fn(() => 'data from query');
+
+    const scope = fork({ handlers: [[query.__.executeFx, listener]] });
+
+    await allSettled(query.refresh, { scope, params: 1 });
+    await allSettled(query.refresh, { scope, params: 2 });
+
+    expect(listener).toBeCalledTimes(2);
+  });
 });
diff --git a/packages/core/src/query/create_headless_query.ts b/packages/core/src/query/create_headless_query.ts
@@ -12,6 +12,7 @@ import {
 import { Validator } from '../validation/type';
 import { Query, QueryMeta, QuerySymbol } from './type';
 import { Event } from 'effector';
+import { isEqual } from '../libs/lohyphen';
 
 export interface SharedQueryFactoryConfig<Data, Initial = Data> {
   name?: string;
@@ -134,7 +135,10 @@ export function createHeadlessQuery<
 
   sample({
     clock: refresh,
-    filter: $stale,
+    source: { stale: $stale, latestParams: operation.__.$latestParams },
+    filter: ({ stale, latestParams }, params) =>
+      stale || !isEqual(params, latestParams),
+    fn: (_, params) => params,
     target: operation.start,
   });