@vueuse/integrations 12.2.0 → 12.3.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@vueuse/integrations",
   "type": "module",
-  "version": "12.2.0",
+  "version": "12.3.0",
   "description": "Integration wrappers for utility libraries",
   "author": "Anthony Fu <https://github.com/antfu>",
   "license": "MIT",
@@ -155,8 +155,8 @@
   },
   "dependencies": {
     "vue": "^3.5.13",
-    "@vueuse/core": "12.2.0",
-    "@vueuse/shared": "12.2.0"
+    "@vueuse/core": "12.3.0",
+    "@vueuse/shared": "12.3.0"
   },
   "devDependencies": {
     "@types/nprogress": "^0.2.3",

package/useAsyncValidator/component.cjs

@@ -17,7 +17,7 @@ function useAsyncValidator(value, rules, options = {}) {
   const pass = vue.ref(!immediate || manual);
   const errors = vue.computed(() => errorInfo.value?.errors || []);
   const errorFields = vue.computed(() => errorInfo.value?.fields || {});
-  const validator = vue.computed(() => new AsyncValidatorSchema(shared.toValue(rules)));
+  const validator = vue.computed(() => new AsyncValidatorSchema(vue.toValue(rules)));
   const execute = async () => {
     isFinished.value = false;
     pass.value = false;

package/useAsyncValidator/component.mjs

@@ -1,5 +1,5 @@
-import { shallowRef, ref, computed, watch, defineComponent, reactive } from 'vue';
-import { toRef, toValue, until } from '@vueuse/shared';
+import { shallowRef, ref, computed, toValue, watch, defineComponent, reactive } from 'vue';
+import { toRef, until } from '@vueuse/shared';
 import Schema from 'async-validator';
 
 const AsyncValidatorSchema = Schema.default || Schema;

package/useAsyncValidator.cjs

@@ -23,7 +23,7 @@ function useAsyncValidator(value, rules, options = {}) {
     var _a;
     return ((_a = errorInfo.value) == null ? void 0 : _a.fields) || {};
   });
-  const validator = vue.computed(() => new AsyncValidatorSchema(shared.toValue(rules)));
+  const validator = vue.computed(() => new AsyncValidatorSchema(vue.toValue(rules)));
   const execute = async () => {
     isFinished.value = false;
     pass.value = false;

package/useAsyncValidator.iife.js

@@ -20,7 +20,7 @@
       var _a;
       return ((_a = errorInfo.value) == null ? void 0 : _a.fields) || {};
     });
-    const validator = vue.computed(() => new AsyncValidatorSchema(shared.toValue(rules)));
+    const validator = vue.computed(() => new AsyncValidatorSchema(vue.toValue(rules)));
     const execute = async () => {
       isFinished.value = false;
       pass.value = false;

package/useAsyncValidator.iife.min.js

@@ -1 +1 @@
-(function(m,n,s,t){"use strict";const p=s.default||s;function y(w,A,F={}){const{validateOption:U={},immediate:o=!0,manual:i=!1}=F,c=n.toRef(w),r=t.shallowRef(null),a=t.ref(!0),l=t.ref(!o||i),d=t.computed(()=>{var e;return((e=r.value)==null?void 0:e.errors)||[]}),f=t.computed(()=>{var e;return((e=r.value)==null?void 0:e.fields)||{}}),v=t.computed(()=>new p(n.toValue(A))),h=async()=>{a.value=!1,l.value=!1;try{await v.value.validate(c.value,U),l.value=!0,r.value=null}catch(e){r.value=e}finally{a.value=!0}return{pass:l.value,errorInfo:r.value,errors:d.value,errorFields:f.value}};i||t.watch([c,v],()=>h(),{immediate:o,deep:!0});const V={isFinished:a,pass:l,errors:d,errorInfo:r,errorFields:f,execute:h};function R(){return new Promise((e,u)=>{n.until(a).toBe(!0).then(()=>e(V)).catch(I=>u(I))})}return{...V,then(e,u){return R().then(e,u)}}}m.useAsyncValidator=y})(this.VueUse=this.VueUse||{},VueUse,AsyncValidator,Vue);
+(function(m,s,u,t){"use strict";const p=u.default||u;function y(w,A,F={}){const{validateOption:U={},immediate:o=!0,manual:i=!1}=F,c=s.toRef(w),r=t.shallowRef(null),a=t.ref(!0),l=t.ref(!o||i),d=t.computed(()=>{var e;return((e=r.value)==null?void 0:e.errors)||[]}),f=t.computed(()=>{var e;return((e=r.value)==null?void 0:e.fields)||{}}),v=t.computed(()=>new p(t.toValue(A))),h=async()=>{a.value=!1,l.value=!1;try{await v.value.validate(c.value,U),l.value=!0,r.value=null}catch(e){r.value=e}finally{a.value=!0}return{pass:l.value,errorInfo:r.value,errors:d.value,errorFields:f.value}};i||t.watch([c,v],()=>h(),{immediate:o,deep:!0});const V={isFinished:a,pass:l,errors:d,errorInfo:r,errorFields:f,execute:h};function R(){return new Promise((e,n)=>{s.until(a).toBe(!0).then(()=>e(V)).catch(I=>n(I))})}return{...V,then(e,n){return R().then(e,n)}}}m.useAsyncValidator=y})(this.VueUse=this.VueUse||{},VueUse,AsyncValidator,Vue);

package/useAsyncValidator.mjs

@@ -1,6 +1,6 @@
-import { toRef, toValue, until } from '@vueuse/shared';
+import { toRef, until } from '@vueuse/shared';
 import Schema from 'async-validator';
-import { shallowRef, ref, computed, watch } from 'vue';
+import { shallowRef, ref, computed, toValue, watch } from 'vue';
 
 const AsyncValidatorSchema = Schema.default || Schema;
 function useAsyncValidator(value, rules, options = {}) {

package/useAxios.cjs

@@ -30,13 +30,13 @@ function useAxios(...args) {
     options = args[args.length - 1] || defaultOptions;
   }
   const {
-    initialData,
     shallow,
     onSuccess = shared.noop,
     onError = shared.noop,
     immediate,
     resetOnExecute = false
   } = options;
+  const initialData = options.initialData;
   const response = vue.shallowRef();
   const data = (shallow ? vue.shallowRef : vue.ref)(initialData);
   const isFinished = vue.ref(false);

package/useAxios.d.cts

@@ -1,7 +1,7 @@
 import { AxiosResponse, AxiosRequestConfig, AxiosInstance } from 'axios';
 import { ShallowRef, Ref } from 'vue';
 
-interface UseAxiosReturn<T, R = AxiosResponse<T>, _D = any> {
+interface UseAxiosReturn<T, R = AxiosResponse<T>, _D = any, O extends UseAxiosOptions = UseAxiosOptions<T>> {
     /**
      * Axios Response
      */
@@ -9,7 +9,7 @@ interface UseAxiosReturn<T, R = AxiosResponse<T>, _D = any> {
     /**
      * Axios response data
      */
-    data: Ref<T | undefined>;
+    data: O extends UseAxiosOptionsWithInitialData<T> ? Ref<T> : Ref<T | undefined>;
     /**
      * Indicates if the request has finished
      */
@@ -39,11 +39,11 @@ interface UseAxiosReturn<T, R = AxiosResponse<T>, _D = any> {
      */
     isCanceled: Ref<boolean>;
 }
-interface StrictUseAxiosReturn<T, R, D> extends UseAxiosReturn<T, R, D> {
+interface StrictUseAxiosReturn<T, R, D, O extends UseAxiosOptions = UseAxiosOptions<T>> extends UseAxiosReturn<T, R, D, O> {
     /**
      * Manually call the axios request
      */
-    execute: (url?: string | AxiosRequestConfig<D>, config?: AxiosRequestConfig<D>) => Promise<StrictUseAxiosReturn<T, R, D>>;
+    execute: (url?: string | AxiosRequestConfig<D>, config?: AxiosRequestConfig<D>) => Promise<StrictUseAxiosReturn<T, R, D, O>>;
 }
 interface EasyUseAxiosReturn<T, R, D> extends UseAxiosReturn<T, R, D> {
     /**
@@ -51,7 +51,7 @@ interface EasyUseAxiosReturn<T, R, D> extends UseAxiosReturn<T, R, D> {
      */
     execute: (url: string, config?: AxiosRequestConfig<D>) => Promise<EasyUseAxiosReturn<T, R, D>>;
 }
-interface UseAxiosOptions<T = any> {
+interface UseAxiosOptionsBase<T = any> {
     /**
      * Will automatically run axios request when `useAxios` is used
      *
@@ -77,10 +77,6 @@ interface UseAxiosOptions<T = any> {
      * Callback when success is caught.
      */
     onSuccess?: (data: T) => void;
-    /**
-     * Initial data to use
-     */
-    initialData?: T;
     /**
      * Sets the state to initialState before executing the promise.
      */
@@ -90,11 +86,21 @@ interface UseAxiosOptions<T = any> {
      */
     onFinish?: () => void;
 }
-declare function useAxios<T = any, R = AxiosResponse<T>, D = any>(url: string, config?: AxiosRequestConfig<D>, options?: UseAxiosOptions): StrictUseAxiosReturn<T, R, D> & Promise<StrictUseAxiosReturn<T, R, D>>;
-declare function useAxios<T = any, R = AxiosResponse<T>, D = any>(url: string, instance?: AxiosInstance, options?: UseAxiosOptions): StrictUseAxiosReturn<T, R, D> & Promise<StrictUseAxiosReturn<T, R, D>>;
-declare function useAxios<T = any, R = AxiosResponse<T>, D = any>(url: string, config: AxiosRequestConfig<D>, instance: AxiosInstance, options?: UseAxiosOptions): StrictUseAxiosReturn<T, R, D> & Promise<StrictUseAxiosReturn<T, R, D>>;
+interface UseAxiosOptionsWithInitialData<T> extends UseAxiosOptionsBase<T> {
+    /**
+     * Initial data
+     */
+    initialData: T;
+}
+type UseAxiosOptions<T = any> = UseAxiosOptionsBase<T> | UseAxiosOptionsWithInitialData<T>;
+declare function useAxios<T = any, R = AxiosResponse<T>, D = any, O extends UseAxiosOptionsWithInitialData<T> = UseAxiosOptionsWithInitialData<T>>(url: string, config?: AxiosRequestConfig<D>, options?: O): StrictUseAxiosReturn<T, R, D, O> & Promise<StrictUseAxiosReturn<T, R, D, O>>;
+declare function useAxios<T = any, R = AxiosResponse<T>, D = any, O extends UseAxiosOptionsWithInitialData<T> = UseAxiosOptionsWithInitialData<T>>(url: string, instance?: AxiosInstance, options?: O): StrictUseAxiosReturn<T, R, D, O> & Promise<StrictUseAxiosReturn<T, R, D, O>>;
+declare function useAxios<T = any, R = AxiosResponse<T>, D = any, O extends UseAxiosOptionsWithInitialData<T> = UseAxiosOptionsWithInitialData<T>>(url: string, config: AxiosRequestConfig<D>, instance: AxiosInstance, options?: O): StrictUseAxiosReturn<T, R, D, O> & Promise<StrictUseAxiosReturn<T, R, D, O>>;
+declare function useAxios<T = any, R = AxiosResponse<T>, D = any, O extends UseAxiosOptionsBase<T> = UseAxiosOptionsBase<T>>(url: string, config?: AxiosRequestConfig<D>, options?: O): StrictUseAxiosReturn<T, R, D, O> & Promise<StrictUseAxiosReturn<T, R, D, O>>;
+declare function useAxios<T = any, R = AxiosResponse<T>, D = any, O extends UseAxiosOptionsBase<T> = UseAxiosOptionsBase<T>>(url: string, instance?: AxiosInstance, options?: O): StrictUseAxiosReturn<T, R, D, O> & Promise<StrictUseAxiosReturn<T, R, D, O>>;
+declare function useAxios<T = any, R = AxiosResponse<T>, D = any, O extends UseAxiosOptionsBase<T> = UseAxiosOptionsBase<T>>(url: string, config: AxiosRequestConfig<D>, instance: AxiosInstance, options?: O): StrictUseAxiosReturn<T, R, D, O> & Promise<StrictUseAxiosReturn<T, R, D, O>>;
 declare function useAxios<T = any, R = AxiosResponse<T>, D = any>(config?: AxiosRequestConfig<D>): EasyUseAxiosReturn<T, R, D> & Promise<EasyUseAxiosReturn<T, R, D>>;
 declare function useAxios<T = any, R = AxiosResponse<T>, D = any>(instance?: AxiosInstance): EasyUseAxiosReturn<T, R, D> & Promise<EasyUseAxiosReturn<T, R, D>>;
 declare function useAxios<T = any, R = AxiosResponse<T>, D = any>(config?: AxiosRequestConfig<D>, instance?: AxiosInstance): EasyUseAxiosReturn<T, R, D> & Promise<EasyUseAxiosReturn<T, R, D>>;
 
-export { type EasyUseAxiosReturn, type StrictUseAxiosReturn, type UseAxiosOptions, type UseAxiosReturn, useAxios };
+export { type EasyUseAxiosReturn, type StrictUseAxiosReturn, type UseAxiosOptions, type UseAxiosOptionsBase, type UseAxiosOptionsWithInitialData, type UseAxiosReturn, useAxios };

package/useAxios.d.mts

@@ -1,7 +1,7 @@
 import { AxiosResponse, AxiosRequestConfig, AxiosInstance } from 'axios';
 import { ShallowRef, Ref } from 'vue';
 
-interface UseAxiosReturn<T, R = AxiosResponse<T>, _D = any> {
+interface UseAxiosReturn<T, R = AxiosResponse<T>, _D = any, O extends UseAxiosOptions = UseAxiosOptions<T>> {
     /**
      * Axios Response
      */
@@ -9,7 +9,7 @@ interface UseAxiosReturn<T, R = AxiosResponse<T>, _D = any> {
     /**
      * Axios response data
      */
-    data: Ref<T | undefined>;
+    data: O extends UseAxiosOptionsWithInitialData<T> ? Ref<T> : Ref<T | undefined>;
     /**
      * Indicates if the request has finished
      */
@@ -39,11 +39,11 @@ interface UseAxiosReturn<T, R = AxiosResponse<T>, _D = any> {
      */
     isCanceled: Ref<boolean>;
 }
-interface StrictUseAxiosReturn<T, R, D> extends UseAxiosReturn<T, R, D> {
+interface StrictUseAxiosReturn<T, R, D, O extends UseAxiosOptions = UseAxiosOptions<T>> extends UseAxiosReturn<T, R, D, O> {
     /**
      * Manually call the axios request
      */
-    execute: (url?: string | AxiosRequestConfig<D>, config?: AxiosRequestConfig<D>) => Promise<StrictUseAxiosReturn<T, R, D>>;
+    execute: (url?: string | AxiosRequestConfig<D>, config?: AxiosRequestConfig<D>) => Promise<StrictUseAxiosReturn<T, R, D, O>>;
 }
 interface EasyUseAxiosReturn<T, R, D> extends UseAxiosReturn<T, R, D> {
     /**
@@ -51,7 +51,7 @@ interface EasyUseAxiosReturn<T, R, D> extends UseAxiosReturn<T, R, D> {
      */
     execute: (url: string, config?: AxiosRequestConfig<D>) => Promise<EasyUseAxiosReturn<T, R, D>>;
 }
-interface UseAxiosOptions<T = any> {
+interface UseAxiosOptionsBase<T = any> {
     /**
      * Will automatically run axios request when `useAxios` is used
      *
@@ -77,10 +77,6 @@ interface UseAxiosOptions<T = any> {
      * Callback when success is caught.
      */
     onSuccess?: (data: T) => void;
-    /**
-     * Initial data to use
-     */
-    initialData?: T;
     /**
      * Sets the state to initialState before executing the promise.
      */
@@ -90,11 +86,21 @@ interface UseAxiosOptions<T = any> {
      */
     onFinish?: () => void;
 }
-declare function useAxios<T = any, R = AxiosResponse<T>, D = any>(url: string, config?: AxiosRequestConfig<D>, options?: UseAxiosOptions): StrictUseAxiosReturn<T, R, D> & Promise<StrictUseAxiosReturn<T, R, D>>;
-declare function useAxios<T = any, R = AxiosResponse<T>, D = any>(url: string, instance?: AxiosInstance, options?: UseAxiosOptions): StrictUseAxiosReturn<T, R, D> & Promise<StrictUseAxiosReturn<T, R, D>>;
-declare function useAxios<T = any, R = AxiosResponse<T>, D = any>(url: string, config: AxiosRequestConfig<D>, instance: AxiosInstance, options?: UseAxiosOptions): StrictUseAxiosReturn<T, R, D> & Promise<StrictUseAxiosReturn<T, R, D>>;
+interface UseAxiosOptionsWithInitialData<T> extends UseAxiosOptionsBase<T> {
+    /**
+     * Initial data
+     */
+    initialData: T;
+}
+type UseAxiosOptions<T = any> = UseAxiosOptionsBase<T> | UseAxiosOptionsWithInitialData<T>;
+declare function useAxios<T = any, R = AxiosResponse<T>, D = any, O extends UseAxiosOptionsWithInitialData<T> = UseAxiosOptionsWithInitialData<T>>(url: string, config?: AxiosRequestConfig<D>, options?: O): StrictUseAxiosReturn<T, R, D, O> & Promise<StrictUseAxiosReturn<T, R, D, O>>;
+declare function useAxios<T = any, R = AxiosResponse<T>, D = any, O extends UseAxiosOptionsWithInitialData<T> = UseAxiosOptionsWithInitialData<T>>(url: string, instance?: AxiosInstance, options?: O): StrictUseAxiosReturn<T, R, D, O> & Promise<StrictUseAxiosReturn<T, R, D, O>>;
+declare function useAxios<T = any, R = AxiosResponse<T>, D = any, O extends UseAxiosOptionsWithInitialData<T> = UseAxiosOptionsWithInitialData<T>>(url: string, config: AxiosRequestConfig<D>, instance: AxiosInstance, options?: O): StrictUseAxiosReturn<T, R, D, O> & Promise<StrictUseAxiosReturn<T, R, D, O>>;
+declare function useAxios<T = any, R = AxiosResponse<T>, D = any, O extends UseAxiosOptionsBase<T> = UseAxiosOptionsBase<T>>(url: string, config?: AxiosRequestConfig<D>, options?: O): StrictUseAxiosReturn<T, R, D, O> & Promise<StrictUseAxiosReturn<T, R, D, O>>;
+declare function useAxios<T = any, R = AxiosResponse<T>, D = any, O extends UseAxiosOptionsBase<T> = UseAxiosOptionsBase<T>>(url: string, instance?: AxiosInstance, options?: O): StrictUseAxiosReturn<T, R, D, O> & Promise<StrictUseAxiosReturn<T, R, D, O>>;
+declare function useAxios<T = any, R = AxiosResponse<T>, D = any, O extends UseAxiosOptionsBase<T> = UseAxiosOptionsBase<T>>(url: string, config: AxiosRequestConfig<D>, instance: AxiosInstance, options?: O): StrictUseAxiosReturn<T, R, D, O> & Promise<StrictUseAxiosReturn<T, R, D, O>>;
 declare function useAxios<T = any, R = AxiosResponse<T>, D = any>(config?: AxiosRequestConfig<D>): EasyUseAxiosReturn<T, R, D> & Promise<EasyUseAxiosReturn<T, R, D>>;
 declare function useAxios<T = any, R = AxiosResponse<T>, D = any>(instance?: AxiosInstance): EasyUseAxiosReturn<T, R, D> & Promise<EasyUseAxiosReturn<T, R, D>>;
 declare function useAxios<T = any, R = AxiosResponse<T>, D = any>(config?: AxiosRequestConfig<D>, instance?: AxiosInstance): EasyUseAxiosReturn<T, R, D> & Promise<EasyUseAxiosReturn<T, R, D>>;
 
-export { type EasyUseAxiosReturn, type StrictUseAxiosReturn, type UseAxiosOptions, type UseAxiosReturn, useAxios };
+export { type EasyUseAxiosReturn, type StrictUseAxiosReturn, type UseAxiosOptions, type UseAxiosOptionsBase, type UseAxiosOptionsWithInitialData, type UseAxiosReturn, useAxios };

package/useAxios.d.ts

@@ -1,7 +1,7 @@
 import { AxiosResponse, AxiosRequestConfig, AxiosInstance } from 'axios';
 import { ShallowRef, Ref } from 'vue';
 
-interface UseAxiosReturn<T, R = AxiosResponse<T>, _D = any> {
+interface UseAxiosReturn<T, R = AxiosResponse<T>, _D = any, O extends UseAxiosOptions = UseAxiosOptions<T>> {
     /**
      * Axios Response
      */
@@ -9,7 +9,7 @@ interface UseAxiosReturn<T, R = AxiosResponse<T>, _D = any> {
     /**
      * Axios response data
      */
-    data: Ref<T | undefined>;
+    data: O extends UseAxiosOptionsWithInitialData<T> ? Ref<T> : Ref<T | undefined>;
     /**
      * Indicates if the request has finished
      */
@@ -39,11 +39,11 @@ interface UseAxiosReturn<T, R = AxiosResponse<T>, _D = any> {
      */
     isCanceled: Ref<boolean>;
 }
-interface StrictUseAxiosReturn<T, R, D> extends UseAxiosReturn<T, R, D> {
+interface StrictUseAxiosReturn<T, R, D, O extends UseAxiosOptions = UseAxiosOptions<T>> extends UseAxiosReturn<T, R, D, O> {
     /**
      * Manually call the axios request
      */
-    execute: (url?: string | AxiosRequestConfig<D>, config?: AxiosRequestConfig<D>) => Promise<StrictUseAxiosReturn<T, R, D>>;
+    execute: (url?: string | AxiosRequestConfig<D>, config?: AxiosRequestConfig<D>) => Promise<StrictUseAxiosReturn<T, R, D, O>>;
 }
 interface EasyUseAxiosReturn<T, R, D> extends UseAxiosReturn<T, R, D> {
     /**
@@ -51,7 +51,7 @@ interface EasyUseAxiosReturn<T, R, D> extends UseAxiosReturn<T, R, D> {
      */
     execute: (url: string, config?: AxiosRequestConfig<D>) => Promise<EasyUseAxiosReturn<T, R, D>>;
 }
-interface UseAxiosOptions<T = any> {
+interface UseAxiosOptionsBase<T = any> {
     /**
      * Will automatically run axios request when `useAxios` is used
      *
@@ -77,10 +77,6 @@ interface UseAxiosOptions<T = any> {
      * Callback when success is caught.
      */
     onSuccess?: (data: T) => void;
-    /**
-     * Initial data to use
-     */
-    initialData?: T;
     /**
      * Sets the state to initialState before executing the promise.
      */
@@ -90,11 +86,21 @@ interface UseAxiosOptions<T = any> {
      */
     onFinish?: () => void;
 }
-declare function useAxios<T = any, R = AxiosResponse<T>, D = any>(url: string, config?: AxiosRequestConfig<D>, options?: UseAxiosOptions): StrictUseAxiosReturn<T, R, D> & Promise<StrictUseAxiosReturn<T, R, D>>;
-declare function useAxios<T = any, R = AxiosResponse<T>, D = any>(url: string, instance?: AxiosInstance, options?: UseAxiosOptions): StrictUseAxiosReturn<T, R, D> & Promise<StrictUseAxiosReturn<T, R, D>>;
-declare function useAxios<T = any, R = AxiosResponse<T>, D = any>(url: string, config: AxiosRequestConfig<D>, instance: AxiosInstance, options?: UseAxiosOptions): StrictUseAxiosReturn<T, R, D> & Promise<StrictUseAxiosReturn<T, R, D>>;
+interface UseAxiosOptionsWithInitialData<T> extends UseAxiosOptionsBase<T> {
+    /**
+     * Initial data
+     */
+    initialData: T;
+}
+type UseAxiosOptions<T = any> = UseAxiosOptionsBase<T> | UseAxiosOptionsWithInitialData<T>;
+declare function useAxios<T = any, R = AxiosResponse<T>, D = any, O extends UseAxiosOptionsWithInitialData<T> = UseAxiosOptionsWithInitialData<T>>(url: string, config?: AxiosRequestConfig<D>, options?: O): StrictUseAxiosReturn<T, R, D, O> & Promise<StrictUseAxiosReturn<T, R, D, O>>;
+declare function useAxios<T = any, R = AxiosResponse<T>, D = any, O extends UseAxiosOptionsWithInitialData<T> = UseAxiosOptionsWithInitialData<T>>(url: string, instance?: AxiosInstance, options?: O): StrictUseAxiosReturn<T, R, D, O> & Promise<StrictUseAxiosReturn<T, R, D, O>>;
+declare function useAxios<T = any, R = AxiosResponse<T>, D = any, O extends UseAxiosOptionsWithInitialData<T> = UseAxiosOptionsWithInitialData<T>>(url: string, config: AxiosRequestConfig<D>, instance: AxiosInstance, options?: O): StrictUseAxiosReturn<T, R, D, O> & Promise<StrictUseAxiosReturn<T, R, D, O>>;
+declare function useAxios<T = any, R = AxiosResponse<T>, D = any, O extends UseAxiosOptionsBase<T> = UseAxiosOptionsBase<T>>(url: string, config?: AxiosRequestConfig<D>, options?: O): StrictUseAxiosReturn<T, R, D, O> & Promise<StrictUseAxiosReturn<T, R, D, O>>;
+declare function useAxios<T = any, R = AxiosResponse<T>, D = any, O extends UseAxiosOptionsBase<T> = UseAxiosOptionsBase<T>>(url: string, instance?: AxiosInstance, options?: O): StrictUseAxiosReturn<T, R, D, O> & Promise<StrictUseAxiosReturn<T, R, D, O>>;
+declare function useAxios<T = any, R = AxiosResponse<T>, D = any, O extends UseAxiosOptionsBase<T> = UseAxiosOptionsBase<T>>(url: string, config: AxiosRequestConfig<D>, instance: AxiosInstance, options?: O): StrictUseAxiosReturn<T, R, D, O> & Promise<StrictUseAxiosReturn<T, R, D, O>>;
 declare function useAxios<T = any, R = AxiosResponse<T>, D = any>(config?: AxiosRequestConfig<D>): EasyUseAxiosReturn<T, R, D> & Promise<EasyUseAxiosReturn<T, R, D>>;
 declare function useAxios<T = any, R = AxiosResponse<T>, D = any>(instance?: AxiosInstance): EasyUseAxiosReturn<T, R, D> & Promise<EasyUseAxiosReturn<T, R, D>>;
 declare function useAxios<T = any, R = AxiosResponse<T>, D = any>(config?: AxiosRequestConfig<D>, instance?: AxiosInstance): EasyUseAxiosReturn<T, R, D> & Promise<EasyUseAxiosReturn<T, R, D>>;
 
-export { type EasyUseAxiosReturn, type StrictUseAxiosReturn, type UseAxiosOptions, type UseAxiosReturn, useAxios };
+export { type EasyUseAxiosReturn, type StrictUseAxiosReturn, type UseAxiosOptions, type UseAxiosOptionsBase, type UseAxiosOptionsWithInitialData, type UseAxiosReturn, useAxios };

package/useAxios.iife.js

@@ -27,13 +27,13 @@
       options = args[args.length - 1] || defaultOptions;
     }
     const {
-      initialData,
       shallow,
       onSuccess = shared.noop,
       onError = shared.noop,
       immediate,
       resetOnExecute = false
     } = options;
+    const initialData = options.initialData;
     const response = vue.shallowRef();
     const data = (shallow ? vue.shallowRef : vue.ref)(initialData);
     const isFinished = vue.ref(false);

package/useAxios.iife.min.js

@@ -1 +1 @@
-(function(L,h,v,l){"use strict";function O(...t){const r=typeof t[0]=="string"?t[0]:void 0,n=typeof r=="string"?1:0,E={immediate:!!n,shallow:!0,abortPrevious:!0};let R={},d=v,u=E;const p=e=>!!e?.request;t.length>0+n&&(p(t[0+n])?d=t[0+n]:R=t[0+n]),t.length>1+n&&p(t[1+n])&&(d=t[1+n]),(t.length===2+n&&!p(t[1+n])||t.length===3+n)&&(u=t[t.length-1]||E);const{initialData:x,shallow:U,onSuccess:j=h.noop,onError:q=h.noop,immediate:B,resetOnExecute:N=!1}=u,y=l.shallowRef(),w=(U?l.shallowRef:l.ref)(x),s=l.ref(!1),c=l.ref(!1),a=l.ref(!1),i=l.shallowRef();let b=new AbortController;const A=e=>{s.value||!c.value||(b.abort(e),b=new AbortController,a.value=!0,c.value=!1,s.value=!1)},V=e=>{c.value=e,s.value=!e},S=()=>{N&&(w.value=x)},P=()=>new Promise((e,f)=>{h.until(s).toBe(!0).then(()=>i.value?f(i.value):e(D))}),C={then:(...e)=>P().then(...e),catch:(...e)=>P().catch(...e)};let m=0;const _=(e=r,f={})=>{i.value=void 0;const F=typeof e=="string"?e:r??f.url;if(F===void 0)return i.value=new v.AxiosError(v.AxiosError.ERR_INVALID_URL),s.value=!0,C;S(),u.abortPrevious!==!1&&A(),V(!0),m+=1;const k=m;return a.value=!1,d(F,{...R,...typeof e=="object"?e:f,signal:b.signal}).then(o=>{if(a.value)return;y.value=o;const I=o.data;w.value=I,j(I)}).catch(o=>{i.value=o,q(o)}).finally(()=>{var o;(o=u.onFinish)==null||o.call(u),k===m&&V(!1)}),C};B&&r&&_();const D={response:y,data:w,error:i,isFinished:s,isLoading:c,cancel:A,isAborted:a,isCanceled:a,abort:A,execute:_};return{...D,...C}}L.useAxios=O})(this.VueUse=this.VueUse||{},VueUse,axios,Vue);
+(function(L,h,v,l){"use strict";function O(...t){const r=typeof t[0]=="string"?t[0]:void 0,n=typeof r=="string"?1:0,E={immediate:!!n,shallow:!0,abortPrevious:!0};let R={},d=v,s=E;const p=e=>!!e?.request;t.length>0+n&&(p(t[0+n])?d=t[0+n]:R=t[0+n]),t.length>1+n&&p(t[1+n])&&(d=t[1+n]),(t.length===2+n&&!p(t[1+n])||t.length===3+n)&&(s=t[t.length-1]||E);const{shallow:U,onSuccess:j=h.noop,onError:q=h.noop,immediate:B,resetOnExecute:N=!1}=s,x=s.initialData,y=l.shallowRef(),w=(U?l.shallowRef:l.ref)(x),i=l.ref(!1),c=l.ref(!1),u=l.ref(!1),a=l.shallowRef();let b=new AbortController;const A=e=>{i.value||!c.value||(b.abort(e),b=new AbortController,u.value=!0,c.value=!1,i.value=!1)},V=e=>{c.value=e,i.value=!e},S=()=>{N&&(w.value=x)},D=()=>new Promise((e,f)=>{h.until(i).toBe(!0).then(()=>a.value?f(a.value):e(_))}),C={then:(...e)=>D().then(...e),catch:(...e)=>D().catch(...e)};let m=0;const P=(e=r,f={})=>{a.value=void 0;const F=typeof e=="string"?e:r??f.url;if(F===void 0)return a.value=new v.AxiosError(v.AxiosError.ERR_INVALID_URL),i.value=!0,C;S(),s.abortPrevious!==!1&&A(),V(!0),m+=1;const k=m;return u.value=!1,d(F,{...R,...typeof e=="object"?e:f,signal:b.signal}).then(o=>{if(u.value)return;y.value=o;const I=o.data;w.value=I,j(I)}).catch(o=>{a.value=o,q(o)}).finally(()=>{var o;(o=s.onFinish)==null||o.call(s),k===m&&V(!1)}),C};B&&r&&P();const _={response:y,data:w,error:a,isFinished:i,isLoading:c,cancel:A,isAborted:u,isCanceled:u,abort:A,execute:P};return{..._,...C}}L.useAxios=O})(this.VueUse=this.VueUse||{},VueUse,axios,Vue);

package/useAxios.mjs

@@ -28,13 +28,13 @@ function useAxios(...args) {
     options = args[args.length - 1] || defaultOptions;
   }
   const {
-    initialData,
     shallow,
     onSuccess = noop,
     onError = noop,
     immediate,
     resetOnExecute = false
   } = options;
+  const initialData = options.initialData;
   const response = shallowRef();
   const data = (shallow ? shallowRef : ref)(initialData);
   const isFinished = ref(false);

package/useChangeCase.cjs

@@ -1,6 +1,5 @@
 'use strict';
 
-var shared = require('@vueuse/shared');
 var changeCase = require('change-case');
 var vue = require('vue');
 
@@ -29,17 +28,17 @@ const changeCaseTransforms = /* @__PURE__ */ Object.entries(changeCase__namespac
 }, {});
 function useChangeCase(input, type, options) {
   const typeRef = vue.computed(() => {
-    const t = shared.toValue(type);
+    const t = vue.toValue(type);
     if (!changeCaseTransforms[t])
       throw new Error(`Invalid change case type "${t}"`);
     return t;
   });
   if (typeof input === "function")
-    return vue.computed(() => changeCaseTransforms[typeRef.value](shared.toValue(input), shared.toValue(options)));
+    return vue.computed(() => changeCaseTransforms[typeRef.value](vue.toValue(input), vue.toValue(options)));
   const text = vue.ref(input);
   return vue.computed({
     get() {
-      return changeCaseTransforms[typeRef.value](text.value, shared.toValue(options));
+      return changeCaseTransforms[typeRef.value](text.value, vue.toValue(options));
     },
     set(value) {
       text.value = value;

package/useChangeCase.iife.js

@@ -1,4 +1,4 @@
-(function (exports, shared, changeCase, vue) {
+(function (exports, changeCase, vue) {
   'use strict';
 
   function _interopNamespaceDefault(e) {
@@ -26,17 +26,17 @@
   }, {});
   function useChangeCase(input, type, options) {
     const typeRef = vue.computed(() => {
-      const t = shared.toValue(type);
+      const t = vue.toValue(type);
       if (!changeCaseTransforms[t])
         throw new Error(`Invalid change case type "${t}"`);
       return t;
     });
     if (typeof input === "function")
-      return vue.computed(() => changeCaseTransforms[typeRef.value](shared.toValue(input), shared.toValue(options)));
+      return vue.computed(() => changeCaseTransforms[typeRef.value](vue.toValue(input), vue.toValue(options)));
     const text = vue.ref(input);
     return vue.computed({
       get() {
-        return changeCaseTransforms[typeRef.value](text.value, shared.toValue(options));
+        return changeCaseTransforms[typeRef.value](text.value, vue.toValue(options));
       },
       set(value) {
         text.value = value;
@@ -46,4 +46,4 @@
 
   exports.useChangeCase = useChangeCase;
 
-})(this.VueUse = this.VueUse || {}, VueUse, changeCase, Vue);
+})(this.VueUse = this.VueUse || {}, changeCase, Vue);

package/useChangeCase.iife.min.js

@@ -1 +1 @@
-(function(f,a,i,c){"use strict";function l(e){var t=Object.create(null);return e&&Object.keys(e).forEach(function(n){if(n!=="default"){var r=Object.getOwnPropertyDescriptor(e,n);Object.defineProperty(t,n,r.get?r:{enumerable:!0,get:function(){return e[n]}})}}),t.default=e,Object.freeze(t)}var g=l(i);const o=Object.entries(g).filter(([e,t])=>typeof t=="function"&&e.endsWith("Case")).reduce((e,[t,n])=>(e[t]=n,e),{});function p(e,t,n){const r=c.computed(()=>{const u=a.toValue(t);if(!o[u])throw new Error(`Invalid change case type "${u}"`);return u});if(typeof e=="function")return c.computed(()=>o[r.value](a.toValue(e),a.toValue(n)));const s=c.ref(e);return c.computed({get(){return o[r.value](s.value,a.toValue(n))},set(u){s.value=u}})}f.useChangeCase=p})(this.VueUse=this.VueUse||{},VueUse,changeCase,Vue);
+(function(o,f,r){"use strict";function i(e){var t=Object.create(null);return e&&Object.keys(e).forEach(function(n){if(n!=="default"){var a=Object.getOwnPropertyDescriptor(e,n);Object.defineProperty(t,n,a.get?a:{enumerable:!0,get:function(){return e[n]}})}}),t.default=e,Object.freeze(t)}var l=i(f);const u=Object.entries(l).filter(([e,t])=>typeof t=="function"&&e.endsWith("Case")).reduce((e,[t,n])=>(e[t]=n,e),{});function h(e,t,n){const a=r.computed(()=>{const c=r.toValue(t);if(!u[c])throw new Error(`Invalid change case type "${c}"`);return c});if(typeof e=="function")return r.computed(()=>u[a.value](r.toValue(e),r.toValue(n)));const s=r.ref(e);return r.computed({get(){return u[a.value](s.value,r.toValue(n))},set(c){s.value=c}})}o.useChangeCase=h})(this.VueUse=this.VueUse||{},changeCase,Vue);

package/useChangeCase.mjs

@@ -1,6 +1,5 @@
-import { toValue } from '@vueuse/shared';
 import * as changeCase from 'change-case';
-import { computed, ref } from 'vue';
+import { computed, toValue, ref } from 'vue';
 
 const changeCaseTransforms = /* @__PURE__ */ Object.entries(changeCase).filter(([name, fn]) => typeof fn === "function" && name.endsWith("Case")).reduce((acc, [name, fn]) => {
   acc[name] = fn;

package/useFocusTrap.cjs

@@ -25,9 +25,9 @@ function useFocusTrap(target, options = {}) {
     }
   };
   const targets = vue.computed(() => {
-    const _targets = shared.toValue(target);
-    return (Array.isArray(_targets) ? _targets : [_targets]).map((el) => {
-      const _el = shared.toValue(el);
+    const _targets = vue.toValue(target);
+    return core.toArray(_targets).map((el) => {
+      const _el = vue.toValue(el);
       return typeof _el === "string" ? _el : core.unrefElement(_el);
     }).filter(shared.notNullish);
   });

package/useFocusTrap.d.cts

@@ -1,7 +1,7 @@
 import { Fn, Arrayable, MaybeComputedElementRef } from '@vueuse/core';
+import { MaybeRefOrGetter } from '@vueuse/shared';
 import { Options, ActivateOptions, DeactivateOptions } from 'focus-trap';
 import { Ref } from 'vue';
-import { MaybeRefOrGetter } from '@vueuse/shared';
 
 interface UseFocusTrapOptions extends Options {
     /**

package/useFocusTrap.d.mts

@@ -1,7 +1,7 @@
 import { Fn, Arrayable, MaybeComputedElementRef } from '@vueuse/core';
+import { MaybeRefOrGetter } from '@vueuse/shared';
 import { Options, ActivateOptions, DeactivateOptions } from 'focus-trap';
 import { Ref } from 'vue';
-import { MaybeRefOrGetter } from '@vueuse/shared';
 
 interface UseFocusTrapOptions extends Options {
     /**

package/useFocusTrap.d.ts

@@ -1,7 +1,7 @@
 import { Fn, Arrayable, MaybeComputedElementRef } from '@vueuse/core';
+import { MaybeRefOrGetter } from '@vueuse/shared';
 import { Options, ActivateOptions, DeactivateOptions } from 'focus-trap';
 import { Ref } from 'vue';
-import { MaybeRefOrGetter } from '@vueuse/shared';
 
 interface UseFocusTrapOptions extends Options {
     /**

package/useFocusTrap.iife.js

@@ -21,9 +21,9 @@
       }
     };
     const targets = vue.computed(() => {
-      const _targets = shared.toValue(target);
-      return (Array.isArray(_targets) ? _targets : [_targets]).map((el) => {
-        const _el = shared.toValue(el);
+      const _targets = vue.toValue(target);
+      return core.toArray(_targets).map((el) => {
+        const _el = vue.toValue(el);
         return typeof _el === "string" ? _el : core.unrefElement(_el);
       }).filter(shared.notNullish);
     });

package/useFocusTrap.iife.min.js

@@ -1 +1 @@
-(function(l,i,u,p,s){"use strict";function v(V,a={}){let t;const{immediate:h,...m}=a,c=s.ref(!1),n=s.ref(!1),o=e=>t&&t.activate(e),f=e=>t&&t.deactivate(e),A=()=>{t&&(t.pause(),n.value=!0)},T=()=>{t&&(t.unpause(),n.value=!1)},g=s.computed(()=>{const e=u.toValue(V);return(Array.isArray(e)?e:[e]).map(y=>{const r=u.toValue(y);return typeof r=="string"?r:i.unrefElement(r)}).filter(u.notNullish)});return s.watch(g,e=>{e.length&&(t=p.createFocusTrap(e,{...m,onActivate(){c.value=!0,a.onActivate&&a.onActivate()},onDeactivate(){c.value=!1,a.onDeactivate&&a.onDeactivate()}}),h&&o())},{flush:"post"}),i.tryOnScopeDispose(()=>f()),{hasFocus:c,isPaused:n,activate:o,deactivate:f,pause:A,unpause:T}}l.useFocusTrap=v})(this.VueUse=this.VueUse||{},VueUse,VueUse,focusTrap,Vue);
+(function(f,u,l,p,a){"use strict";function v(h,s={}){let t;const{immediate:V,...d}=s,c=a.ref(!1),n=a.ref(!1),i=e=>t&&t.activate(e),o=e=>t&&t.deactivate(e),m=()=>{t&&(t.pause(),n.value=!0)},T=()=>{t&&(t.unpause(),n.value=!1)},g=a.computed(()=>{const e=a.toValue(h);return u.toArray(e).map(A=>{const r=a.toValue(A);return typeof r=="string"?r:u.unrefElement(r)}).filter(l.notNullish)});return a.watch(g,e=>{e.length&&(t=p.createFocusTrap(e,{...d,onActivate(){c.value=!0,s.onActivate&&s.onActivate()},onDeactivate(){c.value=!1,s.onDeactivate&&s.onDeactivate()}}),V&&i())},{flush:"post"}),u.tryOnScopeDispose(()=>o()),{hasFocus:c,isPaused:n,activate:i,deactivate:o,pause:m,unpause:T}}f.useFocusTrap=v})(this.VueUse=this.VueUse||{},VueUse,VueUse,focusTrap,Vue);

package/useFocusTrap.mjs

@@ -1,7 +1,7 @@
-import { unrefElement, tryOnScopeDispose } from '@vueuse/core';
-import { toValue, notNullish } from '@vueuse/shared';
+import { toArray, unrefElement, tryOnScopeDispose } from '@vueuse/core';
+import { notNullish } from '@vueuse/shared';
 import { createFocusTrap } from 'focus-trap';
-import { ref, computed, watch } from 'vue';
+import { ref, computed, toValue, watch } from 'vue';
 
 function useFocusTrap(target, options = {}) {
   let trap;
@@ -24,7 +24,7 @@ function useFocusTrap(target, options = {}) {
   };
   const targets = computed(() => {
     const _targets = toValue(target);
-    return (Array.isArray(_targets) ? _targets : [_targets]).map((el) => {
+    return toArray(_targets).map((el) => {
       const _el = toValue(el);
       return typeof _el === "string" ? _el : unrefElement(_el);
     }).filter(notNullish);

package/useFuse.cjs

@@ -1,6 +1,5 @@
 'use strict';
 
-var shared = require('@vueuse/shared');
 var Fuse = require('fuse.js');
 var vue = require('vue');
 
@@ -8,15 +7,15 @@ function useFuse(search, data, options) {
   const createFuse = () => {
     var _a, _b;
     return new Fuse(
-      (_a = shared.toValue(data)) != null ? _a : [],
-      (_b = shared.toValue(options)) == null ? void 0 : _b.fuseOptions
+      (_a = vue.toValue(data)) != null ? _a : [],
+      (_b = vue.toValue(options)) == null ? void 0 : _b.fuseOptions
     );
   };
   const fuse = vue.ref(createFuse());
   vue.watch(
     () => {
       var _a;
-      return (_a = shared.toValue(options)) == null ? void 0 : _a.fuseOptions;
+      return (_a = vue.toValue(options)) == null ? void 0 : _a.fuseOptions;
     },
     () => {
       fuse.value = createFuse();
@@ -24,18 +23,18 @@ function useFuse(search, data, options) {
     { deep: true }
   );
   vue.watch(
-    () => shared.toValue(data),
+    () => vue.toValue(data),
     (newData) => {
       fuse.value.setCollection(newData);
     },
     { deep: true }
   );
   const results = vue.computed(() => {
-    const resolved = shared.toValue(options);
-    if ((resolved == null ? void 0 : resolved.matchAllWhenSearchEmpty) && !shared.toValue(search))
-      return shared.toValue(data).map((item, index) => ({ item, refIndex: index }));
+    const resolved = vue.toValue(options);
+    if ((resolved == null ? void 0 : resolved.matchAllWhenSearchEmpty) && !vue.toValue(search))
+      return vue.toValue(data).map((item, index) => ({ item, refIndex: index }));
     const limit = resolved == null ? void 0 : resolved.resultLimit;
-    return fuse.value.search(shared.toValue(search), limit ? { limit } : void 0);
+    return fuse.value.search(vue.toValue(search), limit ? { limit } : void 0);
   });
   return {
     fuse,