@signalium/query 1.0.10 → 1.0.12

package/dist/esm/QueryClient.d.ts

@@ -17,9 +17,15 @@ import { NetworkManager } from './NetworkManager.js';
 import { QueryResultImpl } from './QueryResult.js';
 import { RefetchManager } from './RefetchManager.js';
 import { MemoryEvictionManager } from './MemoryEvictionManager.js';
-import { CachedQueryExtra } from './QueryStore.js';
+import { type Signal } from 'signalium';
 export interface QueryContext {
     fetch: typeof fetch;
+    log?: {
+        error?: (message: string, error?: unknown) => void;
+        warn?: (message: string, error?: unknown) => void;
+        info?: (message: string) => void;
+        debug?: (message: string) => void;
+    };
     evictionMultiplier?: number;
     refetchMultiplier?: number;
 }
@@ -39,7 +45,7 @@ export interface StreamCacheOptions {
 export interface QueryPaginationOptions<Result> {
     getNextPageParams?(lastPage: Result, params?: QueryParams | undefined): QueryParams | undefined;
 }
-export type QueryParams = Record<string, string | number | boolean | undefined | null>;
+export type QueryParams = Record<string, string | number | boolean | undefined | null | Signal<string | number | boolean | undefined | null>>;
 export declare const enum QueryType {
     Query = "query",
     InfiniteQuery = "infiniteQuery",
@@ -52,6 +58,7 @@ export interface QueryDefinition<Params extends QueryParams | undefined, Result,
     shape: TypeDef;
     shapeKey: number;
     fetchFn: (context: QueryContext, params: Params, prevResult?: Result) => Promise<Result>;
+    debounce?: number;
     cache?: QueryCacheOptions;
     stream?: {
         shape: TypeDef;
@@ -70,6 +77,7 @@ export interface InfiniteQueryDefinition<Params extends QueryParams | undefined,
     shapeKey: number;
     fetchFn: (context: QueryContext, params: Params, prevResult?: Result) => Promise<Result>;
     pagination: QueryPaginationOptions<Result>;
+    debounce?: number;
     cache?: QueryCacheOptions;
     stream?: {
         shape: TypeDef;
@@ -96,6 +104,10 @@ export interface CachedQuery {
     updatedAt: number;
     extra?: CachedQueryExtra;
 }
+export interface CachedQueryExtra {
+    streamOrphanRefs?: number[];
+    optimisticInsertRefs?: number[];
+}
 export interface QueryStore {
     /**
      * Asynchronously retrieves a document by key.
@@ -117,8 +129,24 @@ export interface QueryStore {
      * Handles eviction internally when the cache is full.
      */
     activateQuery(queryDef: QueryDefinition<any, any, any>, queryKey: number): void;
+    deleteQuery(queryKey: number): void;
 }
 export type MaybePromise<T> = T | Promise<T>;
+/**
+ * Extracts actual values from params that may contain Signals.
+ */
+export declare function extractParamsForKey(params: QueryParams | undefined): Record<string, string | number | boolean | undefined | null> | undefined;
+/**
+ * Computes the query key for instance lookup. This is used for two different keys:
+ *
+ * - Query instance key
+ * - Query storage key
+ *
+ * Instance keys are created by passing in the query definition and parameters WITHOUT
+ * extracting the Signal values, whereas storage keys are created by extracting the Signal values.
+ * This way, we can reuse the same instance for given Signals, but different underlying values
+ * will be stored and put into the LRU cache separately.
+ */
 export declare const queryKeyFor: (queryDef: AnyQueryDefinition<any, any, any>, params: unknown) => number;
 export declare class QueryClient {
     private store;
@@ -134,6 +162,7 @@ export declare class QueryClient {
     saveQueryData(queryDef: AnyQueryDefinition<QueryParams | undefined, unknown, unknown>, queryKey: number, data: unknown, updatedAt: number, entityRefs?: Set<number>, extra?: CachedQueryExtra): void;
     activateQuery(queryInstance: QueryResultImpl<unknown>): void;
     loadCachedQuery(queryDef: AnyQueryDefinition<QueryParams | undefined, unknown, unknown>, queryKey: number): MaybePromise<CachedQuery | undefined>;
+    deleteCachedQuery(queryKey: number): void;
     /**
      * Loads a query from the document store and returns a QueryResult
      * that triggers fetches and prepopulates with cached data

package/dist/esm/QueryClient.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"QueryClient.d.ts","sourceRoot":"","sources":["../../src/QueryClient.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"QueryClient.d.ts","sourceRoot":"","sources":["../../src/QueryClient.ts"],"names":[],"mappings":"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"}

package/dist/esm/QueryClient.js

@@ -17,19 +17,54 @@ import { NetworkManager } from './NetworkManager.js';
 import { QueryResultImpl } from './QueryResult.js';
 import { RefetchManager } from './RefetchManager.js';
 import { MemoryEvictionManager } from './MemoryEvictionManager.js';
+/**
+ * Checks if a value is a Signal instance
+ */
+function isSignal(value) {
+    return typeof value === 'object' && value !== null;
+}
+/**
+ * Extracts actual values from params that may contain Signals.
+ */
+export function extractParamsForKey(params) {
+    if (params === undefined) {
+        return undefined;
+    }
+    const extracted = {};
+    for (const [key, value] of Object.entries(params)) {
+        if (isSignal(value)) {
+            extracted[key] = value.value;
+        }
+        else {
+            extracted[key] = value;
+        }
+    }
+    return extracted;
+}
+/**
+ * Computes the query key for instance lookup. This is used for two different keys:
+ *
+ * - Query instance key
+ * - Query storage key
+ *
+ * Instance keys are created by passing in the query definition and parameters WITHOUT
+ * extracting the Signal values, whereas storage keys are created by extracting the Signal values.
+ * This way, we can reuse the same instance for given Signals, but different underlying values
+ * will be stored and put into the LRU cache separately.
+ */
 export const queryKeyFor = (queryDef, params) => {
     return hashValue([queryDef.id, queryDef.shapeKey, params]);
 };
 export class QueryClient {
     store;
     context;
-    entityMap = new EntityStore();
+    entityMap;
     queryInstances = new Map();
     memoryEvictionManager;
     refetchManager;
     networkManager;
     isServer;
-    constructor(store, context = { fetch }, networkManager, memoryEvictionManager, refetchManager) {
+    constructor(store, context = { fetch, log: console }, networkManager, memoryEvictionManager, refetchManager) {
         this.store = store;
         this.context = context;
         this.memoryEvictionManager =
@@ -37,6 +72,7 @@ export class QueryClient {
         this.refetchManager = refetchManager ?? new RefetchManager(this.context.refetchMultiplier);
         this.networkManager = networkManager ?? new NetworkManager();
         this.isServer = typeof window === 'undefined';
+        this.entityMap = new EntityStore(this);
     }
     getContext() {
         return this.context;
@@ -48,17 +84,22 @@ export class QueryClient {
         this.store.saveQuery(queryDef, queryKey, data, updatedAt, clonedRefs, extra);
     }
     activateQuery(queryInstance) {
-        const { def, queryKey } = queryInstance;
-        this.store.activateQuery(def, queryKey);
+        const { def, queryKey, storageKey } = queryInstance;
+        // Use storageKey for cache operations (store.activateQuery)
+        this.store.activateQuery(def, storageKey);
         // Only add to refetch manager if it's not a stream
         if (def.type !== "stream" /* QueryType.Stream */ && def.cache?.refetchInterval) {
             this.refetchManager.addQuery(queryInstance);
         }
+        // Use queryKey for instance eviction (memoryEvictionManager)
         this.memoryEvictionManager.cancelEviction(queryKey);
     }
     loadCachedQuery(queryDef, queryKey) {
         return this.store.loadQuery(queryDef, queryKey, this.entityMap);
     }
+    deleteCachedQuery(queryKey) {
+        this.store.deleteQuery(queryKey);
+    }
     /**
      * Loads a query from the document store and returns a QueryResult
      * that triggers fetches and prepopulates with cached data
@@ -78,7 +119,9 @@ export class QueryClient {
         return this.entityMap.hydratePreloadedEntity(key, shape);
     }
     saveEntity(key, obj, shape, entityRefs) {
+        // console.log('saveEntity', key, JSON.stringify(obj, null, 2), shape, entityRefs, new Error().stack);
         const record = this.entityMap.setEntity(key, obj, shape, entityRefs);
+        // console.log('saveEntity record', JSON.stringify(obj, null, 2), new Error().stack);
         this.store.saveEntity(key, obj, entityRefs);
         return record;
     }

package/dist/esm/QueryClient.js.map

@@ -1 +1 @@
-{"version":3,"file":"QueryClient.js","sourceRoot":"","sources":["../../src/QueryClient.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"QueryClient.js","sourceRoot":"","sources":["../../src/QueryClient.ts"],"names":[],"mappings":"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"}

package/dist/esm/QueryResult.d.ts

@@ -8,6 +8,7 @@ import { type AnyQueryDefinition, type QueryClient, type QueryParams } from './Q
 export declare class QueryResultImpl<T> implements BaseQueryResult<T, unknown, unknown> {
     def: AnyQueryDefinition<any, any, any>;
     queryKey: number;
+    storageKey: number;
     private queryClient;
     private initialized;
     private isRefetchingSignal;
@@ -18,12 +19,12 @@ export declare class QueryResultImpl<T> implements BaseQueryResult<T, unknown, u
     private allNestedRefIdsSignal;
     private refetchPromise;
     private fetchMorePromise;
-    private attemptCount;
     private unsubscribe?;
-    private streamUnsubscribe?;
     private relay;
     private _relayState;
-    private wasOffline;
+    private wasPaused;
+    private currentParams;
+    private debounceTimer;
     private get relayState();
     private _extra;
     private get extraData();
@@ -59,6 +60,11 @@ export declare class QueryResultImpl<T> implements BaseQueryResult<T, unknown, u
      * Fetches fresh data, updates the cache, and updates updatedAt timestamp
      */
     private runQuery;
+    /**
+     * Triggers a debounced refetch. If debounce is configured, delays the fetch.
+     * Otherwise, calls refetch immediately.
+     */
+    private debouncedRefetch;
     refetch: () => Promise<T>;
     fetchNextPage: () => Promise<T>;
     get isRefetching(): boolean;

package/dist/esm/QueryResult.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"QueryResult.d.ts","sourceRoot":"","sources":["../../src/QueryResult.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"QueryResult.d.ts","sourceRoot":"","sources":["../../src/QueryResult.ts"],"names":[],"mappings":"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"}

package/dist/esm/QueryResult.js

@@ -4,6 +4,7 @@ import { NetworkMode } from './types.js';
 import { getProxyId, parseValue } from './proxy.js';
 import { parseEntities, parseObjectEntities } from './parseEntities.js';
 import { ValidatorDef } from './typeDefs.js';
+import { extractParamsForKey, queryKeyFor, } from './QueryClient.js';
 // ======================================================
 // QueryResultExtra - Manages stream orphans and optimistic inserts
 // ======================================================
@@ -254,7 +255,8 @@ class QueryResultExtra {
  */
 export class QueryResultImpl {
     def;
-    queryKey;
+    queryKey; // Instance key (includes Signal identity)
+    storageKey = -1; // Storage key (extracted values only)
     queryClient;
     initialized = false;
     isRefetchingSignal = signal(false);
@@ -265,12 +267,12 @@ export class QueryResultImpl {
     allNestedRefIdsSignal = undefined;
     refetchPromise = undefined;
     fetchMorePromise = undefined;
-    attemptCount = 0;
     unsubscribe = undefined;
-    streamUnsubscribe = undefined;
     relay;
     _relayState = undefined;
-    wasOffline = false;
+    wasPaused = false;
+    currentParams = undefined;
+    debounceTimer = undefined;
     get relayState() {
         const relayState = this._relayState;
         if (!relayState) {
@@ -303,7 +305,7 @@ export class QueryResultImpl {
             else {
                 // Clone current params
                 let hasDefinedParams = false;
-                const clonedParams = { ...this.params };
+                const clonedParams = { ...this.currentParams };
                 // iterate over the next page params and copy any defined values to the
                 for (const [key, value] of Object.entries(nextParams)) {
                     if (value !== undefined && value !== null) {
@@ -320,91 +322,96 @@ export class QueryResultImpl {
         setReactivePromise(this);
         this.def = def;
         this.queryClient = queryClient;
-        this.queryKey = queryKey;
+        this.queryKey = queryKey; // Instance key (Signal identity)
         this.params = params;
         // Create the relay and handle activation/deactivation
         this.relay = relay(state => {
             this._relayState = state;
+            // Extract params (reading Signal values establishes tracking)
+            this.currentParams = extractParamsForKey(this.params);
+            this.storageKey = queryKeyFor(this.def, this.currentParams);
             // Load from cache first, then fetch fresh data
             this.queryClient.activateQuery(this);
-            // Track network status for reconnect handling
-            const networkManager = this.queryClient.networkManager;
-            const isOnline = networkManager.getOnlineSignal().value;
             // Store initial offline state
-            this.wasOffline = !isOnline;
+            const isPaused = this.isPaused;
+            this.wasPaused = isPaused;
             if (this.initialized) {
-                // For any query with streams, resubscribe on reactivation
-                if (this.def.type === "stream" /* QueryType.Stream */ ||
-                    this.def.stream) {
-                    this.setupSubscription();
-                }
-                if (this.def.type !== "stream" /* QueryType.Stream */) {
-                    // Check if we just came back online
-                    if (!this.wasOffline && isOnline) {
-                        // We're back online - check if we should refresh
-                        const refreshStaleOnReconnect = this.def.cache?.refreshStaleOnReconnect ?? true;
-                        if (refreshStaleOnReconnect && this.isStale) {
-                            this.refetch();
-                        }
-                        // Reset attempt count on reconnect
-                        this.attemptCount = 0;
+                if (!isPaused) {
+                    // For any query with streams, resubscribe on reactivation
+                    if (this.def.type === "stream" /* QueryType.Stream */ ||
+                        this.def.stream) {
+                        this.setupSubscription();
                     }
-                    else if (this.isStale && !this.isPaused) {
+                    if (this.def.type !== "stream" /* QueryType.Stream */ && this.isStale) {
                         this.refetch();
                     }
                 }
-                // Update wasOffline for next check
-                this.wasOffline = !isOnline;
             }
             else {
                 this.initialize();
             }
+            const deactivate = () => {
+                // Clear debounce timer if active
+                clearTimeout(this.debounceTimer);
+                this.debounceTimer = undefined;
+                // Last subscriber left, deactivate refetch and schedule memory eviction
+                // Unsubscribe from any active streams
+                this.unsubscribe?.();
+                this.unsubscribe = undefined;
+                // Remove from refetch manager if configured
+                if (this.def.type !== "stream" /* QueryType.Stream */ && this.def.cache?.refetchInterval) {
+                    this.queryClient.refetchManager.removeQuery(this);
+                }
+                // Schedule removal from memory using the global eviction manager
+                // This allows quick reactivation from memory if needed again soon
+                // Disk cache (if configured) will still be available after eviction
+                // Use queryKey for instance eviction, storageKey for cache eviction
+                this.queryClient.memoryEvictionManager.scheduleEviction(this.queryKey);
+            };
             // Return deactivation callback
             return {
                 update: () => {
-                    // For any query with streams, unsubscribe and resubscribe to re-establish connection
-                    if (this.def.type === "stream" /* QueryType.Stream */ ||
-                        this.def.stream) {
-                        this.setupSubscription();
-                    }
-                    // For StreamQuery, we're done - it doesn't react to network status
-                    if (this.def.type === "stream" /* QueryType.Stream */) {
+                    const { wasPaused, isPaused } = this;
+                    this.wasPaused = isPaused;
+                    if (isPaused) {
+                        deactivate();
+                        // TODO: Add abort signal
                         return;
                     }
-                    // Network status changed - check if we should react
-                    const currentlyOnline = networkManager.getOnlineSignal().value;
-                    // If we just came back online
-                    if (this.wasOffline && currentlyOnline) {
-                        const refreshStaleOnReconnect = this.def.cache?.refreshStaleOnReconnect ?? true;
-                        if (refreshStaleOnReconnect && this.isStale) {
-                            state.setPromise(this.runQuery(this.params, true));
-                        }
-                        // Reset attempt count on reconnect
-                        this.attemptCount = 0;
-                    }
-                    // Update wasOffline for next check
-                    this.wasOffline = !currentlyOnline;
-                },
-                deactivate: () => {
-                    // Last subscriber left, deactivate refetch and schedule memory eviction
-                    // Unsubscribe from any active streams
-                    if (this.unsubscribe) {
-                        this.unsubscribe();
-                        this.unsubscribe = undefined;
+                    // Read Signal values again to establish tracking for any new Signals
+                    // Extract params (reading Signal values establishes tracking)
+                    const newExtractedParams = extractParamsForKey(this.params);
+                    const newStorageKey = queryKeyFor(this.def, newExtractedParams);
+                    const paramsDidChange = newStorageKey !== this.storageKey;
+                    // Check if storage key changed (comparing hash values)
+                    if (paramsDidChange) {
+                        // Same storage key, just Signal instances changed but values are the same
+                        // Update params and trigger debounced refetch
+                        this.params = newExtractedParams;
+                        this.storageKey = newStorageKey;
                     }
-                    if (this.streamUnsubscribe) {
-                        this.streamUnsubscribe();
-                        this.streamUnsubscribe = undefined;
+                    if (wasPaused) {
+                        this.queryClient.activateQuery(this);
+                        if (this.def.type !== "stream" /* QueryType.Stream */) {
+                            const refreshStaleOnReconnect = this.def.cache?.refreshStaleOnReconnect ?? true;
+                            if (refreshStaleOnReconnect && this.isStale) {
+                                state.setPromise(this.runQuery(this.currentParams, true));
+                            }
+                        }
+                        else {
+                            this.setupSubscription();
+                        }
                     }
-                    // Remove from refetch manager if configured
-                    if (this.def.type !== "stream" /* QueryType.Stream */ && this.def.cache?.refetchInterval) {
-                        this.queryClient.refetchManager.removeQuery(this);
+                    else if (paramsDidChange) {
+                        if (this.def.type !== "stream" /* QueryType.Stream */) {
+                            this.debouncedRefetch();
+                        }
+                        else {
+                            this.setupSubscription();
+                        }
                     }
-                    // Schedule removal from memory using the global eviction manager
-                    // This allows quick reactivation from memory if needed again soon
-                    // Disk cache (if configured) will still be available after eviction
-                    this.queryClient.memoryEvictionManager.scheduleEviction(this.queryKey);
                 },
+                deactivate,
             };
         });
     }
@@ -486,10 +493,11 @@ export class QueryResultImpl {
      */
     async initialize() {
         const state = this.relayState;
+        this.initialized = true;
+        let cached;
         try {
-            this.initialized = true;
-            // Load from cache first
-            const cached = await this.queryClient.loadCachedQuery(this.def, this.queryKey);
+            // Load from cache first (use storage key for cache operations)
+            cached = await this.queryClient.loadCachedQuery(this.def, this.storageKey);
             if (cached !== undefined) {
                 // Set the cached timestamp
                 this.updatedAt = cached.updatedAt;
@@ -508,6 +516,17 @@ export class QueryResultImpl {
                         ? parseEntities(cached.value, shape, this.queryClient, new Set())
                         : parseValue(cached.value, shape, this.def.id);
             }
+        }
+        catch (error) {
+            this.queryClient.deleteCachedQuery(this.storageKey);
+            this.queryClient
+                .getContext()
+                .log?.warn?.('Failed to initialize query, the query cache may be corrupted or invalid', error);
+        }
+        if (this.isPaused) {
+            return;
+        }
+        try {
             // Setup subscriptions (handles both StreamQuery and Query/InfiniteQuery with stream)
             if (this.def.type === "stream" /* QueryType.Stream */ ||
                 this.def.stream) {
@@ -518,13 +537,19 @@ export class QueryResultImpl {
                 if (cached !== undefined) {
                     // Check if data is stale
                     if (this.isStale) {
-                        // Data is stale, trigger background refetch
-                        this.refetch();
+                        // Data is stale, trigger background refetch (with debounce if configured)
+                        if (this.def.debounce !== undefined && this.def.debounce > 0) {
+                            this.debouncedRefetch();
+                        }
+                        else {
+                            this.refetch();
+                        }
                     }
                 }
                 else {
-                    // No cached data, fetch fresh
-                    state.setPromise(this.runQuery(this.params, true));
+                    // No cached data, fetch fresh immediately (don't debounce initial fetch)
+                    // Debounce only applies to refetches triggered by parameter changes
+                    state.setPromise(this.runQuery(this.currentParams, true));
                 }
             }
         }
@@ -554,14 +579,17 @@ export class QueryResultImpl {
             shapeDef = stream.shape;
             subscribeFn = stream.subscribeFn;
         }
-        this.unsubscribe = subscribeFn(this.queryClient.getContext(), this.params, update => {
+        // Extract params (reading Signal values establishes tracking)
+        const extractedParams = this.currentParams;
+        this.unsubscribe = subscribeFn(this.queryClient.getContext(), extractedParams, update => {
             const parsedData = parseObjectEntities(update, shapeDef, this.queryClient);
             // Update the relay state
             if (this.def.type === "stream" /* QueryType.Stream */) {
                 this.relayState.value = parsedData;
                 this.updatedAt = Date.now();
                 // Cache the data
-                this.queryClient.saveQueryData(this.def, this.queryKey, parsedData, this.updatedAt);
+                // Use storage key for cache operations
+                this.queryClient.saveQueryData(this.def, this.storageKey, parsedData, this.updatedAt);
             }
             else {
                 const allRefIds = this.getAllEntityRefs();
@@ -588,8 +616,6 @@ export class QueryResultImpl {
             try {
                 const queryDef = this.def;
                 const freshData = await queryDef.fetchFn(this.queryClient.getContext(), params);
-                // Success! Reset attempt count
-                this.attemptCount = 0;
                 // Parse and cache the fresh data
                 let entityRefs;
                 const isInfinite = this.def.type === "infiniteQuery" /* QueryType.InfiniteQuery */;
@@ -620,14 +646,14 @@ export class QueryResultImpl {
                 }
                 this._nextPageParams = undefined;
                 // Cache the data (synchronous, fire-and-forget)
-                this.queryClient.saveQueryData(this.def, this.queryKey, queryData, updatedAt, entityRefs, this.getExtraForPersistence());
+                // Use storage key for cache operations
+                this.queryClient.saveQueryData(this.def, this.storageKey, queryData, updatedAt, entityRefs, this.getExtraForPersistence());
                 // Update the timestamp
                 this.updatedAt = Date.now();
                 return queryData;
             }
             catch (error) {
                 lastError = error;
-                this.attemptCount = attempt + 1;
                 // If we've exhausted retries, throw the error
                 if (attempt >= retries) {
                     throw error;
@@ -645,6 +671,28 @@ export class QueryResultImpl {
         throw lastError;
     }
     // ======================================================
+    // Private debounce methods
+    // ======================================================
+    /**
+     * Triggers a debounced refetch. If debounce is configured, delays the fetch.
+     * Otherwise, calls refetch immediately.
+     */
+    debouncedRefetch() {
+        // We know this is a non-stream query because we're calling refetch, which is only available on non-stream queries
+        const debounce = this.def.debounce;
+        if (debounce === undefined) {
+            this.refetch();
+            return;
+        }
+        // Clear existing timer
+        clearTimeout(this.debounceTimer);
+        // Set new timer
+        this.debounceTimer = setTimeout(() => {
+            this.debounceTimer = undefined;
+            this.refetch();
+        }, debounce);
+    }
+    // ======================================================
     // Public methods
     // ======================================================
     refetch = () => {
@@ -657,13 +705,16 @@ export class QueryResultImpl {
         if (this.refetchPromise) {
             return this.refetchPromise;
         }
+        // Clear debounce timer if active (manual refetch should bypass debounce)
+        clearTimeout(this.debounceTimer);
+        this.debounceTimer = undefined;
         // Clear memoized nextPageParams so it's recalculated after refetch
         this._nextPageParams = undefined;
         // Set the signal before any async operations so it's immediately visible
         // Use untrack to avoid reactive violations when called from reactive context
         this.isRefetchingSignal.value = true;
         this._version.update(v => v + 1);
-        const promise = this.runQuery(this.params, true)
+        const promise = this.runQuery(this.currentParams, true)
             .then(result => {
             this.relayState.value = result;
             // Clear stream orphans and optimistic inserts on refetch
@@ -747,7 +798,8 @@ export class QueryResultImpl {
             return; // Query not initialized yet
         }
         const extra = this._extra?.getForPersistence();
-        this.queryClient.saveQueryData(this.def, this.queryKey, this.relayState.value, this.updatedAt, this.refIds, extra);
+        // Use storage key for cache operations
+        this.queryClient.saveQueryData(this.def, this.storageKey, this.relayState.value, this.updatedAt, this.refIds, extra);
     }
     /**
      * Get extra data for persistence (converts Sets to arrays of entity ref IDs)