@vueuse/integrations 8.3.1 → 8.4.2
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 +10 -8
- package/index.d.ts +9 -2
- package/index.iife.js +10 -8
- package/index.iife.min.js +1 -1
- package/index.mjs +11 -9
- package/package.json +9 -6
- package/useAxios.cjs +10 -8
- package/useAxios.d.ts +9 -2
- package/useAxios.iife.js +10 -8
- package/useAxios.iife.min.js +1 -1
- package/useAxios.mjs +11 -9
package/index.cjs
CHANGED
|
@@ -45,34 +45,35 @@ var __spreadValues$3 = (a, b) => {
|
|
|
45
45
|
var __spreadProps$1 = (a, b) => __defProps$1(a, __getOwnPropDescs$1(b));
|
|
46
46
|
function useAxios(...args) {
|
|
47
47
|
const url = typeof args[0] === "string" ? args[0] : void 0;
|
|
48
|
-
const argsPlaceholder = url ? 1 : 0;
|
|
48
|
+
const argsPlaceholder = shared.isString(url) ? 1 : 0;
|
|
49
49
|
let defaultConfig = {};
|
|
50
50
|
let instance = axios__default["default"];
|
|
51
51
|
let options = { immediate: !!argsPlaceholder };
|
|
52
|
+
const isAxiosInstance = (val) => !!(val == null ? void 0 : val.request);
|
|
52
53
|
if (args.length > 0 + argsPlaceholder) {
|
|
53
|
-
if (
|
|
54
|
+
if (isAxiosInstance(args[0 + argsPlaceholder]))
|
|
54
55
|
instance = args[0 + argsPlaceholder];
|
|
55
56
|
else
|
|
56
57
|
defaultConfig = args[0 + argsPlaceholder];
|
|
57
58
|
}
|
|
58
59
|
if (args.length > 1 + argsPlaceholder) {
|
|
59
|
-
if (
|
|
60
|
+
if (isAxiosInstance(args[1 + argsPlaceholder]))
|
|
60
61
|
instance = args[1 + argsPlaceholder];
|
|
61
62
|
}
|
|
62
|
-
if (args.length === 2 + argsPlaceholder && !(
|
|
63
|
+
if (args.length === 2 + argsPlaceholder && !isAxiosInstance(args[1 + argsPlaceholder]) || args.length === 3 + argsPlaceholder)
|
|
63
64
|
options = args[args.length - 1];
|
|
64
65
|
const response = vueDemi.shallowRef();
|
|
65
66
|
const data = vueDemi.shallowRef();
|
|
66
67
|
const isFinished = vueDemi.ref(false);
|
|
67
68
|
const isLoading = vueDemi.ref(false);
|
|
68
|
-
const
|
|
69
|
+
const isAborted = vueDemi.ref(false);
|
|
69
70
|
const error = vueDemi.shallowRef();
|
|
70
71
|
const cancelToken = axios__default["default"].CancelToken.source();
|
|
71
72
|
const abort = (message) => {
|
|
72
73
|
if (isFinished.value || !isLoading.value)
|
|
73
74
|
return;
|
|
74
75
|
cancelToken.cancel(message);
|
|
75
|
-
|
|
76
|
+
isAborted.value = true;
|
|
76
77
|
isLoading.value = false;
|
|
77
78
|
isFinished.value = false;
|
|
78
79
|
};
|
|
@@ -110,8 +111,9 @@ function useAxios(...args) {
|
|
|
110
111
|
isFinished,
|
|
111
112
|
isLoading,
|
|
112
113
|
cancel: abort,
|
|
113
|
-
|
|
114
|
-
|
|
114
|
+
isAborted,
|
|
115
|
+
canceled: isAborted,
|
|
116
|
+
aborted: isAborted,
|
|
115
117
|
abort,
|
|
116
118
|
execute
|
|
117
119
|
};
|
package/index.d.ts
CHANGED
|
@@ -34,7 +34,7 @@ interface UseAxiosReturn<T> {
|
|
|
34
34
|
/**
|
|
35
35
|
* Indicates if the request was canceled
|
|
36
36
|
*/
|
|
37
|
-
|
|
37
|
+
isAborted: Ref<boolean>;
|
|
38
38
|
/**
|
|
39
39
|
* Any errors that may have occurred
|
|
40
40
|
*/
|
|
@@ -45,12 +45,19 @@ interface UseAxiosReturn<T> {
|
|
|
45
45
|
abort: (message?: string | undefined) => void;
|
|
46
46
|
/**
|
|
47
47
|
* isFinished alias
|
|
48
|
+
* @deprecated use `isFinished` instead
|
|
48
49
|
*/
|
|
49
50
|
finished: Ref<boolean>;
|
|
50
51
|
/**
|
|
51
|
-
*
|
|
52
|
+
* isLoading alias
|
|
53
|
+
* @deprecated use `isLoading` instead
|
|
52
54
|
*/
|
|
53
55
|
loading: Ref<boolean>;
|
|
56
|
+
/**
|
|
57
|
+
* isAborted alias
|
|
58
|
+
* @deprecated use `isAborted` instead
|
|
59
|
+
*/
|
|
60
|
+
aborted: Ref<boolean>;
|
|
54
61
|
/**
|
|
55
62
|
* abort alias
|
|
56
63
|
*/
|
package/index.iife.js
CHANGED
|
@@ -93,34 +93,35 @@
|
|
|
93
93
|
var __spreadProps$1 = (a, b) => __defProps$1(a, __getOwnPropDescs$1(b));
|
|
94
94
|
function useAxios(...args) {
|
|
95
95
|
const url = typeof args[0] === "string" ? args[0] : void 0;
|
|
96
|
-
const argsPlaceholder = url ? 1 : 0;
|
|
96
|
+
const argsPlaceholder = shared.isString(url) ? 1 : 0;
|
|
97
97
|
let defaultConfig = {};
|
|
98
98
|
let instance = axios__default["default"];
|
|
99
99
|
let options = { immediate: !!argsPlaceholder };
|
|
100
|
+
const isAxiosInstance = (val) => !!(val == null ? void 0 : val.request);
|
|
100
101
|
if (args.length > 0 + argsPlaceholder) {
|
|
101
|
-
if (
|
|
102
|
+
if (isAxiosInstance(args[0 + argsPlaceholder]))
|
|
102
103
|
instance = args[0 + argsPlaceholder];
|
|
103
104
|
else
|
|
104
105
|
defaultConfig = args[0 + argsPlaceholder];
|
|
105
106
|
}
|
|
106
107
|
if (args.length > 1 + argsPlaceholder) {
|
|
107
|
-
if (
|
|
108
|
+
if (isAxiosInstance(args[1 + argsPlaceholder]))
|
|
108
109
|
instance = args[1 + argsPlaceholder];
|
|
109
110
|
}
|
|
110
|
-
if (args.length === 2 + argsPlaceholder && !(
|
|
111
|
+
if (args.length === 2 + argsPlaceholder && !isAxiosInstance(args[1 + argsPlaceholder]) || args.length === 3 + argsPlaceholder)
|
|
111
112
|
options = args[args.length - 1];
|
|
112
113
|
const response = vueDemi.shallowRef();
|
|
113
114
|
const data = vueDemi.shallowRef();
|
|
114
115
|
const isFinished = vueDemi.ref(false);
|
|
115
116
|
const isLoading = vueDemi.ref(false);
|
|
116
|
-
const
|
|
117
|
+
const isAborted = vueDemi.ref(false);
|
|
117
118
|
const error = vueDemi.shallowRef();
|
|
118
119
|
const cancelToken = axios__default["default"].CancelToken.source();
|
|
119
120
|
const abort = (message) => {
|
|
120
121
|
if (isFinished.value || !isLoading.value)
|
|
121
122
|
return;
|
|
122
123
|
cancelToken.cancel(message);
|
|
123
|
-
|
|
124
|
+
isAborted.value = true;
|
|
124
125
|
isLoading.value = false;
|
|
125
126
|
isFinished.value = false;
|
|
126
127
|
};
|
|
@@ -158,8 +159,9 @@
|
|
|
158
159
|
isFinished,
|
|
159
160
|
isLoading,
|
|
160
161
|
cancel: abort,
|
|
161
|
-
|
|
162
|
-
|
|
162
|
+
isAborted,
|
|
163
|
+
canceled: isAborted,
|
|
164
|
+
aborted: isAborted,
|
|
163
165
|
abort,
|
|
164
166
|
execute
|
|
165
167
|
};
|
package/index.iife.min.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
var VueDemi=function(s,n,h){if(s.install)return s;if(n)if(n.version.slice(0,2)==="2.")if(h){for(var
|
|
1
|
+
var VueDemi=function(s,n,h){if(s.install)return s;if(n)if(n.version.slice(0,2)==="2.")if(h){for(var m in h)s[m]=h[m];s.isVue2=!0,s.isVue3=!1,s.install=function(){},s.Vue=n,s.Vue2=n,s.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 m in n)s[m]=n[m];s.isVue2=!1,s.isVue3=!0,s.install=function(){},s.Vue=n,s.Vue2=void 0,s.version=n.version,s.set=function(i,g,S){return Array.isArray(i)?(i.length=Math.max(i.length,g),i.splice(g,1,S),S):(i[g]=S,S)},s.del=function(i,g){if(Array.isArray(i)){i.splice(g,1);return}delete i[g]}}else console.error("[vue-demi] Vue version "+n.version+" is unsupported.");else console.error("[vue-demi] no Vue instance found, please be sure to import `vue` before `vue-demi`.");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,n,h,m,i,g,S,b,Y,Z,x,D,ee){"use strict";function j(t){return t&&typeof t=="object"&&"default"in t?t:{default:t}}var N=j(m),T=j(g),te=j(Z),re=j(x),O=j(D),ne=j(ee),ae=Object.defineProperty,oe=Object.defineProperties,se=Object.getOwnPropertyDescriptors,U=Object.getOwnPropertySymbols,le=Object.prototype.hasOwnProperty,ue=Object.prototype.propertyIsEnumerable,G=(t,r,e)=>r in t?ae(t,r,{enumerable:!0,configurable:!0,writable:!0,value:e}):t[r]=e,H=(t,r)=>{for(var e in r||(r={}))le.call(r,e)&&G(t,e,r[e]);if(U)for(var e of U(r))ue.call(r,e)&&G(t,e,r[e]);return t},Q=(t,r)=>oe(t,se(r));function fe(...t){const r=typeof t[0]=="string"?t[0]:void 0,e=h.isString(r)?1:0;let a={},u=N.default,c={immediate:!!e};const v=_=>!!(_==null?void 0:_.request);t.length>0+e&&(v(t[0+e])?u=t[0+e]:a=t[0+e]),t.length>1+e&&v(t[1+e])&&(u=t[1+e]),(t.length===2+e&&!v(t[1+e])||t.length===3+e)&&(c=t[t.length-1]);const f=n.shallowRef(),o=n.shallowRef(),d=n.ref(!1),p=n.ref(!1),P=n.ref(!1),C=n.shallowRef(),A=N.default.CancelToken.source(),I=_=>{d.value||!p.value||(A.cancel(_),P.value=!0,p.value=!1,d.value=!1)},F=_=>{p.value=_,d.value=!_},L=(_=r,w={})=>{let E=r??"",l;typeof _=="string"&&(E=_),l=w,F(!0),u(E,Q(H(H({},a),l),{cancelToken:A.token})).then(y=>{f.value=y,o.value=y.data}).catch(y=>{C.value=y}).finally(()=>{F(!1)})};c.immediate&&r&&L();const $={response:f,data:o,error:C,finished:d,loading:p,isFinished:d,isLoading:p,cancel:I,isAborted:P,canceled:P,aborted:P,abort:I,execute:L};function k(){return new Promise((_,w)=>{h.until(d).toBe(!0).then(()=>_($)).catch(E=>w(E))})}return Q(H({},$),{then(_,w){return k().then(_,w)}})}var ce=Object.freeze({__proto__:null,camelCase:i.camelCase,capitalCase:i.capitalCase,constantCase:i.constantCase,dotCase:i.dotCase,headerCase:i.headerCase,noCase:i.noCase,paramCase:i.paramCase,pascalCase:i.pascalCase,pathCase:i.pathCase,sentenceCase:i.sentenceCase,snakeCase:i.snakeCase});function ie(t,r,e){const a=n.ref(t);return n.computed({get(){return ce[r](a.value,e)},set(u){a.value=u}})}var de=Object.defineProperty,J=Object.getOwnPropertySymbols,ve=Object.prototype.hasOwnProperty,pe=Object.prototype.propertyIsEnumerable,V=(t,r,e)=>r in t?de(t,r,{enumerable:!0,configurable:!0,writable:!0,value:e}):t[r]=e,z=(t,r)=>{for(var e in r||(r={}))ve.call(r,e)&&V(t,e,r[e]);if(J)for(var e of J(r))pe.call(r,e)&&V(t,e,r[e]);return t};function _e(t){const r=new T.default(t?t.headers.cookie:null);return(e,{doNotParse:a=!1,autoUpdateDependencies:u=!1}={})=>M(e,{doNotParse:a,autoUpdateDependencies:u},r)}function M(t,{doNotParse:r=!1,autoUpdateDependencies:e=!1}={},a=new T.default){const u=e?[...t||[]]:t;let c=a.getAll({doNotParse:!0});const v=n.ref(0),f=()=>{const o=a.getAll({doNotParse:!0});he(u||null,o,c)&&v.value++,c=o};return a.addChangeListener(f),h.tryOnScopeDispose(()=>{a.removeChangeListener(f)}),{get:(...o)=>(e&&u&&!u.includes(o[0])&&u.push(o[0]),v.value,a.get(o[0],z({doNotParse:r},o[1]))),getAll:(...o)=>(v.value,a.getAll(z({doNotParse:r},o[0]))),set:(...o)=>a.set(...o),remove:(...o)=>a.remove(...o),addChangeListener:(...o)=>a.addChangeListener(...o),removeChangeListener:(...o)=>a.removeChangeListener(...o)}}function he(t,r,e){if(!t)return!0;for(const a of t)if(r[a]!==e[a])return!0;return!1}var Oe=Object.defineProperty,W=Object.getOwnPropertySymbols,Ce=Object.prototype.hasOwnProperty,Pe=Object.prototype.propertyIsEnumerable,B=(t,r,e)=>r in t?Oe(t,r,{enumerable:!0,configurable:!0,writable:!0,value:e}):t[r]=e,we=(t,r)=>{for(var e in r||(r={}))Ce.call(r,e)&&B(t,e,r[e]);if(W)for(var e of W(r))Pe.call(r,e)&&B(t,e,r[e]);return t};function ye(t,r){const e=n.ref();let a=[];const u=b.createEventHook(),c=b.createEventHook(),v=b.createEventHook(),f=b.createEventHook(),o=b.createEventHook(),d=n.ref(!1),p=n.ref(!1),P=n.ref(!1),C=n.ref(!1),A=n.ref({color:"black",size:3,arrowEnd:!1,cornerRadius:0,dasharray:void 0,fill:"transparent",mode:"draw"});n.watch(A,()=>{const l=e.value;l&&(l.brush=A.value)},{deep:!0});const I=()=>{var l;return(l=e.value)==null?void 0:l.undo()},F=()=>{var l;return(l=e.value)==null?void 0:l.redo()},L=()=>{var l;return(l=e.value)==null?void 0:l.clear()},$=()=>{var l;return(l=e.value)==null?void 0:l.cancel()},k=l=>{var y;return(y=e.value)==null?void 0:y.load(l)},_=()=>{var l;return(l=e.value)==null?void 0:l.dump()},w=()=>{var l;a.forEach(y=>y()),(l=e.value)==null||l.unmount()},E=()=>{e.value&&(d.value=e.value.canUndo(),p.value=e.value.canRedo(),P.value=e.value.altPressed,C.value=e.value.shiftPressed)};return n.watch(()=>b.unrefElement(t),l=>{!l||typeof SVGSVGElement=="undefined"||!(l instanceof SVGSVGElement)||(e.value&&w(),e.value=S.createDrauu(we({el:l},r)),E(),a=[e.value.on("canceled",()=>c.trigger()),e.value.on("committed",()=>v.trigger()),e.value.on("start",()=>f.trigger()),e.value.on("end",()=>o.trigger()),e.value.on("changed",()=>{E(),u.trigger()})])},{flush:"post"}),h.tryOnScopeDispose(()=>w()),{drauuInstance:e,load:k,dump:_,clear:L,cancel:$,undo:I,redo:F,canUndo:d,canRedo:p,brush:A,onChanged:u.on,onCommitted:v.on,onStart:f.on,onEnd:o.on,onCanceled:c.on}}var ge=Object.defineProperty,be=Object.defineProperties,me=Object.getOwnPropertyDescriptors,R=Object.getOwnPropertySymbols,q=Object.prototype.hasOwnProperty,K=Object.prototype.propertyIsEnumerable,X=(t,r,e)=>r in t?ge(t,r,{enumerable:!0,configurable:!0,writable:!0,value:e}):t[r]=e,Ee=(t,r)=>{for(var e in r||(r={}))q.call(r,e)&&X(t,e,r[e]);if(R)for(var e of R(r))K.call(r,e)&&X(t,e,r[e]);return t},Se=(t,r)=>be(t,me(r)),je=(t,r)=>{var e={};for(var a in t)q.call(t,a)&&r.indexOf(a)<0&&(e[a]=t[a]);if(t!=null&&R)for(var a of R(t))r.indexOf(a)<0&&K.call(t,a)&&(e[a]=t[a]);return e};function Ae(t,r={}){let e;const a=r,{immediate:u}=a,c=je(a,["immediate"]),v=n.ref(!1),f=n.ref(!1),o=C=>e&&e.activate(C),d=C=>e&&e.deactivate(C),p=()=>{e&&(e.pause(),f.value=!0)},P=()=>{e&&(e.unpause(),f.value=!1)};return n.watch(()=>b.unrefElement(t),C=>{!C||(e=Y.createFocusTrap(C,Se(Ee({},c),{onActivate(){v.value=!0,r.onActivate&&r.onActivate()},onDeactivate(){v.value=!1,r.onDeactivate&&r.onDeactivate()}})),u&&o())},{flush:"post"}),b.tryOnScopeDispose(()=>d()),{hasFocus:v,isPaused:f,activate:o,deactivate:d,pause:p,unpause:P}}function Re(t,r,e){var a;const u=(f,o)=>{var d;const p=o;return new te.default((d=n.unref(f))!=null?d:[],p)},c=n.ref(u(r,(a=n.unref(e))==null?void 0:a.fuseOptions));return n.watch(()=>{var f;return(f=n.unref(e))==null?void 0:f.fuseOptions},f=>{c.value=u(r,f)},{deep:!0}),n.watch(()=>n.unref(r),f=>{c.value.setCollection(f)},{deep:!0}),{results:n.computed(()=>{var f,o;if(((f=n.unref(e))==null?void 0:f.matchAllWhenSearchEmpty)&&!n.unref(t))return n.unref(r).map((p,P)=>({item:p,refIndex:P}));const d=(o=n.unref(e))==null?void 0:o.resultLimit;return c.value.search(n.unref(t),d?{limit:d}:void 0)})}}function Ie(t,r={}){const e=n.ref(t),{onError:a,fallbackValue:u=null}=r,c=(o,d)=>{try{return re.default(o,d)}catch(p){return a==null||a(p),u}},v=n.computed(()=>c(e.value,{header:!0})),f=n.computed(()=>c(e.value));return{header:v,payload:f}}function Fe(t=null,r){const e=n.isRef(t)?t:n.ref(t),a=n.computed({set:c=>c?O.default.start():O.default.done(),get:()=>h.isNumber(e.value)&&e.value<1});r&&O.default.configure(r);const u=O.default.set;return O.default.set=c=>(e.value=c,u.call(O.default,c)),n.watchEffect(()=>{h.isNumber(e.value)&&u.call(O.default,e.value)}),h.tryOnScopeDispose(O.default.remove),{isLoading:a,progress:e,start:O.default.start,done:O.default.done,remove:()=>{e.value=null,O.default.remove()}}}function Le(t,r){const e=n.ref(t),a=n.ref("");return n.watch(e,async u=>{e.value&&h.isClient&&(a.value=await ne.default.toDataURL(u,r))},{immediate:!0}),a}s.createCookies=_e,s.useAxios=fe,s.useChangeCase=ie,s.useCookies=M,s.useDrauu=ye,s.useFocusTrap=Ae,s.useFuse=Re,s.useJwt=Ie,s.useNProgress=Fe,s.useQRCode=Le,Object.defineProperty(s,"__esModule",{value:!0})})(this.VueUse=this.VueUse||{},VueDemi,VueUse,axios,changeCase,UniversalCookie,Drauu,VueUse,focusTrap,Fuse,jwt_decode,nprogress,QRCode);
|
package/index.mjs
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { shallowRef, ref, computed, watch, unref, isRef, watchEffect } from 'vue-demi';
|
|
2
|
-
import { until, tryOnScopeDispose, isNumber, isClient } from '@vueuse/shared';
|
|
2
|
+
import { isString, until, tryOnScopeDispose, isNumber, isClient } from '@vueuse/shared';
|
|
3
3
|
import axios from 'axios';
|
|
4
4
|
import { camelCase, capitalCase, constantCase, dotCase, headerCase, noCase, paramCase, pascalCase, pathCase, sentenceCase, snakeCase } from 'change-case';
|
|
5
5
|
import Cookie from 'universal-cookie';
|
|
@@ -32,34 +32,35 @@ var __spreadValues$3 = (a, b) => {
|
|
|
32
32
|
var __spreadProps$1 = (a, b) => __defProps$1(a, __getOwnPropDescs$1(b));
|
|
33
33
|
function useAxios(...args) {
|
|
34
34
|
const url = typeof args[0] === "string" ? args[0] : void 0;
|
|
35
|
-
const argsPlaceholder = url ? 1 : 0;
|
|
35
|
+
const argsPlaceholder = isString(url) ? 1 : 0;
|
|
36
36
|
let defaultConfig = {};
|
|
37
37
|
let instance = axios;
|
|
38
38
|
let options = { immediate: !!argsPlaceholder };
|
|
39
|
+
const isAxiosInstance = (val) => !!(val == null ? void 0 : val.request);
|
|
39
40
|
if (args.length > 0 + argsPlaceholder) {
|
|
40
|
-
if (
|
|
41
|
+
if (isAxiosInstance(args[0 + argsPlaceholder]))
|
|
41
42
|
instance = args[0 + argsPlaceholder];
|
|
42
43
|
else
|
|
43
44
|
defaultConfig = args[0 + argsPlaceholder];
|
|
44
45
|
}
|
|
45
46
|
if (args.length > 1 + argsPlaceholder) {
|
|
46
|
-
if (
|
|
47
|
+
if (isAxiosInstance(args[1 + argsPlaceholder]))
|
|
47
48
|
instance = args[1 + argsPlaceholder];
|
|
48
49
|
}
|
|
49
|
-
if (args.length === 2 + argsPlaceholder && !(
|
|
50
|
+
if (args.length === 2 + argsPlaceholder && !isAxiosInstance(args[1 + argsPlaceholder]) || args.length === 3 + argsPlaceholder)
|
|
50
51
|
options = args[args.length - 1];
|
|
51
52
|
const response = shallowRef();
|
|
52
53
|
const data = shallowRef();
|
|
53
54
|
const isFinished = ref(false);
|
|
54
55
|
const isLoading = ref(false);
|
|
55
|
-
const
|
|
56
|
+
const isAborted = ref(false);
|
|
56
57
|
const error = shallowRef();
|
|
57
58
|
const cancelToken = axios.CancelToken.source();
|
|
58
59
|
const abort = (message) => {
|
|
59
60
|
if (isFinished.value || !isLoading.value)
|
|
60
61
|
return;
|
|
61
62
|
cancelToken.cancel(message);
|
|
62
|
-
|
|
63
|
+
isAborted.value = true;
|
|
63
64
|
isLoading.value = false;
|
|
64
65
|
isFinished.value = false;
|
|
65
66
|
};
|
|
@@ -97,8 +98,9 @@ function useAxios(...args) {
|
|
|
97
98
|
isFinished,
|
|
98
99
|
isLoading,
|
|
99
100
|
cancel: abort,
|
|
100
|
-
|
|
101
|
-
|
|
101
|
+
isAborted,
|
|
102
|
+
canceled: isAborted,
|
|
103
|
+
aborted: isAborted,
|
|
102
104
|
abort,
|
|
103
105
|
execute
|
|
104
106
|
};
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@vueuse/integrations",
|
|
3
|
-
"version": "8.
|
|
3
|
+
"version": "8.4.2",
|
|
4
4
|
"description": "Integration wrappers for utility libraries",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"vue",
|
|
@@ -98,6 +98,9 @@
|
|
|
98
98
|
"axios": {
|
|
99
99
|
"optional": true
|
|
100
100
|
},
|
|
101
|
+
"change-case": {
|
|
102
|
+
"optional": true
|
|
103
|
+
},
|
|
101
104
|
"drauu": {
|
|
102
105
|
"optional": true
|
|
103
106
|
},
|
|
@@ -121,18 +124,18 @@
|
|
|
121
124
|
}
|
|
122
125
|
},
|
|
123
126
|
"dependencies": {
|
|
124
|
-
"@vueuse/core": "8.
|
|
125
|
-
"@vueuse/shared": "8.
|
|
127
|
+
"@vueuse/core": "8.4.2",
|
|
128
|
+
"@vueuse/shared": "8.4.2",
|
|
126
129
|
"vue-demi": "*"
|
|
127
130
|
},
|
|
128
131
|
"devDependencies": {
|
|
129
132
|
"@types/nprogress": "^0.2.0",
|
|
130
133
|
"@types/qrcode": "^1.4.2",
|
|
131
|
-
"axios": "^0.
|
|
134
|
+
"axios": "^0.27.2",
|
|
132
135
|
"change-case": "^4.1.2",
|
|
133
136
|
"drauu": "^0.3.0",
|
|
134
|
-
"focus-trap": "^6.
|
|
135
|
-
"fuse.js": "^6.
|
|
137
|
+
"focus-trap": "^6.9.0",
|
|
138
|
+
"fuse.js": "^6.6.0",
|
|
136
139
|
"jwt-decode": "^3.1.2",
|
|
137
140
|
"nprogress": "^0.2.0",
|
|
138
141
|
"qrcode": "^1.5.0",
|
package/useAxios.cjs
CHANGED
|
@@ -31,34 +31,35 @@ var __spreadValues = (a, b) => {
|
|
|
31
31
|
var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
|
|
32
32
|
function useAxios(...args) {
|
|
33
33
|
const url = typeof args[0] === "string" ? args[0] : void 0;
|
|
34
|
-
const argsPlaceholder = url ? 1 : 0;
|
|
34
|
+
const argsPlaceholder = shared.isString(url) ? 1 : 0;
|
|
35
35
|
let defaultConfig = {};
|
|
36
36
|
let instance = axios__default["default"];
|
|
37
37
|
let options = { immediate: !!argsPlaceholder };
|
|
38
|
+
const isAxiosInstance = (val) => !!(val == null ? void 0 : val.request);
|
|
38
39
|
if (args.length > 0 + argsPlaceholder) {
|
|
39
|
-
if (
|
|
40
|
+
if (isAxiosInstance(args[0 + argsPlaceholder]))
|
|
40
41
|
instance = args[0 + argsPlaceholder];
|
|
41
42
|
else
|
|
42
43
|
defaultConfig = args[0 + argsPlaceholder];
|
|
43
44
|
}
|
|
44
45
|
if (args.length > 1 + argsPlaceholder) {
|
|
45
|
-
if (
|
|
46
|
+
if (isAxiosInstance(args[1 + argsPlaceholder]))
|
|
46
47
|
instance = args[1 + argsPlaceholder];
|
|
47
48
|
}
|
|
48
|
-
if (args.length === 2 + argsPlaceholder && !(
|
|
49
|
+
if (args.length === 2 + argsPlaceholder && !isAxiosInstance(args[1 + argsPlaceholder]) || args.length === 3 + argsPlaceholder)
|
|
49
50
|
options = args[args.length - 1];
|
|
50
51
|
const response = vueDemi.shallowRef();
|
|
51
52
|
const data = vueDemi.shallowRef();
|
|
52
53
|
const isFinished = vueDemi.ref(false);
|
|
53
54
|
const isLoading = vueDemi.ref(false);
|
|
54
|
-
const
|
|
55
|
+
const isAborted = vueDemi.ref(false);
|
|
55
56
|
const error = vueDemi.shallowRef();
|
|
56
57
|
const cancelToken = axios__default["default"].CancelToken.source();
|
|
57
58
|
const abort = (message) => {
|
|
58
59
|
if (isFinished.value || !isLoading.value)
|
|
59
60
|
return;
|
|
60
61
|
cancelToken.cancel(message);
|
|
61
|
-
|
|
62
|
+
isAborted.value = true;
|
|
62
63
|
isLoading.value = false;
|
|
63
64
|
isFinished.value = false;
|
|
64
65
|
};
|
|
@@ -96,8 +97,9 @@ function useAxios(...args) {
|
|
|
96
97
|
isFinished,
|
|
97
98
|
isLoading,
|
|
98
99
|
cancel: abort,
|
|
99
|
-
|
|
100
|
-
|
|
100
|
+
isAborted,
|
|
101
|
+
canceled: isAborted,
|
|
102
|
+
aborted: isAborted,
|
|
101
103
|
abort,
|
|
102
104
|
execute
|
|
103
105
|
};
|
package/useAxios.d.ts
CHANGED
|
@@ -21,7 +21,7 @@ interface UseAxiosReturn<T> {
|
|
|
21
21
|
/**
|
|
22
22
|
* Indicates if the request was canceled
|
|
23
23
|
*/
|
|
24
|
-
|
|
24
|
+
isAborted: Ref<boolean>;
|
|
25
25
|
/**
|
|
26
26
|
* Any errors that may have occurred
|
|
27
27
|
*/
|
|
@@ -32,12 +32,19 @@ interface UseAxiosReturn<T> {
|
|
|
32
32
|
abort: (message?: string | undefined) => void;
|
|
33
33
|
/**
|
|
34
34
|
* isFinished alias
|
|
35
|
+
* @deprecated use `isFinished` instead
|
|
35
36
|
*/
|
|
36
37
|
finished: Ref<boolean>;
|
|
37
38
|
/**
|
|
38
|
-
*
|
|
39
|
+
* isLoading alias
|
|
40
|
+
* @deprecated use `isLoading` instead
|
|
39
41
|
*/
|
|
40
42
|
loading: Ref<boolean>;
|
|
43
|
+
/**
|
|
44
|
+
* isAborted alias
|
|
45
|
+
* @deprecated use `isAborted` instead
|
|
46
|
+
*/
|
|
47
|
+
aborted: Ref<boolean>;
|
|
41
48
|
/**
|
|
42
49
|
* abort alias
|
|
43
50
|
*/
|
package/useAxios.iife.js
CHANGED
|
@@ -88,34 +88,35 @@
|
|
|
88
88
|
var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
|
|
89
89
|
function useAxios(...args) {
|
|
90
90
|
const url = typeof args[0] === "string" ? args[0] : void 0;
|
|
91
|
-
const argsPlaceholder = url ? 1 : 0;
|
|
91
|
+
const argsPlaceholder = shared.isString(url) ? 1 : 0;
|
|
92
92
|
let defaultConfig = {};
|
|
93
93
|
let instance = axios__default["default"];
|
|
94
94
|
let options = { immediate: !!argsPlaceholder };
|
|
95
|
+
const isAxiosInstance = (val) => !!(val == null ? void 0 : val.request);
|
|
95
96
|
if (args.length > 0 + argsPlaceholder) {
|
|
96
|
-
if (
|
|
97
|
+
if (isAxiosInstance(args[0 + argsPlaceholder]))
|
|
97
98
|
instance = args[0 + argsPlaceholder];
|
|
98
99
|
else
|
|
99
100
|
defaultConfig = args[0 + argsPlaceholder];
|
|
100
101
|
}
|
|
101
102
|
if (args.length > 1 + argsPlaceholder) {
|
|
102
|
-
if (
|
|
103
|
+
if (isAxiosInstance(args[1 + argsPlaceholder]))
|
|
103
104
|
instance = args[1 + argsPlaceholder];
|
|
104
105
|
}
|
|
105
|
-
if (args.length === 2 + argsPlaceholder && !(
|
|
106
|
+
if (args.length === 2 + argsPlaceholder && !isAxiosInstance(args[1 + argsPlaceholder]) || args.length === 3 + argsPlaceholder)
|
|
106
107
|
options = args[args.length - 1];
|
|
107
108
|
const response = vueDemi.shallowRef();
|
|
108
109
|
const data = vueDemi.shallowRef();
|
|
109
110
|
const isFinished = vueDemi.ref(false);
|
|
110
111
|
const isLoading = vueDemi.ref(false);
|
|
111
|
-
const
|
|
112
|
+
const isAborted = vueDemi.ref(false);
|
|
112
113
|
const error = vueDemi.shallowRef();
|
|
113
114
|
const cancelToken = axios__default["default"].CancelToken.source();
|
|
114
115
|
const abort = (message) => {
|
|
115
116
|
if (isFinished.value || !isLoading.value)
|
|
116
117
|
return;
|
|
117
118
|
cancelToken.cancel(message);
|
|
118
|
-
|
|
119
|
+
isAborted.value = true;
|
|
119
120
|
isLoading.value = false;
|
|
120
121
|
isFinished.value = false;
|
|
121
122
|
};
|
|
@@ -153,8 +154,9 @@
|
|
|
153
154
|
isFinished,
|
|
154
155
|
isLoading,
|
|
155
156
|
cancel: abort,
|
|
156
|
-
|
|
157
|
-
|
|
157
|
+
isAborted,
|
|
158
|
+
canceled: isAborted,
|
|
159
|
+
aborted: isAborted,
|
|
158
160
|
abort,
|
|
159
161
|
execute
|
|
160
162
|
};
|
package/useAxios.iife.min.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
var VueDemi=function(n,r,
|
|
1
|
+
var VueDemi=function(n,r,a){if(n.install)return n;if(r)if(r.version.slice(0,2)==="2.")if(a){for(var f in a)n[f]=a[f];n.isVue2=!0,n.isVue3=!1,n.install=function(){},n.Vue=r,n.Vue2=r,n.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 f in r)n[f]=r[f];n.isVue2=!1,n.isVue3=!0,n.install=function(){},n.Vue=r,n.Vue2=void 0,n.version=r.version,n.set=function(i,l,u){return Array.isArray(i)?(i.length=Math.max(i.length,l),i.splice(l,1,u),u):(i[l]=u,u)},n.del=function(i,l){if(Array.isArray(i)){i.splice(l,1);return}delete i[l]}}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 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,r,a,f){"use strict";function i(e){return e&&typeof e=="object"&&"default"in e?e:{default:e}}var l=i(f),u=Object.defineProperty,L=Object.defineProperties,M=Object.getOwnPropertyDescriptors,w=Object.getOwnPropertySymbols,g=Object.prototype.hasOwnProperty,q=Object.prototype.propertyIsEnumerable,A=(e,o,t)=>o in e?u(e,o,{enumerable:!0,configurable:!0,writable:!0,value:t}):e[o]=t,y=(e,o)=>{for(var t in o||(o={}))g.call(o,t)&&A(e,t,o[t]);if(w)for(var t of w(o))q.call(o,t)&&A(e,t,o[t]);return e},j=(e,o)=>L(e,M(o));function B(...e){const o=typeof e[0]=="string"?e[0]:void 0,t=a.isString(o)?1:0;let x={},P=l.default,I={immediate:!!t};const b=s=>!!(s==null?void 0:s.request);e.length>0+t&&(b(e[0+t])?P=e[0+t]:x=e[0+t]),e.length>1+t&&b(e[1+t])&&(P=e[1+t]),(e.length===2+t&&!b(e[1+t])||e.length===3+t)&&(I=e[e.length-1]);const C=r.shallowRef(),R=r.shallowRef(),c=r.ref(!1),p=r.ref(!1),v=r.ref(!1),S=r.shallowRef(),T=l.default.CancelToken.source(),U=s=>{c.value||!p.value||(T.cancel(s),v.value=!0,p.value=!1,c.value=!1)},m=s=>{p.value=s,c.value=!s},E=(s=o,d={})=>{let h=o??"",O;typeof s=="string"&&(h=s),O=d,m(!0),P(h,j(y(y({},x),O),{cancelToken:T.token})).then(_=>{C.value=_,R.value=_.data}).catch(_=>{S.value=_}).finally(()=>{m(!1)})};I.immediate&&o&&E();const F={response:C,data:R,error:S,finished:c,loading:p,isFinished:c,isLoading:p,cancel:U,isAborted:v,canceled:v,aborted:v,abort:U,execute:E};function N(){return new Promise((s,d)=>{a.until(c).toBe(!0).then(()=>s(F)).catch(h=>d(h))})}return j(y({},F),{then(s,d){return N().then(s,d)}})}n.useAxios=B,Object.defineProperty(n,"__esModule",{value:!0})})(this.VueUse=this.VueUse||{},VueDemi,VueUse,axios);
|
package/useAxios.mjs
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { shallowRef, ref } from 'vue-demi';
|
|
2
|
-
import { until } from '@vueuse/shared';
|
|
2
|
+
import { isString, until } from '@vueuse/shared';
|
|
3
3
|
import axios from 'axios';
|
|
4
4
|
|
|
5
5
|
var __defProp = Object.defineProperty;
|
|
@@ -23,34 +23,35 @@ var __spreadValues = (a, b) => {
|
|
|
23
23
|
var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
|
|
24
24
|
function useAxios(...args) {
|
|
25
25
|
const url = typeof args[0] === "string" ? args[0] : void 0;
|
|
26
|
-
const argsPlaceholder = url ? 1 : 0;
|
|
26
|
+
const argsPlaceholder = isString(url) ? 1 : 0;
|
|
27
27
|
let defaultConfig = {};
|
|
28
28
|
let instance = axios;
|
|
29
29
|
let options = { immediate: !!argsPlaceholder };
|
|
30
|
+
const isAxiosInstance = (val) => !!(val == null ? void 0 : val.request);
|
|
30
31
|
if (args.length > 0 + argsPlaceholder) {
|
|
31
|
-
if (
|
|
32
|
+
if (isAxiosInstance(args[0 + argsPlaceholder]))
|
|
32
33
|
instance = args[0 + argsPlaceholder];
|
|
33
34
|
else
|
|
34
35
|
defaultConfig = args[0 + argsPlaceholder];
|
|
35
36
|
}
|
|
36
37
|
if (args.length > 1 + argsPlaceholder) {
|
|
37
|
-
if (
|
|
38
|
+
if (isAxiosInstance(args[1 + argsPlaceholder]))
|
|
38
39
|
instance = args[1 + argsPlaceholder];
|
|
39
40
|
}
|
|
40
|
-
if (args.length === 2 + argsPlaceholder && !(
|
|
41
|
+
if (args.length === 2 + argsPlaceholder && !isAxiosInstance(args[1 + argsPlaceholder]) || args.length === 3 + argsPlaceholder)
|
|
41
42
|
options = args[args.length - 1];
|
|
42
43
|
const response = shallowRef();
|
|
43
44
|
const data = shallowRef();
|
|
44
45
|
const isFinished = ref(false);
|
|
45
46
|
const isLoading = ref(false);
|
|
46
|
-
const
|
|
47
|
+
const isAborted = ref(false);
|
|
47
48
|
const error = shallowRef();
|
|
48
49
|
const cancelToken = axios.CancelToken.source();
|
|
49
50
|
const abort = (message) => {
|
|
50
51
|
if (isFinished.value || !isLoading.value)
|
|
51
52
|
return;
|
|
52
53
|
cancelToken.cancel(message);
|
|
53
|
-
|
|
54
|
+
isAborted.value = true;
|
|
54
55
|
isLoading.value = false;
|
|
55
56
|
isFinished.value = false;
|
|
56
57
|
};
|
|
@@ -88,8 +89,9 @@ function useAxios(...args) {
|
|
|
88
89
|
isFinished,
|
|
89
90
|
isLoading,
|
|
90
91
|
cancel: abort,
|
|
91
|
-
|
|
92
|
-
|
|
92
|
+
isAborted,
|
|
93
|
+
canceled: isAborted,
|
|
94
|
+
aborted: isAborted,
|
|
93
95
|
abort,
|
|
94
96
|
execute
|
|
95
97
|
};
|