@vueuse/integrations 9.1.1 → 9.3.0
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 +4 -3
- package/index.d.ts +19 -13
- package/index.iife.js +4 -3
- package/index.iife.min.js +1 -1
- package/index.mjs +4 -3
- package/package.json +6 -6
- package/useAsyncValidator/component.d.ts +1 -1
- package/useAxios.cjs +4 -3
- package/useAxios.d.ts +19 -13
- package/useAxios.iife.js +4 -3
- package/useAxios.iife.min.js +1 -1
- package/useAxios.mjs +4 -3
- package/useFocusTrap/component.d.ts +1 -1
package/index.cjs
CHANGED
|
@@ -115,7 +115,7 @@ function useAxios(...args) {
|
|
|
115
115
|
const argsPlaceholder = shared.isString(url) ? 1 : 0;
|
|
116
116
|
let defaultConfig = {};
|
|
117
117
|
let instance = axios__default["default"];
|
|
118
|
-
let options = { immediate: !!argsPlaceholder };
|
|
118
|
+
let options = { immediate: !!argsPlaceholder, shallow: true };
|
|
119
119
|
const isAxiosInstance = (val) => !!(val == null ? void 0 : val.request);
|
|
120
120
|
if (args.length > 0 + argsPlaceholder) {
|
|
121
121
|
if (isAxiosInstance(args[0 + argsPlaceholder]))
|
|
@@ -130,7 +130,7 @@ function useAxios(...args) {
|
|
|
130
130
|
if (args.length === 2 + argsPlaceholder && !isAxiosInstance(args[1 + argsPlaceholder]) || args.length === 3 + argsPlaceholder)
|
|
131
131
|
options = args[args.length - 1];
|
|
132
132
|
const response = vueDemi.shallowRef();
|
|
133
|
-
const data = vueDemi.shallowRef();
|
|
133
|
+
const data = options.shallow ? vueDemi.shallowRef() : vueDemi.ref();
|
|
134
134
|
const isFinished = vueDemi.ref(false);
|
|
135
135
|
const isLoading = vueDemi.ref(false);
|
|
136
136
|
const isAborted = vueDemi.ref(false);
|
|
@@ -153,9 +153,10 @@ function useAxios(...args) {
|
|
|
153
153
|
});
|
|
154
154
|
const then = (onFulfilled, onRejected) => waitUntilFinished().then(onFulfilled, onRejected);
|
|
155
155
|
const execute = (executeUrl = url, config = {}) => {
|
|
156
|
+
error.value = void 0;
|
|
156
157
|
const _url = typeof executeUrl === "string" ? executeUrl : url != null ? url : "";
|
|
157
158
|
loading(true);
|
|
158
|
-
instance(_url, __spreadProps$1(__spreadValues$3(__spreadValues$3({}, defaultConfig), config), { cancelToken: cancelToken.token })).then((r) => {
|
|
159
|
+
instance(_url, __spreadProps$1(__spreadValues$3(__spreadValues$3({}, defaultConfig), typeof executeUrl === "object" ? executeUrl : config), { cancelToken: cancelToken.token })).then((r) => {
|
|
159
160
|
response.value = r;
|
|
160
161
|
data.value = r.data;
|
|
161
162
|
}).catch((e) => {
|
package/index.d.ts
CHANGED
|
@@ -40,11 +40,11 @@ interface UseAsyncValidatorOptions {
|
|
|
40
40
|
*/
|
|
41
41
|
declare function useAsyncValidator(value: MaybeComputedRef<Record<string, any>>, rules: MaybeComputedRef<Rules>, options?: UseAsyncValidatorOptions): UseAsyncValidatorReturn & PromiseLike<UseAsyncValidatorReturn>;
|
|
42
42
|
|
|
43
|
-
interface UseAxiosReturn<T> {
|
|
43
|
+
interface UseAxiosReturn<T, D> {
|
|
44
44
|
/**
|
|
45
45
|
* Axios Response
|
|
46
46
|
*/
|
|
47
|
-
response: ShallowRef<AxiosResponse<T> | undefined>;
|
|
47
|
+
response: ShallowRef<AxiosResponse<T, D> | undefined>;
|
|
48
48
|
/**
|
|
49
49
|
* Axios response data
|
|
50
50
|
*/
|
|
@@ -64,7 +64,7 @@ interface UseAxiosReturn<T> {
|
|
|
64
64
|
/**
|
|
65
65
|
* Any errors that may have occurred
|
|
66
66
|
*/
|
|
67
|
-
error: ShallowRef<AxiosError<T> | undefined>;
|
|
67
|
+
error: ShallowRef<AxiosError<T, D> | undefined>;
|
|
68
68
|
/**
|
|
69
69
|
* Aborts the current request
|
|
70
70
|
*/
|
|
@@ -98,17 +98,17 @@ interface UseAxiosReturn<T> {
|
|
|
98
98
|
*/
|
|
99
99
|
isCanceled: Ref<boolean>;
|
|
100
100
|
}
|
|
101
|
-
interface StrictUseAxiosReturn<T> extends UseAxiosReturn<T> {
|
|
101
|
+
interface StrictUseAxiosReturn<T, D> extends UseAxiosReturn<T, D> {
|
|
102
102
|
/**
|
|
103
103
|
* Manually call the axios request
|
|
104
104
|
*/
|
|
105
|
-
execute: (url?: string
|
|
105
|
+
execute: (url?: string | AxiosRequestConfig<D>, config?: AxiosRequestConfig<D>) => PromiseLike<StrictUseAxiosReturn<T, D>>;
|
|
106
106
|
}
|
|
107
|
-
interface EasyUseAxiosReturn<T> extends UseAxiosReturn<T> {
|
|
107
|
+
interface EasyUseAxiosReturn<T, D> extends UseAxiosReturn<T, D> {
|
|
108
108
|
/**
|
|
109
109
|
* Manually call the axios request
|
|
110
110
|
*/
|
|
111
|
-
execute: (url: string, config?: AxiosRequestConfig) => PromiseLike<EasyUseAxiosReturn<T>>;
|
|
111
|
+
execute: (url: string, config?: AxiosRequestConfig<D>) => PromiseLike<EasyUseAxiosReturn<T, D>>;
|
|
112
112
|
}
|
|
113
113
|
interface UseAxiosOptions {
|
|
114
114
|
/**
|
|
@@ -116,13 +116,19 @@ interface UseAxiosOptions {
|
|
|
116
116
|
*
|
|
117
117
|
*/
|
|
118
118
|
immediate?: boolean;
|
|
119
|
+
/**
|
|
120
|
+
* Use shallowRef.
|
|
121
|
+
*
|
|
122
|
+
* @default true
|
|
123
|
+
*/
|
|
124
|
+
shallow?: boolean;
|
|
119
125
|
}
|
|
120
|
-
declare function useAxios<T = any>(url: string, config?: AxiosRequestConfig
|
|
121
|
-
declare function useAxios<T = any>(url: string, instance?: AxiosInstance, options?: UseAxiosOptions): StrictUseAxiosReturn<T> & PromiseLike<StrictUseAxiosReturn<T>>;
|
|
122
|
-
declare function useAxios<T = any>(url: string, config: AxiosRequestConfig
|
|
123
|
-
declare function useAxios<T = any>(config?: AxiosRequestConfig): EasyUseAxiosReturn<T> & PromiseLike<EasyUseAxiosReturn<T>>;
|
|
124
|
-
declare function useAxios<T = any>(instance?: AxiosInstance): EasyUseAxiosReturn<T> & PromiseLike<EasyUseAxiosReturn<T>>;
|
|
125
|
-
declare function useAxios<T = any>(config?: AxiosRequestConfig
|
|
126
|
+
declare function useAxios<T = any, D = any>(url: string, config?: AxiosRequestConfig<D>, options?: UseAxiosOptions): StrictUseAxiosReturn<T, D> & PromiseLike<StrictUseAxiosReturn<T, D>>;
|
|
127
|
+
declare function useAxios<T = any, D = any>(url: string, instance?: AxiosInstance, options?: UseAxiosOptions): StrictUseAxiosReturn<T, D> & PromiseLike<StrictUseAxiosReturn<T, D>>;
|
|
128
|
+
declare function useAxios<T = any, D = any>(url: string, config: AxiosRequestConfig<D>, instance: AxiosInstance, options?: UseAxiosOptions): StrictUseAxiosReturn<T, D> & PromiseLike<StrictUseAxiosReturn<T, D>>;
|
|
129
|
+
declare function useAxios<T = any, D = any>(config?: AxiosRequestConfig<D>): EasyUseAxiosReturn<T, D> & PromiseLike<EasyUseAxiosReturn<T, D>>;
|
|
130
|
+
declare function useAxios<T = any, D = any>(instance?: AxiosInstance): EasyUseAxiosReturn<T, D> & PromiseLike<EasyUseAxiosReturn<T, D>>;
|
|
131
|
+
declare function useAxios<T = any, D = any>(config?: AxiosRequestConfig<D>, instance?: AxiosInstance): EasyUseAxiosReturn<T, D> & PromiseLike<EasyUseAxiosReturn<T, D>>;
|
|
126
132
|
|
|
127
133
|
declare const changeCase_camelCase: typeof camelCase;
|
|
128
134
|
declare const changeCase_capitalCase: typeof capitalCase;
|
package/index.iife.js
CHANGED
|
@@ -173,7 +173,7 @@
|
|
|
173
173
|
const argsPlaceholder = shared.isString(url) ? 1 : 0;
|
|
174
174
|
let defaultConfig = {};
|
|
175
175
|
let instance = axios__default["default"];
|
|
176
|
-
let options = { immediate: !!argsPlaceholder };
|
|
176
|
+
let options = { immediate: !!argsPlaceholder, shallow: true };
|
|
177
177
|
const isAxiosInstance = (val) => !!(val == null ? void 0 : val.request);
|
|
178
178
|
if (args.length > 0 + argsPlaceholder) {
|
|
179
179
|
if (isAxiosInstance(args[0 + argsPlaceholder]))
|
|
@@ -188,7 +188,7 @@
|
|
|
188
188
|
if (args.length === 2 + argsPlaceholder && !isAxiosInstance(args[1 + argsPlaceholder]) || args.length === 3 + argsPlaceholder)
|
|
189
189
|
options = args[args.length - 1];
|
|
190
190
|
const response = vueDemi.shallowRef();
|
|
191
|
-
const data = vueDemi.shallowRef();
|
|
191
|
+
const data = options.shallow ? vueDemi.shallowRef() : vueDemi.ref();
|
|
192
192
|
const isFinished = vueDemi.ref(false);
|
|
193
193
|
const isLoading = vueDemi.ref(false);
|
|
194
194
|
const isAborted = vueDemi.ref(false);
|
|
@@ -211,9 +211,10 @@
|
|
|
211
211
|
});
|
|
212
212
|
const then = (onFulfilled, onRejected) => waitUntilFinished().then(onFulfilled, onRejected);
|
|
213
213
|
const execute = (executeUrl = url, config = {}) => {
|
|
214
|
+
error.value = void 0;
|
|
214
215
|
const _url = typeof executeUrl === "string" ? executeUrl : url != null ? url : "";
|
|
215
216
|
loading(true);
|
|
216
|
-
instance(_url, __spreadProps$1(__spreadValues$3(__spreadValues$3({}, defaultConfig), config), { cancelToken: cancelToken.token })).then((r) => {
|
|
217
|
+
instance(_url, __spreadProps$1(__spreadValues$3(__spreadValues$3({}, defaultConfig), typeof executeUrl === "object" ? executeUrl : config), { cancelToken: cancelToken.token })).then((r) => {
|
|
217
218
|
response.value = r;
|
|
218
219
|
data.value = r.data;
|
|
219
220
|
}).catch((e) => {
|
package/index.iife.min.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
var VueDemi=function(l,o,j){if(l.install)return l;if(o)if(o.version.slice(0,4)==="2.7."){for(var a in o)l[a]=o[a];l.isVue2=!0,l.isVue3=!1,l.install=function(){},l.Vue=o,l.Vue2=o,l.version=o.version}else if(o.version.slice(0,2)==="2.")if(j){for(var a in j)l[a]=j[a];l.isVue2=!0,l.isVue3=!1,l.install=function(){},l.Vue=o,l.Vue2=o,l.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)l[a]=o[a];l.isVue2=!1,l.isVue3=!0,l.install=function(){},l.Vue=o,l.Vue2=void 0,l.version=o.version,l.set=function(h,_,S){return Array.isArray(h)?(h.length=Math.max(h.length,_),h.splice(_,1,S),S):(h[_]=S,S)},l.del=function(h,_){if(Array.isArray(h)){h.splice(_,1);return}delete h[_]}}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`.");return l}(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(l,o,j,a,h,_,S,D,m,ee,te,re,ne,ae){"use strict";function E(r){return r&&typeof r=="object"&&"default"in r?r:{default:r}}var oe=E(j),N=E(h),k=E(S),le=E(te),se=E(re),w=E(ne),ue=E(ae),fe=Object.defineProperty,ce=Object.defineProperties,ie=Object.getOwnPropertyDescriptors,T=Object.getOwnPropertySymbols,de=Object.prototype.hasOwnProperty,ve=Object.prototype.propertyIsEnumerable,G=(r,t,e)=>t in r?fe(r,t,{enumerable:!0,configurable:!0,writable:!0,value:e}):r[t]=e,pe=(r,t)=>{for(var e in t||(t={}))de.call(t,e)&&G(r,e,t[e]);if(T)for(var e of T(t))ve.call(t,e)&&G(r,e,t[e]);return r},_e=(r,t)=>ce(r,ie(t));function Pe(r,t,e={}){const n=a.ref(),s=a.ref(!1),i=a.ref(!1),f=a.computed(()=>{var v;return((v=n.value)==null?void 0:v.errors)||[]}),d=a.computed(()=>{var v;return((v=n.value)==null?void 0:v.fields)||{}}),{validateOption:u={}}=e;a.watchEffect(async()=>{s.value=!1,i.value=!1;const v=new oe.default(o.resolveUnref(t));try{await v.validate(o.resolveUnref(r),u),i.value=!0,n.value=null}catch(P){n.value=P}finally{s.value=!0}});const p={pass:i,isFinished:s,errorInfo:n,errors:f,errorFields:d};function y(){return new Promise((v,P)=>{o.until(s).toBe(!0).then(()=>v(p)).catch(C=>P(C))})}return _e(pe({},p),{then(v,P){return y().then(v,P)}})}var Oe=Object.defineProperty,ye=Object.defineProperties,he=Object.getOwnPropertyDescriptors,Q=Object.getOwnPropertySymbols,we=Object.prototype.hasOwnProperty,Ce=Object.prototype.propertyIsEnumerable,z=(r,t,e)=>t in r?Oe(r,t,{enumerable:!0,configurable:!0,writable:!0,value:e}):r[t]=e,L=(r,t)=>{for(var e in t||(t={}))we.call(t,e)&&z(r,e,t[e]);if(Q)for(var e of Q(t))Ce.call(t,e)&&z(r,e,t[e]);return r},B=(r,t)=>ye(r,he(t));function ge(...r){const t=typeof r[0]=="string"?r[0]:void 0,e=o.isString(t)?1:0;let n={},s=N.default,i={immediate:!!e};const f=O=>!!(O==null?void 0:O.request);r.length>0+e&&(f(r[0+e])?s=r[0+e]:n=r[0+e]),r.length>1+e&&f(r[1+e])&&(s=r[1+e]),(r.length===2+e&&!f(r[1+e])||r.length===3+e)&&(i=r[r.length-1]);const d=a.shallowRef(),u=a.shallowRef(),p=a.ref(!1),y=a.ref(!1),v=a.ref(!1),P=a.shallowRef(),C=N.default.CancelToken.source(),U=O=>{p.value||!y.value||(C.cancel(O),v.value=!0,y.value=!1,p.value=!1)},$=O=>{y.value=O,p.value=!O},H=()=>new Promise((O,b)=>{o.until(p).toBe(!0).then(()=>O(R)).catch(b)}),F=(O,b)=>H().then(O,b),I=(O=t,b={})=>{const c=typeof O=="string"?O:t??"";return $(!0),s(c,B(L(L({},n),b),{cancelToken:C.token})).then(g=>{d.value=g,u.value=g.data}).catch(g=>{P.value=g}).finally(()=>$(!1)),{then:F}};i.immediate&&t&&I();const R={response:d,data:u,error:P,finished:p,loading:y,isFinished:p,isLoading:y,cancel:U,isAborted:v,canceled:v,aborted:v,isCanceled:v,abort:U,execute:I};return B(L({},R),{then:F})}var M=Object.freeze({__proto__:null,camelCase:_.camelCase,capitalCase:_.capitalCase,constantCase:_.constantCase,dotCase:_.dotCase,headerCase:_.headerCase,noCase:_.noCase,paramCase:_.paramCase,pascalCase:_.pascalCase,pathCase:_.pathCase,sentenceCase:_.sentenceCase,snakeCase:_.snakeCase});function me(r,t,e){if(o.isFunction(r))return a.computed(()=>M[t](o.resolveUnref(r),e));const n=a.ref(r);return a.computed({get(){return M[t](n.value,e)},set(s){n.value=s}})}var be=Object.defineProperty,W=Object.getOwnPropertySymbols,Ee=Object.prototype.hasOwnProperty,Se=Object.prototype.propertyIsEnumerable,J=(r,t,e)=>t in r?be(r,t,{enumerable:!0,configurable:!0,writable:!0,value:e}):r[t]=e,q=(r,t)=>{for(var e in t||(t={}))Ee.call(t,e)&&J(r,e,t[e]);if(W)for(var e of W(t))Se.call(t,e)&&J(r,e,t[e]);return r};function je(r){const t=new k.default(r?r.headers.cookie:null);return(e,{doNotParse:n=!1,autoUpdateDependencies:s=!1}={})=>K(e,{doNotParse:n,autoUpdateDependencies:s},t)}function K(r,{doNotParse:t=!1,autoUpdateDependencies:e=!1}={},n=new k.default){const s=e?[...r||[]]:r;let i=n.getAll({doNotParse:!0});const f=a.ref(0),d=()=>{const u=n.getAll({doNotParse:!0});Ae(s||null,u,i)&&f.value++,i=u};return n.addChangeListener(d),o.tryOnScopeDispose(()=>{n.removeChangeListener(d)}),{get:(...u)=>(e&&s&&!s.includes(u[0])&&s.push(u[0]),f.value,n.get(u[0],q({doNotParse:t},u[1]))),getAll:(...u)=>(f.value,n.getAll(q({doNotParse:t},u[0]))),set:(...u)=>n.set(...u),remove:(...u)=>n.remove(...u),addChangeListener:(...u)=>n.addChangeListener(...u),removeChangeListener:(...u)=>n.removeChangeListener(...u)}}function Ae(r,t,e){if(!r)return!0;for(const n of r)if(t[n]!==e[n])return!0;return!1}var Ue=Object.defineProperty,X=Object.getOwnPropertySymbols,$e=Object.prototype.hasOwnProperty,Fe=Object.prototype.propertyIsEnumerable,Y=(r,t,e)=>t in r?Ue(r,t,{enumerable:!0,configurable:!0,writable:!0,value:e}):r[t]=e,Ie=(r,t)=>{for(var e in t||(t={}))$e.call(t,e)&&Y(r,e,t[e]);if(X)for(var e of X(t))Fe.call(t,e)&&Y(r,e,t[e]);return r};function Re(r,t){const e=a.ref();let n=[];const s=m.createEventHook(),i=m.createEventHook(),f=m.createEventHook(),d=m.createEventHook(),u=m.createEventHook(),p=a.ref(!1),y=a.ref(!1),v=a.ref(!1),P=a.ref(!1),C=a.ref({color:"black",size:3,arrowEnd:!1,cornerRadius:0,dasharray:void 0,fill:"transparent",mode:"draw"});a.watch(C,()=>{const c=e.value;c&&(c.brush=C.value,c.mode=C.value.mode)},{deep:!0});const U=()=>{var c;return(c=e.value)==null?void 0:c.undo()},$=()=>{var c;return(c=e.value)==null?void 0:c.redo()},H=()=>{var c;return(c=e.value)==null?void 0:c.clear()},F=()=>{var c;return(c=e.value)==null?void 0:c.cancel()},I=c=>{var g;return(g=e.value)==null?void 0:g.load(c)},R=()=>{var c;return(c=e.value)==null?void 0:c.dump()},O=()=>{var c;n.forEach(g=>g()),(c=e.value)==null||c.unmount()},b=()=>{e.value&&(p.value=e.value.canUndo(),y.value=e.value.canRedo(),v.value=e.value.altPressed,P.value=e.value.shiftPressed)};return a.watch(()=>m.unrefElement(r),c=>{!c||typeof SVGSVGElement=="undefined"||!(c instanceof SVGSVGElement)||(e.value&&O(),e.value=D.createDrauu(Ie({el:c},t)),b(),n=[e.value.on("canceled",()=>i.trigger()),e.value.on("committed",()=>f.trigger()),e.value.on("start",()=>d.trigger()),e.value.on("end",()=>u.trigger()),e.value.on("changed",()=>{b(),s.trigger()})])},{flush:"post"}),o.tryOnScopeDispose(()=>O()),{drauuInstance:e,load:I,dump:R,clear:H,cancel:F,undo:U,redo:$,canUndo:p,canRedo:y,brush:C,onChanged:s.on,onCommitted:f.on,onStart:d.on,onEnd:u.on,onCanceled:i.on}}var Le=Object.defineProperty,He=Object.defineProperties,Ne=Object.getOwnPropertyDescriptors,A=Object.getOwnPropertySymbols,Z=Object.prototype.hasOwnProperty,x=Object.prototype.propertyIsEnumerable,V=(r,t,e)=>t in r?Le(r,t,{enumerable:!0,configurable:!0,writable:!0,value:e}):r[t]=e,ke=(r,t)=>{for(var e in t||(t={}))Z.call(t,e)&&V(r,e,t[e]);if(A)for(var e of A(t))x.call(t,e)&&V(r,e,t[e]);return r},Te=(r,t)=>He(r,Ne(t)),Ge=(r,t)=>{var e={};for(var n in r)Z.call(r,n)&&t.indexOf(n)<0&&(e[n]=r[n]);if(r!=null&&A)for(var n of A(r))t.indexOf(n)<0&&x.call(r,n)&&(e[n]=r[n]);return e};function Qe(r,t={}){let e;const n=t,{immediate:s}=n,i=Ge(n,["immediate"]),f=a.ref(!1),d=a.ref(!1),u=P=>e&&e.activate(P),p=P=>e&&e.deactivate(P),y=()=>{e&&(e.pause(),d.value=!0)},v=()=>{e&&(e.unpause(),d.value=!1)};return a.watch(()=>m.unrefElement(r),P=>{!P||(e=ee.createFocusTrap(P,Te(ke({},i),{onActivate(){f.value=!0,t.onActivate&&t.onActivate()},onDeactivate(){f.value=!1,t.onDeactivate&&t.onDeactivate()}})),s&&u())},{flush:"post"}),m.tryOnScopeDispose(()=>p()),{hasFocus:f,isPaused:d,activate:u,deactivate:p,pause:y,unpause:v}}function ze(r,t,e){const n=()=>{var f,d;return new le.default((f=o.resolveUnref(t))!=null?f:[],(d=o.resolveUnref(e))==null?void 0:d.fuseOptions)},s=a.ref(n());a.watch(()=>{var f;return(f=o.resolveUnref(e))==null?void 0:f.fuseOptions},()=>{s.value=n()},{deep:!0}),a.watch(()=>o.resolveUnref(t),f=>{s.value.setCollection(f)},{deep:!0});const i=a.computed(()=>{const f=o.resolveUnref(e);if((f==null?void 0:f.matchAllWhenSearchEmpty)&&!a.unref(r))return o.resolveUnref(t).map((u,p)=>({item:u,refIndex:p}));const d=f==null?void 0:f.resultLimit;return s.value.search(o.resolveUnref(r),d?{limit:d}:void 0)});return{fuse:s,results:i}}function Be(r,t={}){const{onError:e,fallbackValue:n=null}=t,s=(d,u)=>{try{return se.default(d,u)}catch(p){return e==null||e(p),n}},i=a.computed(()=>s(o.resolveUnref(r),{header:!0})),f=a.computed(()=>s(o.resolveUnref(r)));return{header:i,payload:f}}function Me(r=null,t){const e=a.ref(r),n=a.computed({set:i=>i?w.default.start():w.default.done(),get:()=>o.isNumber(e.value)&&e.value<1});t&&w.default.configure(t);const s=w.default.set;return w.default.set=i=>(e.value=i,s.call(w.default,i)),a.watchEffect(()=>{o.isNumber(e.value)&&o.isClient&&s.call(w.default,e.value)}),o.tryOnScopeDispose(w.default.remove),{isLoading:n,progress:e,start:w.default.start,done:w.default.done,remove:()=>{e.value=null,w.default.remove()}}}function We(r,t){const e=o.resolveRef(r),n=a.ref("");return a.watch(e,async s=>{e.value&&o.isClient&&(n.value=await ue.default.toDataURL(s,t))},{immediate:!0}),n}l.createCookies=je,l.useAsyncValidator=Pe,l.useAxios=ge,l.useChangeCase=me,l.useCookies=K,l.useDrauu=Re,l.useFocusTrap=Qe,l.useFuse=ze,l.useJwt=Be,l.useNProgress=Me,l.useQRCode=We,Object.defineProperty(l,"__esModule",{value:!0})})(this.VueUse=this.VueUse||{},VueUse,AsyncValidator,VueDemi,axios,changeCase,UniversalCookie,Drauu,VueUse,focusTrap,Fuse,jwt_decode,nprogress,QRCode);
|
|
1
|
+
var VueDemi=function(l,o,j){if(l.install)return l;if(o)if(o.version.slice(0,4)==="2.7."){for(var a in o)l[a]=o[a];l.isVue2=!0,l.isVue3=!1,l.install=function(){},l.Vue=o,l.Vue2=o,l.version=o.version}else if(o.version.slice(0,2)==="2.")if(j){for(var a in j)l[a]=j[a];l.isVue2=!0,l.isVue3=!1,l.install=function(){},l.Vue=o,l.Vue2=o,l.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)l[a]=o[a];l.isVue2=!1,l.isVue3=!0,l.install=function(){},l.Vue=o,l.Vue2=void 0,l.version=o.version,l.set=function(y,P,S){return Array.isArray(y)?(y.length=Math.max(y.length,P),y.splice(P,1,S),S):(y[P]=S,S)},l.del=function(y,P){if(Array.isArray(y)){y.splice(P,1);return}delete y[P]}}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`.");return l}(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(l,o,j,a,y,P,S,D,b,ee,te,re,ne,ae){"use strict";function E(r){return r&&typeof r=="object"&&"default"in r?r:{default:r}}var oe=E(j),N=E(y),k=E(S),le=E(te),se=E(re),w=E(ne),ue=E(ae),fe=Object.defineProperty,ce=Object.defineProperties,ie=Object.getOwnPropertyDescriptors,T=Object.getOwnPropertySymbols,de=Object.prototype.hasOwnProperty,ve=Object.prototype.propertyIsEnumerable,G=(r,t,e)=>t in r?fe(r,t,{enumerable:!0,configurable:!0,writable:!0,value:e}):r[t]=e,pe=(r,t)=>{for(var e in t||(t={}))de.call(t,e)&&G(r,e,t[e]);if(T)for(var e of T(t))ve.call(t,e)&&G(r,e,t[e]);return r},_e=(r,t)=>ce(r,ie(t));function Pe(r,t,e={}){const n=a.ref(),s=a.ref(!1),i=a.ref(!1),f=a.computed(()=>{var v;return((v=n.value)==null?void 0:v.errors)||[]}),d=a.computed(()=>{var v;return((v=n.value)==null?void 0:v.fields)||{}}),{validateOption:u={}}=e;a.watchEffect(async()=>{s.value=!1,i.value=!1;const v=new oe.default(o.resolveUnref(t));try{await v.validate(o.resolveUnref(r),u),i.value=!0,n.value=null}catch(O){n.value=O}finally{s.value=!0}});const p={pass:i,isFinished:s,errorInfo:n,errors:f,errorFields:d};function h(){return new Promise((v,O)=>{o.until(s).toBe(!0).then(()=>v(p)).catch(C=>O(C))})}return _e(pe({},p),{then(v,O){return h().then(v,O)}})}var Oe=Object.defineProperty,he=Object.defineProperties,ye=Object.getOwnPropertyDescriptors,Q=Object.getOwnPropertySymbols,we=Object.prototype.hasOwnProperty,Ce=Object.prototype.propertyIsEnumerable,z=(r,t,e)=>t in r?Oe(r,t,{enumerable:!0,configurable:!0,writable:!0,value:e}):r[t]=e,L=(r,t)=>{for(var e in t||(t={}))we.call(t,e)&&z(r,e,t[e]);if(Q)for(var e of Q(t))Ce.call(t,e)&&z(r,e,t[e]);return r},B=(r,t)=>he(r,ye(t));function ge(...r){const t=typeof r[0]=="string"?r[0]:void 0,e=o.isString(t)?1:0;let n={},s=N.default,i={immediate:!!e,shallow:!0};const f=_=>!!(_==null?void 0:_.request);r.length>0+e&&(f(r[0+e])?s=r[0+e]:n=r[0+e]),r.length>1+e&&f(r[1+e])&&(s=r[1+e]),(r.length===2+e&&!f(r[1+e])||r.length===3+e)&&(i=r[r.length-1]);const d=a.shallowRef(),u=i.shallow?a.shallowRef():a.ref(),p=a.ref(!1),h=a.ref(!1),v=a.ref(!1),O=a.shallowRef(),C=N.default.CancelToken.source(),$=_=>{p.value||!h.value||(C.cancel(_),v.value=!0,h.value=!1,p.value=!1)},U=_=>{h.value=_,p.value=!_},H=()=>new Promise((_,m)=>{o.until(p).toBe(!0).then(()=>_(R)).catch(m)}),F=(_,m)=>H().then(_,m),I=(_=t,m={})=>{O.value=void 0;const c=typeof _=="string"?_:t??"";return U(!0),s(c,B(L(L({},n),typeof _=="object"?_:m),{cancelToken:C.token})).then(g=>{d.value=g,u.value=g.data}).catch(g=>{O.value=g}).finally(()=>U(!1)),{then:F}};i.immediate&&t&&I();const R={response:d,data:u,error:O,finished:p,loading:h,isFinished:p,isLoading:h,cancel:$,isAborted:v,canceled:v,aborted:v,isCanceled:v,abort:$,execute:I};return B(L({},R),{then:F})}var M=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 be(r,t,e){if(o.isFunction(r))return a.computed(()=>M[t](o.resolveUnref(r),e));const n=a.ref(r);return a.computed({get(){return M[t](n.value,e)},set(s){n.value=s}})}var me=Object.defineProperty,W=Object.getOwnPropertySymbols,Ee=Object.prototype.hasOwnProperty,Se=Object.prototype.propertyIsEnumerable,J=(r,t,e)=>t in r?me(r,t,{enumerable:!0,configurable:!0,writable:!0,value:e}):r[t]=e,q=(r,t)=>{for(var e in t||(t={}))Ee.call(t,e)&&J(r,e,t[e]);if(W)for(var e of W(t))Se.call(t,e)&&J(r,e,t[e]);return r};function je(r){const t=new k.default(r?r.headers.cookie:null);return(e,{doNotParse:n=!1,autoUpdateDependencies:s=!1}={})=>K(e,{doNotParse:n,autoUpdateDependencies:s},t)}function K(r,{doNotParse:t=!1,autoUpdateDependencies:e=!1}={},n=new k.default){const s=e?[...r||[]]:r;let i=n.getAll({doNotParse:!0});const f=a.ref(0),d=()=>{const u=n.getAll({doNotParse:!0});Ae(s||null,u,i)&&f.value++,i=u};return n.addChangeListener(d),o.tryOnScopeDispose(()=>{n.removeChangeListener(d)}),{get:(...u)=>(e&&s&&!s.includes(u[0])&&s.push(u[0]),f.value,n.get(u[0],q({doNotParse:t},u[1]))),getAll:(...u)=>(f.value,n.getAll(q({doNotParse:t},u[0]))),set:(...u)=>n.set(...u),remove:(...u)=>n.remove(...u),addChangeListener:(...u)=>n.addChangeListener(...u),removeChangeListener:(...u)=>n.removeChangeListener(...u)}}function Ae(r,t,e){if(!r)return!0;for(const n of r)if(t[n]!==e[n])return!0;return!1}var $e=Object.defineProperty,X=Object.getOwnPropertySymbols,Ue=Object.prototype.hasOwnProperty,Fe=Object.prototype.propertyIsEnumerable,Y=(r,t,e)=>t in r?$e(r,t,{enumerable:!0,configurable:!0,writable:!0,value:e}):r[t]=e,Ie=(r,t)=>{for(var e in t||(t={}))Ue.call(t,e)&&Y(r,e,t[e]);if(X)for(var e of X(t))Fe.call(t,e)&&Y(r,e,t[e]);return r};function Re(r,t){const e=a.ref();let n=[];const s=b.createEventHook(),i=b.createEventHook(),f=b.createEventHook(),d=b.createEventHook(),u=b.createEventHook(),p=a.ref(!1),h=a.ref(!1),v=a.ref(!1),O=a.ref(!1),C=a.ref({color:"black",size:3,arrowEnd:!1,cornerRadius:0,dasharray:void 0,fill:"transparent",mode:"draw"});a.watch(C,()=>{const c=e.value;c&&(c.brush=C.value,c.mode=C.value.mode)},{deep:!0});const $=()=>{var c;return(c=e.value)==null?void 0:c.undo()},U=()=>{var c;return(c=e.value)==null?void 0:c.redo()},H=()=>{var c;return(c=e.value)==null?void 0:c.clear()},F=()=>{var c;return(c=e.value)==null?void 0:c.cancel()},I=c=>{var g;return(g=e.value)==null?void 0:g.load(c)},R=()=>{var c;return(c=e.value)==null?void 0:c.dump()},_=()=>{var c;n.forEach(g=>g()),(c=e.value)==null||c.unmount()},m=()=>{e.value&&(p.value=e.value.canUndo(),h.value=e.value.canRedo(),v.value=e.value.altPressed,O.value=e.value.shiftPressed)};return a.watch(()=>b.unrefElement(r),c=>{!c||typeof SVGSVGElement=="undefined"||!(c instanceof SVGSVGElement)||(e.value&&_(),e.value=D.createDrauu(Ie({el:c},t)),m(),n=[e.value.on("canceled",()=>i.trigger()),e.value.on("committed",()=>f.trigger()),e.value.on("start",()=>d.trigger()),e.value.on("end",()=>u.trigger()),e.value.on("changed",()=>{m(),s.trigger()})])},{flush:"post"}),o.tryOnScopeDispose(()=>_()),{drauuInstance:e,load:I,dump:R,clear:H,cancel:F,undo:$,redo:U,canUndo:p,canRedo:h,brush:C,onChanged:s.on,onCommitted:f.on,onStart:d.on,onEnd:u.on,onCanceled:i.on}}var Le=Object.defineProperty,He=Object.defineProperties,Ne=Object.getOwnPropertyDescriptors,A=Object.getOwnPropertySymbols,Z=Object.prototype.hasOwnProperty,V=Object.prototype.propertyIsEnumerable,x=(r,t,e)=>t in r?Le(r,t,{enumerable:!0,configurable:!0,writable:!0,value:e}):r[t]=e,ke=(r,t)=>{for(var e in t||(t={}))Z.call(t,e)&&x(r,e,t[e]);if(A)for(var e of A(t))V.call(t,e)&&x(r,e,t[e]);return r},Te=(r,t)=>He(r,Ne(t)),Ge=(r,t)=>{var e={};for(var n in r)Z.call(r,n)&&t.indexOf(n)<0&&(e[n]=r[n]);if(r!=null&&A)for(var n of A(r))t.indexOf(n)<0&&V.call(r,n)&&(e[n]=r[n]);return e};function Qe(r,t={}){let e;const n=t,{immediate:s}=n,i=Ge(n,["immediate"]),f=a.ref(!1),d=a.ref(!1),u=O=>e&&e.activate(O),p=O=>e&&e.deactivate(O),h=()=>{e&&(e.pause(),d.value=!0)},v=()=>{e&&(e.unpause(),d.value=!1)};return a.watch(()=>b.unrefElement(r),O=>{!O||(e=ee.createFocusTrap(O,Te(ke({},i),{onActivate(){f.value=!0,t.onActivate&&t.onActivate()},onDeactivate(){f.value=!1,t.onDeactivate&&t.onDeactivate()}})),s&&u())},{flush:"post"}),b.tryOnScopeDispose(()=>p()),{hasFocus:f,isPaused:d,activate:u,deactivate:p,pause:h,unpause:v}}function ze(r,t,e){const n=()=>{var f,d;return new le.default((f=o.resolveUnref(t))!=null?f:[],(d=o.resolveUnref(e))==null?void 0:d.fuseOptions)},s=a.ref(n());a.watch(()=>{var f;return(f=o.resolveUnref(e))==null?void 0:f.fuseOptions},()=>{s.value=n()},{deep:!0}),a.watch(()=>o.resolveUnref(t),f=>{s.value.setCollection(f)},{deep:!0});const i=a.computed(()=>{const f=o.resolveUnref(e);if((f==null?void 0:f.matchAllWhenSearchEmpty)&&!a.unref(r))return o.resolveUnref(t).map((u,p)=>({item:u,refIndex:p}));const d=f==null?void 0:f.resultLimit;return s.value.search(o.resolveUnref(r),d?{limit:d}:void 0)});return{fuse:s,results:i}}function Be(r,t={}){const{onError:e,fallbackValue:n=null}=t,s=(d,u)=>{try{return se.default(d,u)}catch(p){return e==null||e(p),n}},i=a.computed(()=>s(o.resolveUnref(r),{header:!0})),f=a.computed(()=>s(o.resolveUnref(r)));return{header:i,payload:f}}function Me(r=null,t){const e=a.ref(r),n=a.computed({set:i=>i?w.default.start():w.default.done(),get:()=>o.isNumber(e.value)&&e.value<1});t&&w.default.configure(t);const s=w.default.set;return w.default.set=i=>(e.value=i,s.call(w.default,i)),a.watchEffect(()=>{o.isNumber(e.value)&&o.isClient&&s.call(w.default,e.value)}),o.tryOnScopeDispose(w.default.remove),{isLoading:n,progress:e,start:w.default.start,done:w.default.done,remove:()=>{e.value=null,w.default.remove()}}}function We(r,t){const e=o.resolveRef(r),n=a.ref("");return a.watch(e,async s=>{e.value&&o.isClient&&(n.value=await ue.default.toDataURL(s,t))},{immediate:!0}),n}l.createCookies=je,l.useAsyncValidator=Pe,l.useAxios=ge,l.useChangeCase=be,l.useCookies=K,l.useDrauu=Re,l.useFocusTrap=Qe,l.useFuse=ze,l.useJwt=Be,l.useNProgress=Me,l.useQRCode=We,Object.defineProperty(l,"__esModule",{value:!0})})(this.VueUse=this.VueUse||{},VueUse,AsyncValidator,VueDemi,axios,changeCase,UniversalCookie,Drauu,VueUse,focusTrap,Fuse,jwt_decode,nprogress,QRCode);
|
package/index.mjs
CHANGED
|
@@ -101,7 +101,7 @@ function useAxios(...args) {
|
|
|
101
101
|
const argsPlaceholder = isString(url) ? 1 : 0;
|
|
102
102
|
let defaultConfig = {};
|
|
103
103
|
let instance = axios;
|
|
104
|
-
let options = { immediate: !!argsPlaceholder };
|
|
104
|
+
let options = { immediate: !!argsPlaceholder, shallow: true };
|
|
105
105
|
const isAxiosInstance = (val) => !!(val == null ? void 0 : val.request);
|
|
106
106
|
if (args.length > 0 + argsPlaceholder) {
|
|
107
107
|
if (isAxiosInstance(args[0 + argsPlaceholder]))
|
|
@@ -116,7 +116,7 @@ function useAxios(...args) {
|
|
|
116
116
|
if (args.length === 2 + argsPlaceholder && !isAxiosInstance(args[1 + argsPlaceholder]) || args.length === 3 + argsPlaceholder)
|
|
117
117
|
options = args[args.length - 1];
|
|
118
118
|
const response = shallowRef();
|
|
119
|
-
const data = shallowRef();
|
|
119
|
+
const data = options.shallow ? shallowRef() : ref();
|
|
120
120
|
const isFinished = ref(false);
|
|
121
121
|
const isLoading = ref(false);
|
|
122
122
|
const isAborted = ref(false);
|
|
@@ -139,9 +139,10 @@ function useAxios(...args) {
|
|
|
139
139
|
});
|
|
140
140
|
const then = (onFulfilled, onRejected) => waitUntilFinished().then(onFulfilled, onRejected);
|
|
141
141
|
const execute = (executeUrl = url, config = {}) => {
|
|
142
|
+
error.value = void 0;
|
|
142
143
|
const _url = typeof executeUrl === "string" ? executeUrl : url != null ? url : "";
|
|
143
144
|
loading(true);
|
|
144
|
-
instance(_url, __spreadProps$1(__spreadValues$3(__spreadValues$3({}, defaultConfig), config), { cancelToken: cancelToken.token })).then((r) => {
|
|
145
|
+
instance(_url, __spreadProps$1(__spreadValues$3(__spreadValues$3({}, defaultConfig), typeof executeUrl === "object" ? executeUrl : config), { cancelToken: cancelToken.token })).then((r) => {
|
|
145
146
|
response.value = r;
|
|
146
147
|
data.value = r.data;
|
|
147
148
|
}).catch((e) => {
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@vueuse/integrations",
|
|
3
|
-
"version": "9.
|
|
3
|
+
"version": "9.3.0",
|
|
4
4
|
"description": "Integration wrappers for utility libraries",
|
|
5
5
|
"author": "Anthony Fu <https://github.com/antfu>",
|
|
6
6
|
"license": "MIT",
|
|
@@ -138,18 +138,18 @@
|
|
|
138
138
|
}
|
|
139
139
|
},
|
|
140
140
|
"dependencies": {
|
|
141
|
-
"@vueuse/core": "9.
|
|
142
|
-
"@vueuse/shared": "9.
|
|
141
|
+
"@vueuse/core": "9.3.0",
|
|
142
|
+
"@vueuse/shared": "9.3.0",
|
|
143
143
|
"vue-demi": "*"
|
|
144
144
|
},
|
|
145
145
|
"devDependencies": {
|
|
146
146
|
"@types/nprogress": "^0.2.0",
|
|
147
|
-
"@types/qrcode": "^1.
|
|
147
|
+
"@types/qrcode": "^1.5.0",
|
|
148
148
|
"async-validator": "^4.2.5",
|
|
149
149
|
"axios": "^0.27.2",
|
|
150
150
|
"change-case": "^4.1.2",
|
|
151
|
-
"drauu": "^0.3.
|
|
152
|
-
"focus-trap": "^
|
|
151
|
+
"drauu": "^0.3.1",
|
|
152
|
+
"focus-trap": "^7.0.0",
|
|
153
153
|
"fuse.js": "^6.6.2",
|
|
154
154
|
"jwt-decode": "^3.1.2",
|
|
155
155
|
"nprogress": "^0.2.0",
|
|
@@ -13,7 +13,7 @@ declare const UseAsyncValidator: vue_demi.DefineComponent<{
|
|
|
13
13
|
};
|
|
14
14
|
}, () => vue_demi.VNode<vue_demi.RendererNode, vue_demi.RendererElement, {
|
|
15
15
|
[key: string]: any;
|
|
16
|
-
}>[] | undefined, unknown, {}, {}, vue_demi.ComponentOptionsMixin, vue_demi.ComponentOptionsMixin,
|
|
16
|
+
}>[] | undefined, unknown, {}, {}, vue_demi.ComponentOptionsMixin, vue_demi.ComponentOptionsMixin, {}, string, vue_demi.VNodeProps & vue_demi.AllowedComponentProps & vue_demi.ComponentCustomProps, Readonly<vue_demi.ExtractPropTypes<{
|
|
17
17
|
form: {
|
|
18
18
|
type: PropType<Record<string, any>>;
|
|
19
19
|
required: true;
|
package/useAxios.cjs
CHANGED
|
@@ -34,7 +34,7 @@ function useAxios(...args) {
|
|
|
34
34
|
const argsPlaceholder = shared.isString(url) ? 1 : 0;
|
|
35
35
|
let defaultConfig = {};
|
|
36
36
|
let instance = axios__default["default"];
|
|
37
|
-
let options = { immediate: !!argsPlaceholder };
|
|
37
|
+
let options = { immediate: !!argsPlaceholder, shallow: true };
|
|
38
38
|
const isAxiosInstance = (val) => !!(val == null ? void 0 : val.request);
|
|
39
39
|
if (args.length > 0 + argsPlaceholder) {
|
|
40
40
|
if (isAxiosInstance(args[0 + argsPlaceholder]))
|
|
@@ -49,7 +49,7 @@ function useAxios(...args) {
|
|
|
49
49
|
if (args.length === 2 + argsPlaceholder && !isAxiosInstance(args[1 + argsPlaceholder]) || args.length === 3 + argsPlaceholder)
|
|
50
50
|
options = args[args.length - 1];
|
|
51
51
|
const response = vueDemi.shallowRef();
|
|
52
|
-
const data = vueDemi.shallowRef();
|
|
52
|
+
const data = options.shallow ? vueDemi.shallowRef() : vueDemi.ref();
|
|
53
53
|
const isFinished = vueDemi.ref(false);
|
|
54
54
|
const isLoading = vueDemi.ref(false);
|
|
55
55
|
const isAborted = vueDemi.ref(false);
|
|
@@ -72,9 +72,10 @@ function useAxios(...args) {
|
|
|
72
72
|
});
|
|
73
73
|
const then = (onFulfilled, onRejected) => waitUntilFinished().then(onFulfilled, onRejected);
|
|
74
74
|
const execute = (executeUrl = url, config = {}) => {
|
|
75
|
+
error.value = void 0;
|
|
75
76
|
const _url = typeof executeUrl === "string" ? executeUrl : url != null ? url : "";
|
|
76
77
|
loading(true);
|
|
77
|
-
instance(_url, __spreadProps(__spreadValues(__spreadValues({}, defaultConfig), config), { cancelToken: cancelToken.token })).then((r) => {
|
|
78
|
+
instance(_url, __spreadProps(__spreadValues(__spreadValues({}, defaultConfig), typeof executeUrl === "object" ? executeUrl : config), { cancelToken: cancelToken.token })).then((r) => {
|
|
78
79
|
response.value = r;
|
|
79
80
|
data.value = r.data;
|
|
80
81
|
}).catch((e) => {
|
package/useAxios.d.ts
CHANGED
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
import { ShallowRef, Ref } from 'vue-demi';
|
|
2
2
|
import { AxiosResponse, AxiosError, AxiosRequestConfig, AxiosInstance } from 'axios';
|
|
3
3
|
|
|
4
|
-
interface UseAxiosReturn<T> {
|
|
4
|
+
interface UseAxiosReturn<T, D> {
|
|
5
5
|
/**
|
|
6
6
|
* Axios Response
|
|
7
7
|
*/
|
|
8
|
-
response: ShallowRef<AxiosResponse<T> | undefined>;
|
|
8
|
+
response: ShallowRef<AxiosResponse<T, D> | undefined>;
|
|
9
9
|
/**
|
|
10
10
|
* Axios response data
|
|
11
11
|
*/
|
|
@@ -25,7 +25,7 @@ interface UseAxiosReturn<T> {
|
|
|
25
25
|
/**
|
|
26
26
|
* Any errors that may have occurred
|
|
27
27
|
*/
|
|
28
|
-
error: ShallowRef<AxiosError<T> | undefined>;
|
|
28
|
+
error: ShallowRef<AxiosError<T, D> | undefined>;
|
|
29
29
|
/**
|
|
30
30
|
* Aborts the current request
|
|
31
31
|
*/
|
|
@@ -59,17 +59,17 @@ interface UseAxiosReturn<T> {
|
|
|
59
59
|
*/
|
|
60
60
|
isCanceled: Ref<boolean>;
|
|
61
61
|
}
|
|
62
|
-
interface StrictUseAxiosReturn<T> extends UseAxiosReturn<T> {
|
|
62
|
+
interface StrictUseAxiosReturn<T, D> extends UseAxiosReturn<T, D> {
|
|
63
63
|
/**
|
|
64
64
|
* Manually call the axios request
|
|
65
65
|
*/
|
|
66
|
-
execute: (url?: string
|
|
66
|
+
execute: (url?: string | AxiosRequestConfig<D>, config?: AxiosRequestConfig<D>) => PromiseLike<StrictUseAxiosReturn<T, D>>;
|
|
67
67
|
}
|
|
68
|
-
interface EasyUseAxiosReturn<T> extends UseAxiosReturn<T> {
|
|
68
|
+
interface EasyUseAxiosReturn<T, D> extends UseAxiosReturn<T, D> {
|
|
69
69
|
/**
|
|
70
70
|
* Manually call the axios request
|
|
71
71
|
*/
|
|
72
|
-
execute: (url: string, config?: AxiosRequestConfig) => PromiseLike<EasyUseAxiosReturn<T>>;
|
|
72
|
+
execute: (url: string, config?: AxiosRequestConfig<D>) => PromiseLike<EasyUseAxiosReturn<T, D>>;
|
|
73
73
|
}
|
|
74
74
|
interface UseAxiosOptions {
|
|
75
75
|
/**
|
|
@@ -77,12 +77,18 @@ interface UseAxiosOptions {
|
|
|
77
77
|
*
|
|
78
78
|
*/
|
|
79
79
|
immediate?: boolean;
|
|
80
|
+
/**
|
|
81
|
+
* Use shallowRef.
|
|
82
|
+
*
|
|
83
|
+
* @default true
|
|
84
|
+
*/
|
|
85
|
+
shallow?: boolean;
|
|
80
86
|
}
|
|
81
|
-
declare function useAxios<T = any>(url: string, config?: AxiosRequestConfig
|
|
82
|
-
declare function useAxios<T = any>(url: string, instance?: AxiosInstance, options?: UseAxiosOptions): StrictUseAxiosReturn<T> & PromiseLike<StrictUseAxiosReturn<T>>;
|
|
83
|
-
declare function useAxios<T = any>(url: string, config: AxiosRequestConfig
|
|
84
|
-
declare function useAxios<T = any>(config?: AxiosRequestConfig): EasyUseAxiosReturn<T> & PromiseLike<EasyUseAxiosReturn<T>>;
|
|
85
|
-
declare function useAxios<T = any>(instance?: AxiosInstance): EasyUseAxiosReturn<T> & PromiseLike<EasyUseAxiosReturn<T>>;
|
|
86
|
-
declare function useAxios<T = any>(config?: AxiosRequestConfig
|
|
87
|
+
declare function useAxios<T = any, D = any>(url: string, config?: AxiosRequestConfig<D>, options?: UseAxiosOptions): StrictUseAxiosReturn<T, D> & PromiseLike<StrictUseAxiosReturn<T, D>>;
|
|
88
|
+
declare function useAxios<T = any, D = any>(url: string, instance?: AxiosInstance, options?: UseAxiosOptions): StrictUseAxiosReturn<T, D> & PromiseLike<StrictUseAxiosReturn<T, D>>;
|
|
89
|
+
declare function useAxios<T = any, D = any>(url: string, config: AxiosRequestConfig<D>, instance: AxiosInstance, options?: UseAxiosOptions): StrictUseAxiosReturn<T, D> & PromiseLike<StrictUseAxiosReturn<T, D>>;
|
|
90
|
+
declare function useAxios<T = any, D = any>(config?: AxiosRequestConfig<D>): EasyUseAxiosReturn<T, D> & PromiseLike<EasyUseAxiosReturn<T, D>>;
|
|
91
|
+
declare function useAxios<T = any, D = any>(instance?: AxiosInstance): EasyUseAxiosReturn<T, D> & PromiseLike<EasyUseAxiosReturn<T, D>>;
|
|
92
|
+
declare function useAxios<T = any, D = any>(config?: AxiosRequestConfig<D>, instance?: AxiosInstance): EasyUseAxiosReturn<T, D> & PromiseLike<EasyUseAxiosReturn<T, D>>;
|
|
87
93
|
|
|
88
94
|
export { EasyUseAxiosReturn, StrictUseAxiosReturn, UseAxiosOptions, UseAxiosReturn, useAxios };
|
package/useAxios.iife.js
CHANGED
|
@@ -102,7 +102,7 @@
|
|
|
102
102
|
const argsPlaceholder = shared.isString(url) ? 1 : 0;
|
|
103
103
|
let defaultConfig = {};
|
|
104
104
|
let instance = axios__default["default"];
|
|
105
|
-
let options = { immediate: !!argsPlaceholder };
|
|
105
|
+
let options = { immediate: !!argsPlaceholder, shallow: true };
|
|
106
106
|
const isAxiosInstance = (val) => !!(val == null ? void 0 : val.request);
|
|
107
107
|
if (args.length > 0 + argsPlaceholder) {
|
|
108
108
|
if (isAxiosInstance(args[0 + argsPlaceholder]))
|
|
@@ -117,7 +117,7 @@
|
|
|
117
117
|
if (args.length === 2 + argsPlaceholder && !isAxiosInstance(args[1 + argsPlaceholder]) || args.length === 3 + argsPlaceholder)
|
|
118
118
|
options = args[args.length - 1];
|
|
119
119
|
const response = vueDemi.shallowRef();
|
|
120
|
-
const data = vueDemi.shallowRef();
|
|
120
|
+
const data = options.shallow ? vueDemi.shallowRef() : vueDemi.ref();
|
|
121
121
|
const isFinished = vueDemi.ref(false);
|
|
122
122
|
const isLoading = vueDemi.ref(false);
|
|
123
123
|
const isAborted = vueDemi.ref(false);
|
|
@@ -140,9 +140,10 @@
|
|
|
140
140
|
});
|
|
141
141
|
const then = (onFulfilled, onRejected) => waitUntilFinished().then(onFulfilled, onRejected);
|
|
142
142
|
const execute = (executeUrl = url, config = {}) => {
|
|
143
|
+
error.value = void 0;
|
|
143
144
|
const _url = typeof executeUrl === "string" ? executeUrl : url != null ? url : "";
|
|
144
145
|
loading(true);
|
|
145
|
-
instance(_url, __spreadProps(__spreadValues(__spreadValues({}, defaultConfig), config), { cancelToken: cancelToken.token })).then((r) => {
|
|
146
|
+
instance(_url, __spreadProps(__spreadValues(__spreadValues({}, defaultConfig), typeof executeUrl === "object" ? executeUrl : config), { cancelToken: cancelToken.token })).then((r) => {
|
|
146
147
|
response.value = r;
|
|
147
148
|
data.value = r.data;
|
|
148
149
|
}).catch((e) => {
|
package/useAxios.iife.min.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
var VueDemi=function(n,
|
|
1
|
+
var VueDemi=function(n,o,a){if(n.install)return n;if(o)if(o.version.slice(0,4)==="2.7."){for(var l in o)n[l]=o[l];n.isVue2=!0,n.isVue3=!1,n.install=function(){},n.Vue=o,n.Vue2=o,n.version=o.version}else if(o.version.slice(0,2)==="2.")if(a){for(var l in a)n[l]=a[l];n.isVue2=!0,n.isVue3=!1,n.install=function(){},n.Vue=o,n.Vue2=o,n.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 l in o)n[l]=o[l];n.isVue2=!1,n.isVue3=!0,n.install=function(){},n.Vue=o,n.Vue2=void 0,n.version=o.version,n.set=function(i,f,c){return Array.isArray(i)?(i.length=Math.max(i.length,f),i.splice(f,1,c),c):(i[f]=c,c)},n.del=function(i,f){if(Array.isArray(i)){i.splice(f,1);return}delete i[f]}}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`.");return n}(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(n,o,a,l){"use strict";function i(e){return e&&typeof e=="object"&&"default"in e?e:{default:e}}var f=i(l),c=Object.defineProperty,M=Object.defineProperties,g=Object.getOwnPropertyDescriptors,O=Object.getOwnPropertySymbols,q=Object.prototype.hasOwnProperty,B=Object.prototype.propertyIsEnumerable,A=(e,s,t)=>s in e?c(e,s,{enumerable:!0,configurable:!0,writable:!0,value:t}):e[s]=t,_=(e,s)=>{for(var t in s||(s={}))q.call(s,t)&&A(e,t,s[t]);if(O)for(var t of O(s))B.call(s,t)&&A(e,t,s[t]);return e},j=(e,s)=>M(e,g(s));function N(...e){const s=typeof e[0]=="string"?e[0]:void 0,t=a.isString(s)?1:0;let C={},y=f.default,P={immediate:!!t,shallow:!0};const b=r=>!!(r==null?void 0:r.request);e.length>0+t&&(b(e[0+t])?y=e[0+t]:C=e[0+t]),e.length>1+t&&b(e[1+t])&&(y=e[1+t]),(e.length===2+t&&!b(e[1+t])||e.length===3+t)&&(P=e[e.length-1]);const I=o.shallowRef(),x=P.shallow?o.shallowRef():o.ref(),u=o.ref(!1),d=o.ref(!1),p=o.ref(!1),w=o.shallowRef(),R=f.default.CancelToken.source(),S=r=>{u.value||!d.value||(R.cancel(r),p.value=!0,d.value=!1,u.value=!1)},T=r=>{d.value=r,u.value=!r},U=()=>new Promise((r,v)=>{a.until(u).toBe(!0).then(()=>r(L)).catch(v)}),E=(r,v)=>U().then(r,v),F=(r=s,v={})=>{w.value=void 0;const k=typeof r=="string"?r:s??"";return T(!0),y(k,j(_(_({},C),typeof r=="object"?r:v),{cancelToken:R.token})).then(h=>{I.value=h,x.value=h.data}).catch(h=>{w.value=h}).finally(()=>T(!1)),{then:E}};P.immediate&&s&&F();const L={response:I,data:x,error:w,finished:u,loading:d,isFinished:u,isLoading:d,cancel:S,isAborted:p,canceled:p,aborted:p,isCanceled:p,abort:S,execute:F};return j(_({},L),{then:E})}n.useAxios=N,Object.defineProperty(n,"__esModule",{value:!0})})(this.VueUse=this.VueUse||{},VueDemi,VueUse,axios);
|
package/useAxios.mjs
CHANGED
|
@@ -26,7 +26,7 @@ function useAxios(...args) {
|
|
|
26
26
|
const argsPlaceholder = isString(url) ? 1 : 0;
|
|
27
27
|
let defaultConfig = {};
|
|
28
28
|
let instance = axios;
|
|
29
|
-
let options = { immediate: !!argsPlaceholder };
|
|
29
|
+
let options = { immediate: !!argsPlaceholder, shallow: true };
|
|
30
30
|
const isAxiosInstance = (val) => !!(val == null ? void 0 : val.request);
|
|
31
31
|
if (args.length > 0 + argsPlaceholder) {
|
|
32
32
|
if (isAxiosInstance(args[0 + argsPlaceholder]))
|
|
@@ -41,7 +41,7 @@ function useAxios(...args) {
|
|
|
41
41
|
if (args.length === 2 + argsPlaceholder && !isAxiosInstance(args[1 + argsPlaceholder]) || args.length === 3 + argsPlaceholder)
|
|
42
42
|
options = args[args.length - 1];
|
|
43
43
|
const response = shallowRef();
|
|
44
|
-
const data = shallowRef();
|
|
44
|
+
const data = options.shallow ? shallowRef() : ref();
|
|
45
45
|
const isFinished = ref(false);
|
|
46
46
|
const isLoading = ref(false);
|
|
47
47
|
const isAborted = ref(false);
|
|
@@ -64,9 +64,10 @@ function useAxios(...args) {
|
|
|
64
64
|
});
|
|
65
65
|
const then = (onFulfilled, onRejected) => waitUntilFinished().then(onFulfilled, onRejected);
|
|
66
66
|
const execute = (executeUrl = url, config = {}) => {
|
|
67
|
+
error.value = void 0;
|
|
67
68
|
const _url = typeof executeUrl === "string" ? executeUrl : url != null ? url : "";
|
|
68
69
|
loading(true);
|
|
69
|
-
instance(_url, __spreadProps(__spreadValues(__spreadValues({}, defaultConfig), config), { cancelToken: cancelToken.token })).then((r) => {
|
|
70
|
+
instance(_url, __spreadProps(__spreadValues(__spreadValues({}, defaultConfig), typeof executeUrl === "object" ? executeUrl : config), { cancelToken: cancelToken.token })).then((r) => {
|
|
70
71
|
response.value = r;
|
|
71
72
|
data.value = r.data;
|
|
72
73
|
}).catch((e) => {
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import * as vue_demi from 'vue-demi';
|
|
2
2
|
import { RenderableComponent } from '@vueuse/core';
|
|
3
3
|
|
|
4
|
-
declare const UseFocusTrap: vue_demi.DefineComponent<RenderableComponent, {}, {}, {}, {}, vue_demi.ComponentOptionsMixin, vue_demi.ComponentOptionsMixin,
|
|
4
|
+
declare const UseFocusTrap: vue_demi.DefineComponent<RenderableComponent, {}, {}, {}, {}, vue_demi.ComponentOptionsMixin, vue_demi.ComponentOptionsMixin, {}, string, vue_demi.VNodeProps & vue_demi.AllowedComponentProps & vue_demi.ComponentCustomProps, Readonly<RenderableComponent>, {}>;
|
|
5
5
|
|
|
6
6
|
export { UseFocusTrap };
|