Fix extra refresh in keepFresh while source is changing for disable…

…d _Query_

.changeset/mean-cups-type.md

@@ -0,0 +1,5 @@
+---
+'@farfetched/core': patch
+---
+
+Fix extra refresh in `keepFresh` while source is changing for disabled _Query_

packages/core/src/trigger_api/__test__/keep_fresh.auto.test.ts

@@ -1,4 +1,4 @@
-import { allSettled, createStore, fork } from 'effector';
+import { allSettled, createStore, createWatch, fork } from 'effector';
 import { describe, test, expect, vi } from 'vitest';
 import { unknownContract } from '../../contract/unknown_contract';
 import { createJsonQuery } from '../../query/create_json_query';
@@ -215,4 +215,34 @@ describe('keepFresh, automatically', () => {
 
     expect(listener).toBeCalledTimes(2);
   });
+
+  test('does not use sources while disabled as source for refresh', async () => {
+    const $url = createStore('https://api.salo.com');
+
+    const query = createJsonQuery({
+      enabled: $url.map((url) => url.length > 0),
+      request: {
+        method: 'GET',
+        url: $url,
+      },
+      response: { contract: unknownContract },
+    });
+
+    keepFresh(query, { automatically: true });
+
+    const scope = fork({
+      handlers: [[query.__.executeFx, vi.fn(async () => 42)]],
+    });
+
+    const listener = vi.fn();
+
+    createWatch({ unit: query.refresh, fn: listener, scope });
+
+    await allSettled(query.refresh, { scope });
+
+    await allSettled($url, { scope, params: '' });
+    await allSettled($url, { scope, params: 'https://api.salo.com' });
+
+    expect(listener).toBeCalledTimes(1);
+  });
 });

packages/core/src/trigger_api/keep_fresh.ts

@@ -89,11 +89,20 @@ export function keepFresh<Params>(
 
   if (config.automatically) {
     const finalyParams = query.finished.finally.map(get('params'));
-    const $previousSources = combine(
-      query.__.lowLevelAPI.sourced.map((sourced) =>
-        normalizeSourced({ field: sourced, clock: finalyParams })
-      )
-    );
+
+    const $previousSources = createStore<any[]>([], { serialize: 'ignore' });
+
+    // @ts-expect-error I have no idea
+    sample({
+      clock: finalyParams,
+      source: combine(
+        query.__.lowLevelAPI.sourced.map((sourced) =>
+          normalizeSourced({ field: sourced, clock: finalyParams })
+        )
+      ),
+      filter: query.$enabled,
+      target: $previousSources,
+    });
 
     const sourcesUpdated = sample({
       clock: query.__.lowLevelAPI.sourced.map(extractSource).filter(is.store),
@@ -116,7 +125,7 @@ export function keepFresh<Params>(
     );
   }
 
-  const forceFresh = merge(triggers);
+  const forceFresh = sample({ clock: triggers, filter: query.$enabled });
 
   sample({
     clock: forceFresh,