@signalium/query 1.0.10 → 1.0.12

package/CHANGELOG.md

@@ -1,5 +1,26 @@
 # @signalium/query
 
+## 1.0.12
+
+### Patch Changes
+
+- f3e1ef0: Fix case-insensitive enum type inference
+- 11116da: Add more tests for shapeKey and fix some small issues
+- 0219742: Fix initialization error handling
+- Updated dependencies [985abb0]
+  - signalium@2.1.5
+
+## 1.0.11
+
+### Patch Changes
+
+- 7f94377: Fixup format registry and add global format type registry
+- d1f9def: Add ability to defined cached methods to entities
+- e0a4844: Add ability for Entities to subscribe to streams when in use
+- 6b961f0: Add support for Signal query parameters and debounced updates
+- Updated dependencies [2cf6766]
+  - signalium@2.1.4
+
 ## 1.0.10
 
 ### Patch Changes

package/dist/cjs/EntityMap.js

@@ -5,6 +5,10 @@ const signalium_1 = require("signalium");
 const proxy_js_1 = require("./proxy.js");
 class EntityStore {
     map = new Map();
+    queryClient;
+    constructor(queryClient) {
+        this.queryClient = queryClient;
+    }
     hasEntity(key) {
         return this.map.has(key);
     }
@@ -19,8 +23,7 @@ class EntityStore {
         refIds.add(key);
         // Entangle the signal value. Whenever the signal value is updated, refIds
         // will also be updated, so no need for a second signal.
-        // eslint-disable-next-line @typescript-eslint/no-unused-expressions
-        record.signal.value;
+        record.notifier.consume();
         if (record.entityRefs !== undefined) {
             for (const ref of record.entityRefs) {
                 this.getNestedEntityRefIds(ref, refIds);
@@ -33,14 +36,16 @@ class EntityStore {
         if (record === undefined) {
             throw new Error(`Entity ${key} not found`);
         }
-        record.proxy = (0, proxy_js_1.createEntityProxy)(key, record, shape);
+        record.proxy = this.createEntityProxy(record, shape);
         return record;
     }
-    setPreloadedEntity(key, obj) {
+    setPreloadedEntity(key, data) {
         const record = {
             key,
-            signal: (0, signalium_1.signal)(obj, { equals: false }),
+            data,
+            notifier: (0, signalium_1.notifier)(),
             cache: new Map(),
+            id: undefined,
             proxy: undefined,
             entityRefs: undefined,
         };
@@ -51,15 +56,48 @@ class EntityStore {
         let record = this.map.get(key);
         if (record === undefined) {
             record = this.setPreloadedEntity(key, obj);
-            record.proxy = (0, proxy_js_1.createEntityProxy)(key, record, shape);
+            record.proxy = this.createEntityProxy(record, shape);
         }
         else {
-            record.signal.update(value => (0, proxy_js_1.mergeValues)(value, obj));
+            record.data = (0, proxy_js_1.mergeValues)(record.data, obj);
+            record.notifier.notify();
             record.cache.clear();
         }
         record.entityRefs = entityRefs;
         return record;
     }
+    createEntityProxy(record, shape) {
+        const idField = shape.idField;
+        if (idField === undefined) {
+            throw new Error(`Entity id field is required ${shape.typenameValue}`);
+        }
+        const id = record.data[idField];
+        if (typeof id !== 'string' && typeof id !== 'number') {
+            console.log(record.data);
+            throw new Error(`Entity id must be string or number: ${shape.typenameValue}`);
+        }
+        record.id = id;
+        let entityRelay;
+        const entityConfig = shape._entityConfig;
+        if (entityConfig?.stream) {
+            entityRelay = (0, signalium_1.relay)(state => {
+                const context = this.queryClient.getContext();
+                const onUpdate = (update) => {
+                    const currentValue = record.data;
+                    const merged = (0, proxy_js_1.mergeValues)(currentValue, update);
+                    record.data = merged;
+                    record.notifier.notify();
+                    record.cache.clear();
+                };
+                const unsubscribe = entityConfig.stream.subscribe(context, id, onUpdate);
+                // Set initial value to the proxy - this resolves the relay promise
+                // Proxy should always exist at this point since it's created before relay access
+                state.value = record.proxy;
+                return unsubscribe;
+            });
+        }
+        return (0, proxy_js_1.createEntityProxy)(record.key, record, shape, entityRelay, this.queryClient);
+    }
 }
 exports.EntityStore = EntityStore;
 //# sourceMappingURL=EntityMap.js.map

package/dist/cjs/EntityMap.js.map

@@ -1 +1 @@
-{"version":3,"file":"EntityMap.js","sourceRoot":"","sources":["../../src/EntityMap.ts"],"names":[],"mappings":";;;AAAA,yCAA2C;AAE3C,yCAA4D;AAY5D,MAAa,WAAW;IACd,GAAG,GAAG,IAAI,GAAG,EAAgD,CAAC;IAEtE,SAAS,CAAC,GAAW;QACnB,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IAC3B,CAAC;IAED,SAAS,CAAC,GAAW;QACnB,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IAC3B,CAAC;IAED,qBAAqB,CAAC,GAAW,EAAE,MAAmB;QACpD,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;QAEnC,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;YACzB,MAAM,IAAI,KAAK,CAAC,UAAU,GAAG,+CAA+C,CAAC,CAAC;QAChF,CAAC;QAED,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAEhB,0EAA0E;QAC1E,wDAAwD;QACxD,oEAAoE;QACpE,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC;QAEpB,IAAI,MAAM,CAAC,UAAU,KAAK,SAAS,EAAE,CAAC;YACpC,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,UAAU,EAAE,CAAC;gBACpC,IAAI,CAAC,qBAAqB,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;YAC1C,CAAC;QACH,CAAC;QAED,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,sBAAsB,CAAC,GAAW,EAAE,KAAgB;QAClD,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;QACnC,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;YACzB,MAAM,IAAI,KAAK,CAAC,UAAU,GAAG,YAAY,CAAC,CAAC;QAC7C,CAAC;QAED,MAAM,CAAC,KAAK,GAAG,IAAA,4BAAiB,EAAC,GAAG,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC;QAErD,OAAO,MAAsB,CAAC;IAChC,CAAC;IAED,kBAAkB,CAAC,GAAW,EAAE,GAA4B;QAC1D,MAAM,MAAM,GAA0B;YACpC,GAAG;YACH,MAAM,EAAE,IAAA,kBAAM,EAAC,GAAG,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC;YACtC,KAAK,EAAE,IAAI,GAAG,EAAE;YAChB,KAAK,EAAE,SAAS;YAChB,UAAU,EAAE,SAAS;SACtB,CAAC;QAEF,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;QAE1B,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,SAAS,CAAC,GAAW,EAAE,GAA4B,EAAE,KAAgB,EAAE,UAAwB;QAC7F,IAAI,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAE/B,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;YACzB,MAAM,GAAG,IAAI,CAAC,kBAAkB,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;YAE3C,MAAM,CAAC,KAAK,GAAG,IAAA,4BAAiB,EAAC,GAAG,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC;QACvD,CAAC;aAAM,CAAC;YACN,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,IAAA,sBAAW,EAAC,KAAK,EAAE,GAAG,CAAC,CAAC,CAAC;YACvD,MAAM,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;QACvB,CAAC;QAED,MAAM,CAAC,UAAU,GAAG,UAAU,CAAC;QAE/B,OAAO,MAAsB,CAAC;IAChC,CAAC;CACF;AA3ED,kCA2EC"}
+{"version":3,"file":"EntityMap.js","sourceRoot":"","sources":["../../src/EntityMap.ts"],"names":[],"mappings":"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"}

package/dist/cjs/QueryClient.js

@@ -13,6 +13,7 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.QueryClientContext = exports.QueryClient = exports.queryKeyFor = void 0;
+exports.extractParamsForKey = extractParamsForKey;
 exports.addOptimisticInsert = addOptimisticInsert;
 exports.removeOptimisticInsert = removeOptimisticInsert;
 const signalium_1 = require("signalium");
@@ -22,6 +23,41 @@ const NetworkManager_js_1 = require("./NetworkManager.js");
 const QueryResult_js_1 = require("./QueryResult.js");
 const RefetchManager_js_1 = require("./RefetchManager.js");
 const MemoryEvictionManager_js_1 = require("./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.
+ */
+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.
+ */
 const queryKeyFor = (queryDef, params) => {
     return (0, utils_1.hashValue)([queryDef.id, queryDef.shapeKey, params]);
 };
@@ -29,13 +65,13 @@ exports.queryKeyFor = queryKeyFor;
 class QueryClient {
     store;
     context;
-    entityMap = new EntityMap_js_1.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 =
@@ -43,6 +79,7 @@ class QueryClient {
         this.refetchManager = refetchManager ?? new RefetchManager_js_1.RefetchManager(this.context.refetchMultiplier);
         this.networkManager = networkManager ?? new NetworkManager_js_1.NetworkManager();
         this.isServer = typeof window === 'undefined';
+        this.entityMap = new EntityMap_js_1.EntityStore(this);
     }
     getContext() {
         return this.context;
@@ -54,17 +91,22 @@ 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
@@ -84,7 +126,9 @@ 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/cjs/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/cjs/QueryResult.js

@@ -7,6 +7,7 @@ const types_js_1 = require("./types.js");
 const proxy_js_1 = require("./proxy.js");
 const parseEntities_js_1 = require("./parseEntities.js");
 const typeDefs_js_1 = require("./typeDefs.js");
+const QueryClient_js_1 = require("./QueryClient.js");
 // ======================================================
 // QueryResultExtra - Manages stream orphans and optimistic inserts
 // ======================================================
@@ -257,7 +258,8 @@ class QueryResultExtra {
  */
 class QueryResultImpl {
     def;
-    queryKey;
+    queryKey; // Instance key (includes Signal identity)
+    storageKey = -1; // Storage key (extracted values only)
     queryClient;
     initialized = false;
     isRefetchingSignal = (0, signalium_1.signal)(false);
@@ -268,12 +270,12 @@ 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) {
@@ -306,7 +308,7 @@ 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) {
@@ -323,91 +325,96 @@ class QueryResultImpl {
         (0, utils_1.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 = (0, signalium_1.relay)(state => {
             this._relayState = state;
+            // Extract params (reading Signal values establishes tracking)
+            this.currentParams = (0, QueryClient_js_1.extractParamsForKey)(this.params);
+            this.storageKey = (0, QueryClient_js_1.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 = (0, QueryClient_js_1.extractParamsForKey)(this.params);
+                    const newStorageKey = (0, QueryClient_js_1.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,
             };
         });
     }
@@ -489,10 +496,11 @@ 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;
@@ -511,6 +519,17 @@ class QueryResultImpl {
                         ? (0, parseEntities_js_1.parseEntities)(cached.value, shape, this.queryClient, new Set())
                         : (0, proxy_js_1.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) {
@@ -521,13 +540,19 @@ 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));
                 }
             }
         }
@@ -557,14 +582,17 @@ 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 = (0, parseEntities_js_1.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();
@@ -591,8 +619,6 @@ 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 */;
@@ -623,14 +649,14 @@ 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;
@@ -648,6 +674,28 @@ 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 = () => {
@@ -660,13 +708,16 @@ 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
@@ -750,7 +801,8 @@ 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)