@vueuse/integrations 9.10.0 → 9.11.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/index.cjs +6 -1
- package/index.d.ts +7 -7
- package/index.iife.js +6 -1
- package/index.iife.min.js +1 -1
- package/index.mjs +7 -2
- package/package.json +4 -4
- package/useAsyncValidator/component.cjs +1 -1
- package/useAsyncValidator/component.mjs +1 -1
- package/useAxios.cjs +6 -1
- package/useAxios.d.ts +7 -7
- package/useAxios.iife.js +6 -1
- package/useAxios.iife.min.js +1 -1
- package/useAxios.mjs +7 -2
- package/useFocusTrap/component.cjs +1 -1
- package/useFocusTrap/component.mjs +1 -1
package/index.cjs
CHANGED
|
@@ -143,7 +143,12 @@ function useAxios(...args) {
|
|
|
143
143
|
const then = (onFulfilled, onRejected) => waitUntilFinished().then(onFulfilled, onRejected);
|
|
144
144
|
const execute = (executeUrl = url, config = {}) => {
|
|
145
145
|
error.value = void 0;
|
|
146
|
-
const _url = typeof executeUrl === "string" ? executeUrl : url != null ? url :
|
|
146
|
+
const _url = typeof executeUrl === "string" ? executeUrl : url != null ? url : config.url;
|
|
147
|
+
if (_url === void 0) {
|
|
148
|
+
error.value = new axios.AxiosError(axios.AxiosError.ERR_INVALID_URL);
|
|
149
|
+
isFinished.value = true;
|
|
150
|
+
return { then };
|
|
151
|
+
}
|
|
147
152
|
loading(true);
|
|
148
153
|
instance(_url, __spreadProps$1(__spreadValues$4(__spreadValues$4({}, defaultConfig), typeof executeUrl === "object" ? executeUrl : config), { cancelToken: cancelToken.token })).then((r) => {
|
|
149
154
|
response.value = r;
|
package/index.d.ts
CHANGED
|
@@ -2,7 +2,7 @@ import { MaybeComputedRef, MaybeRef, ConfigurableFlush, RemovableRef } from '@vu
|
|
|
2
2
|
import { ValidateError, ValidateOption, Rules } from 'async-validator';
|
|
3
3
|
import * as vue_demi from 'vue-demi';
|
|
4
4
|
import { Ref, ShallowRef, WritableComputedRef, ComputedRef } from 'vue-demi';
|
|
5
|
-
import { AxiosResponse, AxiosError,
|
|
5
|
+
import { AxiosResponse, AxiosError, RawAxiosRequestConfig, AxiosInstance } from 'axios';
|
|
6
6
|
import { camelCase, capitalCase, constantCase, dotCase, headerCase, noCase, paramCase, pascalCase, pathCase, sentenceCase, snakeCase, Options } from 'change-case';
|
|
7
7
|
import * as universal_cookie from 'universal-cookie';
|
|
8
8
|
import universal_cookie__default from 'universal-cookie';
|
|
@@ -102,13 +102,13 @@ interface StrictUseAxiosReturn<T, R, D> extends UseAxiosReturn<T, R, D> {
|
|
|
102
102
|
/**
|
|
103
103
|
* Manually call the axios request
|
|
104
104
|
*/
|
|
105
|
-
execute: (url?: string |
|
|
105
|
+
execute: (url?: string | RawAxiosRequestConfig<D>, config?: RawAxiosRequestConfig<D>) => PromiseLike<StrictUseAxiosReturn<T, R, D>>;
|
|
106
106
|
}
|
|
107
107
|
interface EasyUseAxiosReturn<T, R, D> extends UseAxiosReturn<T, R, D> {
|
|
108
108
|
/**
|
|
109
109
|
* Manually call the axios request
|
|
110
110
|
*/
|
|
111
|
-
execute: (url: string, config?:
|
|
111
|
+
execute: (url: string, config?: RawAxiosRequestConfig<D>) => PromiseLike<EasyUseAxiosReturn<T, R, D>>;
|
|
112
112
|
}
|
|
113
113
|
interface UseAxiosOptions {
|
|
114
114
|
/**
|
|
@@ -123,12 +123,12 @@ interface UseAxiosOptions {
|
|
|
123
123
|
*/
|
|
124
124
|
shallow?: boolean;
|
|
125
125
|
}
|
|
126
|
-
declare function useAxios<T = any, R = AxiosResponse<T>, D = any>(url: string, config?:
|
|
126
|
+
declare function useAxios<T = any, R = AxiosResponse<T>, D = any>(url: string, config?: RawAxiosRequestConfig<D>, options?: UseAxiosOptions): StrictUseAxiosReturn<T, R, D> & PromiseLike<StrictUseAxiosReturn<T, R, D>>;
|
|
127
127
|
declare function useAxios<T = any, R = AxiosResponse<T>, D = any>(url: string, instance?: AxiosInstance, options?: UseAxiosOptions): StrictUseAxiosReturn<T, R, D> & PromiseLike<StrictUseAxiosReturn<T, R, D>>;
|
|
128
|
-
declare function useAxios<T = any, R = AxiosResponse<T>, D = any>(url: string, config:
|
|
129
|
-
declare function useAxios<T = any, R = AxiosResponse<T>, D = any>(config?:
|
|
128
|
+
declare function useAxios<T = any, R = AxiosResponse<T>, D = any>(url: string, config: RawAxiosRequestConfig<D>, instance: AxiosInstance, options?: UseAxiosOptions): StrictUseAxiosReturn<T, R, D> & PromiseLike<StrictUseAxiosReturn<T, R, D>>;
|
|
129
|
+
declare function useAxios<T = any, R = AxiosResponse<T>, D = any>(config?: RawAxiosRequestConfig<D>): EasyUseAxiosReturn<T, R, D> & PromiseLike<EasyUseAxiosReturn<T, R, D>>;
|
|
130
130
|
declare function useAxios<T = any, R = AxiosResponse<T>, D = any>(instance?: AxiosInstance): EasyUseAxiosReturn<T, R, D> & PromiseLike<EasyUseAxiosReturn<T, R, D>>;
|
|
131
|
-
declare function useAxios<T = any, R = AxiosResponse<T>, D = any>(config?:
|
|
131
|
+
declare function useAxios<T = any, R = AxiosResponse<T>, D = any>(config?: RawAxiosRequestConfig<D>, instance?: AxiosInstance): EasyUseAxiosReturn<T, R, D> & PromiseLike<EasyUseAxiosReturn<T, R, D>>;
|
|
132
132
|
|
|
133
133
|
declare const changeCase_camelCase: typeof camelCase;
|
|
134
134
|
declare const changeCase_capitalCase: typeof capitalCase;
|
package/index.iife.js
CHANGED
|
@@ -243,7 +243,12 @@ var VueDemi = (function (VueDemi, Vue, VueCompositionAPI) {
|
|
|
243
243
|
const then = (onFulfilled, onRejected) => waitUntilFinished().then(onFulfilled, onRejected);
|
|
244
244
|
const execute = (executeUrl = url, config = {}) => {
|
|
245
245
|
error.value = void 0;
|
|
246
|
-
const _url = typeof executeUrl === "string" ? executeUrl : url != null ? url :
|
|
246
|
+
const _url = typeof executeUrl === "string" ? executeUrl : url != null ? url : config.url;
|
|
247
|
+
if (_url === void 0) {
|
|
248
|
+
error.value = new axios.AxiosError(axios.AxiosError.ERR_INVALID_URL);
|
|
249
|
+
isFinished.value = true;
|
|
250
|
+
return { then };
|
|
251
|
+
}
|
|
247
252
|
loading(true);
|
|
248
253
|
instance(_url, __spreadProps$1(__spreadValues$4(__spreadValues$4({}, defaultConfig), typeof executeUrl === "object" ? executeUrl : config), { cancelToken: cancelToken.token })).then((r) => {
|
|
249
254
|
response.value = r;
|
package/index.iife.min.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
var VueDemi=function(s,o,j){if(s.install)return s;if(!o)return console.error("[vue-demi] no Vue instance found, please be sure to import `vue` before `vue-demi`."),s;if(o.version.slice(0,4)==="2.7."){let p=function(C,E){var P,A={},I={config:o.config,use:o.use.bind(o),mixin:o.mixin.bind(o),component:o.component.bind(o),provide:function(y,$){return A[y]=$,this},directive:function(y,$){return $?(o.directive(y,$),I):o.directive(y)},mount:function(y,$){return P||(P=new o(Object.assign({propsData:E},C,{provide:Object.assign(A,C.provide)})),P.$mount(y,$),P)},unmount:function(){P&&(P.$destroy(),P=void 0)}};return I};var G=p;for(var a in o)s[a]=o[a];s.isVue2=!0,s.isVue3=!1,s.install=function(){},s.Vue=o,s.Vue2=o,s.version=o.version,s.warn=o.util.warn,s.createApp=p}else if(o.version.slice(0,2)==="2.")if(j){for(var a in j)s[a]=j[a];s.isVue2=!0,s.isVue3=!1,s.install=function(){},s.Vue=o,s.Vue2=o,s.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 a in o)s[a]=o[a];s.isVue2=!1,s.isVue3=!0,s.install=function(){},s.Vue=o,s.Vue2=void 0,s.version=o.version,s.set=function(p,C,E){return Array.isArray(p)?(p.length=Math.max(p.length,C),p.splice(C,1,E),E):(p[C]=E,E)},s.del=function(p,C){if(Array.isArray(p)){p.splice(C,1);return}delete p[C]}}else console.error("[vue-demi] Vue version "+o.version+" is unsupported.");return s}(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(s,o,j,a,G,p,C,E,P,A,I,y,$,g,ne){"use strict";var oe=Object.defineProperty,ae=Object.defineProperties,se=Object.getOwnPropertyDescriptors,J=Object.getOwnPropertySymbols,le=Object.prototype.hasOwnProperty,ue=Object.prototype.propertyIsEnumerable,Q=(t,r,e)=>r in t?oe(t,r,{enumerable:!0,configurable:!0,writable:!0,value:e}):t[r]=e,ce=(t,r)=>{for(var e in r||(r={}))le.call(r,e)&&Q(t,e,r[e]);if(J)for(var e of J(r))ue.call(r,e)&&Q(t,e,r[e]);return t},ie=(t,r)=>ae(t,se(r));function fe(t,r,e={}){const n=a.ref(),l=a.ref(!1),d=a.ref(!1),c=a.computed(()=>{var f;return((f=n.value)==null?void 0:f.errors)||[]}),i=a.computed(()=>{var f;return((f=n.value)==null?void 0:f.fields)||{}}),{validateOption:u={}}=e;a.watchEffect(async()=>{l.value=!1,d.value=!1;const f=new j(o.resolveUnref(r));try{await f.validate(o.resolveUnref(t),u),d.value=!0,n.value=null}catch(O){n.value=O}finally{l.value=!0}});const _={pass:d,isFinished:l,errorInfo:n,errors:c,errorFields:i};function h(){return new Promise((f,O)=>{o.until(l).toBe(!0).then(()=>f(_)).catch(m=>O(m))})}return ie(ce({},_),{then(f,O){return h().then(f,O)}})}var ve=Object.defineProperty,de=Object.defineProperties,pe=Object.getOwnPropertyDescriptors,z=Object.getOwnPropertySymbols,_e=Object.prototype.hasOwnProperty,we=Object.prototype.propertyIsEnumerable,W=(t,r,e)=>r in t?ve(t,r,{enumerable:!0,configurable:!0,writable:!0,value:e}):t[r]=e,T=(t,r)=>{for(var e in r||(r={}))_e.call(r,e)&&W(t,e,r[e]);if(z)for(var e of z(r))we.call(r,e)&&W(t,e,r[e]);return t},M=(t,r)=>de(t,pe(r));function Oe(...t){const r=typeof t[0]=="string"?t[0]:void 0,e=o.isString(r)?1:0;let n={},l=G,d={immediate:!!e,shallow:!0};const c=w=>!!(w==null?void 0:w.request);t.length>0+e&&(c(t[0+e])?l=t[0+e]:n=t[0+e]),t.length>1+e&&c(t[1+e])&&(l=t[1+e]),(t.length===2+e&&!c(t[1+e])||t.length===3+e)&&(d=t[t.length-1]);const i=a.shallowRef(),u=d.shallow?a.shallowRef():a.ref(),_=a.ref(!1),h=a.ref(!1),f=a.ref(!1),O=a.shallowRef(),m=G.CancelToken.source(),F=w=>{_.value||!h.value||(m.cancel(w),f.value=!0,h.value=!1,_.value=!1)},N=w=>{h.value=w,_.value=!w},B=()=>new Promise((w,S)=>{o.until(_).toBe(!0).then(()=>w(L)).catch(S)}),R=(w,S)=>B().then(w,S),H=(w=r,S={})=>{O.value=void 0;const v=typeof w=="string"?w:r??"";return N(!0),l(v,M(T(T({},n),typeof w=="object"?w:S),{cancelToken:m.token})).then(b=>{i.value=b,u.value=b.data}).catch(b=>{O.value=b}).finally(()=>N(!1)),{then:R}};d.immediate&&r&&H();const L={response:i,data:u,error:O,finished:_,loading:h,isFinished:_,isLoading:h,cancel:F,isAborted:f,canceled:f,aborted:f,isCanceled:f,abort:F,execute:H};return M(T({},L),{then:R})}var q=Object.freeze({__proto__:null,camelCase:p.camelCase,capitalCase:p.capitalCase,constantCase:p.constantCase,dotCase:p.dotCase,headerCase:p.headerCase,noCase:p.noCase,paramCase:p.paramCase,pascalCase:p.pascalCase,pathCase:p.pathCase,sentenceCase:p.sentenceCase,snakeCase:p.snakeCase});function Pe(t,r,e){if(o.isFunction(t))return a.computed(()=>q[r](o.resolveUnref(t),e));const n=a.ref(t);return a.computed({get(){return q[r](n.value,e)},set(l){n.value=l}})}var he=Object.defineProperty,X=Object.getOwnPropertySymbols,ye=Object.prototype.hasOwnProperty,Ce=Object.prototype.propertyIsEnumerable,Y=(t,r,e)=>r in t?he(t,r,{enumerable:!0,configurable:!0,writable:!0,value:e}):t[r]=e,Z=(t,r)=>{for(var e in r||(r={}))ye.call(r,e)&&Y(t,e,r[e]);if(X)for(var e of X(r))Ce.call(r,e)&&Y(t,e,r[e]);return t};function ge(t){const r=new C(t?t.headers.cookie:null);return(e,{doNotParse:n=!1,autoUpdateDependencies:l=!1}={})=>k(e,{doNotParse:n,autoUpdateDependencies:l},r)}function k(t,{doNotParse:r=!1,autoUpdateDependencies:e=!1}={},n=new C){const l=e?[...t||[]]:t;let d=n.getAll({doNotParse:!0});const c=a.ref(0),i=()=>{const u=n.getAll({doNotParse:!0});me(l||null,u,d)&&c.value++,d=u};return n.addChangeListener(i),o.tryOnScopeDispose(()=>{n.removeChangeListener(i)}),{get:(...u)=>(e&&l&&!l.includes(u[0])&&l.push(u[0]),c.value,n.get(u[0],Z({doNotParse:r},u[1]))),getAll:(...u)=>(c.value,n.getAll(Z({doNotParse:r},u[0]))),set:(...u)=>n.set(...u),remove:(...u)=>n.remove(...u),addChangeListener:(...u)=>n.addChangeListener(...u),removeChangeListener:(...u)=>n.removeChangeListener(...u)}}function me(t,r,e){if(!t)return!0;for(const n of t)if(r[n]!==e[n])return!0;return!1}var be=Object.defineProperty,K=Object.getOwnPropertySymbols,Ee=Object.prototype.hasOwnProperty,$e=Object.prototype.propertyIsEnumerable,x=(t,r,e)=>r in t?be(t,r,{enumerable:!0,configurable:!0,writable:!0,value:e}):t[r]=e,Se=(t,r)=>{for(var e in r||(r={}))Ee.call(r,e)&&x(t,e,r[e]);if(K)for(var e of K(r))$e.call(r,e)&&x(t,e,r[e]);return t};function je(t,r){const e=a.ref();let n=[];const l=P.createEventHook(),d=P.createEventHook(),c=P.createEventHook(),i=P.createEventHook(),u=P.createEventHook(),_=a.ref(!1),h=a.ref(!1),f=a.ref(!1),O=a.ref(!1),m=a.ref({color:"black",size:3,arrowEnd:!1,cornerRadius:0,dasharray:void 0,fill:"transparent",mode:"draw"});a.watch(m,()=>{const v=e.value;v&&(v.brush=m.value,v.mode=m.value.mode)},{deep:!0});const F=()=>{var v;return(v=e.value)==null?void 0:v.undo()},N=()=>{var v;return(v=e.value)==null?void 0:v.redo()},B=()=>{var v;return(v=e.value)==null?void 0:v.clear()},R=()=>{var v;return(v=e.value)==null?void 0:v.cancel()},H=v=>{var b;return(b=e.value)==null?void 0:b.load(v)},L=()=>{var v;return(v=e.value)==null?void 0:v.dump()},w=()=>{var v;n.forEach(b=>b()),(v=e.value)==null||v.unmount()},S=()=>{e.value&&(_.value=e.value.canUndo(),h.value=e.value.canRedo(),f.value=e.value.altPressed,O.value=e.value.shiftPressed)};return a.watch(()=>P.unrefElement(t),v=>{!v||typeof SVGSVGElement=="undefined"||!(v instanceof SVGSVGElement)||(e.value&&w(),e.value=E.createDrauu(Se({el:v},r)),S(),n=[e.value.on("canceled",()=>d.trigger()),e.value.on("committed",()=>c.trigger()),e.value.on("start",()=>i.trigger()),e.value.on("end",()=>u.trigger()),e.value.on("changed",()=>{S(),l.trigger()})])},{flush:"post"}),o.tryOnScopeDispose(()=>w()),{drauuInstance:e,load:H,dump:L,clear:B,cancel:R,undo:F,redo:N,canUndo:_,canRedo:h,brush:m,onChanged:l.on,onCommitted:c.on,onStart:i.on,onEnd:u.on,onCanceled:d.on}}var Ae=Object.defineProperty,Ie=Object.defineProperties,Ue=Object.getOwnPropertyDescriptors,U=Object.getOwnPropertySymbols,V=Object.prototype.hasOwnProperty,D=Object.prototype.propertyIsEnumerable,ee=(t,r,e)=>r in t?Ae(t,r,{enumerable:!0,configurable:!0,writable:!0,value:e}):t[r]=e,Fe=(t,r)=>{for(var e in r||(r={}))V.call(r,e)&&ee(t,e,r[e]);if(U)for(var e of U(r))D.call(r,e)&&ee(t,e,r[e]);return t},Ne=(t,r)=>Ie(t,Ue(r)),Re=(t,r)=>{var e={};for(var n in t)V.call(t,n)&&r.indexOf(n)<0&&(e[n]=t[n]);if(t!=null&&U)for(var n of U(t))r.indexOf(n)<0&&D.call(t,n)&&(e[n]=t[n]);return e};function He(t,r={}){let e;const n=r,{immediate:l}=n,d=Re(n,["immediate"]),c=a.ref(!1),i=a.ref(!1),u=O=>e&&e.activate(O),_=O=>e&&e.deactivate(O),h=()=>{e&&(e.pause(),i.value=!0)},f=()=>{e&&(e.unpause(),i.value=!1)};return a.watch(()=>P.unrefElement(t),O=>{!O||(e=A.createFocusTrap(O,Ne(Fe({},d),{onActivate(){c.value=!0,r.onActivate&&r.onActivate()},onDeactivate(){c.value=!1,r.onDeactivate&&r.onDeactivate()}})),l&&u())},{flush:"post"}),P.tryOnScopeDispose(()=>_()),{hasFocus:c,isPaused:i,activate:u,deactivate:_,pause:h,unpause:f}}function Le(t,r,e){const n=()=>{var c,i;return new I((c=o.resolveUnref(r))!=null?c:[],(i=o.resolveUnref(e))==null?void 0:i.fuseOptions)},l=a.ref(n());a.watch(()=>{var c;return(c=o.resolveUnref(e))==null?void 0:c.fuseOptions},()=>{l.value=n()},{deep:!0}),a.watch(()=>o.resolveUnref(r),c=>{l.value.setCollection(c)},{deep:!0});const d=a.computed(()=>{const c=o.resolveUnref(e);if((c==null?void 0:c.matchAllWhenSearchEmpty)&&!a.unref(t))return o.resolveUnref(r).map((u,_)=>({item:u,refIndex:_}));const i=c==null?void 0:c.resultLimit;return l.value.search(o.resolveUnref(t),i?{limit:i}:void 0)});return{fuse:l,results:d}}var Te=Object.defineProperty,re=Object.getOwnPropertySymbols,Be=Object.prototype.hasOwnProperty,Ge=Object.prototype.propertyIsEnumerable,te=(t,r,e)=>r in t?Te(t,r,{enumerable:!0,configurable:!0,writable:!0,value:e}):t[r]=e,Je=(t,r)=>{for(var e in r||(r={}))Be.call(r,e)&&te(t,e,r[e]);if(re)for(var e of re(r))Ge.call(r,e)&&te(t,e,r[e]);return t};function Qe(t,r,e={}){const{flush:n="pre",deep:l=!0,shallow:d,onError:c=f=>{console.error(f)}}=e,i=(d?a.shallowRef:a.ref)(r),u=o.resolveUnref(r);async function _(){try{const f=await y.get(t);f===void 0?u!=null&&await y.set(t,u):i.value=f}catch(f){c(f)}}_();async function h(){try{i.value==null?await y.del(t):Array.isArray(i.value)?await y.update(t,()=>JSON.parse(JSON.stringify(i.value))):typeof i.value=="object"?await y.update(t,()=>Je({},i.value)):await y.update(t,()=>i.value)}catch(f){c(f)}}return a.watch(i,()=>h(),{flush:n,deep:l}),i}function ze(t,r={}){const{onError:e,fallbackValue:n=null}=r,l=(i,u)=>{try{return $(i,u)}catch(_){return e==null||e(_),n}},d=a.computed(()=>l(o.resolveUnref(t),{header:!0})),c=a.computed(()=>l(o.resolveUnref(t)));return{header:d,payload:c}}function We(t=null,r){const e=a.ref(t),n=a.computed({set:d=>d?g.start():g.done(),get:()=>o.isNumber(e.value)&&e.value<1});r&&g.configure(r);const l=g.set;return g.set=d=>(e.value=d,l.call(g,d)),a.watchEffect(()=>{o.isNumber(e.value)&&o.isClient&&l.call(g,e.value)}),o.tryOnScopeDispose(g.remove),{isLoading:n,progress:e,start:g.start,done:g.done,remove:()=>{e.value=null,g.remove()}}}function Me(t,r){const e=o.resolveRef(t),n=a.ref("");return a.watch(e,async l=>{e.value&&o.isClient&&(n.value=await ne.toDataURL(l,r))},{immediate:!0}),n}s.createCookies=ge,s.useAsyncValidator=fe,s.useAxios=Oe,s.useChangeCase=Pe,s.useCookies=k,s.useDrauu=je,s.useFocusTrap=He,s.useFuse=Le,s.useIDBKeyval=Qe,s.useJwt=ze,s.useNProgress=We,s.useQRCode=Me})(this.VueUse=this.VueUse||{},VueUse,AsyncValidator,VueDemi,axios,changeCase,UniversalCookie,Drauu,VueUse,focusTrap,Fuse,idbKeyval,jwt_decode,nprogress,QRCode);
|
|
1
|
+
var VueDemi=function(s,o,S){if(s.install)return s;if(!o)return console.error("[vue-demi] no Vue instance found, please be sure to import `vue` before `vue-demi`."),s;if(o.version.slice(0,4)==="2.7."){let p=function(C,$){var P,U={},R={config:o.config,use:o.use.bind(o),mixin:o.mixin.bind(o),component:o.component.bind(o),provide:function(y,A){return U[y]=A,this},directive:function(y,A){return A?(o.directive(y,A),R):o.directive(y)},mount:function(y,A){return P||(P=new o(Object.assign({propsData:$},C,{provide:Object.assign(U,C.provide)})),P.$mount(y,A),P)},unmount:function(){P&&(P.$destroy(),P=void 0)}};return R};var I=p;for(var a in o)s[a]=o[a];s.isVue2=!0,s.isVue3=!1,s.install=function(){},s.Vue=o,s.Vue2=o,s.version=o.version,s.warn=o.util.warn,s.createApp=p}else if(o.version.slice(0,2)==="2.")if(S){for(var a in S)s[a]=S[a];s.isVue2=!0,s.isVue3=!1,s.install=function(){},s.Vue=o,s.Vue2=o,s.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 a in o)s[a]=o[a];s.isVue2=!1,s.isVue3=!0,s.install=function(){},s.Vue=o,s.Vue2=void 0,s.version=o.version,s.set=function(p,C,$){return Array.isArray(p)?(p.length=Math.max(p.length,C),p.splice(C,1,$),$):(p[C]=$,$)},s.del=function(p,C){if(Array.isArray(p)){p.splice(C,1);return}delete p[C]}}else console.error("[vue-demi] Vue version "+o.version+" is unsupported.");return s}(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(s,o,S,a,I,p,C,$,P,U,R,y,A,g,ne){"use strict";var oe=Object.defineProperty,ae=Object.defineProperties,se=Object.getOwnPropertyDescriptors,J=Object.getOwnPropertySymbols,le=Object.prototype.hasOwnProperty,ue=Object.prototype.propertyIsEnumerable,Q=(t,r,e)=>r in t?oe(t,r,{enumerable:!0,configurable:!0,writable:!0,value:e}):t[r]=e,ce=(t,r)=>{for(var e in r||(r={}))le.call(r,e)&&Q(t,e,r[e]);if(J)for(var e of J(r))ue.call(r,e)&&Q(t,e,r[e]);return t},ie=(t,r)=>ae(t,se(r));function fe(t,r,e={}){const n=a.ref(),l=a.ref(!1),d=a.ref(!1),c=a.computed(()=>{var f;return((f=n.value)==null?void 0:f.errors)||[]}),i=a.computed(()=>{var f;return((f=n.value)==null?void 0:f.fields)||{}}),{validateOption:u={}}=e;a.watchEffect(async()=>{l.value=!1,d.value=!1;const f=new S(o.resolveUnref(r));try{await f.validate(o.resolveUnref(t),u),d.value=!0,n.value=null}catch(w){n.value=w}finally{l.value=!0}});const _={pass:d,isFinished:l,errorInfo:n,errors:c,errorFields:i};function h(){return new Promise((f,w)=>{o.until(l).toBe(!0).then(()=>f(_)).catch(m=>w(m))})}return ie(ce({},_),{then(f,w){return h().then(f,w)}})}var ve=Object.defineProperty,de=Object.defineProperties,pe=Object.getOwnPropertyDescriptors,z=Object.getOwnPropertySymbols,_e=Object.prototype.hasOwnProperty,we=Object.prototype.propertyIsEnumerable,W=(t,r,e)=>r in t?ve(t,r,{enumerable:!0,configurable:!0,writable:!0,value:e}):t[r]=e,B=(t,r)=>{for(var e in r||(r={}))_e.call(r,e)&&W(t,e,r[e]);if(z)for(var e of z(r))we.call(r,e)&&W(t,e,r[e]);return t},M=(t,r)=>de(t,pe(r));function Oe(...t){const r=typeof t[0]=="string"?t[0]:void 0,e=o.isString(r)?1:0;let n={},l=I,d={immediate:!!e,shallow:!0};const c=O=>!!(O==null?void 0:O.request);t.length>0+e&&(c(t[0+e])?l=t[0+e]:n=t[0+e]),t.length>1+e&&c(t[1+e])&&(l=t[1+e]),(t.length===2+e&&!c(t[1+e])||t.length===3+e)&&(d=t[t.length-1]);const i=a.shallowRef(),u=d.shallow?a.shallowRef():a.ref(),_=a.ref(!1),h=a.ref(!1),f=a.ref(!1),w=a.shallowRef(),m=I.CancelToken.source(),N=O=>{_.value||!h.value||(m.cancel(O),f.value=!0,h.value=!1,_.value=!1)},L=O=>{h.value=O,_.value=!O},G=()=>new Promise((O,b)=>{o.until(_).toBe(!0).then(()=>O(T)).catch(b)}),j=(O,b)=>G().then(O,b),H=(O=r,b={})=>{w.value=void 0;const v=typeof O=="string"?O:r??b.url;return v===void 0?(w.value=new I.AxiosError(I.AxiosError.ERR_INVALID_URL),_.value=!0,{then:j}):(L(!0),l(v,M(B(B({},n),typeof O=="object"?O:b),{cancelToken:m.token})).then(E=>{i.value=E,u.value=E.data}).catch(E=>{w.value=E}).finally(()=>L(!1)),{then:j})};d.immediate&&r&&H();const T={response:i,data:u,error:w,finished:_,loading:h,isFinished:_,isLoading:h,cancel:N,isAborted:f,canceled:f,aborted:f,isCanceled:f,abort:N,execute:H};return M(B({},T),{then:j})}var q=Object.freeze({__proto__:null,camelCase:p.camelCase,capitalCase:p.capitalCase,constantCase:p.constantCase,dotCase:p.dotCase,headerCase:p.headerCase,noCase:p.noCase,paramCase:p.paramCase,pascalCase:p.pascalCase,pathCase:p.pathCase,sentenceCase:p.sentenceCase,snakeCase:p.snakeCase});function Pe(t,r,e){if(o.isFunction(t))return a.computed(()=>q[r](o.resolveUnref(t),e));const n=a.ref(t);return a.computed({get(){return q[r](n.value,e)},set(l){n.value=l}})}var he=Object.defineProperty,X=Object.getOwnPropertySymbols,ye=Object.prototype.hasOwnProperty,Ce=Object.prototype.propertyIsEnumerable,Y=(t,r,e)=>r in t?he(t,r,{enumerable:!0,configurable:!0,writable:!0,value:e}):t[r]=e,Z=(t,r)=>{for(var e in r||(r={}))ye.call(r,e)&&Y(t,e,r[e]);if(X)for(var e of X(r))Ce.call(r,e)&&Y(t,e,r[e]);return t};function ge(t){const r=new C(t?t.headers.cookie:null);return(e,{doNotParse:n=!1,autoUpdateDependencies:l=!1}={})=>k(e,{doNotParse:n,autoUpdateDependencies:l},r)}function k(t,{doNotParse:r=!1,autoUpdateDependencies:e=!1}={},n=new C){const l=e?[...t||[]]:t;let d=n.getAll({doNotParse:!0});const c=a.ref(0),i=()=>{const u=n.getAll({doNotParse:!0});me(l||null,u,d)&&c.value++,d=u};return n.addChangeListener(i),o.tryOnScopeDispose(()=>{n.removeChangeListener(i)}),{get:(...u)=>(e&&l&&!l.includes(u[0])&&l.push(u[0]),c.value,n.get(u[0],Z({doNotParse:r},u[1]))),getAll:(...u)=>(c.value,n.getAll(Z({doNotParse:r},u[0]))),set:(...u)=>n.set(...u),remove:(...u)=>n.remove(...u),addChangeListener:(...u)=>n.addChangeListener(...u),removeChangeListener:(...u)=>n.removeChangeListener(...u)}}function me(t,r,e){if(!t)return!0;for(const n of t)if(r[n]!==e[n])return!0;return!1}var be=Object.defineProperty,K=Object.getOwnPropertySymbols,Ee=Object.prototype.hasOwnProperty,$e=Object.prototype.propertyIsEnumerable,x=(t,r,e)=>r in t?be(t,r,{enumerable:!0,configurable:!0,writable:!0,value:e}):t[r]=e,Ae=(t,r)=>{for(var e in r||(r={}))Ee.call(r,e)&&x(t,e,r[e]);if(K)for(var e of K(r))$e.call(r,e)&&x(t,e,r[e]);return t};function Se(t,r){const e=a.ref();let n=[];const l=P.createEventHook(),d=P.createEventHook(),c=P.createEventHook(),i=P.createEventHook(),u=P.createEventHook(),_=a.ref(!1),h=a.ref(!1),f=a.ref(!1),w=a.ref(!1),m=a.ref({color:"black",size:3,arrowEnd:!1,cornerRadius:0,dasharray:void 0,fill:"transparent",mode:"draw"});a.watch(m,()=>{const v=e.value;v&&(v.brush=m.value,v.mode=m.value.mode)},{deep:!0});const N=()=>{var v;return(v=e.value)==null?void 0:v.undo()},L=()=>{var v;return(v=e.value)==null?void 0:v.redo()},G=()=>{var v;return(v=e.value)==null?void 0:v.clear()},j=()=>{var v;return(v=e.value)==null?void 0:v.cancel()},H=v=>{var E;return(E=e.value)==null?void 0:E.load(v)},T=()=>{var v;return(v=e.value)==null?void 0:v.dump()},O=()=>{var v;n.forEach(E=>E()),(v=e.value)==null||v.unmount()},b=()=>{e.value&&(_.value=e.value.canUndo(),h.value=e.value.canRedo(),f.value=e.value.altPressed,w.value=e.value.shiftPressed)};return a.watch(()=>P.unrefElement(t),v=>{!v||typeof SVGSVGElement=="undefined"||!(v instanceof SVGSVGElement)||(e.value&&O(),e.value=$.createDrauu(Ae({el:v},r)),b(),n=[e.value.on("canceled",()=>d.trigger()),e.value.on("committed",()=>c.trigger()),e.value.on("start",()=>i.trigger()),e.value.on("end",()=>u.trigger()),e.value.on("changed",()=>{b(),l.trigger()})])},{flush:"post"}),o.tryOnScopeDispose(()=>O()),{drauuInstance:e,load:H,dump:T,clear:G,cancel:j,undo:N,redo:L,canUndo:_,canRedo:h,brush:m,onChanged:l.on,onCommitted:c.on,onStart:i.on,onEnd:u.on,onCanceled:d.on}}var je=Object.defineProperty,Ie=Object.defineProperties,Ue=Object.getOwnPropertyDescriptors,F=Object.getOwnPropertySymbols,V=Object.prototype.hasOwnProperty,D=Object.prototype.propertyIsEnumerable,ee=(t,r,e)=>r in t?je(t,r,{enumerable:!0,configurable:!0,writable:!0,value:e}):t[r]=e,Re=(t,r)=>{for(var e in r||(r={}))V.call(r,e)&&ee(t,e,r[e]);if(F)for(var e of F(r))D.call(r,e)&&ee(t,e,r[e]);return t},Fe=(t,r)=>Ie(t,Ue(r)),Ne=(t,r)=>{var e={};for(var n in t)V.call(t,n)&&r.indexOf(n)<0&&(e[n]=t[n]);if(t!=null&&F)for(var n of F(t))r.indexOf(n)<0&&D.call(t,n)&&(e[n]=t[n]);return e};function Le(t,r={}){let e;const n=r,{immediate:l}=n,d=Ne(n,["immediate"]),c=a.ref(!1),i=a.ref(!1),u=w=>e&&e.activate(w),_=w=>e&&e.deactivate(w),h=()=>{e&&(e.pause(),i.value=!0)},f=()=>{e&&(e.unpause(),i.value=!1)};return a.watch(()=>P.unrefElement(t),w=>{!w||(e=U.createFocusTrap(w,Fe(Re({},d),{onActivate(){c.value=!0,r.onActivate&&r.onActivate()},onDeactivate(){c.value=!1,r.onDeactivate&&r.onDeactivate()}})),l&&u())},{flush:"post"}),P.tryOnScopeDispose(()=>_()),{hasFocus:c,isPaused:i,activate:u,deactivate:_,pause:h,unpause:f}}function He(t,r,e){const n=()=>{var c,i;return new R((c=o.resolveUnref(r))!=null?c:[],(i=o.resolveUnref(e))==null?void 0:i.fuseOptions)},l=a.ref(n());a.watch(()=>{var c;return(c=o.resolveUnref(e))==null?void 0:c.fuseOptions},()=>{l.value=n()},{deep:!0}),a.watch(()=>o.resolveUnref(r),c=>{l.value.setCollection(c)},{deep:!0});const d=a.computed(()=>{const c=o.resolveUnref(e);if((c==null?void 0:c.matchAllWhenSearchEmpty)&&!a.unref(t))return o.resolveUnref(r).map((u,_)=>({item:u,refIndex:_}));const i=c==null?void 0:c.resultLimit;return l.value.search(o.resolveUnref(t),i?{limit:i}:void 0)});return{fuse:l,results:d}}var Te=Object.defineProperty,re=Object.getOwnPropertySymbols,Be=Object.prototype.hasOwnProperty,Ge=Object.prototype.propertyIsEnumerable,te=(t,r,e)=>r in t?Te(t,r,{enumerable:!0,configurable:!0,writable:!0,value:e}):t[r]=e,Je=(t,r)=>{for(var e in r||(r={}))Be.call(r,e)&&te(t,e,r[e]);if(re)for(var e of re(r))Ge.call(r,e)&&te(t,e,r[e]);return t};function Qe(t,r,e={}){const{flush:n="pre",deep:l=!0,shallow:d,onError:c=f=>{console.error(f)}}=e,i=(d?a.shallowRef:a.ref)(r),u=o.resolveUnref(r);async function _(){try{const f=await y.get(t);f===void 0?u!=null&&await y.set(t,u):i.value=f}catch(f){c(f)}}_();async function h(){try{i.value==null?await y.del(t):Array.isArray(i.value)?await y.update(t,()=>JSON.parse(JSON.stringify(i.value))):typeof i.value=="object"?await y.update(t,()=>Je({},i.value)):await y.update(t,()=>i.value)}catch(f){c(f)}}return a.watch(i,()=>h(),{flush:n,deep:l}),i}function ze(t,r={}){const{onError:e,fallbackValue:n=null}=r,l=(i,u)=>{try{return A(i,u)}catch(_){return e==null||e(_),n}},d=a.computed(()=>l(o.resolveUnref(t),{header:!0})),c=a.computed(()=>l(o.resolveUnref(t)));return{header:d,payload:c}}function We(t=null,r){const e=a.ref(t),n=a.computed({set:d=>d?g.start():g.done(),get:()=>o.isNumber(e.value)&&e.value<1});r&&g.configure(r);const l=g.set;return g.set=d=>(e.value=d,l.call(g,d)),a.watchEffect(()=>{o.isNumber(e.value)&&o.isClient&&l.call(g,e.value)}),o.tryOnScopeDispose(g.remove),{isLoading:n,progress:e,start:g.start,done:g.done,remove:()=>{e.value=null,g.remove()}}}function Me(t,r){const e=o.resolveRef(t),n=a.ref("");return a.watch(e,async l=>{e.value&&o.isClient&&(n.value=await ne.toDataURL(l,r))},{immediate:!0}),n}s.createCookies=ge,s.useAsyncValidator=fe,s.useAxios=Oe,s.useChangeCase=Pe,s.useCookies=k,s.useDrauu=Se,s.useFocusTrap=Le,s.useFuse=He,s.useIDBKeyval=Qe,s.useJwt=ze,s.useNProgress=We,s.useQRCode=Me})(this.VueUse=this.VueUse||{},VueUse,AsyncValidator,VueDemi,axios,changeCase,UniversalCookie,Drauu,VueUse,focusTrap,Fuse,idbKeyval,jwt_decode,nprogress,QRCode);
|
package/index.mjs
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { resolveUnref, until, isString, isFunction, tryOnScopeDispose, isNumber, isClient, resolveRef } from '@vueuse/shared';
|
|
2
2
|
import Schema from 'async-validator';
|
|
3
3
|
import { ref, computed, watchEffect, shallowRef, watch, unref } from 'vue-demi';
|
|
4
|
-
import axios from 'axios';
|
|
4
|
+
import axios, { AxiosError } from 'axios';
|
|
5
5
|
import { camelCase, capitalCase, constantCase, dotCase, headerCase, noCase, paramCase, pascalCase, pathCase, sentenceCase, snakeCase } from 'change-case';
|
|
6
6
|
import Cookie from 'universal-cookie';
|
|
7
7
|
import { createDrauu } from 'drauu';
|
|
@@ -141,7 +141,12 @@ function useAxios(...args) {
|
|
|
141
141
|
const then = (onFulfilled, onRejected) => waitUntilFinished().then(onFulfilled, onRejected);
|
|
142
142
|
const execute = (executeUrl = url, config = {}) => {
|
|
143
143
|
error.value = void 0;
|
|
144
|
-
const _url = typeof executeUrl === "string" ? executeUrl : url != null ? url :
|
|
144
|
+
const _url = typeof executeUrl === "string" ? executeUrl : url != null ? url : config.url;
|
|
145
|
+
if (_url === void 0) {
|
|
146
|
+
error.value = new AxiosError(AxiosError.ERR_INVALID_URL);
|
|
147
|
+
isFinished.value = true;
|
|
148
|
+
return { then };
|
|
149
|
+
}
|
|
145
150
|
loading(true);
|
|
146
151
|
instance(_url, __spreadProps$1(__spreadValues$4(__spreadValues$4({}, defaultConfig), typeof executeUrl === "object" ? executeUrl : config), { cancelToken: cancelToken.token })).then((r) => {
|
|
147
152
|
response.value = r;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@vueuse/integrations",
|
|
3
|
-
"version": "9.
|
|
3
|
+
"version": "9.11.1",
|
|
4
4
|
"description": "Integration wrappers for utility libraries",
|
|
5
5
|
"author": "Anthony Fu <https://github.com/antfu>",
|
|
6
6
|
"license": "MIT",
|
|
@@ -147,15 +147,15 @@
|
|
|
147
147
|
}
|
|
148
148
|
},
|
|
149
149
|
"dependencies": {
|
|
150
|
-
"@vueuse/core": "9.
|
|
151
|
-
"@vueuse/shared": "9.
|
|
150
|
+
"@vueuse/core": "9.11.1",
|
|
151
|
+
"@vueuse/shared": "9.11.1",
|
|
152
152
|
"vue-demi": "*"
|
|
153
153
|
},
|
|
154
154
|
"devDependencies": {
|
|
155
155
|
"@types/nprogress": "^0.2.0",
|
|
156
156
|
"@types/qrcode": "^1.5.0",
|
|
157
157
|
"async-validator": "^4.2.5",
|
|
158
|
-
"axios": "^1.2.
|
|
158
|
+
"axios": "^1.2.3",
|
|
159
159
|
"change-case": "^4.1.2",
|
|
160
160
|
"drauu": "^0.3.2",
|
|
161
161
|
"focus-trap": "^7.2.0",
|
package/useAxios.cjs
CHANGED
|
@@ -67,7 +67,12 @@ function useAxios(...args) {
|
|
|
67
67
|
const then = (onFulfilled, onRejected) => waitUntilFinished().then(onFulfilled, onRejected);
|
|
68
68
|
const execute = (executeUrl = url, config = {}) => {
|
|
69
69
|
error.value = void 0;
|
|
70
|
-
const _url = typeof executeUrl === "string" ? executeUrl : url != null ? url :
|
|
70
|
+
const _url = typeof executeUrl === "string" ? executeUrl : url != null ? url : config.url;
|
|
71
|
+
if (_url === void 0) {
|
|
72
|
+
error.value = new axios.AxiosError(axios.AxiosError.ERR_INVALID_URL);
|
|
73
|
+
isFinished.value = true;
|
|
74
|
+
return { then };
|
|
75
|
+
}
|
|
71
76
|
loading(true);
|
|
72
77
|
instance(_url, __spreadProps(__spreadValues(__spreadValues({}, defaultConfig), typeof executeUrl === "object" ? executeUrl : config), { cancelToken: cancelToken.token })).then((r) => {
|
|
73
78
|
response.value = r;
|
package/useAxios.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { ShallowRef, Ref } from 'vue-demi';
|
|
2
|
-
import { AxiosResponse, AxiosError,
|
|
2
|
+
import { AxiosResponse, AxiosError, RawAxiosRequestConfig, AxiosInstance } from 'axios';
|
|
3
3
|
|
|
4
4
|
interface UseAxiosReturn<T, R = AxiosResponse<T>, D = any> {
|
|
5
5
|
/**
|
|
@@ -63,13 +63,13 @@ interface StrictUseAxiosReturn<T, R, D> extends UseAxiosReturn<T, R, D> {
|
|
|
63
63
|
/**
|
|
64
64
|
* Manually call the axios request
|
|
65
65
|
*/
|
|
66
|
-
execute: (url?: string |
|
|
66
|
+
execute: (url?: string | RawAxiosRequestConfig<D>, config?: RawAxiosRequestConfig<D>) => PromiseLike<StrictUseAxiosReturn<T, R, D>>;
|
|
67
67
|
}
|
|
68
68
|
interface EasyUseAxiosReturn<T, R, D> extends UseAxiosReturn<T, R, D> {
|
|
69
69
|
/**
|
|
70
70
|
* Manually call the axios request
|
|
71
71
|
*/
|
|
72
|
-
execute: (url: string, config?:
|
|
72
|
+
execute: (url: string, config?: RawAxiosRequestConfig<D>) => PromiseLike<EasyUseAxiosReturn<T, R, D>>;
|
|
73
73
|
}
|
|
74
74
|
interface UseAxiosOptions {
|
|
75
75
|
/**
|
|
@@ -84,11 +84,11 @@ interface UseAxiosOptions {
|
|
|
84
84
|
*/
|
|
85
85
|
shallow?: boolean;
|
|
86
86
|
}
|
|
87
|
-
declare function useAxios<T = any, R = AxiosResponse<T>, D = any>(url: string, config?:
|
|
87
|
+
declare function useAxios<T = any, R = AxiosResponse<T>, D = any>(url: string, config?: RawAxiosRequestConfig<D>, options?: UseAxiosOptions): StrictUseAxiosReturn<T, R, D> & PromiseLike<StrictUseAxiosReturn<T, R, D>>;
|
|
88
88
|
declare function useAxios<T = any, R = AxiosResponse<T>, D = any>(url: string, instance?: AxiosInstance, options?: UseAxiosOptions): StrictUseAxiosReturn<T, R, D> & PromiseLike<StrictUseAxiosReturn<T, R, D>>;
|
|
89
|
-
declare function useAxios<T = any, R = AxiosResponse<T>, D = any>(url: string, config:
|
|
90
|
-
declare function useAxios<T = any, R = AxiosResponse<T>, D = any>(config?:
|
|
89
|
+
declare function useAxios<T = any, R = AxiosResponse<T>, D = any>(url: string, config: RawAxiosRequestConfig<D>, instance: AxiosInstance, options?: UseAxiosOptions): StrictUseAxiosReturn<T, R, D> & PromiseLike<StrictUseAxiosReturn<T, R, D>>;
|
|
90
|
+
declare function useAxios<T = any, R = AxiosResponse<T>, D = any>(config?: RawAxiosRequestConfig<D>): EasyUseAxiosReturn<T, R, D> & PromiseLike<EasyUseAxiosReturn<T, R, D>>;
|
|
91
91
|
declare function useAxios<T = any, R = AxiosResponse<T>, D = any>(instance?: AxiosInstance): EasyUseAxiosReturn<T, R, D> & PromiseLike<EasyUseAxiosReturn<T, R, D>>;
|
|
92
|
-
declare function useAxios<T = any, R = AxiosResponse<T>, D = any>(config?:
|
|
92
|
+
declare function useAxios<T = any, R = AxiosResponse<T>, D = any>(config?: RawAxiosRequestConfig<D>, instance?: AxiosInstance): EasyUseAxiosReturn<T, R, D> & PromiseLike<EasyUseAxiosReturn<T, R, D>>;
|
|
93
93
|
|
|
94
94
|
export { EasyUseAxiosReturn, StrictUseAxiosReturn, UseAxiosOptions, UseAxiosReturn, useAxios };
|
package/useAxios.iife.js
CHANGED
|
@@ -178,7 +178,12 @@ var VueDemi = (function (VueDemi, Vue, VueCompositionAPI) {
|
|
|
178
178
|
const then = (onFulfilled, onRejected) => waitUntilFinished().then(onFulfilled, onRejected);
|
|
179
179
|
const execute = (executeUrl = url, config = {}) => {
|
|
180
180
|
error.value = void 0;
|
|
181
|
-
const _url = typeof executeUrl === "string" ? executeUrl : url != null ? url :
|
|
181
|
+
const _url = typeof executeUrl === "string" ? executeUrl : url != null ? url : config.url;
|
|
182
|
+
if (_url === void 0) {
|
|
183
|
+
error.value = new axios.AxiosError(axios.AxiosError.ERR_INVALID_URL);
|
|
184
|
+
isFinished.value = true;
|
|
185
|
+
return { then };
|
|
186
|
+
}
|
|
182
187
|
loading(true);
|
|
183
188
|
instance(_url, __spreadProps(__spreadValues(__spreadValues({}, defaultConfig), typeof executeUrl === "object" ? executeUrl : config), { cancelToken: cancelToken.token })).then((r) => {
|
|
184
189
|
response.value = r;
|
package/useAxios.iife.min.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
var VueDemi=function(e,n,
|
|
1
|
+
var VueDemi=function(e,n,v){if(e.install)return e;if(!n)return console.error("[vue-demi] no Vue instance found, please be sure to import `vue` before `vue-demi`."),e;if(n.version.slice(0,4)==="2.7."){let s=function(f,u){var c,y={},_={config:n.config,use:n.use.bind(n),mixin:n.mixin.bind(n),component:n.component.bind(n),provide:function(a,d){return y[a]=d,this},directive:function(a,d){return d?(n.directive(a,d),_):n.directive(a)},mount:function(a,d){return c||(c=new n(Object.assign({propsData:u},f,{provide:Object.assign(y,f.provide)})),c.$mount(a,d),c)},unmount:function(){c&&(c.$destroy(),c=void 0)}};return _};var U=s;for(var l in n)e[l]=n[l];e.isVue2=!0,e.isVue3=!1,e.install=function(){},e.Vue=n,e.Vue2=n,e.version=n.version,e.warn=n.util.warn,e.createApp=s}else if(n.version.slice(0,2)==="2.")if(v){for(var l in v)e[l]=v[l];e.isVue2=!0,e.isVue3=!1,e.install=function(){},e.Vue=n,e.Vue2=n,e.version=n.version}else console.error("[vue-demi] no VueCompositionAPI instance found, please be sure to import `@vue/composition-api` before `vue-demi`.");else if(n.version.slice(0,2)==="3."){for(var l in n)e[l]=n[l];e.isVue2=!1,e.isVue3=!0,e.install=function(){},e.Vue=n,e.Vue2=void 0,e.version=n.version,e.set=function(s,f,u){return Array.isArray(s)?(s.length=Math.max(s.length,f),s.splice(f,1,u),u):(s[f]=u,u)},e.del=function(s,f){if(Array.isArray(s)){s.splice(f,1);return}delete s[f]}}else console.error("[vue-demi] Vue version "+n.version+" is unsupported.");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,n,v,l){"use strict";var U=Object.defineProperty,s=Object.defineProperties,f=Object.getOwnPropertyDescriptors,u=Object.getOwnPropertySymbols,c=Object.prototype.hasOwnProperty,y=Object.prototype.propertyIsEnumerable,_=(r,o,t)=>o in r?U(r,o,{enumerable:!0,configurable:!0,writable:!0,value:t}):r[o]=t,a=(r,o)=>{for(var t in o||(o={}))c.call(o,t)&&_(r,t,o[t]);if(u)for(var t of u(o))y.call(o,t)&&_(r,t,o[t]);return r},d=(r,o)=>s(r,f(o));function $(...r){const o=typeof r[0]=="string"?r[0]:void 0,t=v.isString(o)?1:0;let E={},O=l,j={immediate:!!t,shallow:!0};const I=i=>!!(i==null?void 0:i.request);r.length>0+t&&(I(r[0+t])?O=r[0+t]:E=r[0+t]),r.length>1+t&&I(r[1+t])&&(O=r[1+t]),(r.length===2+t&&!I(r[1+t])||r.length===3+t)&&(j=r[r.length-1]);const x=n.shallowRef(),C=j.shallow?n.shallowRef():n.ref(),p=n.ref(!1),w=n.ref(!1),b=n.ref(!1),P=n.shallowRef(),g=l.CancelToken.source(),L=i=>{p.value||!w.value||(g.cancel(i),b.value=!0,w.value=!1,p.value=!1)},S=i=>{w.value=i,p.value=!i},q=()=>new Promise((i,h)=>{v.until(p).toBe(!0).then(()=>i(F)).catch(h)}),R=(i,h)=>q().then(i,h),T=(i=o,h={})=>{P.value=void 0;const N=typeof i=="string"?i:o??h.url;return N===void 0?(P.value=new l.AxiosError(l.AxiosError.ERR_INVALID_URL),p.value=!0,{then:R}):(S(!0),O(N,d(a(a({},E),typeof i=="object"?i:h),{cancelToken:g.token})).then(A=>{x.value=A,C.value=A.data}).catch(A=>{P.value=A}).finally(()=>S(!1)),{then:R})};j.immediate&&o&&T();const F={response:x,data:C,error:P,finished:p,loading:w,isFinished:p,isLoading:w,cancel:L,isAborted:b,canceled:b,aborted:b,isCanceled:b,abort:L,execute:T};return d(a({},F),{then:R})}e.useAxios=$})(this.VueUse=this.VueUse||{},VueDemi,VueUse,axios);
|
package/useAxios.mjs
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { shallowRef, ref } from 'vue-demi';
|
|
2
2
|
import { isString, until } from '@vueuse/shared';
|
|
3
|
-
import axios from 'axios';
|
|
3
|
+
import axios, { AxiosError } from 'axios';
|
|
4
4
|
|
|
5
5
|
var __defProp = Object.defineProperty;
|
|
6
6
|
var __defProps = Object.defineProperties;
|
|
@@ -65,7 +65,12 @@ function useAxios(...args) {
|
|
|
65
65
|
const then = (onFulfilled, onRejected) => waitUntilFinished().then(onFulfilled, onRejected);
|
|
66
66
|
const execute = (executeUrl = url, config = {}) => {
|
|
67
67
|
error.value = void 0;
|
|
68
|
-
const _url = typeof executeUrl === "string" ? executeUrl : url != null ? url :
|
|
68
|
+
const _url = typeof executeUrl === "string" ? executeUrl : url != null ? url : config.url;
|
|
69
|
+
if (_url === void 0) {
|
|
70
|
+
error.value = new AxiosError(AxiosError.ERR_INVALID_URL);
|
|
71
|
+
isFinished.value = true;
|
|
72
|
+
return { then };
|
|
73
|
+
}
|
|
69
74
|
loading(true);
|
|
70
75
|
instance(_url, __spreadProps(__spreadValues(__spreadValues({}, defaultConfig), typeof executeUrl === "object" ? executeUrl : config), { cancelToken: cancelToken.token })).then((r) => {
|
|
71
76
|
response.value = r;
|
|
@@ -4,7 +4,7 @@ var vueDemi = require('vue-demi');
|
|
|
4
4
|
var focusTrap = require('focus-trap');
|
|
5
5
|
var core = require('@vueuse/core');
|
|
6
6
|
|
|
7
|
-
const UseFocusTrap = vueDemi.defineComponent({
|
|
7
|
+
const UseFocusTrap = /* @__PURE__ */ vueDemi.defineComponent({
|
|
8
8
|
name: "UseFocusTrap",
|
|
9
9
|
props: ["as", "options"],
|
|
10
10
|
setup(props, { slots }) {
|
|
@@ -2,7 +2,7 @@ import { defineComponent, ref, watch, onScopeDispose, h } from 'vue-demi';
|
|
|
2
2
|
import { createFocusTrap } from 'focus-trap';
|
|
3
3
|
import { unrefElement } from '@vueuse/core';
|
|
4
4
|
|
|
5
|
-
const UseFocusTrap = defineComponent({
|
|
5
|
+
const UseFocusTrap = /* @__PURE__ */ defineComponent({
|
|
6
6
|
name: "UseFocusTrap",
|
|
7
7
|
props: ["as", "options"],
|
|
8
8
|
setup(props, { slots }) {
|