@tanstack/vue-query 5.0.0-beta.9 → 5.0.0-rc.11

package/build/modern/types.d.cts

@@ -1,9 +1,15 @@
-import { Ref } from 'vue-demi';
+import { Ref, UnwrapRef } from 'vue-demi';
 
+type Primitive = string | number | boolean | bigint | symbol | undefined | null;
+type UnwrapLeaf = Primitive | Function | Date | Error | RegExp | Map<any, any> | WeakMap<any, any> | Set<any> | WeakSet<any>;
 type MaybeRef<T> = Ref<T> | T;
+type MaybeRefOrGetter<T> = MaybeRef<T> | (() => T);
 type MaybeRefDeep<T> = MaybeRef<T extends Function ? T : T extends object ? {
     [Property in keyof T]: MaybeRefDeep<T[Property]>;
 } : T>;
+type DeepUnwrapRef<T> = T extends UnwrapLeaf ? T : T extends Ref<infer U> ? DeepUnwrapRef<U> : T extends {} ? {
+    [Property in keyof T]: DeepUnwrapRef<T[Property]>;
+} : UnwrapRef<T>;
 type DistributiveOmit<T, K extends keyof any> = T extends any ? Omit<T, K> : never;
 
-export { DistributiveOmit, MaybeRef, MaybeRefDeep };
+export { DeepUnwrapRef, DistributiveOmit, MaybeRef, MaybeRefDeep, MaybeRefOrGetter };

package/build/modern/types.d.ts

@@ -1,9 +1,15 @@
-import { Ref } from 'vue-demi';
+import { Ref, UnwrapRef } from 'vue-demi';
 
+type Primitive = string | number | boolean | bigint | symbol | undefined | null;
+type UnwrapLeaf = Primitive | Function | Date | Error | RegExp | Map<any, any> | WeakMap<any, any> | Set<any> | WeakSet<any>;
 type MaybeRef<T> = Ref<T> | T;
+type MaybeRefOrGetter<T> = MaybeRef<T> | (() => T);
 type MaybeRefDeep<T> = MaybeRef<T extends Function ? T : T extends object ? {
     [Property in keyof T]: MaybeRefDeep<T[Property]>;
 } : T>;
+type DeepUnwrapRef<T> = T extends UnwrapLeaf ? T : T extends Ref<infer U> ? DeepUnwrapRef<U> : T extends {} ? {
+    [Property in keyof T]: DeepUnwrapRef<T[Property]>;
+} : UnwrapRef<T>;
 type DistributiveOmit<T, K extends keyof any> = T extends any ? Omit<T, K> : never;
 
-export { DistributiveOmit, MaybeRef, MaybeRefDeep };
+export { DeepUnwrapRef, DistributiveOmit, MaybeRef, MaybeRefDeep, MaybeRefOrGetter };

package/build/modern/useBaseQuery.cjs

@@ -27,9 +27,20 @@ var import_vue_demi = require("vue-demi");
 var import_useQueryClient = require("./useQueryClient.cjs");
 var import_utils = require("./utils.cjs");
 function useBaseQuery(Observer, options, queryClient) {
+  if (process.env.NODE_ENV === "development") {
+    if (!(0, import_vue_demi.getCurrentScope)()) {
+      console.warn(
+        'vue-query composables like "useQuery()" should only be used inside a "setup()" function or a running effect scope. They might otherwise lead to memory leaks.'
+      );
+    }
+  }
   const client = queryClient || (0, import_useQueryClient.useQueryClient)();
   const defaultedOptions = (0, import_vue_demi.computed)(() => {
-    const defaulted = client.defaultQueryOptions((0, import_utils.cloneDeepUnref)(options));
+    const clonedOptions = (0, import_utils.cloneDeepUnref)(options);
+    if (typeof clonedOptions.enabled === "function") {
+      clonedOptions.enabled = clonedOptions.enabled();
+    }
+    const defaulted = client.defaultQueryOptions(clonedOptions);
     defaulted._optimisticResults = client.isRestoring.value ? "isRestoring" : "optimistic";
     return defaulted;
   });
@@ -49,43 +60,62 @@ function useBaseQuery(Observer, options, queryClient) {
     },
     { immediate: true }
   );
-  (0, import_vue_demi.watch)(
-    defaultedOptions,
-    () => {
-      observer.setOptions(defaultedOptions.value);
-      (0, import_utils.updateState)(state, observer.getCurrentResult());
-    },
-    { deep: true }
-  );
+  const updater = () => {
+    observer.setOptions(defaultedOptions.value);
+    (0, import_utils.updateState)(state, observer.getCurrentResult());
+  };
+  (0, import_vue_demi.watch)(defaultedOptions, updater);
   (0, import_vue_demi.onScopeDispose)(() => {
     unsubscribe();
   });
+  const refetch = (...args) => {
+    updater();
+    return state.refetch(...args);
+  };
   const suspense = () => {
-    return new Promise((resolve) => {
-      let stopWatch = () => {
-      };
-      const run = () => {
-        if (defaultedOptions.value.enabled !== false) {
-          const optimisticResult = observer.getOptimisticResult(
-            defaultedOptions.value
-          );
-          if (optimisticResult.isStale) {
-            stopWatch();
-            resolve(observer.fetchOptimistic(defaultedOptions.value));
-          } else {
-            stopWatch();
-            resolve(optimisticResult);
+    return new Promise(
+      (resolve, reject) => {
+        let stopWatch = () => {
+        };
+        const run = () => {
+          if (defaultedOptions.value.enabled !== false) {
+            const optimisticResult = observer.getOptimisticResult(
+              defaultedOptions.value
+            );
+            if (optimisticResult.isStale) {
+              stopWatch();
+              observer.fetchOptimistic(defaultedOptions.value).then(resolve, reject);
+            } else {
+              stopWatch();
+              resolve(optimisticResult);
+            }
           }
-        }
-      };
-      run();
-      stopWatch = (0, import_vue_demi.watch)(defaultedOptions, run, { deep: true });
-    });
-  };
-  return {
-    ...(0, import_vue_demi.toRefs)((0, import_vue_demi.readonly)(state)),
-    suspense
+        };
+        run();
+        stopWatch = (0, import_vue_demi.watch)(defaultedOptions, run);
+      }
+    );
   };
+  (0, import_vue_demi.watch)(
+    () => state.error,
+    (error) => {
+      if (state.isError && !state.isFetching && (0, import_utils.shouldThrowError)(defaultedOptions.value.throwOnError, [
+        error,
+        observer.getCurrentQuery()
+      ])) {
+        throw error;
+      }
+    }
+  );
+  const object = (0, import_vue_demi.toRefs)((0, import_vue_demi.readonly)(state));
+  for (const key in state) {
+    if (typeof state[key] === "function") {
+      object[key] = state[key];
+    }
+  }
+  object.suspense = suspense;
+  object.refetch = refetch;
+  return object;
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/build/modern/useBaseQuery.cjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/useBaseQuery.ts"],"sourcesContent":["import {\n  computed,\n  onScopeDispose,\n  reactive,\n  readonly,\n  toRefs,\n  watch,\n} from 'vue-demi'\nimport { useQueryClient } from './useQueryClient'\nimport { cloneDeepUnref, updateState } from './utils'\nimport type { ToRefs } from 'vue-demi'\nimport type {\n  DefaultedQueryObserverOptions,\n  QueryKey,\n  QueryObserver,\n  QueryObserverResult,\n} from '@tanstack/query-core'\nimport type { QueryClient } from './queryClient'\nimport type { UseQueryOptions } from './useQuery'\nimport type { UseInfiniteQueryOptions } from './useInfiniteQuery'\n\nexport type UseBaseQueryReturnType<\n  TData,\n  TError,\n  Result = QueryObserverResult<TData, TError>,\n> = ToRefs<Readonly<Result>> & {\n  suspense: () => Promise<Result>\n}\n\ntype UseQueryOptionsGeneric<\n  TQueryFnData,\n  TError,\n  TData,\n  TQueryData,\n  TQueryKey extends QueryKey = QueryKey,\n  TPageParam = unknown,\n> =\n  | UseQueryOptions<TQueryFnData, TError, TData, TQueryData, TQueryKey>\n  | UseInfiniteQueryOptions<\n      TQueryFnData,\n      TError,\n      TData,\n      TQueryData,\n      TQueryKey,\n      TPageParam\n    >\n\nexport function useBaseQuery<\n  TQueryFnData,\n  TError,\n  TData,\n  TQueryData,\n  TQueryKey extends QueryKey,\n  TPageParam,\n>(\n  Observer: typeof QueryObserver,\n  options: UseQueryOptionsGeneric<\n    TQueryFnData,\n    TError,\n    TData,\n    TQueryData,\n    TQueryKey,\n    TPageParam\n  >,\n  queryClient?: QueryClient,\n): UseBaseQueryReturnType<TData, TError> {\n  const client = queryClient || useQueryClient()\n\n  const defaultedOptions = computed(() => {\n    const defaulted: DefaultedQueryObserverOptions<\n      TQueryFnData,\n      TError,\n      TData,\n      TQueryData,\n      TQueryKey\n    > = client.defaultQueryOptions(cloneDeepUnref(options as any))\n\n    defaulted._optimisticResults = client.isRestoring.value\n      ? 'isRestoring'\n      : 'optimistic'\n\n    return defaulted\n  })\n\n  const observer = new Observer(client, defaultedOptions.value)\n  const state = reactive(observer.getCurrentResult())\n\n  let unsubscribe = () => {\n    // noop\n  }\n\n  watch(\n    client.isRestoring,\n    (isRestoring) => {\n      // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition\n      if (!isRestoring) {\n        unsubscribe()\n        unsubscribe = observer.subscribe((result) => {\n          updateState(state, result)\n        })\n      }\n    },\n    { immediate: true },\n  )\n\n  watch(\n    defaultedOptions,\n    () => {\n      observer.setOptions(defaultedOptions.value)\n      updateState(state, observer.getCurrentResult())\n    },\n    { deep: true },\n  )\n\n  onScopeDispose(() => {\n    unsubscribe()\n  })\n\n  const suspense = () => {\n    return new Promise<QueryObserverResult<TData, TError>>((resolve) => {\n      let stopWatch = () => {\n        //noop\n      }\n      const run = () => {\n        if (defaultedOptions.value.enabled !== false) {\n          const optimisticResult = observer.getOptimisticResult(\n            defaultedOptions.value,\n          )\n          if (optimisticResult.isStale) {\n            stopWatch()\n            resolve(observer.fetchOptimistic(defaultedOptions.value))\n          } else {\n            stopWatch()\n            resolve(optimisticResult)\n          }\n        }\n      }\n\n      run()\n\n      stopWatch = watch(defaultedOptions, run, { deep: true })\n    })\n  }\n\n  return {\n    ...(toRefs(readonly(state)) as ToRefs<\n      Readonly<QueryObserverResult<TData, TError>>\n    >),\n    suspense,\n  }\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,sBAOO;AACP,4BAA+B;AAC/B,mBAA4C;AAsCrC,SAAS,aAQd,UACA,SAQA,aACuC;AACvC,QAAM,SAAS,mBAAe,sCAAe;AAE7C,QAAM,uBAAmB,0BAAS,MAAM;AACtC,UAAM,YAMF,OAAO,wBAAoB,6BAAe,OAAc,CAAC;AAE7D,cAAU,qBAAqB,OAAO,YAAY,QAC9C,gBACA;AAEJ,WAAO;AAAA,EACT,CAAC;AAED,QAAM,WAAW,IAAI,SAAS,QAAQ,iBAAiB,KAAK;AAC5D,QAAM,YAAQ,0BAAS,SAAS,iBAAiB,CAAC;AAElD,MAAI,cAAc,MAAM;AAAA,EAExB;AAEA;AAAA,IACE,OAAO;AAAA,IACP,CAAC,gBAAgB;AAEf,UAAI,CAAC,aAAa;AAChB,oBAAY;AACZ,sBAAc,SAAS,UAAU,CAAC,WAAW;AAC3C,wCAAY,OAAO,MAAM;AAAA,QAC3B,CAAC;AAAA,MACH;AAAA,IACF;AAAA,IACA,EAAE,WAAW,KAAK;AAAA,EACpB;AAEA;AAAA,IACE;AAAA,IACA,MAAM;AACJ,eAAS,WAAW,iBAAiB,KAAK;AAC1C,oCAAY,OAAO,SAAS,iBAAiB,CAAC;AAAA,IAChD;AAAA,IACA,EAAE,MAAM,KAAK;AAAA,EACf;AAEA,sCAAe,MAAM;AACnB,gBAAY;AAAA,EACd,CAAC;AAED,QAAM,WAAW,MAAM;AACrB,WAAO,IAAI,QAA4C,CAAC,YAAY;AAClE,UAAI,YAAY,MAAM;AAAA,MAEtB;AACA,YAAM,MAAM,MAAM;AAChB,YAAI,iBAAiB,MAAM,YAAY,OAAO;AAC5C,gBAAM,mBAAmB,SAAS;AAAA,YAChC,iBAAiB;AAAA,UACnB;AACA,cAAI,iBAAiB,SAAS;AAC5B,sBAAU;AACV,oBAAQ,SAAS,gBAAgB,iBAAiB,KAAK,CAAC;AAAA,UAC1D,OAAO;AACL,sBAAU;AACV,oBAAQ,gBAAgB;AAAA,UAC1B;AAAA,QACF;AAAA,MACF;AAEA,UAAI;AAEJ,sBAAY,uBAAM,kBAAkB,KAAK,EAAE,MAAM,KAAK,CAAC;AAAA,IACzD,CAAC;AAAA,EACH;AAEA,SAAO;AAAA,IACL,OAAI,4BAAO,0BAAS,KAAK,CAAC;AAAA,IAG1B;AAAA,EACF;AACF;","names":[]}
+{"version":3,"sources":["../../src/useBaseQuery.ts"],"sourcesContent":["import {\n  computed,\n  getCurrentScope,\n  onScopeDispose,\n  reactive,\n  readonly,\n  toRefs,\n  watch,\n} from 'vue-demi'\nimport { useQueryClient } from './useQueryClient'\nimport { cloneDeepUnref, shouldThrowError, updateState } from './utils'\nimport type { ToRef } from 'vue-demi'\nimport type {\n  DefaultedQueryObserverOptions,\n  QueryKey,\n  QueryObserver,\n  QueryObserverResult,\n} from '@tanstack/query-core'\nimport type { QueryClient } from './queryClient'\nimport type { UseQueryOptions, UseQueryReturnType } from './useQuery'\nimport type { UseInfiniteQueryOptions } from './useInfiniteQuery'\n\nexport type UseBaseQueryReturnType<\n  TData,\n  TError,\n  Result = QueryObserverResult<TData, TError>,\n> = {\n  [K in keyof Result]: K extends\n    | 'fetchNextPage'\n    | 'fetchPreviousPage'\n    | 'refetch'\n    | 'remove'\n    ? Result[K]\n    : ToRef<Readonly<Result>[K]>\n} & {\n  suspense: () => Promise<Result>\n}\n\ntype UseQueryOptionsGeneric<\n  TQueryFnData,\n  TError,\n  TData,\n  TQueryData,\n  TQueryKey extends QueryKey = QueryKey,\n  TPageParam = unknown,\n> =\n  | UseQueryOptions<TQueryFnData, TError, TData, TQueryData, TQueryKey>\n  | UseInfiniteQueryOptions<\n      TQueryFnData,\n      TError,\n      TData,\n      TQueryData,\n      TQueryKey,\n      TPageParam\n    >\n\nexport function useBaseQuery<\n  TQueryFnData,\n  TError,\n  TData,\n  TQueryData,\n  TQueryKey extends QueryKey,\n  TPageParam,\n>(\n  Observer: typeof QueryObserver,\n  options: UseQueryOptionsGeneric<\n    TQueryFnData,\n    TError,\n    TData,\n    TQueryData,\n    TQueryKey,\n    TPageParam\n  >,\n  queryClient?: QueryClient,\n): UseBaseQueryReturnType<TData, TError> {\n  if (process.env.NODE_ENV === 'development') {\n    if (!getCurrentScope()) {\n      console.warn(\n        'vue-query composables like \"useQuery()\" should only be used inside a \"setup()\" function or a running effect scope. They might otherwise lead to memory leaks.',\n      )\n    }\n  }\n\n  const client = queryClient || useQueryClient()\n\n  const defaultedOptions = computed(() => {\n    const clonedOptions = cloneDeepUnref(options as any)\n\n    if (typeof clonedOptions.enabled === 'function') {\n      clonedOptions.enabled = clonedOptions.enabled()\n    }\n\n    const defaulted: DefaultedQueryObserverOptions<\n      TQueryFnData,\n      TError,\n      TData,\n      TQueryData,\n      TQueryKey\n    > = client.defaultQueryOptions(clonedOptions)\n\n    defaulted._optimisticResults = client.isRestoring.value\n      ? 'isRestoring'\n      : 'optimistic'\n\n    return defaulted\n  })\n\n  const observer = new Observer(client, defaultedOptions.value)\n  const state = reactive(observer.getCurrentResult())\n\n  let unsubscribe = () => {\n    // noop\n  }\n\n  watch(\n    client.isRestoring,\n    (isRestoring) => {\n      // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition\n      if (!isRestoring) {\n        unsubscribe()\n        unsubscribe = observer.subscribe((result) => {\n          updateState(state, result)\n        })\n      }\n    },\n    { immediate: true },\n  )\n\n  const updater = () => {\n    observer.setOptions(defaultedOptions.value)\n    updateState(state, observer.getCurrentResult())\n  }\n\n  watch(defaultedOptions, updater)\n\n  onScopeDispose(() => {\n    unsubscribe()\n  })\n\n  // fix #5910\n  const refetch = (...args: Parameters<(typeof state)['refetch']>) => {\n    updater()\n    return state.refetch(...args)\n  }\n\n  const suspense = () => {\n    return new Promise<QueryObserverResult<TData, TError>>(\n      (resolve, reject) => {\n        let stopWatch = () => {\n          //noop\n        }\n        const run = () => {\n          if (defaultedOptions.value.enabled !== false) {\n            const optimisticResult = observer.getOptimisticResult(\n              defaultedOptions.value,\n            )\n            if (optimisticResult.isStale) {\n              stopWatch()\n              observer\n                .fetchOptimistic(defaultedOptions.value)\n                .then(resolve, reject)\n            } else {\n              stopWatch()\n              resolve(optimisticResult)\n            }\n          }\n        }\n\n        run()\n\n        stopWatch = watch(defaultedOptions, run)\n      },\n    )\n  }\n\n  // Handle error boundary\n  watch(\n    () => state.error,\n    (error) => {\n      if (\n        state.isError &&\n        !state.isFetching &&\n        shouldThrowError(defaultedOptions.value.throwOnError, [\n          error as TError,\n          observer.getCurrentQuery(),\n        ])\n      ) {\n        throw error\n      }\n    },\n  )\n\n  const object: any = toRefs(readonly(state))\n  for (const key in state) {\n    if (typeof state[key as keyof typeof state] === 'function') {\n      object[key] = state[key as keyof typeof state]\n    }\n  }\n\n  object.suspense = suspense\n  object.refetch = refetch\n\n  return object as UseQueryReturnType<TData, TError>\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,sBAQO;AACP,4BAA+B;AAC/B,mBAA8D;AA8CvD,SAAS,aAQd,UACA,SAQA,aACuC;AACvC,MAAI,QAAQ,IAAI,aAAa,eAAe;AAC1C,QAAI,KAAC,iCAAgB,GAAG;AACtB,cAAQ;AAAA,QACN;AAAA,MACF;AAAA,IACF;AAAA,EACF;AAEA,QAAM,SAAS,mBAAe,sCAAe;AAE7C,QAAM,uBAAmB,0BAAS,MAAM;AACtC,UAAM,oBAAgB,6BAAe,OAAc;AAEnD,QAAI,OAAO,cAAc,YAAY,YAAY;AAC/C,oBAAc,UAAU,cAAc,QAAQ;AAAA,IAChD;AAEA,UAAM,YAMF,OAAO,oBAAoB,aAAa;AAE5C,cAAU,qBAAqB,OAAO,YAAY,QAC9C,gBACA;AAEJ,WAAO;AAAA,EACT,CAAC;AAED,QAAM,WAAW,IAAI,SAAS,QAAQ,iBAAiB,KAAK;AAC5D,QAAM,YAAQ,0BAAS,SAAS,iBAAiB,CAAC;AAElD,MAAI,cAAc,MAAM;AAAA,EAExB;AAEA;AAAA,IACE,OAAO;AAAA,IACP,CAAC,gBAAgB;AAEf,UAAI,CAAC,aAAa;AAChB,oBAAY;AACZ,sBAAc,SAAS,UAAU,CAAC,WAAW;AAC3C,wCAAY,OAAO,MAAM;AAAA,QAC3B,CAAC;AAAA,MACH;AAAA,IACF;AAAA,IACA,EAAE,WAAW,KAAK;AAAA,EACpB;AAEA,QAAM,UAAU,MAAM;AACpB,aAAS,WAAW,iBAAiB,KAAK;AAC1C,kCAAY,OAAO,SAAS,iBAAiB,CAAC;AAAA,EAChD;AAEA,6BAAM,kBAAkB,OAAO;AAE/B,sCAAe,MAAM;AACnB,gBAAY;AAAA,EACd,CAAC;AAGD,QAAM,UAAU,IAAI,SAAgD;AAClE,YAAQ;AACR,WAAO,MAAM,QAAQ,GAAG,IAAI;AAAA,EAC9B;AAEA,QAAM,WAAW,MAAM;AACrB,WAAO,IAAI;AAAA,MACT,CAAC,SAAS,WAAW;AACnB,YAAI,YAAY,MAAM;AAAA,QAEtB;AACA,cAAM,MAAM,MAAM;AAChB,cAAI,iBAAiB,MAAM,YAAY,OAAO;AAC5C,kBAAM,mBAAmB,SAAS;AAAA,cAChC,iBAAiB;AAAA,YACnB;AACA,gBAAI,iBAAiB,SAAS;AAC5B,wBAAU;AACV,uBACG,gBAAgB,iBAAiB,KAAK,EACtC,KAAK,SAAS,MAAM;AAAA,YACzB,OAAO;AACL,wBAAU;AACV,sBAAQ,gBAAgB;AAAA,YAC1B;AAAA,UACF;AAAA,QACF;AAEA,YAAI;AAEJ,wBAAY,uBAAM,kBAAkB,GAAG;AAAA,MACzC;AAAA,IACF;AAAA,EACF;AAGA;AAAA,IACE,MAAM,MAAM;AAAA,IACZ,CAAC,UAAU;AACT,UACE,MAAM,WACN,CAAC,MAAM,kBACP,+BAAiB,iBAAiB,MAAM,cAAc;AAAA,QACpD;AAAA,QACA,SAAS,gBAAgB;AAAA,MAC3B,CAAC,GACD;AACA,cAAM;AAAA,MACR;AAAA,IACF;AAAA,EACF;AAEA,QAAM,aAAc,4BAAO,0BAAS,KAAK,CAAC;AAC1C,aAAW,OAAO,OAAO;AACvB,QAAI,OAAO,MAAM,GAAyB,MAAM,YAAY;AAC1D,aAAO,GAAG,IAAI,MAAM,GAAyB;AAAA,IAC/C;AAAA,EACF;AAEA,SAAO,WAAW;AAClB,SAAO,UAAU;AAEjB,SAAO;AACT;","names":[]}

package/build/modern/useBaseQuery.d.cts

@@ -1,5 +1,5 @@
 import 'vue-demi';
 import '@tanstack/query-core';
 import './queryClient.cjs';
-export { f as UseBaseQueryReturnType, g as useBaseQuery } from './useQuery-ebff9211.js';
+export { f as UseBaseQueryReturnType, g as useBaseQuery } from './useQuery-f89ce9b1.js';
 import './types.cjs';

package/build/modern/useBaseQuery.d.ts

@@ -1,5 +1,5 @@
 import 'vue-demi';
 import '@tanstack/query-core';
 import './queryClient.js';
-export { f as UseBaseQueryReturnType, g as useBaseQuery } from './useQuery-846c66db.js';
+export { f as UseBaseQueryReturnType, g as useBaseQuery } from './useQuery-62b5e5ac.js';
 import './types.js';

package/build/modern/useBaseQuery.js

@@ -1,6 +1,7 @@
 // src/useBaseQuery.ts
 import {
   computed,
+  getCurrentScope,
   onScopeDispose,
   reactive,
   readonly,
@@ -8,11 +9,22 @@ import {
   watch
 } from "vue-demi";
 import { useQueryClient } from "./useQueryClient.js";
-import { cloneDeepUnref, updateState } from "./utils.js";
+import { cloneDeepUnref, shouldThrowError, updateState } from "./utils.js";
 function useBaseQuery(Observer, options, queryClient) {
+  if (process.env.NODE_ENV === "development") {
+    if (!getCurrentScope()) {
+      console.warn(
+        'vue-query composables like "useQuery()" should only be used inside a "setup()" function or a running effect scope. They might otherwise lead to memory leaks.'
+      );
+    }
+  }
   const client = queryClient || useQueryClient();
   const defaultedOptions = computed(() => {
-    const defaulted = client.defaultQueryOptions(cloneDeepUnref(options));
+    const clonedOptions = cloneDeepUnref(options);
+    if (typeof clonedOptions.enabled === "function") {
+      clonedOptions.enabled = clonedOptions.enabled();
+    }
+    const defaulted = client.defaultQueryOptions(clonedOptions);
     defaulted._optimisticResults = client.isRestoring.value ? "isRestoring" : "optimistic";
     return defaulted;
   });
@@ -32,43 +44,62 @@ function useBaseQuery(Observer, options, queryClient) {
     },
     { immediate: true }
   );
-  watch(
-    defaultedOptions,
-    () => {
-      observer.setOptions(defaultedOptions.value);
-      updateState(state, observer.getCurrentResult());
-    },
-    { deep: true }
-  );
+  const updater = () => {
+    observer.setOptions(defaultedOptions.value);
+    updateState(state, observer.getCurrentResult());
+  };
+  watch(defaultedOptions, updater);
   onScopeDispose(() => {
     unsubscribe();
   });
+  const refetch = (...args) => {
+    updater();
+    return state.refetch(...args);
+  };
   const suspense = () => {
-    return new Promise((resolve) => {
-      let stopWatch = () => {
-      };
-      const run = () => {
-        if (defaultedOptions.value.enabled !== false) {
-          const optimisticResult = observer.getOptimisticResult(
-            defaultedOptions.value
-          );
-          if (optimisticResult.isStale) {
-            stopWatch();
-            resolve(observer.fetchOptimistic(defaultedOptions.value));
-          } else {
-            stopWatch();
-            resolve(optimisticResult);
+    return new Promise(
+      (resolve, reject) => {
+        let stopWatch = () => {
+        };
+        const run = () => {
+          if (defaultedOptions.value.enabled !== false) {
+            const optimisticResult = observer.getOptimisticResult(
+              defaultedOptions.value
+            );
+            if (optimisticResult.isStale) {
+              stopWatch();
+              observer.fetchOptimistic(defaultedOptions.value).then(resolve, reject);
+            } else {
+              stopWatch();
+              resolve(optimisticResult);
+            }
           }
-        }
-      };
-      run();
-      stopWatch = watch(defaultedOptions, run, { deep: true });
-    });
-  };
-  return {
-    ...toRefs(readonly(state)),
-    suspense
+        };
+        run();
+        stopWatch = watch(defaultedOptions, run);
+      }
+    );
   };
+  watch(
+    () => state.error,
+    (error) => {
+      if (state.isError && !state.isFetching && shouldThrowError(defaultedOptions.value.throwOnError, [
+        error,
+        observer.getCurrentQuery()
+      ])) {
+        throw error;
+      }
+    }
+  );
+  const object = toRefs(readonly(state));
+  for (const key in state) {
+    if (typeof state[key] === "function") {
+      object[key] = state[key];
+    }
+  }
+  object.suspense = suspense;
+  object.refetch = refetch;
+  return object;
 }
 export {
   useBaseQuery

package/build/modern/useBaseQuery.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/useBaseQuery.ts"],"sourcesContent":["import {\n  computed,\n  onScopeDispose,\n  reactive,\n  readonly,\n  toRefs,\n  watch,\n} from 'vue-demi'\nimport { useQueryClient } from './useQueryClient'\nimport { cloneDeepUnref, updateState } from './utils'\nimport type { ToRefs } from 'vue-demi'\nimport type {\n  DefaultedQueryObserverOptions,\n  QueryKey,\n  QueryObserver,\n  QueryObserverResult,\n} from '@tanstack/query-core'\nimport type { QueryClient } from './queryClient'\nimport type { UseQueryOptions } from './useQuery'\nimport type { UseInfiniteQueryOptions } from './useInfiniteQuery'\n\nexport type UseBaseQueryReturnType<\n  TData,\n  TError,\n  Result = QueryObserverResult<TData, TError>,\n> = ToRefs<Readonly<Result>> & {\n  suspense: () => Promise<Result>\n}\n\ntype UseQueryOptionsGeneric<\n  TQueryFnData,\n  TError,\n  TData,\n  TQueryData,\n  TQueryKey extends QueryKey = QueryKey,\n  TPageParam = unknown,\n> =\n  | UseQueryOptions<TQueryFnData, TError, TData, TQueryData, TQueryKey>\n  | UseInfiniteQueryOptions<\n      TQueryFnData,\n      TError,\n      TData,\n      TQueryData,\n      TQueryKey,\n      TPageParam\n    >\n\nexport function useBaseQuery<\n  TQueryFnData,\n  TError,\n  TData,\n  TQueryData,\n  TQueryKey extends QueryKey,\n  TPageParam,\n>(\n  Observer: typeof QueryObserver,\n  options: UseQueryOptionsGeneric<\n    TQueryFnData,\n    TError,\n    TData,\n    TQueryData,\n    TQueryKey,\n    TPageParam\n  >,\n  queryClient?: QueryClient,\n): UseBaseQueryReturnType<TData, TError> {\n  const client = queryClient || useQueryClient()\n\n  const defaultedOptions = computed(() => {\n    const defaulted: DefaultedQueryObserverOptions<\n      TQueryFnData,\n      TError,\n      TData,\n      TQueryData,\n      TQueryKey\n    > = client.defaultQueryOptions(cloneDeepUnref(options as any))\n\n    defaulted._optimisticResults = client.isRestoring.value\n      ? 'isRestoring'\n      : 'optimistic'\n\n    return defaulted\n  })\n\n  const observer = new Observer(client, defaultedOptions.value)\n  const state = reactive(observer.getCurrentResult())\n\n  let unsubscribe = () => {\n    // noop\n  }\n\n  watch(\n    client.isRestoring,\n    (isRestoring) => {\n      // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition\n      if (!isRestoring) {\n        unsubscribe()\n        unsubscribe = observer.subscribe((result) => {\n          updateState(state, result)\n        })\n      }\n    },\n    { immediate: true },\n  )\n\n  watch(\n    defaultedOptions,\n    () => {\n      observer.setOptions(defaultedOptions.value)\n      updateState(state, observer.getCurrentResult())\n    },\n    { deep: true },\n  )\n\n  onScopeDispose(() => {\n    unsubscribe()\n  })\n\n  const suspense = () => {\n    return new Promise<QueryObserverResult<TData, TError>>((resolve) => {\n      let stopWatch = () => {\n        //noop\n      }\n      const run = () => {\n        if (defaultedOptions.value.enabled !== false) {\n          const optimisticResult = observer.getOptimisticResult(\n            defaultedOptions.value,\n          )\n          if (optimisticResult.isStale) {\n            stopWatch()\n            resolve(observer.fetchOptimistic(defaultedOptions.value))\n          } else {\n            stopWatch()\n            resolve(optimisticResult)\n          }\n        }\n      }\n\n      run()\n\n      stopWatch = watch(defaultedOptions, run, { deep: true })\n    })\n  }\n\n  return {\n    ...(toRefs(readonly(state)) as ToRefs<\n      Readonly<QueryObserverResult<TData, TError>>\n    >),\n    suspense,\n  }\n}\n"],"mappings":";AAAA;AAAA,EACE;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OACK;AACP,SAAS,sBAAsB;AAC/B,SAAS,gBAAgB,mBAAmB;AAsCrC,SAAS,aAQd,UACA,SAQA,aACuC;AACvC,QAAM,SAAS,eAAe,eAAe;AAE7C,QAAM,mBAAmB,SAAS,MAAM;AACtC,UAAM,YAMF,OAAO,oBAAoB,eAAe,OAAc,CAAC;AAE7D,cAAU,qBAAqB,OAAO,YAAY,QAC9C,gBACA;AAEJ,WAAO;AAAA,EACT,CAAC;AAED,QAAM,WAAW,IAAI,SAAS,QAAQ,iBAAiB,KAAK;AAC5D,QAAM,QAAQ,SAAS,SAAS,iBAAiB,CAAC;AAElD,MAAI,cAAc,MAAM;AAAA,EAExB;AAEA;AAAA,IACE,OAAO;AAAA,IACP,CAAC,gBAAgB;AAEf,UAAI,CAAC,aAAa;AAChB,oBAAY;AACZ,sBAAc,SAAS,UAAU,CAAC,WAAW;AAC3C,sBAAY,OAAO,MAAM;AAAA,QAC3B,CAAC;AAAA,MACH;AAAA,IACF;AAAA,IACA,EAAE,WAAW,KAAK;AAAA,EACpB;AAEA;AAAA,IACE;AAAA,IACA,MAAM;AACJ,eAAS,WAAW,iBAAiB,KAAK;AAC1C,kBAAY,OAAO,SAAS,iBAAiB,CAAC;AAAA,IAChD;AAAA,IACA,EAAE,MAAM,KAAK;AAAA,EACf;AAEA,iBAAe,MAAM;AACnB,gBAAY;AAAA,EACd,CAAC;AAED,QAAM,WAAW,MAAM;AACrB,WAAO,IAAI,QAA4C,CAAC,YAAY;AAClE,UAAI,YAAY,MAAM;AAAA,MAEtB;AACA,YAAM,MAAM,MAAM;AAChB,YAAI,iBAAiB,MAAM,YAAY,OAAO;AAC5C,gBAAM,mBAAmB,SAAS;AAAA,YAChC,iBAAiB;AAAA,UACnB;AACA,cAAI,iBAAiB,SAAS;AAC5B,sBAAU;AACV,oBAAQ,SAAS,gBAAgB,iBAAiB,KAAK,CAAC;AAAA,UAC1D,OAAO;AACL,sBAAU;AACV,oBAAQ,gBAAgB;AAAA,UAC1B;AAAA,QACF;AAAA,MACF;AAEA,UAAI;AAEJ,kBAAY,MAAM,kBAAkB,KAAK,EAAE,MAAM,KAAK,CAAC;AAAA,IACzD,CAAC;AAAA,EACH;AAEA,SAAO;AAAA,IACL,GAAI,OAAO,SAAS,KAAK,CAAC;AAAA,IAG1B;AAAA,EACF;AACF;","names":[]}
+{"version":3,"sources":["../../src/useBaseQuery.ts"],"sourcesContent":["import {\n  computed,\n  getCurrentScope,\n  onScopeDispose,\n  reactive,\n  readonly,\n  toRefs,\n  watch,\n} from 'vue-demi'\nimport { useQueryClient } from './useQueryClient'\nimport { cloneDeepUnref, shouldThrowError, updateState } from './utils'\nimport type { ToRef } from 'vue-demi'\nimport type {\n  DefaultedQueryObserverOptions,\n  QueryKey,\n  QueryObserver,\n  QueryObserverResult,\n} from '@tanstack/query-core'\nimport type { QueryClient } from './queryClient'\nimport type { UseQueryOptions, UseQueryReturnType } from './useQuery'\nimport type { UseInfiniteQueryOptions } from './useInfiniteQuery'\n\nexport type UseBaseQueryReturnType<\n  TData,\n  TError,\n  Result = QueryObserverResult<TData, TError>,\n> = {\n  [K in keyof Result]: K extends\n    | 'fetchNextPage'\n    | 'fetchPreviousPage'\n    | 'refetch'\n    | 'remove'\n    ? Result[K]\n    : ToRef<Readonly<Result>[K]>\n} & {\n  suspense: () => Promise<Result>\n}\n\ntype UseQueryOptionsGeneric<\n  TQueryFnData,\n  TError,\n  TData,\n  TQueryData,\n  TQueryKey extends QueryKey = QueryKey,\n  TPageParam = unknown,\n> =\n  | UseQueryOptions<TQueryFnData, TError, TData, TQueryData, TQueryKey>\n  | UseInfiniteQueryOptions<\n      TQueryFnData,\n      TError,\n      TData,\n      TQueryData,\n      TQueryKey,\n      TPageParam\n    >\n\nexport function useBaseQuery<\n  TQueryFnData,\n  TError,\n  TData,\n  TQueryData,\n  TQueryKey extends QueryKey,\n  TPageParam,\n>(\n  Observer: typeof QueryObserver,\n  options: UseQueryOptionsGeneric<\n    TQueryFnData,\n    TError,\n    TData,\n    TQueryData,\n    TQueryKey,\n    TPageParam\n  >,\n  queryClient?: QueryClient,\n): UseBaseQueryReturnType<TData, TError> {\n  if (process.env.NODE_ENV === 'development') {\n    if (!getCurrentScope()) {\n      console.warn(\n        'vue-query composables like \"useQuery()\" should only be used inside a \"setup()\" function or a running effect scope. They might otherwise lead to memory leaks.',\n      )\n    }\n  }\n\n  const client = queryClient || useQueryClient()\n\n  const defaultedOptions = computed(() => {\n    const clonedOptions = cloneDeepUnref(options as any)\n\n    if (typeof clonedOptions.enabled === 'function') {\n      clonedOptions.enabled = clonedOptions.enabled()\n    }\n\n    const defaulted: DefaultedQueryObserverOptions<\n      TQueryFnData,\n      TError,\n      TData,\n      TQueryData,\n      TQueryKey\n    > = client.defaultQueryOptions(clonedOptions)\n\n    defaulted._optimisticResults = client.isRestoring.value\n      ? 'isRestoring'\n      : 'optimistic'\n\n    return defaulted\n  })\n\n  const observer = new Observer(client, defaultedOptions.value)\n  const state = reactive(observer.getCurrentResult())\n\n  let unsubscribe = () => {\n    // noop\n  }\n\n  watch(\n    client.isRestoring,\n    (isRestoring) => {\n      // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition\n      if (!isRestoring) {\n        unsubscribe()\n        unsubscribe = observer.subscribe((result) => {\n          updateState(state, result)\n        })\n      }\n    },\n    { immediate: true },\n  )\n\n  const updater = () => {\n    observer.setOptions(defaultedOptions.value)\n    updateState(state, observer.getCurrentResult())\n  }\n\n  watch(defaultedOptions, updater)\n\n  onScopeDispose(() => {\n    unsubscribe()\n  })\n\n  // fix #5910\n  const refetch = (...args: Parameters<(typeof state)['refetch']>) => {\n    updater()\n    return state.refetch(...args)\n  }\n\n  const suspense = () => {\n    return new Promise<QueryObserverResult<TData, TError>>(\n      (resolve, reject) => {\n        let stopWatch = () => {\n          //noop\n        }\n        const run = () => {\n          if (defaultedOptions.value.enabled !== false) {\n            const optimisticResult = observer.getOptimisticResult(\n              defaultedOptions.value,\n            )\n            if (optimisticResult.isStale) {\n              stopWatch()\n              observer\n                .fetchOptimistic(defaultedOptions.value)\n                .then(resolve, reject)\n            } else {\n              stopWatch()\n              resolve(optimisticResult)\n            }\n          }\n        }\n\n        run()\n\n        stopWatch = watch(defaultedOptions, run)\n      },\n    )\n  }\n\n  // Handle error boundary\n  watch(\n    () => state.error,\n    (error) => {\n      if (\n        state.isError &&\n        !state.isFetching &&\n        shouldThrowError(defaultedOptions.value.throwOnError, [\n          error as TError,\n          observer.getCurrentQuery(),\n        ])\n      ) {\n        throw error\n      }\n    },\n  )\n\n  const object: any = toRefs(readonly(state))\n  for (const key in state) {\n    if (typeof state[key as keyof typeof state] === 'function') {\n      object[key] = state[key as keyof typeof state]\n    }\n  }\n\n  object.suspense = suspense\n  object.refetch = refetch\n\n  return object as UseQueryReturnType<TData, TError>\n}\n"],"mappings":";AAAA;AAAA,EACE;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OACK;AACP,SAAS,sBAAsB;AAC/B,SAAS,gBAAgB,kBAAkB,mBAAmB;AA8CvD,SAAS,aAQd,UACA,SAQA,aACuC;AACvC,MAAI,QAAQ,IAAI,aAAa,eAAe;AAC1C,QAAI,CAAC,gBAAgB,GAAG;AACtB,cAAQ;AAAA,QACN;AAAA,MACF;AAAA,IACF;AAAA,EACF;AAEA,QAAM,SAAS,eAAe,eAAe;AAE7C,QAAM,mBAAmB,SAAS,MAAM;AACtC,UAAM,gBAAgB,eAAe,OAAc;AAEnD,QAAI,OAAO,cAAc,YAAY,YAAY;AAC/C,oBAAc,UAAU,cAAc,QAAQ;AAAA,IAChD;AAEA,UAAM,YAMF,OAAO,oBAAoB,aAAa;AAE5C,cAAU,qBAAqB,OAAO,YAAY,QAC9C,gBACA;AAEJ,WAAO;AAAA,EACT,CAAC;AAED,QAAM,WAAW,IAAI,SAAS,QAAQ,iBAAiB,KAAK;AAC5D,QAAM,QAAQ,SAAS,SAAS,iBAAiB,CAAC;AAElD,MAAI,cAAc,MAAM;AAAA,EAExB;AAEA;AAAA,IACE,OAAO;AAAA,IACP,CAAC,gBAAgB;AAEf,UAAI,CAAC,aAAa;AAChB,oBAAY;AACZ,sBAAc,SAAS,UAAU,CAAC,WAAW;AAC3C,sBAAY,OAAO,MAAM;AAAA,QAC3B,CAAC;AAAA,MACH;AAAA,IACF;AAAA,IACA,EAAE,WAAW,KAAK;AAAA,EACpB;AAEA,QAAM,UAAU,MAAM;AACpB,aAAS,WAAW,iBAAiB,KAAK;AAC1C,gBAAY,OAAO,SAAS,iBAAiB,CAAC;AAAA,EAChD;AAEA,QAAM,kBAAkB,OAAO;AAE/B,iBAAe,MAAM;AACnB,gBAAY;AAAA,EACd,CAAC;AAGD,QAAM,UAAU,IAAI,SAAgD;AAClE,YAAQ;AACR,WAAO,MAAM,QAAQ,GAAG,IAAI;AAAA,EAC9B;AAEA,QAAM,WAAW,MAAM;AACrB,WAAO,IAAI;AAAA,MACT,CAAC,SAAS,WAAW;AACnB,YAAI,YAAY,MAAM;AAAA,QAEtB;AACA,cAAM,MAAM,MAAM;AAChB,cAAI,iBAAiB,MAAM,YAAY,OAAO;AAC5C,kBAAM,mBAAmB,SAAS;AAAA,cAChC,iBAAiB;AAAA,YACnB;AACA,gBAAI,iBAAiB,SAAS;AAC5B,wBAAU;AACV,uBACG,gBAAgB,iBAAiB,KAAK,EACtC,KAAK,SAAS,MAAM;AAAA,YACzB,OAAO;AACL,wBAAU;AACV,sBAAQ,gBAAgB;AAAA,YAC1B;AAAA,UACF;AAAA,QACF;AAEA,YAAI;AAEJ,oBAAY,MAAM,kBAAkB,GAAG;AAAA,MACzC;AAAA,IACF;AAAA,EACF;AAGA;AAAA,IACE,MAAM,MAAM;AAAA,IACZ,CAAC,UAAU;AACT,UACE,MAAM,WACN,CAAC,MAAM,cACP,iBAAiB,iBAAiB,MAAM,cAAc;AAAA,QACpD;AAAA,QACA,SAAS,gBAAgB;AAAA,MAC3B,CAAC,GACD;AACA,cAAM;AAAA,MACR;AAAA,IACF;AAAA,EACF;AAEA,QAAM,SAAc,OAAO,SAAS,KAAK,CAAC;AAC1C,aAAW,OAAO,OAAO;AACvB,QAAI,OAAO,MAAM,GAAyB,MAAM,YAAY;AAC1D,aAAO,GAAG,IAAI,MAAM,GAAyB;AAAA,IAC/C;AAAA,EACF;AAEA,SAAO,WAAW;AAClB,SAAO,UAAU;AAEjB,SAAO;AACT;","names":[]}

package/build/modern/useInfiniteQuery.cjs

@@ -32,12 +32,7 @@ function useInfiniteQuery(options, queryClient) {
     options,
     queryClient
   );
-  return {
-    ...result,
-    fetchNextPage: result.fetchNextPage.value,
-    fetchPreviousPage: result.fetchPreviousPage.value,
-    refetch: result.refetch.value
-  };
+  return result;
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/build/modern/useInfiniteQuery.cjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/useInfiniteQuery.ts"],"sourcesContent":["import { InfiniteQueryObserver } from '@tanstack/query-core'\nimport { useBaseQuery } from './useBaseQuery'\nimport type {\n  DefaultError,\n  InfiniteData,\n  InfiniteQueryObserverOptions,\n  InfiniteQueryObserverResult,\n  QueryKey,\n  QueryObserver,\n  WithRequired,\n} from '@tanstack/query-core'\n\nimport type { UseBaseQueryReturnType } from './useBaseQuery'\n\nimport type { DistributiveOmit, MaybeRefDeep } from './types'\nimport type { QueryClient } from './queryClient'\nimport type { UnwrapRef } from 'vue-demi'\n\nexport type UseInfiniteQueryOptions<\n  TQueryFnData = unknown,\n  TError = DefaultError,\n  TData = TQueryFnData,\n  TQueryData = TQueryFnData,\n  TQueryKey extends QueryKey = QueryKey,\n  TPageParam = unknown,\n> = {\n  [Property in keyof InfiniteQueryObserverOptions<\n    TQueryFnData,\n    TError,\n    TData,\n    TQueryData,\n    TQueryKey,\n    TPageParam\n  >]: Property extends 'queryFn'\n    ? InfiniteQueryObserverOptions<\n        TQueryFnData,\n        TError,\n        TData,\n        TQueryData,\n        UnwrapRef<TQueryKey>,\n        TPageParam\n      >[Property]\n    : MaybeRefDeep<\n        WithRequired<\n          InfiniteQueryObserverOptions<\n            TQueryFnData,\n            TError,\n            TData,\n            TQueryData,\n            TQueryKey,\n            TPageParam\n          >,\n          'queryKey'\n        >[Property]\n      >\n}\n\ntype InfiniteQueryReturnType<TData, TError> = UseBaseQueryReturnType<\n  TData,\n  TError,\n  InfiniteQueryObserverResult<TData, TError>\n>\nexport type UseInfiniteQueryReturnType<TData, TError> = DistributiveOmit<\n  InfiniteQueryReturnType<TData, TError>,\n  'fetchNextPage' | 'fetchPreviousPage' | 'refetch'\n> & {\n  fetchNextPage: InfiniteQueryObserverResult<TData, TError>['fetchNextPage']\n  fetchPreviousPage: InfiniteQueryObserverResult<\n    TData,\n    TError\n  >['fetchPreviousPage']\n  refetch: InfiniteQueryObserverResult<TData, TError>['refetch']\n}\n\nexport function useInfiniteQuery<\n  TQueryFnData,\n  TError = DefaultError,\n  TData = InfiniteData<TQueryFnData>,\n  TQueryKey extends QueryKey = QueryKey,\n  TPageParam = unknown,\n>(\n  options: UseInfiniteQueryOptions<\n    TQueryFnData,\n    TError,\n    TData,\n    TQueryFnData,\n    TQueryKey,\n    TPageParam\n  >,\n  queryClient?: QueryClient,\n): UseInfiniteQueryReturnType<TData, TError> {\n  // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion\n  const result = useBaseQuery(\n    // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion\n    InfiniteQueryObserver as typeof QueryObserver,\n    options,\n    queryClient,\n  ) as InfiniteQueryReturnType<TData, TError>\n  return {\n    ...result,\n    fetchNextPage: result.fetchNextPage.value,\n    fetchPreviousPage: result.fetchPreviousPage.value,\n    refetch: result.refetch.value,\n  }\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,wBAAsC;AACtC,0BAA6B;AAyEtB,SAAS,iBAOd,SAQA,aAC2C;AAE3C,QAAM,aAAS;AAAA;AAAA,IAEb;AAAA,IACA;AAAA,IACA;AAAA,EACF;AACA,SAAO;AAAA,IACL,GAAG;AAAA,IACH,eAAe,OAAO,cAAc;AAAA,IACpC,mBAAmB,OAAO,kBAAkB;AAAA,IAC5C,SAAS,OAAO,QAAQ;AAAA,EAC1B;AACF;","names":[]}
+{"version":3,"sources":["../../src/useInfiniteQuery.ts"],"sourcesContent":["import { InfiniteQueryObserver } from '@tanstack/query-core'\nimport { useBaseQuery } from './useBaseQuery'\nimport type {\n  DefaultError,\n  InfiniteData,\n  InfiniteQueryObserverOptions,\n  InfiniteQueryObserverResult,\n  QueryKey,\n  QueryObserver,\n  WithRequired,\n} from '@tanstack/query-core'\n\nimport type { UseBaseQueryReturnType } from './useBaseQuery'\n\nimport type {\n  DeepUnwrapRef,\n  DistributiveOmit,\n  MaybeRefDeep,\n  MaybeRefOrGetter,\n} from './types'\nimport type { QueryClient } from './queryClient'\n\nexport type UseInfiniteQueryOptions<\n  TQueryFnData = unknown,\n  TError = DefaultError,\n  TData = TQueryFnData,\n  TQueryData = TQueryFnData,\n  TQueryKey extends QueryKey = QueryKey,\n  TPageParam = unknown,\n> = {\n  [Property in keyof InfiniteQueryObserverOptions<\n    TQueryFnData,\n    TError,\n    TData,\n    TQueryData,\n    TQueryKey,\n    TPageParam\n  >]: Property extends 'queryFn'\n    ? InfiniteQueryObserverOptions<\n        TQueryFnData,\n        TError,\n        TData,\n        TQueryData,\n        DeepUnwrapRef<TQueryKey>,\n        TPageParam\n      >[Property]\n    : Property extends 'enabled'\n    ? MaybeRefOrGetter<\n        InfiniteQueryObserverOptions<\n          TQueryFnData,\n          TError,\n          TData,\n          TQueryData,\n          TQueryKey\n        >[Property]\n      >\n    : MaybeRefDeep<\n        WithRequired<\n          InfiniteQueryObserverOptions<\n            TQueryFnData,\n            TError,\n            TData,\n            TQueryData,\n            TQueryKey,\n            TPageParam\n          >,\n          'queryKey'\n        >[Property]\n      >\n}\n\ntype InfiniteQueryReturnType<TData, TError> = UseBaseQueryReturnType<\n  TData,\n  TError,\n  InfiniteQueryObserverResult<TData, TError>\n>\nexport type UseInfiniteQueryReturnType<TData, TError> = DistributiveOmit<\n  InfiniteQueryReturnType<TData, TError>,\n  'fetchNextPage' | 'fetchPreviousPage' | 'refetch'\n> & {\n  fetchNextPage: InfiniteQueryObserverResult<TData, TError>['fetchNextPage']\n  fetchPreviousPage: InfiniteQueryObserverResult<\n    TData,\n    TError\n  >['fetchPreviousPage']\n  refetch: InfiniteQueryObserverResult<TData, TError>['refetch']\n}\n\nexport function useInfiniteQuery<\n  TQueryFnData,\n  TError = DefaultError,\n  TData = InfiniteData<TQueryFnData>,\n  TQueryKey extends QueryKey = QueryKey,\n  TPageParam = unknown,\n>(\n  options: UseInfiniteQueryOptions<\n    TQueryFnData,\n    TError,\n    TData,\n    TQueryFnData,\n    TQueryKey,\n    TPageParam\n  >,\n  queryClient?: QueryClient,\n): UseInfiniteQueryReturnType<TData, TError> {\n  // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion\n  const result = useBaseQuery(\n    // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion\n    InfiniteQueryObserver as typeof QueryObserver,\n    options,\n    queryClient,\n  ) as InfiniteQueryReturnType<TData, TError>\n\n  return result\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,wBAAsC;AACtC,0BAA6B;AAuFtB,SAAS,iBAOd,SAQA,aAC2C;AAE3C,QAAM,aAAS;AAAA;AAAA,IAEb;AAAA,IACA;AAAA,IACA;AAAA,EACF;AAEA,SAAO;AACT;","names":[]}

package/build/modern/useInfiniteQuery.d.cts

@@ -1,5 +1,5 @@
 import '@tanstack/query-core';
-export { d as UseInfiniteQueryOptions, e as UseInfiniteQueryReturnType, a as useInfiniteQuery } from './useQuery-ebff9211.js';
+export { d as UseInfiniteQueryOptions, e as UseInfiniteQueryReturnType, a as useInfiniteQuery } from './useQuery-f89ce9b1.js';
 import './types.cjs';
 import './queryClient.cjs';
 import 'vue-demi';

package/build/modern/useInfiniteQuery.d.ts

@@ -1,5 +1,5 @@
 import '@tanstack/query-core';
-export { d as UseInfiniteQueryOptions, e as UseInfiniteQueryReturnType, a as useInfiniteQuery } from './useQuery-846c66db.js';
+export { d as UseInfiniteQueryOptions, e as UseInfiniteQueryReturnType, a as useInfiniteQuery } from './useQuery-62b5e5ac.js';
 import './types.js';
 import './queryClient.js';
 import 'vue-demi';

package/build/modern/useInfiniteQuery.js

@@ -8,12 +8,7 @@ function useInfiniteQuery(options, queryClient) {
     options,
     queryClient
   );
-  return {
-    ...result,
-    fetchNextPage: result.fetchNextPage.value,
-    fetchPreviousPage: result.fetchPreviousPage.value,
-    refetch: result.refetch.value
-  };
+  return result;
 }
 export {
   useInfiniteQuery

package/build/modern/useInfiniteQuery.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/useInfiniteQuery.ts"],"sourcesContent":["import { InfiniteQueryObserver } from '@tanstack/query-core'\nimport { useBaseQuery } from './useBaseQuery'\nimport type {\n  DefaultError,\n  InfiniteData,\n  InfiniteQueryObserverOptions,\n  InfiniteQueryObserverResult,\n  QueryKey,\n  QueryObserver,\n  WithRequired,\n} from '@tanstack/query-core'\n\nimport type { UseBaseQueryReturnType } from './useBaseQuery'\n\nimport type { DistributiveOmit, MaybeRefDeep } from './types'\nimport type { QueryClient } from './queryClient'\nimport type { UnwrapRef } from 'vue-demi'\n\nexport type UseInfiniteQueryOptions<\n  TQueryFnData = unknown,\n  TError = DefaultError,\n  TData = TQueryFnData,\n  TQueryData = TQueryFnData,\n  TQueryKey extends QueryKey = QueryKey,\n  TPageParam = unknown,\n> = {\n  [Property in keyof InfiniteQueryObserverOptions<\n    TQueryFnData,\n    TError,\n    TData,\n    TQueryData,\n    TQueryKey,\n    TPageParam\n  >]: Property extends 'queryFn'\n    ? InfiniteQueryObserverOptions<\n        TQueryFnData,\n        TError,\n        TData,\n        TQueryData,\n        UnwrapRef<TQueryKey>,\n        TPageParam\n      >[Property]\n    : MaybeRefDeep<\n        WithRequired<\n          InfiniteQueryObserverOptions<\n            TQueryFnData,\n            TError,\n            TData,\n            TQueryData,\n            TQueryKey,\n            TPageParam\n          >,\n          'queryKey'\n        >[Property]\n      >\n}\n\ntype InfiniteQueryReturnType<TData, TError> = UseBaseQueryReturnType<\n  TData,\n  TError,\n  InfiniteQueryObserverResult<TData, TError>\n>\nexport type UseInfiniteQueryReturnType<TData, TError> = DistributiveOmit<\n  InfiniteQueryReturnType<TData, TError>,\n  'fetchNextPage' | 'fetchPreviousPage' | 'refetch'\n> & {\n  fetchNextPage: InfiniteQueryObserverResult<TData, TError>['fetchNextPage']\n  fetchPreviousPage: InfiniteQueryObserverResult<\n    TData,\n    TError\n  >['fetchPreviousPage']\n  refetch: InfiniteQueryObserverResult<TData, TError>['refetch']\n}\n\nexport function useInfiniteQuery<\n  TQueryFnData,\n  TError = DefaultError,\n  TData = InfiniteData<TQueryFnData>,\n  TQueryKey extends QueryKey = QueryKey,\n  TPageParam = unknown,\n>(\n  options: UseInfiniteQueryOptions<\n    TQueryFnData,\n    TError,\n    TData,\n    TQueryFnData,\n    TQueryKey,\n    TPageParam\n  >,\n  queryClient?: QueryClient,\n): UseInfiniteQueryReturnType<TData, TError> {\n  // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion\n  const result = useBaseQuery(\n    // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion\n    InfiniteQueryObserver as typeof QueryObserver,\n    options,\n    queryClient,\n  ) as InfiniteQueryReturnType<TData, TError>\n  return {\n    ...result,\n    fetchNextPage: result.fetchNextPage.value,\n    fetchPreviousPage: result.fetchPreviousPage.value,\n    refetch: result.refetch.value,\n  }\n}\n"],"mappings":";AAAA,SAAS,6BAA6B;AACtC,SAAS,oBAAoB;AAyEtB,SAAS,iBAOd,SAQA,aAC2C;AAE3C,QAAM,SAAS;AAAA;AAAA,IAEb;AAAA,IACA;AAAA,IACA;AAAA,EACF;AACA,SAAO;AAAA,IACL,GAAG;AAAA,IACH,eAAe,OAAO,cAAc;AAAA,IACpC,mBAAmB,OAAO,kBAAkB;AAAA,IAC5C,SAAS,OAAO,QAAQ;AAAA,EAC1B;AACF;","names":[]}
+{"version":3,"sources":["../../src/useInfiniteQuery.ts"],"sourcesContent":["import { InfiniteQueryObserver } from '@tanstack/query-core'\nimport { useBaseQuery } from './useBaseQuery'\nimport type {\n  DefaultError,\n  InfiniteData,\n  InfiniteQueryObserverOptions,\n  InfiniteQueryObserverResult,\n  QueryKey,\n  QueryObserver,\n  WithRequired,\n} from '@tanstack/query-core'\n\nimport type { UseBaseQueryReturnType } from './useBaseQuery'\n\nimport type {\n  DeepUnwrapRef,\n  DistributiveOmit,\n  MaybeRefDeep,\n  MaybeRefOrGetter,\n} from './types'\nimport type { QueryClient } from './queryClient'\n\nexport type UseInfiniteQueryOptions<\n  TQueryFnData = unknown,\n  TError = DefaultError,\n  TData = TQueryFnData,\n  TQueryData = TQueryFnData,\n  TQueryKey extends QueryKey = QueryKey,\n  TPageParam = unknown,\n> = {\n  [Property in keyof InfiniteQueryObserverOptions<\n    TQueryFnData,\n    TError,\n    TData,\n    TQueryData,\n    TQueryKey,\n    TPageParam\n  >]: Property extends 'queryFn'\n    ? InfiniteQueryObserverOptions<\n        TQueryFnData,\n        TError,\n        TData,\n        TQueryData,\n        DeepUnwrapRef<TQueryKey>,\n        TPageParam\n      >[Property]\n    : Property extends 'enabled'\n    ? MaybeRefOrGetter<\n        InfiniteQueryObserverOptions<\n          TQueryFnData,\n          TError,\n          TData,\n          TQueryData,\n          TQueryKey\n        >[Property]\n      >\n    : MaybeRefDeep<\n        WithRequired<\n          InfiniteQueryObserverOptions<\n            TQueryFnData,\n            TError,\n            TData,\n            TQueryData,\n            TQueryKey,\n            TPageParam\n          >,\n          'queryKey'\n        >[Property]\n      >\n}\n\ntype InfiniteQueryReturnType<TData, TError> = UseBaseQueryReturnType<\n  TData,\n  TError,\n  InfiniteQueryObserverResult<TData, TError>\n>\nexport type UseInfiniteQueryReturnType<TData, TError> = DistributiveOmit<\n  InfiniteQueryReturnType<TData, TError>,\n  'fetchNextPage' | 'fetchPreviousPage' | 'refetch'\n> & {\n  fetchNextPage: InfiniteQueryObserverResult<TData, TError>['fetchNextPage']\n  fetchPreviousPage: InfiniteQueryObserverResult<\n    TData,\n    TError\n  >['fetchPreviousPage']\n  refetch: InfiniteQueryObserverResult<TData, TError>['refetch']\n}\n\nexport function useInfiniteQuery<\n  TQueryFnData,\n  TError = DefaultError,\n  TData = InfiniteData<TQueryFnData>,\n  TQueryKey extends QueryKey = QueryKey,\n  TPageParam = unknown,\n>(\n  options: UseInfiniteQueryOptions<\n    TQueryFnData,\n    TError,\n    TData,\n    TQueryFnData,\n    TQueryKey,\n    TPageParam\n  >,\n  queryClient?: QueryClient,\n): UseInfiniteQueryReturnType<TData, TError> {\n  // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion\n  const result = useBaseQuery(\n    // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion\n    InfiniteQueryObserver as typeof QueryObserver,\n    options,\n    queryClient,\n  ) as InfiniteQueryReturnType<TData, TError>\n\n  return result\n}\n"],"mappings":";AAAA,SAAS,6BAA6B;AACtC,SAAS,oBAAoB;AAuFtB,SAAS,iBAOd,SAQA,aAC2C;AAE3C,QAAM,SAAS;AAAA;AAAA,IAEb;AAAA,IACA;AAAA,IACA;AAAA,EACF;AAEA,SAAO;AACT;","names":[]}

package/build/modern/useIsFetching.cjs

@@ -25,21 +25,21 @@ __export(useIsFetching_exports, {
 module.exports = __toCommonJS(useIsFetching_exports);
 var import_vue_demi = require("vue-demi");
 var import_useQueryClient = require("./useQueryClient.cjs");
-var import_utils = require("./utils.cjs");
 function useIsFetching(fetchingFilters = {}, queryClient) {
-  const filters = (0, import_vue_demi.computed)(() => (0, import_utils.cloneDeepUnref)(fetchingFilters));
+  if (process.env.NODE_ENV === "development") {
+    if (!(0, import_vue_demi.getCurrentScope)()) {
+      console.warn(
+        'vue-query composables like "useQuery()" should only be used inside a "setup()" function or a running effect scope. They might otherwise lead to memory leaks.'
+      );
+    }
+  }
   const client = queryClient || (0, import_useQueryClient.useQueryClient)();
-  const isFetching = (0, import_vue_demi.ref)(client.isFetching(filters));
-  const unsubscribe = client.getQueryCache().subscribe(() => {
-    isFetching.value = client.isFetching(filters);
-  });
-  (0, import_vue_demi.watch)(
-    filters,
-    () => {
-      isFetching.value = client.isFetching(filters);
-    },
-    { deep: true }
-  );
+  const isFetching = (0, import_vue_demi.ref)();
+  const listener = () => {
+    isFetching.value = client.isFetching(fetchingFilters);
+  };
+  const unsubscribe = client.getQueryCache().subscribe(listener);
+  (0, import_vue_demi.watchEffect)(listener);
   (0, import_vue_demi.onScopeDispose)(() => {
     unsubscribe();
   });

package/build/modern/useIsFetching.cjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/useIsFetching.ts"],"sourcesContent":["import { computed, onScopeDispose, ref, watch } from 'vue-demi'\nimport { useQueryClient } from './useQueryClient'\nimport { cloneDeepUnref } from './utils'\nimport type { Ref } from 'vue-demi'\nimport type { QueryFilters as QF } from '@tanstack/query-core'\nimport type { MaybeRefDeep } from './types'\nimport type { QueryClient } from './queryClient'\n\nexport type QueryFilters = MaybeRefDeep<QF>\n\nexport function useIsFetching(\n  fetchingFilters: MaybeRefDeep<QF> = {},\n  queryClient?: QueryClient,\n): Ref<number> {\n  const filters = computed(() => cloneDeepUnref(fetchingFilters))\n  const client = queryClient || useQueryClient()\n\n  const isFetching = ref(client.isFetching(filters))\n\n  const unsubscribe = client.getQueryCache().subscribe(() => {\n    isFetching.value = client.isFetching(filters)\n  })\n\n  watch(\n    filters,\n    () => {\n      isFetching.value = client.isFetching(filters)\n    },\n    { deep: true },\n  )\n\n  onScopeDispose(() => {\n    unsubscribe()\n  })\n\n  return isFetching\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,sBAAqD;AACrD,4BAA+B;AAC/B,mBAA+B;AAQxB,SAAS,cACd,kBAAoC,CAAC,GACrC,aACa;AACb,QAAM,cAAU,0BAAS,UAAM,6BAAe,eAAe,CAAC;AAC9D,QAAM,SAAS,mBAAe,sCAAe;AAE7C,QAAM,iBAAa,qBAAI,OAAO,WAAW,OAAO,CAAC;AAEjD,QAAM,cAAc,OAAO,cAAc,EAAE,UAAU,MAAM;AACzD,eAAW,QAAQ,OAAO,WAAW,OAAO;AAAA,EAC9C,CAAC;AAED;AAAA,IACE;AAAA,IACA,MAAM;AACJ,iBAAW,QAAQ,OAAO,WAAW,OAAO;AAAA,IAC9C;AAAA,IACA,EAAE,MAAM,KAAK;AAAA,EACf;AAEA,sCAAe,MAAM;AACnB,gBAAY;AAAA,EACd,CAAC;AAED,SAAO;AACT;","names":[]}
+{"version":3,"sources":["../../src/useIsFetching.ts"],"sourcesContent":["import { getCurrentScope, onScopeDispose, ref, watchEffect } from 'vue-demi'\nimport { useQueryClient } from './useQueryClient'\nimport type { Ref } from 'vue-demi'\nimport type { QueryFilters as QF } from '@tanstack/query-core'\nimport type { MaybeRefDeep } from './types'\nimport type { QueryClient } from './queryClient'\n\nexport type QueryFilters = MaybeRefDeep<QF>\n\nexport function useIsFetching(\n  fetchingFilters: MaybeRefDeep<QF> = {},\n  queryClient?: QueryClient,\n): Ref<number> {\n  if (process.env.NODE_ENV === 'development') {\n    if (!getCurrentScope()) {\n      console.warn(\n        'vue-query composables like \"useQuery()\" should only be used inside a \"setup()\" function or a running effect scope. They might otherwise lead to memory leaks.',\n      )\n    }\n  }\n\n  const client = queryClient || useQueryClient()\n\n  const isFetching = ref()\n\n  const listener = () => {\n    isFetching.value = client.isFetching(fetchingFilters)\n  }\n\n  const unsubscribe = client.getQueryCache().subscribe(listener)\n\n  watchEffect(listener)\n\n  onScopeDispose(() => {\n    unsubscribe()\n  })\n\n  return isFetching\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,sBAAkE;AAClE,4BAA+B;AAQxB,SAAS,cACd,kBAAoC,CAAC,GACrC,aACa;AACb,MAAI,QAAQ,IAAI,aAAa,eAAe;AAC1C,QAAI,KAAC,iCAAgB,GAAG;AACtB,cAAQ;AAAA,QACN;AAAA,MACF;AAAA,IACF;AAAA,EACF;AAEA,QAAM,SAAS,mBAAe,sCAAe;AAE7C,QAAM,iBAAa,qBAAI;AAEvB,QAAM,WAAW,MAAM;AACrB,eAAW,QAAQ,OAAO,WAAW,eAAe;AAAA,EACtD;AAEA,QAAM,cAAc,OAAO,cAAc,EAAE,UAAU,QAAQ;AAE7D,mCAAY,QAAQ;AAEpB,sCAAe,MAAM;AACnB,gBAAY;AAAA,EACd,CAAC;AAED,SAAO;AACT;","names":[]}

package/build/modern/useIsFetching.js

@@ -1,21 +1,21 @@
 // src/useIsFetching.ts
-import { computed, onScopeDispose, ref, watch } from "vue-demi";
+import { getCurrentScope, onScopeDispose, ref, watchEffect } from "vue-demi";
 import { useQueryClient } from "./useQueryClient.js";
-import { cloneDeepUnref } from "./utils.js";
 function useIsFetching(fetchingFilters = {}, queryClient) {
-  const filters = computed(() => cloneDeepUnref(fetchingFilters));
+  if (process.env.NODE_ENV === "development") {
+    if (!getCurrentScope()) {
+      console.warn(
+        'vue-query composables like "useQuery()" should only be used inside a "setup()" function or a running effect scope. They might otherwise lead to memory leaks.'
+      );
+    }
+  }
   const client = queryClient || useQueryClient();
-  const isFetching = ref(client.isFetching(filters));
-  const unsubscribe = client.getQueryCache().subscribe(() => {
-    isFetching.value = client.isFetching(filters);
-  });
-  watch(
-    filters,
-    () => {
-      isFetching.value = client.isFetching(filters);
-    },
-    { deep: true }
-  );
+  const isFetching = ref();
+  const listener = () => {
+    isFetching.value = client.isFetching(fetchingFilters);
+  };
+  const unsubscribe = client.getQueryCache().subscribe(listener);
+  watchEffect(listener);
   onScopeDispose(() => {
     unsubscribe();
   });

package/build/modern/useIsFetching.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/useIsFetching.ts"],"sourcesContent":["import { computed, onScopeDispose, ref, watch } from 'vue-demi'\nimport { useQueryClient } from './useQueryClient'\nimport { cloneDeepUnref } from './utils'\nimport type { Ref } from 'vue-demi'\nimport type { QueryFilters as QF } from '@tanstack/query-core'\nimport type { MaybeRefDeep } from './types'\nimport type { QueryClient } from './queryClient'\n\nexport type QueryFilters = MaybeRefDeep<QF>\n\nexport function useIsFetching(\n  fetchingFilters: MaybeRefDeep<QF> = {},\n  queryClient?: QueryClient,\n): Ref<number> {\n  const filters = computed(() => cloneDeepUnref(fetchingFilters))\n  const client = queryClient || useQueryClient()\n\n  const isFetching = ref(client.isFetching(filters))\n\n  const unsubscribe = client.getQueryCache().subscribe(() => {\n    isFetching.value = client.isFetching(filters)\n  })\n\n  watch(\n    filters,\n    () => {\n      isFetching.value = client.isFetching(filters)\n    },\n    { deep: true },\n  )\n\n  onScopeDispose(() => {\n    unsubscribe()\n  })\n\n  return isFetching\n}\n"],"mappings":";AAAA,SAAS,UAAU,gBAAgB,KAAK,aAAa;AACrD,SAAS,sBAAsB;AAC/B,SAAS,sBAAsB;AAQxB,SAAS,cACd,kBAAoC,CAAC,GACrC,aACa;AACb,QAAM,UAAU,SAAS,MAAM,eAAe,eAAe,CAAC;AAC9D,QAAM,SAAS,eAAe,eAAe;AAE7C,QAAM,aAAa,IAAI,OAAO,WAAW,OAAO,CAAC;AAEjD,QAAM,cAAc,OAAO,cAAc,EAAE,UAAU,MAAM;AACzD,eAAW,QAAQ,OAAO,WAAW,OAAO;AAAA,EAC9C,CAAC;AAED;AAAA,IACE;AAAA,IACA,MAAM;AACJ,iBAAW,QAAQ,OAAO,WAAW,OAAO;AAAA,IAC9C;AAAA,IACA,EAAE,MAAM,KAAK;AAAA,EACf;AAEA,iBAAe,MAAM;AACnB,gBAAY;AAAA,EACd,CAAC;AAED,SAAO;AACT;","names":[]}
+{"version":3,"sources":["../../src/useIsFetching.ts"],"sourcesContent":["import { getCurrentScope, onScopeDispose, ref, watchEffect } from 'vue-demi'\nimport { useQueryClient } from './useQueryClient'\nimport type { Ref } from 'vue-demi'\nimport type { QueryFilters as QF } from '@tanstack/query-core'\nimport type { MaybeRefDeep } from './types'\nimport type { QueryClient } from './queryClient'\n\nexport type QueryFilters = MaybeRefDeep<QF>\n\nexport function useIsFetching(\n  fetchingFilters: MaybeRefDeep<QF> = {},\n  queryClient?: QueryClient,\n): Ref<number> {\n  if (process.env.NODE_ENV === 'development') {\n    if (!getCurrentScope()) {\n      console.warn(\n        'vue-query composables like \"useQuery()\" should only be used inside a \"setup()\" function or a running effect scope. They might otherwise lead to memory leaks.',\n      )\n    }\n  }\n\n  const client = queryClient || useQueryClient()\n\n  const isFetching = ref()\n\n  const listener = () => {\n    isFetching.value = client.isFetching(fetchingFilters)\n  }\n\n  const unsubscribe = client.getQueryCache().subscribe(listener)\n\n  watchEffect(listener)\n\n  onScopeDispose(() => {\n    unsubscribe()\n  })\n\n  return isFetching\n}\n"],"mappings":";AAAA,SAAS,iBAAiB,gBAAgB,KAAK,mBAAmB;AAClE,SAAS,sBAAsB;AAQxB,SAAS,cACd,kBAAoC,CAAC,GACrC,aACa;AACb,MAAI,QAAQ,IAAI,aAAa,eAAe;AAC1C,QAAI,CAAC,gBAAgB,GAAG;AACtB,cAAQ;AAAA,QACN;AAAA,MACF;AAAA,IACF;AAAA,EACF;AAEA,QAAM,SAAS,eAAe,eAAe;AAE7C,QAAM,aAAa,IAAI;AAEvB,QAAM,WAAW,MAAM;AACrB,eAAW,QAAQ,OAAO,WAAW,eAAe;AAAA,EACtD;AAEA,QAAM,cAAc,OAAO,cAAc,EAAE,UAAU,QAAQ;AAE7D,cAAY,QAAQ;AAEpB,iBAAe,MAAM;AACnB,gBAAY;AAAA,EACd,CAAC;AAED,SAAO;AACT;","names":[]}

package/build/modern/useMutation.cjs

@@ -28,6 +28,13 @@ var import_query_core = require("@tanstack/query-core");
 var import_utils = require("./utils.cjs");
 var import_useQueryClient = require("./useQueryClient.cjs");
 function useMutation(mutationOptions, queryClient) {
+  if (process.env.NODE_ENV === "development") {
+    if (!(0, import_vue_demi.getCurrentScope)()) {
+      console.warn(
+        'vue-query composables like "useQuery()" should only be used inside a "setup()" function or a running effect scope. They might otherwise lead to memory leaks.'
+      );
+    }
+  }
   const client = queryClient || (0, import_useQueryClient.useQueryClient)();
   const options = (0, import_vue_demi.computed)(() => {
     return client.defaultMutationOptions((0, import_utils.cloneDeepUnref)(mutationOptions));
@@ -41,17 +48,21 @@ function useMutation(mutationOptions, queryClient) {
     observer.mutate(variables, mutateOptions).catch(() => {
     });
   };
-  (0, import_vue_demi.watch)(
-    options,
-    () => {
-      observer.setOptions(options.value);
-    },
-    { deep: true }
-  );
+  (0, import_vue_demi.watch)(options, () => {
+    observer.setOptions(options.value);
+  });
   (0, import_vue_demi.onScopeDispose)(() => {
     unsubscribe();
   });
   const resultRefs = (0, import_vue_demi.toRefs)((0, import_vue_demi.readonly)(state));
+  (0, import_vue_demi.watch)(
+    () => state.error,
+    (error) => {
+      if (error && (0, import_utils.shouldThrowError)(options.value.throwOnError, [error])) {
+        throw error;
+      }
+    }
+  );
   return {
     ...resultRefs,
     mutate,

package/build/modern/useMutation.cjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/useMutation.ts"],"sourcesContent":["import {\n  computed,\n  onScopeDispose,\n  reactive,\n  readonly,\n  toRefs,\n  watch,\n} from 'vue-demi'\nimport { MutationObserver } from '@tanstack/query-core'\nimport { cloneDeepUnref, updateState } from './utils'\nimport { useQueryClient } from './useQueryClient'\nimport type { ToRefs } from 'vue-demi'\nimport type {\n  DefaultError,\n  MutateFunction,\n  MutateOptions,\n  MutationObserverOptions,\n  MutationObserverResult,\n} from '@tanstack/query-core'\nimport type { DistributiveOmit, MaybeRefDeep } from './types'\nimport type { QueryClient } from './queryClient'\n\ntype MutationResult<TData, TError, TVariables, TContext> = DistributiveOmit<\n  MutationObserverResult<TData, TError, TVariables, TContext>,\n  'mutate' | 'reset'\n>\n\nexport type UseMutationOptions<\n  TData = unknown,\n  TError = DefaultError,\n  TVariables = void,\n  TContext = unknown,\n> = MaybeRefDeep<MutationObserverOptions<TData, TError, TVariables, TContext>>\n\ntype MutateSyncFunction<\n  TData = unknown,\n  TError = DefaultError,\n  TVariables = void,\n  TContext = unknown,\n> = (\n  ...options: Parameters<MutateFunction<TData, TError, TVariables, TContext>>\n) => void\n\nexport type UseMutationReturnType<\n  TData,\n  TError,\n  TVariables,\n  TContext,\n  Result = MutationResult<TData, TError, TVariables, TContext>,\n> = ToRefs<Readonly<Result>> & {\n  mutate: MutateSyncFunction<TData, TError, TVariables, TContext>\n  mutateAsync: MutateFunction<TData, TError, TVariables, TContext>\n  reset: MutationObserverResult<TData, TError, TVariables, TContext>['reset']\n}\n\nexport function useMutation<\n  TData = unknown,\n  TError = DefaultError,\n  TVariables = void,\n  TContext = unknown,\n>(\n  mutationOptions: MaybeRefDeep<\n    MutationObserverOptions<TData, TError, TVariables, TContext>\n  >,\n  queryClient?: QueryClient,\n): UseMutationReturnType<TData, TError, TVariables, TContext> {\n  const client = queryClient || useQueryClient()\n  const options = computed(() => {\n    return client.defaultMutationOptions(cloneDeepUnref(mutationOptions))\n  })\n  const observer = new MutationObserver(client, options.value)\n  const state = reactive(observer.getCurrentResult())\n\n  const unsubscribe = observer.subscribe((result) => {\n    updateState(state, result)\n  })\n\n  const mutate = (\n    variables: TVariables,\n    mutateOptions?: MutateOptions<TData, TError, TVariables, TContext>,\n  ) => {\n    observer.mutate(variables, mutateOptions).catch(() => {\n      // This is intentional\n    })\n  }\n\n  watch(\n    options,\n    () => {\n      observer.setOptions(options.value)\n    },\n    { deep: true },\n  )\n\n  onScopeDispose(() => {\n    unsubscribe()\n  })\n\n  const resultRefs = toRefs(readonly(state)) as unknown as ToRefs<\n    Readonly<MutationResult<TData, TError, TVariables, TContext>>\n  >\n\n  return {\n    ...resultRefs,\n    mutate,\n    mutateAsync: state.mutate,\n    reset: state.reset,\n  }\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,sBAOO;AACP,wBAAiC;AACjC,mBAA4C;AAC5C,4BAA+B;AA6CxB,SAAS,YAMd,iBAGA,aAC4D;AAC5D,QAAM,SAAS,mBAAe,sCAAe;AAC7C,QAAM,cAAU,0BAAS,MAAM;AAC7B,WAAO,OAAO,2BAAuB,6BAAe,eAAe,CAAC;AAAA,EACtE,CAAC;AACD,QAAM,WAAW,IAAI,mCAAiB,QAAQ,QAAQ,KAAK;AAC3D,QAAM,YAAQ,0BAAS,SAAS,iBAAiB,CAAC;AAElD,QAAM,cAAc,SAAS,UAAU,CAAC,WAAW;AACjD,kCAAY,OAAO,MAAM;AAAA,EAC3B,CAAC;AAED,QAAM,SAAS,CACb,WACA,kBACG;AACH,aAAS,OAAO,WAAW,aAAa,EAAE,MAAM,MAAM;AAAA,IAEtD,CAAC;AAAA,EACH;AAEA;AAAA,IACE;AAAA,IACA,MAAM;AACJ,eAAS,WAAW,QAAQ,KAAK;AAAA,IACnC;AAAA,IACA,EAAE,MAAM,KAAK;AAAA,EACf;AAEA,sCAAe,MAAM;AACnB,gBAAY;AAAA,EACd,CAAC;AAED,QAAM,iBAAa,4BAAO,0BAAS,KAAK,CAAC;AAIzC,SAAO;AAAA,IACL,GAAG;AAAA,IACH;AAAA,IACA,aAAa,MAAM;AAAA,IACnB,OAAO,MAAM;AAAA,EACf;AACF;","names":[]}
+{"version":3,"sources":["../../src/useMutation.ts"],"sourcesContent":["import {\n  computed,\n  getCurrentScope,\n  onScopeDispose,\n  reactive,\n  readonly,\n  toRefs,\n  watch,\n} from 'vue-demi'\nimport { MutationObserver } from '@tanstack/query-core'\nimport { cloneDeepUnref, shouldThrowError, updateState } from './utils'\nimport { useQueryClient } from './useQueryClient'\nimport type { ToRefs } from 'vue-demi'\nimport type {\n  DefaultError,\n  MutateFunction,\n  MutateOptions,\n  MutationObserverOptions,\n  MutationObserverResult,\n} from '@tanstack/query-core'\nimport type { DistributiveOmit, MaybeRefDeep } from './types'\nimport type { QueryClient } from './queryClient'\n\ntype MutationResult<TData, TError, TVariables, TContext> = DistributiveOmit<\n  MutationObserverResult<TData, TError, TVariables, TContext>,\n  'mutate' | 'reset'\n>\n\nexport type UseMutationOptions<\n  TData = unknown,\n  TError = DefaultError,\n  TVariables = void,\n  TContext = unknown,\n> = MaybeRefDeep<MutationObserverOptions<TData, TError, TVariables, TContext>>\n\ntype MutateSyncFunction<\n  TData = unknown,\n  TError = DefaultError,\n  TVariables = void,\n  TContext = unknown,\n> = (\n  ...options: Parameters<MutateFunction<TData, TError, TVariables, TContext>>\n) => void\n\nexport type UseMutationReturnType<\n  TData,\n  TError,\n  TVariables,\n  TContext,\n  Result = MutationResult<TData, TError, TVariables, TContext>,\n> = ToRefs<Readonly<Result>> & {\n  mutate: MutateSyncFunction<TData, TError, TVariables, TContext>\n  mutateAsync: MutateFunction<TData, TError, TVariables, TContext>\n  reset: MutationObserverResult<TData, TError, TVariables, TContext>['reset']\n}\n\nexport function useMutation<\n  TData = unknown,\n  TError = DefaultError,\n  TVariables = void,\n  TContext = unknown,\n>(\n  mutationOptions: MaybeRefDeep<\n    MutationObserverOptions<TData, TError, TVariables, TContext>\n  >,\n  queryClient?: QueryClient,\n): UseMutationReturnType<TData, TError, TVariables, TContext> {\n  if (process.env.NODE_ENV === 'development') {\n    if (!getCurrentScope()) {\n      console.warn(\n        'vue-query composables like \"useQuery()\" should only be used inside a \"setup()\" function or a running effect scope. They might otherwise lead to memory leaks.',\n      )\n    }\n  }\n\n  const client = queryClient || useQueryClient()\n  const options = computed(() => {\n    return client.defaultMutationOptions(cloneDeepUnref(mutationOptions))\n  })\n  const observer = new MutationObserver(client, options.value)\n  const state = reactive(observer.getCurrentResult())\n\n  const unsubscribe = observer.subscribe((result) => {\n    updateState(state, result)\n  })\n\n  const mutate = (\n    variables: TVariables,\n    mutateOptions?: MutateOptions<TData, TError, TVariables, TContext>,\n  ) => {\n    observer.mutate(variables, mutateOptions).catch(() => {\n      // This is intentional\n    })\n  }\n\n  watch(options, () => {\n    observer.setOptions(options.value)\n  })\n\n  onScopeDispose(() => {\n    unsubscribe()\n  })\n\n  const resultRefs = toRefs(readonly(state)) as unknown as ToRefs<\n    Readonly<MutationResult<TData, TError, TVariables, TContext>>\n  >\n\n  watch(\n    () => state.error,\n    (error) => {\n      if (\n        error &&\n        shouldThrowError(options.value.throwOnError, [error as TError])\n      ) {\n        throw error\n      }\n    },\n  )\n\n  return {\n    ...resultRefs,\n    mutate,\n    mutateAsync: state.mutate,\n    reset: state.reset,\n  }\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,sBAQO;AACP,wBAAiC;AACjC,mBAA8D;AAC9D,4BAA+B;AA6CxB,SAAS,YAMd,iBAGA,aAC4D;AAC5D,MAAI,QAAQ,IAAI,aAAa,eAAe;AAC1C,QAAI,KAAC,iCAAgB,GAAG;AACtB,cAAQ;AAAA,QACN;AAAA,MACF;AAAA,IACF;AAAA,EACF;AAEA,QAAM,SAAS,mBAAe,sCAAe;AAC7C,QAAM,cAAU,0BAAS,MAAM;AAC7B,WAAO,OAAO,2BAAuB,6BAAe,eAAe,CAAC;AAAA,EACtE,CAAC;AACD,QAAM,WAAW,IAAI,mCAAiB,QAAQ,QAAQ,KAAK;AAC3D,QAAM,YAAQ,0BAAS,SAAS,iBAAiB,CAAC;AAElD,QAAM,cAAc,SAAS,UAAU,CAAC,WAAW;AACjD,kCAAY,OAAO,MAAM;AAAA,EAC3B,CAAC;AAED,QAAM,SAAS,CACb,WACA,kBACG;AACH,aAAS,OAAO,WAAW,aAAa,EAAE,MAAM,MAAM;AAAA,IAEtD,CAAC;AAAA,EACH;AAEA,6BAAM,SAAS,MAAM;AACnB,aAAS,WAAW,QAAQ,KAAK;AAAA,EACnC,CAAC;AAED,sCAAe,MAAM;AACnB,gBAAY;AAAA,EACd,CAAC;AAED,QAAM,iBAAa,4BAAO,0BAAS,KAAK,CAAC;AAIzC;AAAA,IACE,MAAM,MAAM;AAAA,IACZ,CAAC,UAAU;AACT,UACE,aACA,+BAAiB,QAAQ,MAAM,cAAc,CAAC,KAAe,CAAC,GAC9D;AACA,cAAM;AAAA,MACR;AAAA,IACF;AAAA,EACF;AAEA,SAAO;AAAA,IACL,GAAG;AAAA,IACH;AAAA,IACA,aAAa,MAAM;AAAA,IACnB,OAAO,MAAM;AAAA,EACf;AACF;","names":[]}