vue-asyncx 1.2.0 → 1.3.0

package/dist/vue-asyncx.d.ts

@@ -18,6 +18,8 @@ declare type UseAsyncDataOptions = UseAsyncOptions;
 
 declare type UseAsyncDataResult<Fn extends (...args: any) => any, DataName extends string> = UseAsyncResult<Fn, `query${Capitalize<(StringDefaultWhenEmpty<DataName, 'data'>)>}`> & {
     [K in (StringDefaultWhenEmpty<DataName, 'data'>)]: Ref<Awaited<ReturnType<Fn>>>;
+} & {
+    [K in `${StringDefaultWhenEmpty<DataName, 'data'>}Expired`]: Ref<boolean>;
 };
 
 declare type UseAsyncOptions = {
@@ -32,6 +34,8 @@ declare type UseAsyncResult<Fn extends (...args: any) => any, Name extends strin
     [K in `${StringDefaultWhenEmpty<Name, 'method'>}Loading`]: Ref<boolean>;
 } & {
     [K in `${StringDefaultWhenEmpty<Name, 'method'>}Arguments`]: Ref<Parameters<Fn>>;
+} & {
+    [K in `${StringDefaultWhenEmpty<Name, 'method'>}Error`]: Ref<any>;
 };
 
 export { }

package/dist/vue-asyncx.js

@@ -1,70 +1,94 @@
-var w = Object.defineProperty, A = Object.defineProperties;
-var v = Object.getOwnPropertyDescriptors;
-var y = Object.getOwnPropertySymbols;
-var E = Object.prototype.hasOwnProperty, T = Object.prototype.propertyIsEnumerable;
-var l = (n, t, o) => t in n ? w(n, t, { enumerable: !0, configurable: !0, writable: !0, value: o }) : n[t] = o, h = (n, t) => {
-  for (var o in t || (t = {}))
-    E.call(t, o) && l(n, o, t[o]);
-  if (y)
-    for (var o of y(t))
-      T.call(t, o) && l(n, o, t[o]);
-  return n;
-}, d = (n, t) => A(n, v(t));
-import { ref as m, watch as O } from "vue";
-function $(...n) {
-  var p;
-  if (!Array.isArray(n) || !n.length) throw TypeError("参数错误：未传递");
-  const { name: t, fn: o, options: i } = typeof n[0] == "function" ? { name: "method", fn: n[0], options: n[1] } : { name: n[0] || "method", fn: n[1], options: n[2] };
-  if (typeof t != "string") throw TypeError("参数错误：name");
-  if (typeof o != "function") throw TypeError("参数错误：fn");
-  const r = m(!1), c = m();
-  function a(...e) {
-    const s = () => {
-      r.value = !0, c.value = e;
-    }, f = () => {
-      r.value = !1, c.value = void 0;
+var $ = Object.defineProperty, F = Object.defineProperties;
+var x = Object.getOwnPropertyDescriptors;
+var w = Object.getOwnPropertySymbols;
+var C = Object.prototype.hasOwnProperty, L = Object.prototype.propertyIsEnumerable;
+var E = (e, n, t) => n in e ? $(e, n, { enumerable: !0, configurable: !0, writable: !0, value: t }) : e[n] = t, A = (e, n) => {
+  for (var t in n || (n = {}))
+    C.call(n, t) && E(e, t, n[t]);
+  if (w)
+    for (var t of w(n))
+      L.call(n, t) && E(e, t, n[t]);
+  return e;
+}, T = (e, n) => F(e, x(n));
+import { ref as p, watch as O, computed as b } from "vue";
+function P(...e) {
+  var m;
+  if (!Array.isArray(e) || !e.length) throw TypeError("参数错误：未传递");
+  const { name: n, fn: t, options: d } = typeof e[0] == "function" ? { name: "method", fn: e[0], options: e[1] } : { name: e[0] || "method", fn: e[1], options: e[2] };
+  if (typeof n != "string") throw TypeError("参数错误：name");
+  if (typeof t != "function") throw TypeError("参数错误：fn");
+  const r = p(!1), u = p(), l = p(), s = { called: 0, finished: 0 };
+  function h(...a) {
+    const i = ++s.called, o = (c) => {
+      l.value = void 0, r.value = !0, u.value = c;
+    }, f = (c, { scene: y, sn: v }) => {
+      v > s.finished && (s.finished = v), s.called === s.finished && (y === "error" && (l.value = c), r.value = !1, u.value = void 0);
     };
-    s();
-    const u = o(...e);
-    return u instanceof Promise ? u.finally(() => f()) : f(), u;
+    o(a);
+    try {
+      const c = t(...a);
+      return c instanceof Promise ? c.then(
+        () => f(void 0, { scene: "normal", sn: i }),
+        (y) => f(y, { scene: "error", sn: i })
+      ) : f(void 0, { scene: "normal", sn: i }), c;
+    } catch (c) {
+      throw f(c, { scene: "error", sn: i }), c;
+    }
   }
-  if (i) {
-    const e = () => {
-    }, s = Object.assign(
+  if (d) {
+    const a = () => {
+    }, i = Object.assign(
       {},
-      "immediate" in i ? { immediate: i.immediate } : {},
-      (p = i.watchOptions) != null ? p : {}
-    ), { watch: f } = i;
-    O(f != null ? f : e, () => a(), s);
+      "immediate" in d ? { immediate: d.immediate } : {},
+      (m = d.watchOptions) != null ? m : {}
+    ), { watch: o } = d;
+    O(o != null ? o : a, () => h(), i);
   }
   return {
-    [t]: a,
-    [`${t}Loading`]: r,
-    [`${t}Arguments`]: c
+    [n]: h,
+    [`${n}Loading`]: r,
+    [`${n}Arguments`]: u,
+    [`${n}Error`]: l
   };
 }
-function b(n) {
-  if (!n) return "";
-  const t = n[0], o = n.slice(1);
-  return t.toUpperCase() + o;
+function j(e) {
+  if (!e) return "";
+  const n = e[0], t = e.slice(1);
+  return n.toUpperCase() + t;
 }
-function j(...n) {
-  if (!Array.isArray(n) || !n.length) throw TypeError("参数错误：未传递");
-  const { name: t, fn: o, options: i } = typeof n[0] == "function" ? { name: "data", fn: n[0], options: n[1] } : { name: n[0] || "data", fn: n[1], options: n[2] };
-  if (typeof t != "string") throw TypeError("参数错误：name");
-  if (typeof o != "function") throw TypeError("参数错误：fn");
-  const r = m();
-  function c(...p) {
-    const e = o(...p);
-    return e instanceof Promise ? e.then((s) => r.value = s) : r.value = e, e;
+function _(...e) {
+  if (!Array.isArray(e) || !e.length) throw TypeError("参数错误：未传递");
+  const { name: n, fn: t, options: d } = typeof e[0] == "function" ? { name: "data", fn: e[0], options: e[1] } : { name: e[0] || "data", fn: e[1], options: e[2] };
+  if (typeof n != "string") throw TypeError("参数错误：name");
+  if (typeof t != "function") throw TypeError("参数错误：fn");
+  const r = p({
+    // 调用序号
+    called: 0,
+    // 调用完成序号
+    finished: 0,
+    // 更新序号
+    updated: 0
+  }), u = p(), l = b(() => r.value.updated < r.value.finished);
+  function s(a, { scene: i, sn: o }) {
+    o > r.value.finished && (r.value.finished = o), i === "update" && o > r.value.updated && (u.value = a, r.value.updated = o);
   }
-  const a = $(`query${b(t)}`, c, i);
-  return d(h({}, a), {
-    [t]: r
+  function h(...a) {
+    const i = ++r.value.called;
+    try {
+      const o = t(...a);
+      return o instanceof Promise ? o.then((f) => s(f, { scene: "update", sn: i }), (f) => s(f, { scene: "error", sn: i })) : s(o, { scene: "update", sn: i }), o;
+    } catch (o) {
+      throw s(o, { scene: "error", sn: i }), o;
+    }
+  }
+  const m = P(`query${j(n)}`, h, d);
+  return T(A({}, m), {
+    [n]: u,
+    [`${n}Expired`]: l
   });
 }
 export {
-  $ as useAsync,
-  j as useAsyncData,
-  $ as useAsyncFunction
+  P as useAsync,
+  _ as useAsyncData,
+  P as useAsyncFunction
 };

package/dist/vue-asyncx.umd.cjs

@@ -1 +1 @@
-(function(t,e){typeof exports=="object"&&typeof module!="undefined"?e(exports,require("vue")):typeof define=="function"&&define.amd?define(["exports","vue"],e):(t=typeof globalThis!="undefined"?globalThis:t||self,e(t.VueAsyncx={},t.Vue))})(this,function(t,e){"use strict";var E=Object.defineProperty,b=Object.defineProperties;var O=Object.getOwnPropertyDescriptors;var l=Object.getOwnPropertySymbols;var j=Object.prototype.hasOwnProperty,P=Object.prototype.propertyIsEnumerable;var h=(t,e,o)=>e in t?E(t,e,{enumerable:!0,configurable:!0,writable:!0,value:o}):t[e]=o,A=(t,e)=>{for(var o in e||(e={}))j.call(e,o)&&h(t,o,e[o]);if(l)for(var o of l(e))P.call(e,o)&&h(t,o,e[o]);return t},w=(t,e)=>b(t,O(e));function o(...n){var d;if(!Array.isArray(n)||!n.length)throw TypeError("参数错误：未传递");const{name:i,fn:r,options:s}=typeof n[0]=="function"?{name:"method",fn:n[0],options:n[1]}:{name:n[0]||"method",fn:n[1],options:n[2]};if(typeof i!="string")throw TypeError("参数错误：name");if(typeof r!="function")throw TypeError("参数错误：fn");const c=e.ref(!1),p=e.ref();function y(...f){const a=()=>{c.value=!0,p.value=f},u=()=>{c.value=!1,p.value=void 0};a();const m=r(...f);return m instanceof Promise?m.finally(()=>u()):u(),m}if(s){const f=()=>{},a=Object.assign({},"immediate"in s?{immediate:s.immediate}:{},(d=s.watchOptions)!=null?d:{}),{watch:u}=s;e.watch(u!=null?u:f,()=>y(),a)}return{[i]:y,[`${i}Loading`]:c,[`${i}Arguments`]:p}}function T(n){if(!n)return"";const i=n[0],r=n.slice(1);return i.toUpperCase()+r}function v(...n){if(!Array.isArray(n)||!n.length)throw TypeError("参数错误：未传递");const{name:i,fn:r,options:s}=typeof n[0]=="function"?{name:"data",fn:n[0],options:n[1]}:{name:n[0]||"data",fn:n[1],options:n[2]};if(typeof i!="string")throw TypeError("参数错误：name");if(typeof r!="function")throw TypeError("参数错误：fn");const c=e.ref();function p(...d){const f=r(...d);return f instanceof Promise?f.then(a=>c.value=a):c.value=f,f}const y=o(`query${T(i)}`,p,s);return w(A({},y),{[i]:c})}t.useAsync=o,t.useAsyncData=v,t.useAsyncFunction=o,Object.defineProperty(t,Symbol.toStringTag,{value:"Module"})});
+(function(t,e){typeof exports=="object"&&typeof module!="undefined"?e(exports,require("vue")):typeof define=="function"&&define.amd?define(["exports","vue"],e):(t=typeof globalThis!="undefined"?globalThis:t||self,e(t.VueAsyncx={},t.Vue))})(this,function(t,e){"use strict";var j=Object.defineProperty,x=Object.defineProperties;var C=Object.getOwnPropertyDescriptors;var E=Object.getOwnPropertySymbols;var L=Object.prototype.hasOwnProperty,P=Object.prototype.propertyIsEnumerable;var T=(t,e,i)=>e in t?j(t,e,{enumerable:!0,configurable:!0,writable:!0,value:i}):t[e]=i,$=(t,e)=>{for(var i in e||(e={}))L.call(e,i)&&T(t,i,e[i]);if(E)for(var i of E(e))P.call(e,i)&&T(t,i,e[i]);return t},b=(t,e)=>x(t,C(e));function i(...n){var v;if(!Array.isArray(n)||!n.length)throw TypeError("参数错误：未传递");const{name:s,fn:l,options:p}=typeof n[0]=="function"?{name:"method",fn:n[0],options:n[1]}:{name:n[0]||"method",fn:n[1],options:n[2]};if(typeof s!="string")throw TypeError("参数错误：name");if(typeof l!="function")throw TypeError("参数错误：fn");const f=e.ref(!1),h=e.ref(),m=e.ref(),c={called:0,finished:0};function y(...d){const r=++c.called,o=a=>{m.value=void 0,f.value=!0,h.value=a},u=(a,{scene:w,sn:A})=>{A>c.finished&&(c.finished=A),c.called===c.finished&&(w==="error"&&(m.value=a),f.value=!1,h.value=void 0)};o(d);try{const a=l(...d);return a instanceof Promise?a.then(()=>u(void 0,{scene:"normal",sn:r}),w=>u(w,{scene:"error",sn:r})):u(void 0,{scene:"normal",sn:r}),a}catch(a){throw u(a,{scene:"error",sn:r}),a}}if(p){const d=()=>{},r=Object.assign({},"immediate"in p?{immediate:p.immediate}:{},(v=p.watchOptions)!=null?v:{}),{watch:o}=p;e.watch(o!=null?o:d,()=>y(),r)}return{[s]:y,[`${s}Loading`]:f,[`${s}Arguments`]:h,[`${s}Error`]:m}}function F(n){if(!n)return"";const s=n[0],l=n.slice(1);return s.toUpperCase()+l}function O(...n){if(!Array.isArray(n)||!n.length)throw TypeError("参数错误：未传递");const{name:s,fn:l,options:p}=typeof n[0]=="function"?{name:"data",fn:n[0],options:n[1]}:{name:n[0]||"data",fn:n[1],options:n[2]};if(typeof s!="string")throw TypeError("参数错误：name");if(typeof l!="function")throw TypeError("参数错误：fn");const f=e.ref({called:0,finished:0,updated:0}),h=e.ref(),m=e.computed(()=>f.value.updated<f.value.finished);function c(d,{scene:r,sn:o}){o>f.value.finished&&(f.value.finished=o),r==="update"&&o>f.value.updated&&(h.value=d,f.value.updated=o)}function y(...d){const r=++f.value.called;try{const o=l(...d);return o instanceof Promise?o.then(u=>c(u,{scene:"update",sn:r}),u=>c(u,{scene:"error",sn:r})):c(o,{scene:"update",sn:r}),o}catch(o){throw c(o,{scene:"error",sn:r}),o}}const v=i(`query${F(s)}`,y,p);return b($({},v),{[s]:h,[`${s}Expired`]:m})}t.useAsync=i,t.useAsyncData=O,t.useAsyncFunction=i,Object.defineProperty(t,Symbol.toStringTag,{value:"Module"})});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue-asyncx",
-  "version": "1.2.0",
+  "version": "1.3.0",
   "description": "",
   "type": "module",
   "types": "dist/vue-asyncx.d.ts",