@vueuse/integrations 8.7.5 → 8.8.0

package/index.cjs

@@ -148,24 +148,20 @@ function useAxios(...args) {
     isLoading.value = loading2;
     isFinished.value = !loading2;
   };
+  const waitUntilFinished = () => new Promise((resolve, reject) => {
+    shared.until(isFinished).toBe(true).then(() => resolve(result)).catch(reject);
+  });
+  const then = (onFulfilled, onRejected) => waitUntilFinished().then(onFulfilled, onRejected);
   const execute = (executeUrl = url, config = {}) => {
-    let _url = url != null ? url : "";
-    let _config;
-    if (typeof executeUrl === "string") {
-      _url = executeUrl;
-      _config = config;
-    } else {
-      _config = config;
-    }
+    const _url = typeof executeUrl === "string" ? executeUrl : url != null ? url : "";
     loading(true);
-    instance(_url, __spreadProps$1(__spreadValues$3(__spreadValues$3({}, defaultConfig), _config), { cancelToken: cancelToken.token })).then((r) => {
+    instance(_url, __spreadProps$1(__spreadValues$3(__spreadValues$3({}, defaultConfig), config), { cancelToken: cancelToken.token })).then((r) => {
       response.value = r;
       data.value = r.data;
     }).catch((e) => {
       error.value = e;
-    }).finally(() => {
-      loading(false);
-    });
+    }).finally(() => loading(false));
+    return { then };
   };
   if (options.immediate && url)
     execute();
@@ -185,15 +181,8 @@ function useAxios(...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);
-    }
+    then
   });
 }
 
@@ -324,8 +313,10 @@ function useDrauu(target, options) {
   });
   vueDemi.watch(brush, () => {
     const instance = drauuInstance.value;
-    if (instance)
+    if (instance) {
       instance.brush = brush.value;
+      instance.mode = brush.value.mode;
+    }
   }, { deep: true });
   const undo = () => {
     var _a;

package/index.d.ts

@@ -102,13 +102,13 @@ interface StrictUseAxiosReturn<T> extends UseAxiosReturn<T> {
     /**
      * Manually call the axios request
      */
-    execute: (url?: string, config?: AxiosRequestConfig) => void;
+    execute: (url?: string, config?: AxiosRequestConfig) => PromiseLike<StrictUseAxiosReturn<T>>;
 }
 interface EasyUseAxiosReturn<T> extends UseAxiosReturn<T> {
     /**
      * Manually call the axios request
      */
-    execute: (url: string, config?: AxiosRequestConfig) => void;
+    execute: (url: string, config?: AxiosRequestConfig) => PromiseLike<EasyUseAxiosReturn<T>>;
 }
 interface UseAxiosOptions {
     /**

package/index.iife.js

@@ -222,24 +222,20 @@
       isLoading.value = loading2;
       isFinished.value = !loading2;
     };
+    const waitUntilFinished = () => new Promise((resolve, reject) => {
+      shared.until(isFinished).toBe(true).then(() => resolve(result)).catch(reject);
+    });
+    const then = (onFulfilled, onRejected) => waitUntilFinished().then(onFulfilled, onRejected);
     const execute = (executeUrl = url, config = {}) => {
-      let _url = url != null ? url : "";
-      let _config;
-      if (typeof executeUrl === "string") {
-        _url = executeUrl;
-        _config = config;
-      } else {
-        _config = config;
-      }
+      const _url = typeof executeUrl === "string" ? executeUrl : url != null ? url : "";
       loading(true);
-      instance(_url, __spreadProps$1(__spreadValues$3(__spreadValues$3({}, defaultConfig), _config), { cancelToken: cancelToken.token })).then((r) => {
+      instance(_url, __spreadProps$1(__spreadValues$3(__spreadValues$3({}, defaultConfig), config), { cancelToken: cancelToken.token })).then((r) => {
         response.value = r;
         data.value = r.data;
       }).catch((e) => {
         error.value = e;
-      }).finally(() => {
-        loading(false);
-      });
+      }).finally(() => loading(false));
+      return { then };
     };
     if (options.immediate && url)
       execute();
@@ -259,15 +255,8 @@
       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);
-      }
+      then
     });
   }
 
@@ -398,8 +387,10 @@
     });
     vueDemi.watch(brush, () => {
       const instance = drauuInstance.value;
-      if (instance)
+      if (instance) {
         instance.brush = brush.value;
+        instance.mode = brush.value.mode;
+      }
     }, { deep: true });
     const undo = () => {
       var _a;

package/index.iife.min.js

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

package/index.mjs

@@ -134,24 +134,20 @@ function useAxios(...args) {
     isLoading.value = loading2;
     isFinished.value = !loading2;
   };
+  const waitUntilFinished = () => new Promise((resolve, reject) => {
+    until(isFinished).toBe(true).then(() => resolve(result)).catch(reject);
+  });
+  const then = (onFulfilled, onRejected) => waitUntilFinished().then(onFulfilled, onRejected);
   const execute = (executeUrl = url, config = {}) => {
-    let _url = url != null ? url : "";
-    let _config;
-    if (typeof executeUrl === "string") {
-      _url = executeUrl;
-      _config = config;
-    } else {
-      _config = config;
-    }
+    const _url = typeof executeUrl === "string" ? executeUrl : url != null ? url : "";
     loading(true);
-    instance(_url, __spreadProps$1(__spreadValues$3(__spreadValues$3({}, defaultConfig), _config), { cancelToken: cancelToken.token })).then((r) => {
+    instance(_url, __spreadProps$1(__spreadValues$3(__spreadValues$3({}, defaultConfig), config), { cancelToken: cancelToken.token })).then((r) => {
       response.value = r;
       data.value = r.data;
     }).catch((e) => {
       error.value = e;
-    }).finally(() => {
-      loading(false);
-    });
+    }).finally(() => loading(false));
+    return { then };
   };
   if (options.immediate && url)
     execute();
@@ -171,15 +167,8 @@ function useAxios(...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);
-    }
+    then
   });
 }
 
@@ -310,8 +299,10 @@ function useDrauu(target, options) {
   });
   watch(brush, () => {
     const instance = drauuInstance.value;
-    if (instance)
+    if (instance) {
       instance.brush = brush.value;
+      instance.mode = brush.value.mode;
+    }
   }, { deep: true });
   const undo = () => {
     var _a;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vueuse/integrations",
-  "version": "8.7.5",
+  "version": "8.8.0",
   "description": "Integration wrappers for utility libraries",
   "author": "Anthony Fu <https://github.com/antfu>",
   "license": "MIT",
@@ -138,14 +138,14 @@
     }
   },
   "dependencies": {
-    "@vueuse/core": "8.7.5",
-    "@vueuse/shared": "8.7.5",
+    "@vueuse/core": "8.8.0",
+    "@vueuse/shared": "8.8.0",
     "vue-demi": "*"
   },
   "devDependencies": {
     "@types/nprogress": "^0.2.0",
     "@types/qrcode": "^1.4.2",
-    "async-validator": "^4.1.1",
+    "async-validator": "^4.2.5",
     "axios": "^0.27.2",
     "change-case": "^4.1.2",
     "drauu": "^0.3.0",

package/useAxios.cjs

@@ -67,24 +67,20 @@ function useAxios(...args) {
     isLoading.value = loading2;
     isFinished.value = !loading2;
   };
+  const waitUntilFinished = () => new Promise((resolve, reject) => {
+    shared.until(isFinished).toBe(true).then(() => resolve(result)).catch(reject);
+  });
+  const then = (onFulfilled, onRejected) => waitUntilFinished().then(onFulfilled, onRejected);
   const execute = (executeUrl = url, config = {}) => {
-    let _url = url != null ? url : "";
-    let _config;
-    if (typeof executeUrl === "string") {
-      _url = executeUrl;
-      _config = config;
-    } else {
-      _config = config;
-    }
+    const _url = typeof executeUrl === "string" ? executeUrl : url != null ? url : "";
     loading(true);
-    instance(_url, __spreadProps(__spreadValues(__spreadValues({}, defaultConfig), _config), { cancelToken: cancelToken.token })).then((r) => {
+    instance(_url, __spreadProps(__spreadValues(__spreadValues({}, defaultConfig), config), { cancelToken: cancelToken.token })).then((r) => {
       response.value = r;
       data.value = r.data;
     }).catch((e) => {
       error.value = e;
-    }).finally(() => {
-      loading(false);
-    });
+    }).finally(() => loading(false));
+    return { then };
   };
   if (options.immediate && url)
     execute();
@@ -104,15 +100,8 @@ function useAxios(...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);
-    }
+    then
   });
 }
 

package/useAxios.d.ts

@@ -63,13 +63,13 @@ interface StrictUseAxiosReturn<T> extends UseAxiosReturn<T> {
     /**
      * Manually call the axios request
      */
-    execute: (url?: string, config?: AxiosRequestConfig) => void;
+    execute: (url?: string, config?: AxiosRequestConfig) => PromiseLike<StrictUseAxiosReturn<T>>;
 }
 interface EasyUseAxiosReturn<T> extends UseAxiosReturn<T> {
     /**
      * Manually call the axios request
      */
-    execute: (url: string, config?: AxiosRequestConfig) => void;
+    execute: (url: string, config?: AxiosRequestConfig) => PromiseLike<EasyUseAxiosReturn<T>>;
 }
 interface UseAxiosOptions {
     /**

package/useAxios.iife.js

@@ -151,24 +151,20 @@
       isLoading.value = loading2;
       isFinished.value = !loading2;
     };
+    const waitUntilFinished = () => new Promise((resolve, reject) => {
+      shared.until(isFinished).toBe(true).then(() => resolve(result)).catch(reject);
+    });
+    const then = (onFulfilled, onRejected) => waitUntilFinished().then(onFulfilled, onRejected);
     const execute = (executeUrl = url, config = {}) => {
-      let _url = url != null ? url : "";
-      let _config;
-      if (typeof executeUrl === "string") {
-        _url = executeUrl;
-        _config = config;
-      } else {
-        _config = config;
-      }
+      const _url = typeof executeUrl === "string" ? executeUrl : url != null ? url : "";
       loading(true);
-      instance(_url, __spreadProps(__spreadValues(__spreadValues({}, defaultConfig), _config), { cancelToken: cancelToken.token })).then((r) => {
+      instance(_url, __spreadProps(__spreadValues(__spreadValues({}, defaultConfig), config), { cancelToken: cancelToken.token })).then((r) => {
         response.value = r;
         data.value = r.data;
       }).catch((e) => {
         error.value = e;
-      }).finally(() => {
-        loading(false);
-      });
+      }).finally(() => loading(false));
+      return { then };
     };
     if (options.immediate && url)
       execute();
@@ -188,15 +184,8 @@
       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);
-      }
+      then
     });
   }
 

package/useAxios.iife.min.js

@@ -1 +1 @@
-var VueDemi=function(e,t,a){if(e.install)return e;if(t)if(t.version.slice(0,4)==="2.7."){for(var c in t)e[c]=t[c];e.isVue2=!0,e.isVue3=!1,e.install=function(){},e.Vue=t,e.Vue2=t,e.version=t.version,e.set=function(r,i,f){return Array.isArray(r)?(r.length=Math.max(r.length,i),r.splice(i,1,f),f):(t.set(r,i,f),f)},e.del=function(r,i){if(Array.isArray(r)){r.splice(i,1);return}t.delete(r,i)}}else if(t.version.slice(0,2)==="2.")if(a){for(var c in a)e[c]=a[c];e.isVue2=!0,e.isVue3=!1,e.install=function(){},e.Vue=t,e.Vue2=t,e.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 c in t)e[c]=t[c];e.isVue2=!1,e.isVue3=!0,e.install=function(){},e.Vue=t,e.Vue2=void 0,e.version=t.version,e.set=function(r,i,f){return Array.isArray(r)?(r.length=Math.max(r.length,i),r.splice(i,1,f),f):(r[i]=f,f)},e.del=function(r,i){if(Array.isArray(r)){r.splice(i,1);return}delete r[i]}}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`.");return e}(this.VueDemi=this.VueDemi||(typeof VueDemi!="undefined"?VueDemi:{}),this.Vue||(typeof Vue!="undefined"?Vue:void 0),this.VueCompositionAPI||(typeof VueCompositionAPI!="undefined"?VueCompositionAPI:void 0));(function(e,t,a,c){"use strict";function r(n){return n&&typeof n=="object"&&"default"in n?n:{default:n}}var i=r(c),f=Object.defineProperty,L=Object.defineProperties,q=Object.getOwnPropertyDescriptors,O=Object.getOwnPropertySymbols,B=Object.prototype.hasOwnProperty,N=Object.prototype.propertyIsEnumerable,w=(n,s,o)=>s in n?f(n,s,{enumerable:!0,configurable:!0,writable:!0,value:o}):n[s]=o,y=(n,s)=>{for(var o in s||(s={}))B.call(s,o)&&w(n,o,s[o]);if(O)for(var o of O(s))N.call(s,o)&&w(n,o,s[o]);return n},j=(n,s)=>L(n,q(s));function z(...n){const s=typeof n[0]=="string"?n[0]:void 0,o=a.isString(s)?1:0;let x={},P=i.default,C={immediate:!!o};const A=l=>!!(l==null?void 0:l.request);n.length>0+o&&(A(n[0+o])?P=n[0+o]:x=n[0+o]),n.length>1+o&&A(n[1+o])&&(P=n[1+o]),(n.length===2+o&&!A(n[1+o])||n.length===3+o)&&(C=n[n.length-1]);const I=t.shallowRef(),M=t.shallowRef(),u=t.ref(!1),p=t.ref(!1),v=t.ref(!1),R=t.shallowRef(),S=i.default.CancelToken.source(),T=l=>{u.value||!p.value||(S.cancel(l),v.value=!0,p.value=!1,u.value=!1)},U=l=>{p.value=l,u.value=!l},E=(l=s,d={})=>{let h=s??"",b;typeof l=="string"&&(h=l),b=d,U(!0),P(h,j(y(y({},x),b),{cancelToken:S.token})).then(_=>{I.value=_,M.value=_.data}).catch(_=>{R.value=_}).finally(()=>{U(!1)})};C.immediate&&s&&E();const F={response:I,data:M,error:R,finished:u,loading:p,isFinished:u,isLoading:p,cancel:T,isAborted:v,canceled:v,aborted:v,isCanceled:v,abort:T,execute:E};function G(){return new Promise((l,d)=>{a.until(u).toBe(!0).then(()=>l(F)).catch(h=>d(h))})}return j(y({},F),{then(l,d){return G().then(l,d)}})}e.useAxios=z,Object.defineProperty(e,"__esModule",{value:!0})})(this.VueUse=this.VueUse||{},VueDemi,VueUse,axios);
+var VueDemi=function(e,t,a){if(e.install)return e;if(t)if(t.version.slice(0,4)==="2.7."){for(var c in t)e[c]=t[c];e.isVue2=!0,e.isVue3=!1,e.install=function(){},e.Vue=t,e.Vue2=t,e.version=t.version,e.set=function(r,i,f){return Array.isArray(r)?(r.length=Math.max(r.length,i),r.splice(i,1,f),f):(t.set(r,i,f),f)},e.del=function(r,i){if(Array.isArray(r)){r.splice(i,1);return}t.delete(r,i)}}else if(t.version.slice(0,2)==="2.")if(a){for(var c in a)e[c]=a[c];e.isVue2=!0,e.isVue3=!1,e.install=function(){},e.Vue=t,e.Vue2=t,e.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 c in t)e[c]=t[c];e.isVue2=!1,e.isVue3=!0,e.install=function(){},e.Vue=t,e.Vue2=void 0,e.version=t.version,e.set=function(r,i,f){return Array.isArray(r)?(r.length=Math.max(r.length,i),r.splice(i,1,f),f):(r[i]=f,f)},e.del=function(r,i){if(Array.isArray(r)){r.splice(i,1);return}delete r[i]}}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`.");return e}(this.VueDemi=this.VueDemi||(typeof VueDemi!="undefined"?VueDemi:{}),this.Vue||(typeof Vue!="undefined"?Vue:void 0),this.VueCompositionAPI||(typeof VueCompositionAPI!="undefined"?VueCompositionAPI:void 0));(function(e,t,a,c){"use strict";function r(n){return n&&typeof n=="object"&&"default"in n?n:{default:n}}var i=r(c),f=Object.defineProperty,F=Object.defineProperties,L=Object.getOwnPropertyDescriptors,A=Object.getOwnPropertySymbols,q=Object.prototype.hasOwnProperty,B=Object.prototype.propertyIsEnumerable,b=(n,s,o)=>s in n?f(n,s,{enumerable:!0,configurable:!0,writable:!0,value:o}):n[s]=o,_=(n,s)=>{for(var o in s||(s={}))q.call(s,o)&&b(n,o,s[o]);if(A)for(var o of A(s))B.call(s,o)&&b(n,o,s[o]);return n},O=(n,s)=>F(n,L(s));function N(...n){const s=typeof n[0]=="string"?n[0]:void 0,o=a.isString(s)?1:0;let w={},y=i.default,j={immediate:!!o};const P=l=>!!(l==null?void 0:l.request);n.length>0+o&&(P(n[0+o])?y=n[0+o]:w=n[0+o]),n.length>1+o&&P(n[1+o])&&(y=n[1+o]),(n.length===2+o&&!P(n[1+o])||n.length===3+o)&&(j=n[n.length-1]);const x=t.shallowRef(),C=t.shallowRef(),u=t.ref(!1),d=t.ref(!1),p=t.ref(!1),I=t.shallowRef(),M=i.default.CancelToken.source(),R=l=>{u.value||!d.value||(M.cancel(l),p.value=!0,d.value=!1,u.value=!1)},S=l=>{d.value=l,u.value=!l},z=()=>new Promise((l,v)=>{a.until(u).toBe(!0).then(()=>l(E)).catch(v)}),T=(l,v)=>z().then(l,v),U=(l=s,v={})=>{const G=typeof l=="string"?l:s??"";return S(!0),y(G,O(_(_({},w),v),{cancelToken:M.token})).then(h=>{x.value=h,C.value=h.data}).catch(h=>{I.value=h}).finally(()=>S(!1)),{then:T}};j.immediate&&s&&U();const E={response:x,data:C,error:I,finished:u,loading:d,isFinished:u,isLoading:d,cancel:R,isAborted:p,canceled:p,aborted:p,isCanceled:p,abort:R,execute:U};return O(_({},E),{then:T})}e.useAxios=N,Object.defineProperty(e,"__esModule",{value:!0})})(this.VueUse=this.VueUse||{},VueDemi,VueUse,axios);

package/useAxios.mjs

@@ -59,24 +59,20 @@ function useAxios(...args) {
     isLoading.value = loading2;
     isFinished.value = !loading2;
   };
+  const waitUntilFinished = () => new Promise((resolve, reject) => {
+    until(isFinished).toBe(true).then(() => resolve(result)).catch(reject);
+  });
+  const then = (onFulfilled, onRejected) => waitUntilFinished().then(onFulfilled, onRejected);
   const execute = (executeUrl = url, config = {}) => {
-    let _url = url != null ? url : "";
-    let _config;
-    if (typeof executeUrl === "string") {
-      _url = executeUrl;
-      _config = config;
-    } else {
-      _config = config;
-    }
+    const _url = typeof executeUrl === "string" ? executeUrl : url != null ? url : "";
     loading(true);
-    instance(_url, __spreadProps(__spreadValues(__spreadValues({}, defaultConfig), _config), { cancelToken: cancelToken.token })).then((r) => {
+    instance(_url, __spreadProps(__spreadValues(__spreadValues({}, defaultConfig), config), { cancelToken: cancelToken.token })).then((r) => {
       response.value = r;
       data.value = r.data;
     }).catch((e) => {
       error.value = e;
-    }).finally(() => {
-      loading(false);
-    });
+    }).finally(() => loading(false));
+    return { then };
   };
   if (options.immediate && url)
     execute();
@@ -96,15 +92,8 @@ function useAxios(...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);
-    }
+    then
   });
 }
 

package/useDrauu.cjs

@@ -46,8 +46,10 @@ function useDrauu(target, options) {
   });
   vueDemi.watch(brush, () => {
     const instance = drauuInstance.value;
-    if (instance)
+    if (instance) {
       instance.brush = brush.value;
+      instance.mode = brush.value.mode;
+    }
   }, { deep: true });
   const undo = () => {
     var _a;

package/useDrauu.iife.js

@@ -129,8 +129,10 @@
     });
     vueDemi.watch(brush, () => {
       const instance = drauuInstance.value;
-      if (instance)
+      if (instance) {
         instance.brush = brush.value;
+        instance.mode = brush.value.mode;
+      }
     }, { deep: true });
     const undo = () => {
       var _a;

package/useDrauu.iife.min.js

@@ -1 +1 @@
-var VueDemi=function(e,r,c){if(e.install)return e;if(r)if(r.version.slice(0,4)==="2.7."){for(var t in r)e[t]=r[t];e.isVue2=!0,e.isVue3=!1,e.install=function(){},e.Vue=r,e.Vue2=r,e.version=r.version,e.set=function(s,a,i){return Array.isArray(s)?(s.length=Math.max(s.length,a),s.splice(a,1,i),i):(r.set(s,a,i),i)},e.del=function(s,a){if(Array.isArray(s)){s.splice(a,1);return}r.delete(s,a)}}else if(r.version.slice(0,2)==="2.")if(c){for(var t in c)e[t]=c[t];e.isVue2=!0,e.isVue3=!1,e.install=function(){},e.Vue=r,e.Vue2=r,e.version=r.version}else console.error("[vue-demi] no VueCompositionAPI instance found, please be sure to import `@vue/composition-api` before `vue-demi`.");else if(r.version.slice(0,2)==="3."){for(var t in r)e[t]=r[t];e.isVue2=!1,e.isVue3=!0,e.install=function(){},e.Vue=r,e.Vue2=void 0,e.version=r.version,e.set=function(s,a,i){return Array.isArray(s)?(s.length=Math.max(s.length,a),s.splice(a,1,i),i):(s[a]=i,i)},e.del=function(s,a){if(Array.isArray(s)){s.splice(a,1);return}delete s[a]}}else console.error("[vue-demi] Vue version "+r.version+" is unsupported.");else console.error("[vue-demi] no Vue instance found, please be sure to import `vue` before `vue-demi`.");return e}(this.VueDemi=this.VueDemi||(typeof VueDemi!="undefined"?VueDemi:{}),this.Vue||(typeof Vue!="undefined"?Vue:void 0),this.VueCompositionAPI||(typeof VueCompositionAPI!="undefined"?VueCompositionAPI:void 0));(function(e,r,c,t,s){"use strict";var a=Object.defineProperty,i=Object.getOwnPropertySymbols,S=Object.prototype.hasOwnProperty,w=Object.prototype.propertyIsEnumerable,v=(u,l,n)=>l in u?a(u,l,{enumerable:!0,configurable:!0,writable:!0,value:n}):u[l]=n,g=(u,l)=>{for(var n in l||(l={}))S.call(l,n)&&v(u,n,l[n]);if(i)for(var n of i(l))w.call(l,n)&&v(u,n,l[n]);return u};function C(u,l){const n=r.ref();let p=[];const h=t.createEventHook(),_=t.createEventHook(),y=t.createEventHook(),E=t.createEventHook(),P=t.createEventHook(),b=r.ref(!1),A=r.ref(!1),U=r.ref(!1),I=r.ref(!1),f=r.ref({color:"black",size:3,arrowEnd:!1,cornerRadius:0,dasharray:void 0,fill:"transparent",mode:"draw"});r.watch(f,()=>{const o=n.value;o&&(o.brush=f.value)},{deep:!0});const k=()=>{var o;return(o=n.value)==null?void 0:o.undo()},G=()=>{var o;return(o=n.value)==null?void 0:o.redo()},j=()=>{var o;return(o=n.value)==null?void 0:o.clear()},M=()=>{var o;return(o=n.value)==null?void 0:o.cancel()},R=o=>{var d;return(d=n.value)==null?void 0:d.load(o)},x=()=>{var o;return(o=n.value)==null?void 0:o.dump()},H=()=>{var o;p.forEach(d=>d()),(o=n.value)==null||o.unmount()},O=()=>{n.value&&(b.value=n.value.canUndo(),A.value=n.value.canRedo(),U.value=n.value.altPressed,I.value=n.value.shiftPressed)};return r.watch(()=>t.unrefElement(u),o=>{!o||typeof SVGSVGElement=="undefined"||!(o instanceof SVGSVGElement)||(n.value&&H(),n.value=c.createDrauu(g({el:o},l)),O(),p=[n.value.on("canceled",()=>_.trigger()),n.value.on("committed",()=>y.trigger()),n.value.on("start",()=>E.trigger()),n.value.on("end",()=>P.trigger()),n.value.on("changed",()=>{O(),h.trigger()})])},{flush:"post"}),s.tryOnScopeDispose(()=>H()),{drauuInstance:n,load:R,dump:x,clear:j,cancel:M,undo:k,redo:G,canUndo:b,canRedo:A,brush:f,onChanged:h.on,onCommitted:y.on,onStart:E.on,onEnd:P.on,onCanceled:_.on}}e.useDrauu=C,Object.defineProperty(e,"__esModule",{value:!0})})(this.VueUse=this.VueUse||{},VueDemi,Drauu,VueUse,VueUse);
+var VueDemi=function(e,r,c){if(e.install)return e;if(r)if(r.version.slice(0,4)==="2.7."){for(var t in r)e[t]=r[t];e.isVue2=!0,e.isVue3=!1,e.install=function(){},e.Vue=r,e.Vue2=r,e.version=r.version,e.set=function(s,a,u){return Array.isArray(s)?(s.length=Math.max(s.length,a),s.splice(a,1,u),u):(r.set(s,a,u),u)},e.del=function(s,a){if(Array.isArray(s)){s.splice(a,1);return}r.delete(s,a)}}else if(r.version.slice(0,2)==="2.")if(c){for(var t in c)e[t]=c[t];e.isVue2=!0,e.isVue3=!1,e.install=function(){},e.Vue=r,e.Vue2=r,e.version=r.version}else console.error("[vue-demi] no VueCompositionAPI instance found, please be sure to import `@vue/composition-api` before `vue-demi`.");else if(r.version.slice(0,2)==="3."){for(var t in r)e[t]=r[t];e.isVue2=!1,e.isVue3=!0,e.install=function(){},e.Vue=r,e.Vue2=void 0,e.version=r.version,e.set=function(s,a,u){return Array.isArray(s)?(s.length=Math.max(s.length,a),s.splice(a,1,u),u):(s[a]=u,u)},e.del=function(s,a){if(Array.isArray(s)){s.splice(a,1);return}delete s[a]}}else console.error("[vue-demi] Vue version "+r.version+" is unsupported.");else console.error("[vue-demi] no Vue instance found, please be sure to import `vue` before `vue-demi`.");return e}(this.VueDemi=this.VueDemi||(typeof VueDemi!="undefined"?VueDemi:{}),this.Vue||(typeof Vue!="undefined"?Vue:void 0),this.VueCompositionAPI||(typeof VueCompositionAPI!="undefined"?VueCompositionAPI:void 0));(function(e,r,c,t,s){"use strict";var a=Object.defineProperty,u=Object.getOwnPropertySymbols,S=Object.prototype.hasOwnProperty,w=Object.prototype.propertyIsEnumerable,v=(i,l,n)=>l in i?a(i,l,{enumerable:!0,configurable:!0,writable:!0,value:n}):i[l]=n,g=(i,l)=>{for(var n in l||(l={}))S.call(l,n)&&v(i,n,l[n]);if(u)for(var n of u(l))w.call(l,n)&&v(i,n,l[n]);return i};function C(i,l){const n=r.ref();let p=[];const h=t.createEventHook(),_=t.createEventHook(),y=t.createEventHook(),E=t.createEventHook(),P=t.createEventHook(),b=r.ref(!1),A=r.ref(!1),U=r.ref(!1),I=r.ref(!1),d=r.ref({color:"black",size:3,arrowEnd:!1,cornerRadius:0,dasharray:void 0,fill:"transparent",mode:"draw"});r.watch(d,()=>{const o=n.value;o&&(o.brush=d.value,o.mode=d.value.mode)},{deep:!0});const k=()=>{var o;return(o=n.value)==null?void 0:o.undo()},G=()=>{var o;return(o=n.value)==null?void 0:o.redo()},j=()=>{var o;return(o=n.value)==null?void 0:o.clear()},M=()=>{var o;return(o=n.value)==null?void 0:o.cancel()},R=o=>{var f;return(f=n.value)==null?void 0:f.load(o)},m=()=>{var o;return(o=n.value)==null?void 0:o.dump()},H=()=>{var o;p.forEach(f=>f()),(o=n.value)==null||o.unmount()},O=()=>{n.value&&(b.value=n.value.canUndo(),A.value=n.value.canRedo(),U.value=n.value.altPressed,I.value=n.value.shiftPressed)};return r.watch(()=>t.unrefElement(i),o=>{!o||typeof SVGSVGElement=="undefined"||!(o instanceof SVGSVGElement)||(n.value&&H(),n.value=c.createDrauu(g({el:o},l)),O(),p=[n.value.on("canceled",()=>_.trigger()),n.value.on("committed",()=>y.trigger()),n.value.on("start",()=>E.trigger()),n.value.on("end",()=>P.trigger()),n.value.on("changed",()=>{O(),h.trigger()})])},{flush:"post"}),s.tryOnScopeDispose(()=>H()),{drauuInstance:n,load:R,dump:m,clear:j,cancel:M,undo:k,redo:G,canUndo:b,canRedo:A,brush:d,onChanged:h.on,onCommitted:y.on,onStart:E.on,onEnd:P.on,onCanceled:_.on}}e.useDrauu=C,Object.defineProperty(e,"__esModule",{value:!0})})(this.VueUse=this.VueUse||{},VueDemi,Drauu,VueUse,VueUse);

package/useDrauu.mjs

@@ -42,8 +42,10 @@ function useDrauu(target, options) {
   });
   watch(brush, () => {
     const instance = drauuInstance.value;
-    if (instance)
+    if (instance) {
       instance.brush = brush.value;
+      instance.mode = brush.value.mode;
+    }
   }, { deep: true });
   const undo = () => {
     var _a;