@vueuse/integrations 7.7.1 → 8.0.0-beta.2

package/index.cjs

@@ -3,8 +3,8 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var vueDemi = require('vue-demi');
-var axios = require('axios');
 var shared = require('@vueuse/shared');
+var axios = require('axios');
 var Cookie = require('universal-cookie');
 var drauu = require('drauu');
 var core = require('@vueuse/core');
@@ -56,7 +56,7 @@ function useAxios(url, ...args) {
     if ("request" in args[1])
       instance = args[1];
   }
-  if (args.length >= 2)
+  if (args.length === 2 && !("request" in args[1]) || args.length === 3)
     options = args[args.length - 1];
   const response = vueDemi.shallowRef();
   const data = vueDemi.shallowRef();
@@ -90,7 +90,7 @@ function useAxios(url, ...args) {
   };
   if (options.immediate)
     execute();
-  return {
+  const result = {
     response,
     data,
     error,
@@ -104,6 +104,16 @@ function useAxios(url, ...args) {
     abort,
     execute
   };
+  function waitUntilFinished() {
+    return new Promise((resolve, reject) => {
+      shared.until(isFinished).toBe(true).then(() => resolve(result)).catch((error2) => reject(error2));
+    });
+  }
+  return __spreadProps$1(__spreadValues$3({}, result), {
+    then(onFulfilled, onRejected) {
+      return waitUntilFinished().then(onFulfilled, onRejected);
+    }
+  });
 }
 
 var __defProp$2 = Object.defineProperty;

package/index.d.ts

@@ -55,9 +55,9 @@ interface UseAxiosOptions {
      */
     immediate?: boolean;
 }
-declare function useAxios<T = any>(url: string, config?: AxiosRequestConfig, options?: UseAxiosOptions): UseAxiosReturn<T>;
-declare function useAxios<T = any>(url: string, instance?: AxiosInstance, options?: UseAxiosOptions): UseAxiosReturn<T>;
-declare function useAxios<T = any>(url: string, config: AxiosRequestConfig, instance: AxiosInstance, options?: UseAxiosOptions): UseAxiosReturn<T>;
+declare function useAxios<T = any>(url: string, config?: AxiosRequestConfig, options?: UseAxiosOptions): UseAxiosReturn<T> & PromiseLike<UseAxiosReturn<T>>;
+declare function useAxios<T = any>(url: string, instance?: AxiosInstance, options?: UseAxiosOptions): UseAxiosReturn<T> & PromiseLike<UseAxiosReturn<T>>;
+declare function useAxios<T = any>(url: string, config: AxiosRequestConfig, instance: AxiosInstance, options?: UseAxiosOptions): UseAxiosReturn<T> & PromiseLike<UseAxiosReturn<T>>;
 
 /**
  * Creates a new {@link useCookies} function

package/index.iife.js

@@ -59,7 +59,7 @@
   window.VueDemi = VueDemi
 })(window)
 ;
-;(function (exports, vueDemi, axios, shared, Cookie, drauu, core, focusTrap, Fuse, jwt_decode, nprogress, QRCode) {
+;(function (exports, vueDemi, shared, axios, Cookie, drauu, core, focusTrap, Fuse, jwt_decode, nprogress, QRCode) {
   'use strict';
 
   function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
@@ -104,7 +104,7 @@
       if ("request" in args[1])
         instance = args[1];
     }
-    if (args.length >= 2)
+    if (args.length === 2 && !("request" in args[1]) || args.length === 3)
       options = args[args.length - 1];
     const response = vueDemi.shallowRef();
     const data = vueDemi.shallowRef();
@@ -138,7 +138,7 @@
     };
     if (options.immediate)
       execute();
-    return {
+    const result = {
       response,
       data,
       error,
@@ -152,6 +152,16 @@
       abort,
       execute
     };
+    function waitUntilFinished() {
+      return new Promise((resolve, reject) => {
+        shared.until(isFinished).toBe(true).then(() => resolve(result)).catch((error2) => reject(error2));
+      });
+    }
+    return __spreadProps$1(__spreadValues$3({}, result), {
+      then(onFulfilled, onRejected) {
+        return waitUntilFinished().then(onFulfilled, onRejected);
+      }
+    });
   }
 
   var __defProp$2 = Object.defineProperty;
@@ -514,4 +524,4 @@
 
   Object.defineProperty(exports, '__esModule', { value: true });
 
-})(this.VueUse = this.VueUse || {}, VueDemi, axios, VueUse, UniversalCookie, Drauu, VueUse, focusTrap, Fuse, jwt_decode, nprogress, QRCode);
+})(this.VueUse = this.VueUse || {}, VueDemi, VueUse, axios, UniversalCookie, Drauu, VueUse, focusTrap, Fuse, jwt_decode, nprogress, QRCode);

package/index.iife.min.js

@@ -1 +1 @@
-(function(d){if(!d.VueDemi){var n={},p=d.Vue;if(p)if(p.version.slice(0,2)==="2."){var g=d.VueCompositionAPI;if(g){for(var m in g)n[m]=g[m];n.isVue2=!0,n.isVue3=!1,n.install=function(){},n.Vue=p,n.Vue2=p,n.version=p.version}else console.error("[vue-demi] no VueCompositionAPI instance found, please be sure to import `@vue/composition-api` before `vue-demi`.")}else if(p.version.slice(0,2)==="3."){for(var m in p)n[m]=p[m];n.isVue2=!1,n.isVue3=!0,n.install=function(){},n.Vue=p,n.Vue2=void 0,n.version=p.version,n.set=function(h,v,b){return Array.isArray(h)?(h.length=Math.max(h.length,v),h.splice(v,1,b),b):(h[v]=b,b)},n.del=function(h,v){if(Array.isArray(h)){h.splice(v,1);return}delete h[v]}}else console.error("[vue-demi] Vue version "+p.version+" is unsupported.");else console.error("[vue-demi] no Vue instance found, please be sure to import `vue` before `vue-demi`.");d.VueDemi=n}})(window),function(d,n,p,g,m,h,v,b,z,B,K,X){"use strict";function C(t){return t&&typeof t=="object"&&"default"in t?t:{default:t}}var A=C(p),R=C(m),Y=C(z),Z=C(B),O=C(K),x=C(X),D=Object.defineProperty,ee=Object.defineProperties,re=Object.getOwnPropertyDescriptors,F=Object.getOwnPropertySymbols,te=Object.prototype.hasOwnProperty,ne=Object.prototype.propertyIsEnumerable,L=(t,r,e)=>r in t?D(t,r,{enumerable:!0,configurable:!0,writable:!0,value:e}):t[r]=e,H=(t,r)=>{for(var e in r||(r={}))te.call(r,e)&&L(t,e,r[e]);if(F)for(var e of F(r))ne.call(r,e)&&L(t,e,r[e]);return t},ae=(t,r)=>ee(t,re(r));function oe(t,...r){let e={},a=A.default,s={immediate:!0};r.length>0&&("request"in r[0]?a=r[0]:e=r[0]),r.length>1&&"request"in r[1]&&(a=r[1]),r.length>=2&&(s=r[r.length-1]);const f=n.shallowRef(),i=n.shallowRef(),l=n.ref(!1),o=n.ref(!1),c=n.ref(!1),_=n.shallowRef(),w=A.default.CancelToken.source(),P=y=>{l.value||!o.value||(w.cancel(y),c.value=!0,o.value=!1,l.value=!1)},V=y=>{o.value=y,l.value=!y},S=(y={})=>{V(!0),a(t,ae(H(H({},e),y),{cancelToken:w.token})).then(E=>{f.value=E,i.value=E.data}).catch(E=>{_.value=E}).finally(()=>{V(!1)})};return s.immediate&&S(),{response:f,data:i,error:_,finished:l,loading:o,isFinished:l,isLoading:o,cancel:P,canceled:c,aborted:c,abort:P,execute:S}}var le=Object.defineProperty,I=Object.getOwnPropertySymbols,ue=Object.prototype.hasOwnProperty,se=Object.prototype.propertyIsEnumerable,N=(t,r,e)=>r in t?le(t,r,{enumerable:!0,configurable:!0,writable:!0,value:e}):t[r]=e,T=(t,r)=>{for(var e in r||(r={}))ue.call(r,e)&&N(t,e,r[e]);if(I)for(var e of I(r))se.call(r,e)&&N(t,e,r[e]);return t};function fe(t){const r=new R.default(t?t.headers.cookie:null);return(e,{doNotParse:a=!1,autoUpdateDependencies:s=!1}={})=>U(e,{doNotParse:a,autoUpdateDependencies:s},r)}function U(t,{doNotParse:r=!1,autoUpdateDependencies:e=!1}={},a=new R.default){const s=e?[...t||[]]:t;let f=a.getAll({doNotParse:!0});const i=n.ref(0),l=()=>{const o=a.getAll({doNotParse:!0});ce(s||null,o,f)&&i.value++,f=o};return a.addChangeListener(l),g.tryOnScopeDispose(()=>{a.removeChangeListener(l)}),{get:(...o)=>(e&&s&&!s.includes(o[0])&&s.push(o[0]),i.value,a.get(o[0],T({doNotParse:r},o[1]))),getAll:(...o)=>(i.value,a.getAll(T({doNotParse:r},o[0]))),set:(...o)=>a.set(...o),remove:(...o)=>a.remove(...o),addChangeListener:(...o)=>a.addChangeListener(...o),removeChangeListener:(...o)=>a.removeChangeListener(...o)}}function ce(t,r,e){if(!t)return!0;for(const a of t)if(r[a]!==e[a])return!0;return!1}var ie=Object.defineProperty,k=Object.getOwnPropertySymbols,de=Object.prototype.hasOwnProperty,ve=Object.prototype.propertyIsEnumerable,G=(t,r,e)=>r in t?ie(t,r,{enumerable:!0,configurable:!0,writable:!0,value:e}):t[r]=e,pe=(t,r)=>{for(var e in r||(r={}))de.call(r,e)&&G(t,e,r[e]);if(k)for(var e of k(r))ve.call(r,e)&&G(t,e,r[e]);return t};function _e(t,r){const e=n.ref();let a=[];const s=v.createEventHook(),f=v.createEventHook(),i=v.createEventHook(),l=v.createEventHook(),o=v.createEventHook(),c=n.ref(!1),_=n.ref(!1),w=n.ref(!1),P=n.ref(!1),V=n.ref({color:"black",size:3,arrowEnd:!1,cornerRadius:0,dasharray:void 0,fill:"transparent",mode:"draw"});n.watch(V,()=>{const u=e.value;u&&(u.brush=V.value)},{deep:!0});const S=()=>{var u;return(u=e.value)==null?void 0:u.undo()},y=()=>{var u;return(u=e.value)==null?void 0:u.redo()},E=()=>{var u;return(u=e.value)==null?void 0:u.clear()},$e=()=>{var u;return(u=e.value)==null?void 0:u.cancel()},Se=u=>{var j;return(j=e.value)==null?void 0:j.load(u)},je=()=>{var u;return(u=e.value)==null?void 0:u.dump()},W=()=>{var u;a.forEach(j=>j()),(u=e.value)==null||u.unmount()},q=()=>{e.value&&(c.value=e.value.canUndo(),_.value=e.value.canRedo(),w.value=e.value.altPressed,P.value=e.value.shiftPressed)};return n.watch(()=>v.unrefElement(t),u=>{!u||typeof SVGSVGElement=="undefined"||!(u instanceof SVGSVGElement)||(e.value&&W(),e.value=h.createDrauu(pe({el:u},r)),q(),a=[e.value.on("canceled",()=>f.trigger()),e.value.on("committed",()=>i.trigger()),e.value.on("start",()=>l.trigger()),e.value.on("end",()=>o.trigger()),e.value.on("changed",()=>{q(),s.trigger()})])},{flush:"post"}),g.tryOnScopeDispose(()=>W()),{drauuInstance:e,load:Se,dump:je,clear:E,cancel:$e,undo:S,redo:y,canUndo:c,canRedo:_,brush:V,onChanged:s.on,onCommitted:i.on,onStart:l.on,onEnd:o.on,onCanceled:f.on}}var he=Object.defineProperty,Oe=Object.defineProperties,Pe=Object.getOwnPropertyDescriptors,$=Object.getOwnPropertySymbols,Q=Object.prototype.hasOwnProperty,J=Object.prototype.propertyIsEnumerable,M=(t,r,e)=>r in t?he(t,r,{enumerable:!0,configurable:!0,writable:!0,value:e}):t[r]=e,ge=(t,r)=>{for(var e in r||(r={}))Q.call(r,e)&&M(t,e,r[e]);if($)for(var e of $(r))J.call(r,e)&&M(t,e,r[e]);return t},we=(t,r)=>Oe(t,Pe(r)),ye=(t,r)=>{var e={};for(var a in t)Q.call(t,a)&&r.indexOf(a)<0&&(e[a]=t[a]);if(t!=null&&$)for(var a of $(t))r.indexOf(a)<0&&J.call(t,a)&&(e[a]=t[a]);return e};function me(t,r={}){let e;const a=r,{immediate:s}=a,f=ye(a,["immediate"]),i=n.ref(!1),l=n.ref(!1),o=P=>e&&e.activate(P),c=P=>e&&e.deactivate(P),_=()=>{e&&(e.pause(),l.value=!0)},w=()=>{e&&(e.unpause(),l.value=!1)};return n.watch(()=>v.unrefElement(t),P=>{!P||(e=b.createFocusTrap(P,we(ge({},f),{onActivate(){i.value=!0,r.onActivate&&r.onActivate()},onDeactivate(){i.value=!1,r.onDeactivate&&r.onDeactivate()}})),s&&o())},{flush:"post"}),v.tryOnScopeDispose(()=>c()),{hasFocus:i,isPaused:l,activate:o,deactivate:c,pause:_,unpause:w}}function be(t,r,e){var a;const s=(l,o)=>{var c;const _=o;return new Y.default((c=n.unref(l))!=null?c:[],_)},f=n.ref(s(r,(a=n.unref(e))==null?void 0:a.fuseOptions));return n.watch(()=>{var l;return(l=n.unref(e))==null?void 0:l.fuseOptions},l=>{f.value=s(r,l)},{deep:!0}),n.watch(()=>n.unref(r),l=>{f.value.setCollection(l)},{deep:!0}),{results:n.computed(()=>{var l,o;if(((l=n.unref(e))==null?void 0:l.matchAllWhenSearchEmpty)&&!n.unref(t))return n.unref(r).map((_,w)=>({item:_,refIndex:w}));const c=(o=n.unref(e))==null?void 0:o.resultLimit;return f.value.search(n.unref(t),c?{limit:c}:void 0)})}}function Ce(t,r={}){const e=n.ref(t),{onError:a,fallbackValue:s=null}=r,f=(o,c)=>{try{return Z.default(o,c)}catch(_){return a==null||a(_),s}},i=n.computed(()=>f(e.value,{header:!0})),l=n.computed(()=>f(e.value));return{header:i,payload:l}}function Ve(t=null,r){const e=n.isRef(t)?t:n.ref(t),a=n.computed({set:f=>f?O.default.start():O.default.done(),get:()=>g.isNumber(e.value)&&e.value<1});r&&O.default.configure(r);const s=O.default.set;return O.default.set=f=>(e.value=f,s.call(O.default,f)),n.watchEffect(()=>{g.isNumber(e.value)&&s.call(O.default,e.value)}),g.tryOnScopeDispose(O.default.remove),{isLoading:a,progress:e,start:O.default.start,done:O.default.done,remove:()=>{e.value=null,O.default.remove()}}}function Ee(t,r){const e=n.ref(t),a=n.ref("");return n.watch(e,async s=>{e.value&&g.isClient&&(a.value=await x.default.toDataURL(s,r))},{immediate:!0}),a}d.createCookies=fe,d.useAxios=oe,d.useCookies=U,d.useDrauu=_e,d.useFocusTrap=me,d.useFuse=be,d.useJwt=Ce,d.useNProgress=Ve,d.useQRCode=Ee,Object.defineProperty(d,"__esModule",{value:!0})}(this.VueUse=this.VueUse||{},VueDemi,axios,VueUse,UniversalCookie,Drauu,VueUse,focusTrap,Fuse,jwt_decode,nprogress,QRCode);
+(function(v){if(!v.VueDemi){var n={},c=v.Vue;if(c)if(c.version.slice(0,2)==="2."){var E=v.VueCompositionAPI;if(E){for(var m in E)n[m]=E[m];n.isVue2=!0,n.isVue3=!1,n.install=function(){},n.Vue=c,n.Vue2=c,n.version=c.version}else console.error("[vue-demi] no VueCompositionAPI instance found, please be sure to import `@vue/composition-api` before `vue-demi`.")}else if(c.version.slice(0,2)==="3."){for(var m in c)n[m]=c[m];n.isVue2=!1,n.isVue3=!0,n.install=function(){},n.Vue=c,n.Vue2=void 0,n.version=c.version,n.set=function(O,p,b){return Array.isArray(O)?(O.length=Math.max(O.length,p),O.splice(p,1,b),b):(O[p]=b,b)},n.del=function(O,p){if(Array.isArray(O)){O.splice(p,1);return}delete O[p]}}else console.error("[vue-demi] Vue version "+c.version+" is unsupported.");else console.error("[vue-demi] no Vue instance found, please be sure to import `vue` before `vue-demi`.");v.VueDemi=n}})(window),function(v,n,c,E,m,O,p,b,Y,Z,x,D){"use strict";function C(r){return r&&typeof r=="object"&&"default"in r?r:{default:r}}var H=C(E),I=C(m),ee=C(Y),te=C(Z),P=C(x),re=C(D),ne=Object.defineProperty,ae=Object.defineProperties,oe=Object.getOwnPropertyDescriptors,N=Object.getOwnPropertySymbols,le=Object.prototype.hasOwnProperty,ue=Object.prototype.propertyIsEnumerable,U=(r,t,e)=>t in r?ne(r,t,{enumerable:!0,configurable:!0,writable:!0,value:e}):r[t]=e,R=(r,t)=>{for(var e in t||(t={}))le.call(t,e)&&U(r,e,t[e]);if(N)for(var e of N(t))ue.call(t,e)&&U(r,e,t[e]);return r},T=(r,t)=>ae(r,oe(t));function se(r,...t){let e={},a=H.default,s={immediate:!0};t.length>0&&("request"in t[0]?a=t[0]:e=t[0]),t.length>1&&"request"in t[1]&&(a=t[1]),(t.length===2&&!("request"in t[1])||t.length===3)&&(s=t[t.length-1]);const f=n.shallowRef(),d=n.shallowRef(),l=n.ref(!1),o=n.ref(!1),i=n.ref(!1),_=n.shallowRef(),g=H.default.CancelToken.source(),w=h=>{l.value||!o.value||(g.cancel(h),i.value=!0,o.value=!1,l.value=!1)},V=h=>{o.value=h,l.value=!h},S=(h={})=>{V(!0),a(r,T(R(R({},e),h),{cancelToken:g.token})).then(y=>{f.value=y,d.value=y.data}).catch(y=>{_.value=y}).finally(()=>{V(!1)})};s.immediate&&S();const j={response:f,data:d,error:_,finished:l,loading:o,isFinished:l,isLoading:o,cancel:w,canceled:i,aborted:i,abort:w,execute:S};function F(){return new Promise((h,y)=>{c.until(l).toBe(!0).then(()=>h(j)).catch(L=>y(L))})}return T(R({},j),{then(h,y){return F().then(h,y)}})}var fe=Object.defineProperty,k=Object.getOwnPropertySymbols,ce=Object.prototype.hasOwnProperty,ie=Object.prototype.propertyIsEnumerable,G=(r,t,e)=>t in r?fe(r,t,{enumerable:!0,configurable:!0,writable:!0,value:e}):r[t]=e,Q=(r,t)=>{for(var e in t||(t={}))ce.call(t,e)&&G(r,e,t[e]);if(k)for(var e of k(t))ie.call(t,e)&&G(r,e,t[e]);return r};function de(r){const t=new I.default(r?r.headers.cookie:null);return(e,{doNotParse:a=!1,autoUpdateDependencies:s=!1}={})=>J(e,{doNotParse:a,autoUpdateDependencies:s},t)}function J(r,{doNotParse:t=!1,autoUpdateDependencies:e=!1}={},a=new I.default){const s=e?[...r||[]]:r;let f=a.getAll({doNotParse:!0});const d=n.ref(0),l=()=>{const o=a.getAll({doNotParse:!0});ve(s||null,o,f)&&d.value++,f=o};return a.addChangeListener(l),c.tryOnScopeDispose(()=>{a.removeChangeListener(l)}),{get:(...o)=>(e&&s&&!s.includes(o[0])&&s.push(o[0]),d.value,a.get(o[0],Q({doNotParse:t},o[1]))),getAll:(...o)=>(d.value,a.getAll(Q({doNotParse:t},o[0]))),set:(...o)=>a.set(...o),remove:(...o)=>a.remove(...o),addChangeListener:(...o)=>a.addChangeListener(...o),removeChangeListener:(...o)=>a.removeChangeListener(...o)}}function ve(r,t,e){if(!r)return!0;for(const a of r)if(t[a]!==e[a])return!0;return!1}var pe=Object.defineProperty,q=Object.getOwnPropertySymbols,_e=Object.prototype.hasOwnProperty,he=Object.prototype.propertyIsEnumerable,M=(r,t,e)=>t in r?pe(r,t,{enumerable:!0,configurable:!0,writable:!0,value:e}):r[t]=e,Oe=(r,t)=>{for(var e in t||(t={}))_e.call(t,e)&&M(r,e,t[e]);if(q)for(var e of q(t))he.call(t,e)&&M(r,e,t[e]);return r};function Pe(r,t){const e=n.ref();let a=[];const s=p.createEventHook(),f=p.createEventHook(),d=p.createEventHook(),l=p.createEventHook(),o=p.createEventHook(),i=n.ref(!1),_=n.ref(!1),g=n.ref(!1),w=n.ref(!1),V=n.ref({color:"black",size:3,arrowEnd:!1,cornerRadius:0,dasharray:void 0,fill:"transparent",mode:"draw"});n.watch(V,()=>{const u=e.value;u&&(u.brush=V.value)},{deep:!0});const S=()=>{var u;return(u=e.value)==null?void 0:u.undo()},j=()=>{var u;return(u=e.value)==null?void 0:u.redo()},F=()=>{var u;return(u=e.value)==null?void 0:u.clear()},h=()=>{var u;return(u=e.value)==null?void 0:u.cancel()},y=u=>{var A;return(A=e.value)==null?void 0:A.load(u)},L=()=>{var u;return(u=e.value)==null?void 0:u.dump()},K=()=>{var u;a.forEach(A=>A()),(u=e.value)==null||u.unmount()},X=()=>{e.value&&(i.value=e.value.canUndo(),_.value=e.value.canRedo(),g.value=e.value.altPressed,w.value=e.value.shiftPressed)};return n.watch(()=>p.unrefElement(r),u=>{!u||typeof SVGSVGElement=="undefined"||!(u instanceof SVGSVGElement)||(e.value&&K(),e.value=O.createDrauu(Oe({el:u},t)),X(),a=[e.value.on("canceled",()=>f.trigger()),e.value.on("committed",()=>d.trigger()),e.value.on("start",()=>l.trigger()),e.value.on("end",()=>o.trigger()),e.value.on("changed",()=>{X(),s.trigger()})])},{flush:"post"}),c.tryOnScopeDispose(()=>K()),{drauuInstance:e,load:y,dump:L,clear:F,cancel:h,undo:S,redo:j,canUndo:i,canRedo:_,brush:V,onChanged:s.on,onCommitted:d.on,onStart:l.on,onEnd:o.on,onCanceled:f.on}}var we=Object.defineProperty,ye=Object.defineProperties,ge=Object.getOwnPropertyDescriptors,$=Object.getOwnPropertySymbols,W=Object.prototype.hasOwnProperty,z=Object.prototype.propertyIsEnumerable,B=(r,t,e)=>t in r?we(r,t,{enumerable:!0,configurable:!0,writable:!0,value:e}):r[t]=e,me=(r,t)=>{for(var e in t||(t={}))W.call(t,e)&&B(r,e,t[e]);if($)for(var e of $(t))z.call(t,e)&&B(r,e,t[e]);return r},be=(r,t)=>ye(r,ge(t)),Ce=(r,t)=>{var e={};for(var a in r)W.call(r,a)&&t.indexOf(a)<0&&(e[a]=r[a]);if(r!=null&&$)for(var a of $(r))t.indexOf(a)<0&&z.call(r,a)&&(e[a]=r[a]);return e};function Ve(r,t={}){let e;const a=t,{immediate:s}=a,f=Ce(a,["immediate"]),d=n.ref(!1),l=n.ref(!1),o=w=>e&&e.activate(w),i=w=>e&&e.deactivate(w),_=()=>{e&&(e.pause(),l.value=!0)},g=()=>{e&&(e.unpause(),l.value=!1)};return n.watch(()=>p.unrefElement(r),w=>{!w||(e=b.createFocusTrap(w,be(me({},f),{onActivate(){d.value=!0,t.onActivate&&t.onActivate()},onDeactivate(){d.value=!1,t.onDeactivate&&t.onDeactivate()}})),s&&o())},{flush:"post"}),p.tryOnScopeDispose(()=>i()),{hasFocus:d,isPaused:l,activate:o,deactivate:i,pause:_,unpause:g}}function Ee(r,t,e){var a;const s=(l,o)=>{var i;const _=o;return new ee.default((i=n.unref(l))!=null?i:[],_)},f=n.ref(s(t,(a=n.unref(e))==null?void 0:a.fuseOptions));return n.watch(()=>{var l;return(l=n.unref(e))==null?void 0:l.fuseOptions},l=>{f.value=s(t,l)},{deep:!0}),n.watch(()=>n.unref(t),l=>{f.value.setCollection(l)},{deep:!0}),{results:n.computed(()=>{var l,o;if(((l=n.unref(e))==null?void 0:l.matchAllWhenSearchEmpty)&&!n.unref(r))return n.unref(t).map((_,g)=>({item:_,refIndex:g}));const i=(o=n.unref(e))==null?void 0:o.resultLimit;return f.value.search(n.unref(r),i?{limit:i}:void 0)})}}function $e(r,t={}){const e=n.ref(r),{onError:a,fallbackValue:s=null}=t,f=(o,i)=>{try{return te.default(o,i)}catch(_){return a==null||a(_),s}},d=n.computed(()=>f(e.value,{header:!0})),l=n.computed(()=>f(e.value));return{header:d,payload:l}}function Se(r=null,t){const e=n.isRef(r)?r:n.ref(r),a=n.computed({set:f=>f?P.default.start():P.default.done(),get:()=>c.isNumber(e.value)&&e.value<1});t&&P.default.configure(t);const s=P.default.set;return P.default.set=f=>(e.value=f,s.call(P.default,f)),n.watchEffect(()=>{c.isNumber(e.value)&&s.call(P.default,e.value)}),c.tryOnScopeDispose(P.default.remove),{isLoading:a,progress:e,start:P.default.start,done:P.default.done,remove:()=>{e.value=null,P.default.remove()}}}function je(r,t){const e=n.ref(r),a=n.ref("");return n.watch(e,async s=>{e.value&&c.isClient&&(a.value=await re.default.toDataURL(s,t))},{immediate:!0}),a}v.createCookies=de,v.useAxios=se,v.useCookies=J,v.useDrauu=Pe,v.useFocusTrap=Ve,v.useFuse=Ee,v.useJwt=$e,v.useNProgress=Se,v.useQRCode=je,Object.defineProperty(v,"__esModule",{value:!0})}(this.VueUse=this.VueUse||{},VueDemi,VueUse,axios,UniversalCookie,Drauu,VueUse,focusTrap,Fuse,jwt_decode,nprogress,QRCode);

package/index.mjs

@@ -1,6 +1,6 @@
 import { shallowRef, ref, watch, unref, computed, isRef, watchEffect } from 'vue-demi';
+import { until, tryOnScopeDispose, isNumber, isClient } from '@vueuse/shared';
 import axios from 'axios';
-import { tryOnScopeDispose, isNumber, isClient } from '@vueuse/shared';
 import Cookie from 'universal-cookie';
 import { createDrauu } from 'drauu';
 import { createEventHook, unrefElement, tryOnScopeDispose as tryOnScopeDispose$1 } from '@vueuse/core';
@@ -43,7 +43,7 @@ function useAxios(url, ...args) {
     if ("request" in args[1])
       instance = args[1];
   }
-  if (args.length >= 2)
+  if (args.length === 2 && !("request" in args[1]) || args.length === 3)
     options = args[args.length - 1];
   const response = shallowRef();
   const data = shallowRef();
@@ -77,7 +77,7 @@ function useAxios(url, ...args) {
   };
   if (options.immediate)
     execute();
-  return {
+  const result = {
     response,
     data,
     error,
@@ -91,6 +91,16 @@ function useAxios(url, ...args) {
     abort,
     execute
   };
+  function waitUntilFinished() {
+    return new Promise((resolve, reject) => {
+      until(isFinished).toBe(true).then(() => resolve(result)).catch((error2) => reject(error2));
+    });
+  }
+  return __spreadProps$1(__spreadValues$3({}, result), {
+    then(onFulfilled, onRejected) {
+      return waitUntilFinished().then(onFulfilled, onRejected);
+    }
+  });
 }
 
 var __defProp$2 = Object.defineProperty;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vueuse/integrations",
-  "version": "7.7.1",
+  "version": "8.0.0-beta.2",
   "description": "Integration wrappers for utility libraries",
   "keywords": [
     "vue",
@@ -115,15 +115,15 @@
     }
   },
   "dependencies": {
-    "@vueuse/core": "7.7.1",
-    "@vueuse/shared": "7.7.1",
+    "@vueuse/core": "8.0.0-beta.2",
+    "@vueuse/shared": "8.0.0-beta.2",
     "vue-demi": "*"
   },
   "devDependencies": {
     "@types/nprogress": "^0.2.0",
     "@types/qrcode": "^1.4.2",
     "axios": "^0.26.0",
-    "drauu": "^0.2.1",
+    "drauu": "^0.3.0",
     "focus-trap": "^6.7.3",
     "fuse.js": "^6.5.3",
     "jwt-decode": "^3.1.2",

package/useAxios.cjs

@@ -3,6 +3,7 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var vueDemi = require('vue-demi');
+var shared = require('@vueuse/shared');
 var axios = require('axios');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
@@ -42,7 +43,7 @@ function useAxios(url, ...args) {
     if ("request" in args[1])
       instance = args[1];
   }
-  if (args.length >= 2)
+  if (args.length === 2 && !("request" in args[1]) || args.length === 3)
     options = args[args.length - 1];
   const response = vueDemi.shallowRef();
   const data = vueDemi.shallowRef();
@@ -76,7 +77,7 @@ function useAxios(url, ...args) {
   };
   if (options.immediate)
     execute();
-  return {
+  const result = {
     response,
     data,
     error,
@@ -90,6 +91,16 @@ function useAxios(url, ...args) {
     abort,
     execute
   };
+  function waitUntilFinished() {
+    return new Promise((resolve, reject) => {
+      shared.until(isFinished).toBe(true).then(() => resolve(result)).catch((error2) => reject(error2));
+    });
+  }
+  return __spreadProps(__spreadValues({}, result), {
+    then(onFulfilled, onRejected) {
+      return waitUntilFinished().then(onFulfilled, onRejected);
+    }
+  });
 }
 
 exports.useAxios = useAxios;

package/useAxios.d.ts

@@ -43,8 +43,8 @@ interface UseAxiosOptions {
      */
     immediate?: boolean;
 }
-declare function useAxios<T = any>(url: string, config?: AxiosRequestConfig, options?: UseAxiosOptions): UseAxiosReturn<T>;
-declare function useAxios<T = any>(url: string, instance?: AxiosInstance, options?: UseAxiosOptions): UseAxiosReturn<T>;
-declare function useAxios<T = any>(url: string, config: AxiosRequestConfig, instance: AxiosInstance, options?: UseAxiosOptions): UseAxiosReturn<T>;
+declare function useAxios<T = any>(url: string, config?: AxiosRequestConfig, options?: UseAxiosOptions): UseAxiosReturn<T> & PromiseLike<UseAxiosReturn<T>>;
+declare function useAxios<T = any>(url: string, instance?: AxiosInstance, options?: UseAxiosOptions): UseAxiosReturn<T> & PromiseLike<UseAxiosReturn<T>>;
+declare function useAxios<T = any>(url: string, config: AxiosRequestConfig, instance: AxiosInstance, options?: UseAxiosOptions): UseAxiosReturn<T> & PromiseLike<UseAxiosReturn<T>>;
 
 export { UseAxiosOptions, UseAxiosReturn, useAxios };

package/useAxios.iife.js

@@ -59,7 +59,7 @@
   window.VueDemi = VueDemi
 })(window)
 ;
-;(function (exports, vueDemi, axios) {
+;(function (exports, vueDemi, shared, axios) {
   'use strict';
 
   function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
@@ -99,7 +99,7 @@
       if ("request" in args[1])
         instance = args[1];
     }
-    if (args.length >= 2)
+    if (args.length === 2 && !("request" in args[1]) || args.length === 3)
       options = args[args.length - 1];
     const response = vueDemi.shallowRef();
     const data = vueDemi.shallowRef();
@@ -133,7 +133,7 @@
     };
     if (options.immediate)
       execute();
-    return {
+    const result = {
       response,
       data,
       error,
@@ -147,10 +147,20 @@
       abort,
       execute
     };
+    function waitUntilFinished() {
+      return new Promise((resolve, reject) => {
+        shared.until(isFinished).toBe(true).then(() => resolve(result)).catch((error2) => reject(error2));
+      });
+    }
+    return __spreadProps(__spreadValues({}, result), {
+      then(onFulfilled, onRejected) {
+        return waitUntilFinished().then(onFulfilled, onRejected);
+      }
+    });
   }
 
   exports.useAxios = useAxios;
 
   Object.defineProperty(exports, '__esModule', { value: true });
 
-})(this.VueUse = this.VueUse || {}, VueDemi, axios);
+})(this.VueUse = this.VueUse || {}, VueDemi, VueUse, axios);

package/useAxios.iife.min.js

@@ -1 +1 @@
-(function(l){if(!l.VueDemi){var e={},o=l.Vue;if(o)if(o.version.slice(0,2)==="2."){var c=l.VueCompositionAPI;if(c){for(var s in c)e[s]=c[s];e.isVue2=!0,e.isVue3=!1,e.install=function(){},e.Vue=o,e.Vue2=o,e.version=o.version}else console.error("[vue-demi] no VueCompositionAPI instance found, please be sure to import `@vue/composition-api` before `vue-demi`.")}else if(o.version.slice(0,2)==="3."){for(var s in o)e[s]=o[s];e.isVue2=!1,e.isVue3=!0,e.install=function(){},e.Vue=o,e.Vue2=void 0,e.version=o.version,e.set=function(i,u,a){return Array.isArray(i)?(i.length=Math.max(i.length,u),i.splice(u,1,a),a):(i[u]=a,a)},e.del=function(i,u){if(Array.isArray(i)){i.splice(u,1);return}delete i[u]}}else console.error("[vue-demi] Vue version "+o.version+" is unsupported.");else console.error("[vue-demi] no Vue instance found, please be sure to import `vue` before `vue-demi`.");l.VueDemi=e}})(window),function(l,e,o){"use strict";function c(n){return n&&typeof n=="object"&&"default"in n?n:{default:n}}var s=c(o),i=Object.defineProperty,u=Object.defineProperties,a=Object.getOwnPropertyDescriptors,h=Object.getOwnPropertySymbols,T=Object.prototype.hasOwnProperty,q=Object.prototype.propertyIsEnumerable,m=(n,r,t)=>r in n?i(n,r,{enumerable:!0,configurable:!0,writable:!0,value:t}):n[r]=t,O=(n,r)=>{for(var t in r||(r={}))T.call(r,t)&&m(n,t,r[t]);if(h)for(var t of h(r))q.call(r,t)&&m(n,t,r[t]);return n},C=(n,r)=>u(n,a(r));function D(n,...r){let t={},_=s.default,P={immediate:!0};r.length>0&&("request"in r[0]?_=r[0]:t=r[0]),r.length>1&&"request"in r[1]&&(_=r[1]),r.length>=2&&(P=r[r.length-1]);const b=e.shallowRef(),y=e.shallowRef(),d=e.ref(!1),p=e.ref(!1),V=e.ref(!1),j=e.shallowRef(),w=s.default.CancelToken.source(),A=f=>{d.value||!p.value||(w.cancel(f),V.value=!0,p.value=!1,d.value=!1)},x=f=>{p.value=f,d.value=!f},R=(f={})=>{x(!0),_(n,C(O(O({},t),f),{cancelToken:w.token})).then(v=>{b.value=v,y.value=v.data}).catch(v=>{j.value=v}).finally(()=>{x(!1)})};return P.immediate&&R(),{response:b,data:y,error:j,finished:d,loading:p,isFinished:d,isLoading:p,cancel:A,canceled:V,aborted:V,abort:A,execute:R}}l.useAxios=D,Object.defineProperty(l,"__esModule",{value:!0})}(this.VueUse=this.VueUse||{},VueDemi,axios);
+(function(a){if(!a.VueDemi){var n={},t=a.Vue;if(t)if(t.version.slice(0,2)==="2."){var p=a.VueCompositionAPI;if(p){for(var f in p)n[f]=p[f];n.isVue2=!0,n.isVue3=!1,n.install=function(){},n.Vue=t,n.Vue2=t,n.version=t.version}else console.error("[vue-demi] no VueCompositionAPI instance found, please be sure to import `@vue/composition-api` before `vue-demi`.")}else if(t.version.slice(0,2)==="3."){for(var f in t)n[f]=t[f];n.isVue2=!1,n.isVue3=!0,n.install=function(){},n.Vue=t,n.Vue2=void 0,n.version=t.version,n.set=function(o,u,c){return Array.isArray(o)?(o.length=Math.max(o.length,u),o.splice(u,1,c),c):(o[u]=c,c)},n.del=function(o,u){if(Array.isArray(o)){o.splice(u,1);return}delete o[u]}}else console.error("[vue-demi] Vue version "+t.version+" is unsupported.");else console.error("[vue-demi] no Vue instance found, please be sure to import `vue` before `vue-demi`.");a.VueDemi=n}})(window),function(a,n,t,p){"use strict";function f(r){return r&&typeof r=="object"&&"default"in r?r:{default:r}}var o=f(p),u=Object.defineProperty,c=Object.defineProperties,T=Object.getOwnPropertyDescriptors,m=Object.getOwnPropertySymbols,C=Object.prototype.hasOwnProperty,D=Object.prototype.propertyIsEnumerable,P=(r,e,i)=>e in r?u(r,e,{enumerable:!0,configurable:!0,writable:!0,value:i}):r[e]=i,h=(r,e)=>{for(var i in e||(e={}))C.call(e,i)&&P(r,i,e[i]);if(m)for(var i of m(e))D.call(e,i)&&P(r,i,e[i]);return r},O=(r,e)=>c(r,T(e));function E(r,...e){let i={},_=o.default,b={immediate:!0};e.length>0&&("request"in e[0]?_=e[0]:i=e[0]),e.length>1&&"request"in e[1]&&(_=e[1]),(e.length===2&&!("request"in e[1])||e.length===3)&&(b=e[e.length-1]);const y=n.shallowRef(),w=n.shallowRef(),d=n.ref(!1),v=n.ref(!1),V=n.ref(!1),j=n.shallowRef(),A=o.default.CancelToken.source(),x=s=>{d.value||!v.value||(A.cancel(s),V.value=!0,v.value=!1,d.value=!1)},U=s=>{v.value=s,d.value=!s},q=(s={})=>{U(!0),_(r,O(h(h({},i),s),{cancelToken:A.token})).then(l=>{y.value=l,w.value=l.data}).catch(l=>{j.value=l}).finally(()=>{U(!1)})};b.immediate&&q();const R={response:y,data:w,error:j,finished:d,loading:v,isFinished:d,isLoading:v,cancel:x,canceled:V,aborted:V,abort:x,execute:q};function F(){return new Promise((s,l)=>{t.until(d).toBe(!0).then(()=>s(R)).catch(I=>l(I))})}return O(h({},R),{then(s,l){return F().then(s,l)}})}a.useAxios=E,Object.defineProperty(a,"__esModule",{value:!0})}(this.VueUse=this.VueUse||{},VueDemi,VueUse,axios);

package/useAxios.mjs

@@ -1,4 +1,5 @@
 import { shallowRef, ref } from 'vue-demi';
+import { until } from '@vueuse/shared';
 import axios from 'axios';
 
 var __defProp = Object.defineProperty;
@@ -34,7 +35,7 @@ function useAxios(url, ...args) {
     if ("request" in args[1])
       instance = args[1];
   }
-  if (args.length >= 2)
+  if (args.length === 2 && !("request" in args[1]) || args.length === 3)
     options = args[args.length - 1];
   const response = shallowRef();
   const data = shallowRef();
@@ -68,7 +69,7 @@ function useAxios(url, ...args) {
   };
   if (options.immediate)
     execute();
-  return {
+  const result = {
     response,
     data,
     error,
@@ -82,6 +83,16 @@ function useAxios(url, ...args) {
     abort,
     execute
   };
+  function waitUntilFinished() {
+    return new Promise((resolve, reject) => {
+      until(isFinished).toBe(true).then(() => resolve(result)).catch((error2) => reject(error2));
+    });
+  }
+  return __spreadProps(__spreadValues({}, result), {
+    then(onFulfilled, onRejected) {
+      return waitUntilFinished().then(onFulfilled, onRejected);
+    }
+  });
 }
 
 export { useAxios };