@tanstack/solid-query 4.14.3 → 4.15.0

package/build/solid/__tests__/createInfiniteQuery.test.jsx

@@ -425,24 +425,28 @@ describe('useInfiniteQuery', () => {
             data: undefined,
             isFetching: true,
             isFetchingNextPage: false,
+            isRefetching: false,
         });
         // Initial fetch done
         expect(states[1]).toMatchObject({
             data: { pages: [10] },
             isFetching: false,
             isFetchingNextPage: false,
+            isRefetching: false,
         });
         // Fetch next page
         expect(states[2]).toMatchObject({
             data: { pages: [10] },
             isFetching: true,
             isFetchingNextPage: true,
+            isRefetching: false,
         });
         // Fetch next page done
         expect(states[3]).toMatchObject({
             data: { pages: [10, 11] },
             isFetching: false,
             isFetchingNextPage: false,
+            isRefetching: false,
         });
         // Fetch previous page
         expect(states[4]).toMatchObject({
@@ -450,6 +454,7 @@ describe('useInfiniteQuery', () => {
             isFetching: true,
             isFetchingNextPage: false,
             isFetchingPreviousPage: true,
+            isRefetching: false,
         });
         // Fetch previous page done
         expect(states[5]).toMatchObject({
@@ -457,6 +462,7 @@ describe('useInfiniteQuery', () => {
             isFetching: false,
             isFetchingNextPage: false,
             isFetchingPreviousPage: false,
+            isRefetching: false,
         });
         // Refetch
         expect(states[6]).toMatchObject({
@@ -464,6 +470,7 @@ describe('useInfiniteQuery', () => {
             isFetching: true,
             isFetchingNextPage: false,
             isFetchingPreviousPage: false,
+            isRefetching: true,
         });
         // Refetch done
         expect(states[7]).toMatchObject({
@@ -471,6 +478,7 @@ describe('useInfiniteQuery', () => {
             isFetching: false,
             isFetchingNextPage: false,
             isFetchingPreviousPage: false,
+            isRefetching: false,
         });
     });
     it('should be able to refetch when providing page params automatically', async () => {
@@ -514,24 +522,28 @@ describe('useInfiniteQuery', () => {
             data: undefined,
             isFetching: true,
             isFetchingNextPage: false,
+            isRefetching: false,
         });
         // Initial fetch done
         expect(states[1]).toMatchObject({
             data: { pages: [10] },
             isFetching: false,
             isFetchingNextPage: false,
+            isRefetching: false,
         });
         // Fetch next page
         expect(states[2]).toMatchObject({
             data: { pages: [10] },
             isFetching: true,
             isFetchingNextPage: true,
+            isRefetching: false,
         });
         // Fetch next page done
         expect(states[3]).toMatchObject({
             data: { pages: [10, 11] },
             isFetching: false,
             isFetchingNextPage: false,
+            isRefetching: false,
         });
         // Fetch previous page
         expect(states[4]).toMatchObject({
@@ -539,6 +551,7 @@ describe('useInfiniteQuery', () => {
             isFetching: true,
             isFetchingNextPage: false,
             isFetchingPreviousPage: true,
+            isRefetching: false,
         });
         // Fetch previous page done
         expect(states[5]).toMatchObject({
@@ -546,6 +559,7 @@ describe('useInfiniteQuery', () => {
             isFetching: false,
             isFetchingNextPage: false,
             isFetchingPreviousPage: false,
+            isRefetching: false,
         });
         // Refetch
         expect(states[6]).toMatchObject({
@@ -553,6 +567,7 @@ describe('useInfiniteQuery', () => {
             isFetching: true,
             isFetchingNextPage: false,
             isFetchingPreviousPage: false,
+            isRefetching: true,
         });
         // Refetch done
         expect(states[7]).toMatchObject({
@@ -560,6 +575,7 @@ describe('useInfiniteQuery', () => {
             isFetching: false,
             isFetchingNextPage: false,
             isFetchingPreviousPage: false,
+            isRefetching: false,
         });
     });
     it('should be able to refetch only specific pages when refetchPages is provided', async () => {

package/build/solid/__tests__/createQuery.test.jsx

@@ -1759,38 +1759,6 @@ describe('createQuery', () => {
         expect(states[1]).toMatchObject({ isStale: false });
         expect(states[2]).toMatchObject({ isStale: true });
     });
-    it('should notify query cache when a query becomes stale', async () => {
-        const key = queryKey();
-        const states = [];
-        const fn = jest.fn();
-        const unsubscribe = queryCache.subscribe(fn);
-        function Page() {
-            const state = createQuery(key, () => 'test', {
-                staleTime: 10,
-            });
-            createRenderEffect(() => {
-                states.push({ ...state });
-            });
-            return null;
-        }
-        render(() => (<QueryClientProvider client={queryClient}>
-        <Page />
-      </QueryClientProvider>));
-        await sleep(20);
-        unsubscribe();
-        // 1. Query added -> loading
-        // 2. Observer result updated -> loading
-        // 3. Observer added
-        // 4. Query updated -> success
-        // 5. Observer result updated -> success
-        // 6. Query updated -> stale
-        // 7. Observer options updated
-        // 8. Observer result updated -> stale
-        // 9. Observer options updated
-        // Number 9 wont run in Solid JS
-        // Number 9 runs in react because the component re-renders after 8
-        expect(fn).toHaveBeenCalledTimes(8);
-    });
     it('should not re-render when it should only re-render on data changes and the data did not change', async () => {
         const key = queryKey();
         const states = [];

package/build/umd/index.development.js

@@ -802,14 +802,16 @@
       this.queryHash = config.queryHash;
       this.initialState = config.state || getDefaultState$1(this.options);
       this.state = this.initialState;
-      this.meta = config.meta;
+    }
+
+    get meta() {
+      return this.options.meta;
     }
 
     setOptions(options) {
       this.options = { ...this.defaultOptions,
         ...options
       };
-      this.meta = options == null ? void 0 : options.meta;
       this.updateCacheTime(this.options.cacheTime);
     }
 
@@ -1039,8 +1041,7 @@
         options: this.options,
         queryKey: this.queryKey,
         state: this.state,
-        fetchFn,
-        meta: this.meta
+        fetchFn
       };
       addSignalProperty(context);
       (_this$options$behavio = this.options.behavior) == null ? void 0 : _this$options$behavio.onFetch(context); // Store state in case the current fetch needs to be reverted
@@ -1274,8 +1275,7 @@
           queryHash,
           options: client.defaultQueryOptions(options),
           state,
-          defaultOptions: client.getQueryDefaults(queryKey),
-          meta: options.meta
+          defaultOptions: client.getQueryDefaults(queryKey)
         });
         this.add(query);
       }
@@ -1381,11 +1381,14 @@
       this.logger = config.logger || defaultLogger;
       this.observers = [];
       this.state = config.state || getDefaultState();
-      this.meta = config.meta;
       this.updateCacheTime(this.options.cacheTime);
       this.scheduleGc();
     }
 
+    get meta() {
+      return this.options.meta;
+    }
+
     setState(state) {
       this.dispatch({
         type: 'setState',
@@ -1630,8 +1633,7 @@
         mutationId: ++this.mutationId,
         options: client.defaultMutationOptions(options),
         state,
-        defaultOptions: options.mutationKey ? client.getMutationDefaults(options.mutationKey) : undefined,
-        meta: options.meta
+        defaultOptions: options.mutationKey ? client.getMutationDefaults(options.mutationKey) : undefined
       });
       this.add(mutation);
       return mutation;
@@ -1750,7 +1752,7 @@
             const queryFnContext = {
               queryKey: context.queryKey,
               pageParam: param,
-              meta: context.meta
+              meta: context.options.meta
             };
             addSignalProperty(queryFnContext);
             const queryFnResult = queryFn(queryFnContext);
@@ -2759,6 +2761,10 @@
       return this.observers.map(observer => observer.getCurrentQuery());
     }
 
+    getObservers() {
+      return this.observers;
+    }
+
     getOptimisticResult(queries) {
       return this.findMatchingObservers(queries).map(match => match.observer.getOptimisticResult(match.defaultedQueryOptions));
     }
@@ -2886,19 +2892,26 @@
     }
 
     createResult(query, options) {
-      var _state$data, _state$data2, _state$fetchMeta, _state$fetchMeta$fetc, _state$fetchMeta2, _state$fetchMeta2$fet;
+      var _state$fetchMeta, _state$fetchMeta$fetc, _state$fetchMeta2, _state$fetchMeta2$fet, _state$data, _state$data2;
 
       const {
         state
       } = query;
       const result = super.createResult(query, options);
+      const {
+        isFetching,
+        isRefetching
+      } = result;
+      const isFetchingNextPage = isFetching && ((_state$fetchMeta = state.fetchMeta) == null ? void 0 : (_state$fetchMeta$fetc = _state$fetchMeta.fetchMore) == null ? void 0 : _state$fetchMeta$fetc.direction) === 'forward';
+      const isFetchingPreviousPage = isFetching && ((_state$fetchMeta2 = state.fetchMeta) == null ? void 0 : (_state$fetchMeta2$fet = _state$fetchMeta2.fetchMore) == null ? void 0 : _state$fetchMeta2$fet.direction) === 'backward';
       return { ...result,
         fetchNextPage: this.fetchNextPage,
         fetchPreviousPage: this.fetchPreviousPage,
         hasNextPage: hasNextPage(options, (_state$data = state.data) == null ? void 0 : _state$data.pages),
         hasPreviousPage: hasPreviousPage(options, (_state$data2 = state.data) == null ? void 0 : _state$data2.pages),
-        isFetchingNextPage: state.fetchStatus === 'fetching' && ((_state$fetchMeta = state.fetchMeta) == null ? void 0 : (_state$fetchMeta$fetc = _state$fetchMeta.fetchMore) == null ? void 0 : _state$fetchMeta$fetc.direction) === 'forward',
-        isFetchingPreviousPage: state.fetchStatus === 'fetching' && ((_state$fetchMeta2 = state.fetchMeta) == null ? void 0 : (_state$fetchMeta2$fet = _state$fetchMeta2.fetchMore) == null ? void 0 : _state$fetchMeta2$fet.direction) === 'backward'
+        isFetchingNextPage,
+        isFetchingPreviousPage,
+        isRefetching: isRefetching && !isFetchingNextPage && !isFetchingPreviousPage
       };
     }