fix: _result -> observable.deep for MobxInfiniteQuery

Author: js2me

src/mobx-infinite-query.test.ts

@@ -69,7 +69,7 @@ class MobxInfiniteQueryMock<
   }
 
   invalidate(params?: MobxQueryInvalidateParams | undefined): Promise<void> {
-    this.spies.invalidate(params);
+    this.spies.invalidate(params)();
     return super.invalidate();
   }
 
@@ -79,36 +79,31 @@ class MobxInfiniteQueryMock<
       | MobxInfiniteQueryDynamicOptions<TData, TError, TQueryKey, TPageParam>,
   ) {
     const result = super.update(options);
-    this.spies.update.mockReturnValue(result);
-    this.spies.update(options);
+    this.spies.update.mockReturnValue(result)(options);
     return result;
   }
 
   async fetchNextPage(options?: FetchNextPageOptions | undefined) {
     const result = await super.fetchNextPage(options);
-    this.spies.fetchNextPage.mockReturnValue(result);
-    this.spies.fetchNextPage(options);
+    this.spies.fetchNextPage.mockReturnValue(result)(options);
     return result;
   }
 
   async fetchPreviousPage(options?: FetchPreviousPageOptions | undefined) {
     const result = await super.fetchPreviousPage(options);
-    this.spies.fetchPreviousPage.mockReturnValue(result);
-    this.spies.fetchPreviousPage(options);
+    this.spies.fetchPreviousPage.mockReturnValue(result)(options);
     return result;
   }
 
   setData(updater: any, options?: any) {
     const result = super.setData(updater, options);
-    this.spies.setData.mockReturnValue(result);
-    this.spies.setData(updater, options);
+    this.spies.setData.mockReturnValue(result)(updater, options);
     return result;
   }
 
   dispose(): void {
     const result = super.dispose();
-    this.spies.dispose.mockReturnValue(result);
-    this.spies.dispose();
+    this.spies.dispose.mockReturnValue(result)();
     return result;
   }
 }
@@ -411,85 +406,22 @@ describe('MobxInfiniteQuery', () => {
   });
 
   describe('"enabled" reactive parameter', () => {
-    it.skip('should be reactive after change queryKey', async () => {
+    it('should be reactive after change queryKey', async () => {
       const mobxQuery = new MobxInfiniteQueryMock({
         queryKey: ['test', 0 as number] as const,
         enabled: ({ queryKey }) => queryKey[1] > 0,
+        getNextPageParam: () => 1,
         queryFn: () => 100,
       });
 
       mobxQuery.update({ queryKey: ['test', 1] as const });
 
-      await when(() => !mobxQuery._rawResult.isFetching);
+      await when(() => !mobxQuery.result.isLoading);
 
       expect(mobxQuery.spies.queryFn).toBeCalledTimes(1);
       expect(mobxQuery.spies.queryFn).nthReturnedWith(1, 100);
 
       mobxQuery.dispose();
     });
-
-    it.skip('should be reactive dependent on another query (runs before declartion)', async () => {
-      const disabledMobxQuery = new MobxInfiniteQueryMock({
-        queryKey: ['test', 0 as number] as const,
-        enabled: ({ queryKey }) => queryKey[1] > 0,
-        queryFn: () => 100,
-      });
-
-      disabledMobxQuery.update({ queryKey: ['test', 1] as const });
-
-      const dependentMobxQuery = new MobxInfiniteQueryMock({
-        options: () => ({
-          enabled: !!disabledMobxQuery.options.enabled,
-          queryKey: [...disabledMobxQuery.options.queryKey, 'dependent'],
-        }),
-        queryFn: ({ queryKey }) => queryKey,
-      });
-
-      await when(() => !disabledMobxQuery._rawResult.isLoading);
-      await when(() => !dependentMobxQuery._rawResult.isLoading);
-
-      expect(dependentMobxQuery.spies.queryFn).toBeCalledTimes(1);
-      expect(dependentMobxQuery.spies.queryFn).nthReturnedWith(1, [
-        'test',
-        1,
-        'dependent',
-      ]);
-
-      disabledMobxQuery.dispose();
-      dependentMobxQuery.dispose();
-    });
-
-    it.skip('should be reactive dependent on another query (runs after declaration)', async () => {
-      const tempDisabledMobxQuery = new MobxInfiniteQueryMock({
-        queryKey: ['test', 0 as number] as const,
-        enabled: ({ queryKey }) => queryKey[1] > 0,
-        queryFn: () => 100,
-      });
-
-      const dependentMobxQuery = new MobxInfiniteQueryMock({
-        options: () => ({
-          enabled: !!tempDisabledMobxQuery.options.enabled,
-          queryKey: [...tempDisabledMobxQuery.options.queryKey, 'dependent'],
-        }),
-        queryFn: ({ queryKey }) => queryKey,
-      });
-
-      tempDisabledMobxQuery.update({ queryKey: ['test', 1] as const });
-
-      await when(() => !tempDisabledMobxQuery._rawResult.isLoading);
-      await when(() => !dependentMobxQuery._rawResult.isLoading);
-
-      expect(dependentMobxQuery.spies.queryFn).toBeCalledTimes(1);
-      // результат с 0 потому что options.enabled у первой квери - это функция и
-      // !!tempDisabledMobxQuery.options.enabled будет всегда true
-      expect(dependentMobxQuery.spies.queryFn).nthReturnedWith(1, [
-        'test',
-        0,
-        'dependent',
-      ]);
-
-      tempDisabledMobxQuery.dispose();
-      dependentMobxQuery.dispose();
-    });
   });
 });

src/mobx-inifinite-query.ts

@@ -85,7 +85,7 @@ export class MobxInfiniteQuery<
       disposer.add(() => this.dispose());
     }
 
-    observable.ref(this, '_result');
+    observable.deep(this, '_result');
     observable.ref(this, 'isResultRequsted');
     action.bound(this, 'setData');
     action.bound(this, 'update');