vue-asyncx 1.2.0 → 1.4.0

package/dist/vue-asyncx.d.ts

@@ -1,28 +1,31 @@
 import { Ref } from 'vue';
+import { WatchCallback } from 'vue';
 import { WatchOptions } from 'vue';
 import { WatchSource } from 'vue';
 
 declare type StringDefaultWhenEmpty<S extends string, D extends string> = S extends '' ? D : S;
 
-declare function useAsync<Fn extends (...args: any) => any>(fn: Fn, options?: UseAsyncOptions): UseAsyncResult<Fn, 'method'>;
+declare function useAsync<Fn extends (...args: any) => any>(fn: Fn, options?: UseAsyncOptions<Fn>): UseAsyncResult<Fn, 'method'>;
 
-declare function useAsync<Fn extends (...args: any) => any, Name extends string = string>(name: Name, fn: Fn, options?: UseAsyncOptions): UseAsyncResult<Fn, Name>;
+declare function useAsync<Fn extends (...args: any) => any, Name extends string = string>(name: Name, fn: Fn, options?: UseAsyncOptions<Fn>): UseAsyncResult<Fn, Name>;
 export { useAsync }
 export { useAsync as useAsyncFunction }
 
-export declare function useAsyncData<Data = any, Fn extends (...args: any) => Data | Promise<Data> | PromiseLike<Data> = (...args: any) => Data | Promise<Data> | PromiseLike<Data>>(fn: Fn, options?: UseAsyncDataOptions): UseAsyncDataResult<Fn, 'data'>;
+export declare function useAsyncData<Data = any, Fn extends (...args: any) => Data | Promise<Data> | PromiseLike<Data> = (...args: any) => Data | Promise<Data> | PromiseLike<Data>>(fn: Fn, options?: UseAsyncDataOptions<Fn>): UseAsyncDataResult<Fn, 'data'>;
 
-export declare function useAsyncData<Data = any, Fn extends (...args: any) => Data | Promise<Data> | PromiseLike<Data> = (...args: any) => Data | Promise<Data> | PromiseLike<Data>, DataName extends string = string>(name: DataName, fn: Fn, options?: UseAsyncDataOptions): UseAsyncDataResult<Fn, DataName>;
+export declare function useAsyncData<Data = any, Fn extends (...args: any) => Data | Promise<Data> | PromiseLike<Data> = (...args: any) => Data | Promise<Data> | PromiseLike<Data>, DataName extends string = string>(name: DataName, fn: Fn, options?: UseAsyncDataOptions<Fn>): UseAsyncDataResult<Fn, DataName>;
 
-declare type UseAsyncDataOptions = UseAsyncOptions;
+declare type UseAsyncDataOptions<Fn extends (...args: any) => any> = UseAsyncOptions<Fn>;
 
 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 = {
+declare type UseAsyncOptions<Fn extends (...args: any) => any> = {
     watch?: WatchSource;
-    watchOptions?: WatchOptions;
+    watchOptions?: UseAsyncWatchOptions<Fn>;
     immediate?: boolean;
 };
 
@@ -32,6 +35,12 @@ 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>;
 };
 
+declare interface UseAsyncWatchOptions<Fn extends (...args: any) => any> extends WatchOptions {
+    handlerCreator?: (fn: Fn) => WatchCallback;
+}
+
 export { }

package/dist/vue-asyncx.js

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

package/package.json

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