vue-asyncx 1.5.3 → 1.6.0

package/dist/vue-asyncx.d.ts

@@ -1,3 +1,4 @@
+import { ComputedRef } from 'vue';
 import { Ref } from 'vue';
 import { WatchCallback } from 'vue';
 import { WatchOptions } from 'vue';
@@ -33,6 +34,7 @@ export declare function useAsyncData<Data = any, Fn extends (...args: any) => Da
 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 interface UseAsyncDataOptions<Fn extends (...args: any) => any> extends UseAsyncOptions<Fn> {
+    initialData?: any;
     enhanceFirstArgument?: boolean;
 }
 
@@ -53,7 +55,9 @@ 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'>}Arguments`]: ComputedRef<Parameters<Fn>>;
+} & {
+    [K in `${StringDefaultWhenEmpty<Name, 'method'>}ArgumentFirst`]: ComputedRef<Parameters<Fn>['0']>;
 } & {
     [K in `${StringDefaultWhenEmpty<Name, 'method'>}Error`]: Ref<any>;
 };

package/dist/vue-asyncx.js

@@ -1,86 +1,90 @@
-var L = Object.defineProperty, O = Object.defineProperties;
-var b = Object.getOwnPropertyDescriptors;
-var F = Object.getOwnPropertySymbols;
-var B = Object.prototype.hasOwnProperty, $ = 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, w = (e, n) => {
-  for (var t in n || (n = {}))
-    B.call(n, t) && T(e, t, n[t]);
-  if (F)
-    for (var t of F(n))
-      $.call(n, t) && T(e, t, n[t]);
+var b = Object.defineProperty, g = Object.defineProperties;
+var x = Object.getOwnPropertyDescriptors;
+var E = Object.getOwnPropertySymbols;
+var $ = Object.prototype.hasOwnProperty, D = Object.prototype.propertyIsEnumerable;
+var B = (e, t, n) => t in e ? b(e, t, { enumerable: !0, configurable: !0, writable: !0, value: n }) : e[t] = n, w = (e, t) => {
+  for (var n in t || (t = {}))
+    $.call(t, n) && B(e, n, t[n]);
+  if (E)
+    for (var n of E(t))
+      D.call(t, n) && B(e, n, t[n]);
   return e;
-}, C = (e, n) => O(e, b(n));
-var U = (e, n) => {
-  var t = {};
+}, C = (e, t) => g(e, x(t));
+var _ = (e, t) => {
+  var n = {};
   for (var a in e)
-    B.call(e, a) && n.indexOf(a) < 0 && (t[a] = e[a]);
-  if (e != null && F)
-    for (var a of F(e))
-      n.indexOf(a) < 0 && $.call(e, a) && (t[a] = e[a]);
-  return t;
+    $.call(e, a) && t.indexOf(a) < 0 && (n[a] = e[a]);
+  if (e != null && E)
+    for (var a of E(e))
+      t.indexOf(a) < 0 && D.call(e, a) && (n[a] = e[a]);
+  return n;
 };
-import { ref as E, watch as x, computed as N } from "vue";
+import { ref as F, computed as H, watch as N } from "vue";
 function j(...e) {
   var v;
   if (!Array.isArray(e) || !e.length) throw TypeError("参数错误：未传递");
-  const { name: n, fn: t, options: a } = 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 p = E(!1), m = E(), s = E(), u = { called: 0, finished: 0 };
-  function y(...h) {
-    const d = ++u.called, A = (r) => {
-      s.value = void 0, p.value = !0, m.value = r;
+  const { name: t, fn: n, options: a } = typeof e[0] == "function" ? { name: "method", fn: e[0], options: e[1] } : { name: e[0] || "method", fn: e[1], options: e[2] };
+  if (typeof t != "string") throw TypeError("参数错误：name");
+  if (typeof n != "function") throw TypeError("参数错误：fn");
+  const m = F(!1), p = F(), U = H(() => {
+    var d;
+    return (d = p.value) == null ? void 0 : d[0];
+  }), s = F(), u = { called: 0, finished: 0 };
+  function y(...d) {
+    const l = ++u.called, A = (r) => {
+      s.value = void 0, m.value = !0, p.value = r;
     }, c = (r, { scene: o, sn: i }) => {
-      i > u.finished && (u.finished = i), u.called === u.finished && (o === "error" && (s.value = r), p.value = !1, m.value = void 0);
+      i > u.finished && (u.finished = i), u.called === u.finished && (o === "error" && (s.value = r), m.value = !1, p.value = void 0);
     };
-    A(h);
+    A(d);
     try {
-      const r = t(...h);
+      const r = n(...d);
       return r instanceof Promise ? r.then(
-        () => c(void 0, { scene: "normal", sn: d }),
-        (o) => c(o, { scene: "error", sn: d })
-      ) : c(void 0, { scene: "normal", sn: d }), r;
+        () => c(void 0, { scene: "normal", sn: l }),
+        (o) => c(o, { scene: "error", sn: l })
+      ) : c(void 0, { scene: "normal", sn: l }), r;
     } catch (r) {
-      throw c(r, { scene: "error", sn: d }), r;
+      throw c(r, { scene: "error", sn: l }), r;
     }
   }
   if (a) {
-    const h = () => {
-    }, l = Object.assign(
+    const d = () => {
+    }, h = Object.assign(
       {},
       "immediate" in a ? { immediate: a.immediate } : {},
       (v = a.watchOptions) != null ? v : {}
-    ), { handlerCreator: d } = l, A = U(l, ["handlerCreator"]), { watch: c } = a, o = (() => {
+    ), { handlerCreator: l } = h, A = _(h, ["handlerCreator"]), { watch: c } = a, o = (() => {
       const i = () => y();
-      if (typeof d != "function") return i;
+      if (typeof l != "function") return i;
       try {
-        const f = d(y);
+        const f = l(y);
         return typeof f == "function" ? f : i;
       } catch (f) {
         return i;
       }
     })();
-    x(c != null ? c : h, o, A);
+    N(c != null ? c : d, o, A);
   }
   return {
-    [n]: y,
-    [`${n}Loading`]: p,
-    [`${n}Arguments`]: m,
-    [`${n}Error`]: s
+    [t]: y,
+    [`${t}Loading`]: m,
+    [`${t}Arguments`]: p,
+    [`${t}ArgumentFirst`]: U,
+    [`${t}Error`]: s
   };
 }
 function G(e) {
   if (!e) return "";
-  const n = e[0], t = e.slice(1);
-  return n.toUpperCase() + t;
+  const t = e[0], n = e.slice(1);
+  return t.toUpperCase() + n;
 }
-const D = "__va_fae";
-function q(...e) {
+const L = "__va_fae";
+function z(...e) {
   if (!Array.isArray(e) || !e.length) throw TypeError("参数错误：未传递");
-  const { name: n, fn: t, options: a } = 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 c = a || {}, { enhanceFirstArgument: p } = c, m = U(c, ["enhanceFirstArgument"]), s = E({
+  const { name: t, fn: n, options: a } = typeof e[0] == "function" ? { name: "data", fn: e[0], options: e[1] } : { name: e[0] || "data", fn: e[1], options: e[2] };
+  if (typeof t != "string") throw TypeError("参数错误：name");
+  if (typeof n != "function") throw TypeError("参数错误：fn");
+  const c = a || {}, { enhanceFirstArgument: m, initialData: p } = c, U = _(c, ["enhanceFirstArgument", "initialData"]), s = F({
     // 调用序号（即：fn 第 called 次调用）
     called: 0,
     // 完成序号（即：fn 第 finished 次调用完成）
@@ -89,55 +93,55 @@ function q(...e) {
     dataUpdateByCalled: 0,
     // 数据完成更新序号（即：data 数据由第 dataUpdateByFinished 次调用完成后更新）
     dataUpdateByFinished: 0
-  }), u = E(), y = N(() => !(s.value.dataUpdateByFinished >= s.value.finished || s.value.dataUpdateByCalled > s.value.finished));
+  }), u = F(p), y = H(() => !(s.value.dataUpdateByFinished >= s.value.finished || s.value.dataUpdateByCalled > s.value.finished));
   function v(r, { sn: o, scene: i }) {
     o < s.value.dataUpdateByCalled || (u.value = r, s.value.dataUpdateByCalled = o, i === "finish" && (s.value.dataUpdateByFinished = o));
   }
-  function l(r, { scene: o, sn: i }) {
+  function h(r, { scene: o, sn: i }) {
     o === "normal" && v(r, { sn: i, scene: "finish" }), i > s.value.finished && (s.value.finished = i);
   }
-  function h(r, {
+  function d(r, {
     enhanceFirstArgument: o,
     sn: i
   }) {
     if (!o) return r;
-    const [f, ...H] = r;
+    const [f, ...O] = r;
     return [C(w({
-      [D]: !0
+      [L]: !0
     }, r.length ? { firstArgument: f } : {}), {
       getData: () => u.value,
-      updateData: (_) => (v(_, { sn: i, scene: "update" }), _)
-    }), ...H];
+      updateData: (T) => (v(T, { sn: i, scene: "update" }), T)
+    }), ...O];
   }
-  function d(...r) {
+  function l(...r) {
     const o = ++s.value.called;
-    r = h(r, { enhanceFirstArgument: p, sn: o });
+    r = d(r, { enhanceFirstArgument: m, sn: o });
     try {
-      const i = t(...r);
+      const i = n(...r);
       return i instanceof Promise ? i.then(
         // promise 正常结束
-        (f) => l(f, { scene: "normal", sn: o }),
+        (f) => h(f, { scene: "normal", sn: o }),
         // promise 出现拒绝
-        (f) => l(f, { scene: "error", sn: o })
-      ) : l(i, { scene: "normal", sn: o }), i;
+        (f) => h(f, { scene: "error", sn: o })
+      ) : h(i, { scene: "normal", sn: o }), i;
     } catch (i) {
-      throw l(i, { scene: "error", sn: o }), i;
+      throw h(i, { scene: "error", sn: o }), i;
     }
   }
-  const A = j(`query${G(n)}`, d, m);
+  const A = j(`query${G(t)}`, l, U);
   return C(w({}, A), {
-    [n]: u,
-    [`${n}Expired`]: y
+    [t]: u,
+    [`${t}Expired`]: y
   });
 }
-function z(e, n) {
-  if (typeof e != "object" || !e || !e[D]) throw Error("请配置 options.enhanceFirstArgument = true");
-  const t = e;
-  return arguments.length === 2 && t.firstArgument === void 0 ? C(w({}, t), { firstArgument: n }) : t;
+function I(e, t) {
+  if (typeof e != "object" || !e || !e[L]) throw Error("请配置 options.enhanceFirstArgument = true");
+  const n = e;
+  return arguments.length === 2 && n.firstArgument === void 0 ? C(w({}, n), { firstArgument: t }) : n;
 }
 export {
-  z as unFirstArgumentEnhanced,
+  I as unFirstArgumentEnhanced,
   j as useAsync,
-  q as useAsyncData,
+  z as useAsyncData,
   j as useAsyncFunction
 };

package/dist/vue-asyncx.umd.cjs

@@ -1 +1 @@
-(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 N=Object.defineProperty,P=Object.defineProperties;var q=Object.getOwnPropertyDescriptors;var C=Object.getOwnPropertySymbols;var $=Object.prototype.hasOwnProperty,j=Object.prototype.propertyIsEnumerable;var O=(e,n,a)=>n in e?N(e,n,{enumerable:!0,configurable:!0,writable:!0,value:a}):e[n]=a,U=(e,n)=>{for(var a in n||(n={}))$.call(n,a)&&O(e,a,n[a]);if(C)for(var a of C(n))j.call(n,a)&&O(e,a,n[a]);return e},_=(e,n)=>P(e,q(n));var B=(e,n)=>{var a={};for(var c in e)$.call(e,c)&&n.indexOf(c)<0&&(a[c]=e[c]);if(e!=null&&C)for(var c of C(e))n.indexOf(c)<0&&j.call(e,c)&&(a[c]=e[c]);return a};function a(...t){var w;if(!Array.isArray(t)||!t.length)throw TypeError("参数错误：未传递");const{name:s,fn:u,options:m}=typeof t[0]=="function"?{name:"method",fn:t[0],options:t[1]}:{name:t[0]||"method",fn:t[1],options:t[2]};if(typeof s!="string")throw TypeError("参数错误：name");if(typeof u!="function")throw TypeError("参数错误：fn");const v=n.ref(!1),E=n.ref(),f=n.ref(),h={called:0,finished:0};function F(...A){const p=++h.called,T=i=>{f.value=void 0,v.value=!0,E.value=i},d=(i,{scene:o,sn:r})=>{r>h.finished&&(h.finished=r),h.called===h.finished&&(o==="error"&&(f.value=i),v.value=!1,E.value=void 0)};T(A);try{const i=u(...A);return i instanceof Promise?i.then(()=>d(void 0,{scene:"normal",sn:p}),o=>d(o,{scene:"error",sn:p})):d(void 0,{scene:"normal",sn:p}),i}catch(i){throw d(i,{scene:"error",sn:p}),i}}if(m){const A=()=>{},y=Object.assign({},"immediate"in m?{immediate:m.immediate}:{},(w=m.watchOptions)!=null?w:{}),{handlerCreator:p}=y,T=B(y,["handlerCreator"]),{watch:d}=m,o=(()=>{const r=()=>F();if(typeof p!="function")return r;try{const l=p(F);return typeof l=="function"?l:r}catch(l){return r}})();n.watch(d!=null?d:A,o,T)}return{[s]:F,[`${s}Loading`]:v,[`${s}Arguments`]:E,[`${s}Error`]:f}}function c(t){if(!t)return"";const s=t[0],u=t.slice(1);return s.toUpperCase()+u}const b="__va_fae";function H(...t){if(!Array.isArray(t)||!t.length)throw TypeError("参数错误：未传递");const{name:s,fn:u,options:m}=typeof t[0]=="function"?{name:"data",fn:t[0],options:t[1]}:{name:t[0]||"data",fn:t[1],options:t[2]};if(typeof s!="string")throw TypeError("参数错误：name");if(typeof u!="function")throw TypeError("参数错误：fn");const d=m||{},{enhanceFirstArgument:v}=d,E=B(d,["enhanceFirstArgument"]),f=n.ref({called:0,finished:0,dataUpdateByCalled:0,dataUpdateByFinished:0}),h=n.ref(),F=n.computed(()=>!(f.value.dataUpdateByFinished>=f.value.finished||f.value.dataUpdateByCalled>f.value.finished));function w(i,{sn:o,scene:r}){o<f.value.dataUpdateByCalled||(h.value=i,f.value.dataUpdateByCalled=o,r==="finish"&&(f.value.dataUpdateByFinished=o))}function y(i,{scene:o,sn:r}){o==="normal"&&w(i,{sn:r,scene:"finish"}),r>f.value.finished&&(f.value.finished=r)}function A(i,{enhanceFirstArgument:o,sn:r}){if(!o)return i;const[l,...g]=i;return[_(U({[b]:!0},i.length?{firstArgument:l}:{}),{getData:()=>h.value,updateData:D=>(w(D,{sn:r,scene:"update"}),D)}),...g]}function p(...i){const o=++f.value.called;i=A(i,{enhanceFirstArgument:v,sn:o});try{const r=u(...i);return r instanceof Promise?r.then(l=>y(l,{scene:"normal",sn:o}),l=>y(l,{scene:"error",sn:o})):y(r,{scene:"normal",sn:o}),r}catch(r){throw y(r,{scene:"error",sn:o}),r}}const T=a(`query${c(s)}`,p,E);return _(U({},T),{[s]:h,[`${s}Expired`]:F})}function L(t,s){if(typeof t!="object"||!t||!t[b])throw Error("请配置 options.enhanceFirstArgument = true");const u=t;return arguments.length===2&&u.firstArgument===void 0?_(U({},u),{firstArgument:s}):u}e.unFirstArgumentEnhanced=L,e.useAsync=a,e.useAsyncData=H,e.useAsyncFunction=a,Object.defineProperty(e,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 x=Object.getOwnPropertyDescriptors;var C=Object.getOwnPropertySymbols;var O=Object.prototype.hasOwnProperty,j=Object.prototype.propertyIsEnumerable;var g=(e,n,a)=>n in e?P(e,n,{enumerable:!0,configurable:!0,writable:!0,value:a}):e[n]=a,U=(e,n)=>{for(var a in n||(n={}))O.call(n,a)&&g(e,a,n[a]);if(C)for(var a of C(n))j.call(n,a)&&g(e,a,n[a]);return e},_=(e,n)=>q(e,x(n));var D=(e,n)=>{var a={};for(var c in e)O.call(e,c)&&n.indexOf(c)<0&&(a[c]=e[c]);if(e!=null&&C)for(var c of C(e))n.indexOf(c)<0&&j.call(e,c)&&(a[c]=e[c]);return a};function a(...t){var w;if(!Array.isArray(t)||!t.length)throw TypeError("参数错误：未传递");const{name:s,fn:u,options:y}=typeof t[0]=="function"?{name:"method",fn:t[0],options:t[1]}:{name:t[0]||"method",fn:t[1],options:t[2]};if(typeof s!="string")throw TypeError("参数错误：name");if(typeof u!="function")throw TypeError("参数错误：fn");const F=n.ref(!1),v=n.ref(),B=n.computed(()=>{var p;return(p=v.value)==null?void 0:p[0]}),f=n.ref(),h={called:0,finished:0};function E(...p){const m=++h.called,T=i=>{f.value=void 0,F.value=!0,v.value=i},d=(i,{scene:o,sn:r})=>{r>h.finished&&(h.finished=r),h.called===h.finished&&(o==="error"&&(f.value=i),F.value=!1,v.value=void 0)};T(p);try{const i=u(...p);return i instanceof Promise?i.then(()=>d(void 0,{scene:"normal",sn:m}),o=>d(o,{scene:"error",sn:m})):d(void 0,{scene:"normal",sn:m}),i}catch(i){throw d(i,{scene:"error",sn:m}),i}}if(y){const p=()=>{},A=Object.assign({},"immediate"in y?{immediate:y.immediate}:{},(w=y.watchOptions)!=null?w:{}),{handlerCreator:m}=A,T=D(A,["handlerCreator"]),{watch:d}=y,o=(()=>{const r=()=>E();if(typeof m!="function")return r;try{const l=m(E);return typeof l=="function"?l:r}catch(l){return r}})();n.watch(d!=null?d:p,o,T)}return{[s]:E,[`${s}Loading`]:F,[`${s}Arguments`]:v,[`${s}ArgumentFirst`]:B,[`${s}Error`]:f}}function c(t){if(!t)return"";const s=t[0],u=t.slice(1);return s.toUpperCase()+u}const $="__va_fae";function H(...t){if(!Array.isArray(t)||!t.length)throw TypeError("参数错误：未传递");const{name:s,fn:u,options:y}=typeof t[0]=="function"?{name:"data",fn:t[0],options:t[1]}:{name:t[0]||"data",fn:t[1],options:t[2]};if(typeof s!="string")throw TypeError("参数错误：name");if(typeof u!="function")throw TypeError("参数错误：fn");const d=y||{},{enhanceFirstArgument:F,initialData:v}=d,B=D(d,["enhanceFirstArgument","initialData"]),f=n.ref({called:0,finished:0,dataUpdateByCalled:0,dataUpdateByFinished:0}),h=n.ref(v),E=n.computed(()=>!(f.value.dataUpdateByFinished>=f.value.finished||f.value.dataUpdateByCalled>f.value.finished));function w(i,{sn:o,scene:r}){o<f.value.dataUpdateByCalled||(h.value=i,f.value.dataUpdateByCalled=o,r==="finish"&&(f.value.dataUpdateByFinished=o))}function A(i,{scene:o,sn:r}){o==="normal"&&w(i,{sn:r,scene:"finish"}),r>f.value.finished&&(f.value.finished=r)}function p(i,{enhanceFirstArgument:o,sn:r}){if(!o)return i;const[l,...N]=i;return[_(U({[$]:!0},i.length?{firstArgument:l}:{}),{getData:()=>h.value,updateData:b=>(w(b,{sn:r,scene:"update"}),b)}),...N]}function m(...i){const o=++f.value.called;i=p(i,{enhanceFirstArgument:F,sn:o});try{const r=u(...i);return r instanceof Promise?r.then(l=>A(l,{scene:"normal",sn:o}),l=>A(l,{scene:"error",sn:o})):A(r,{scene:"normal",sn:o}),r}catch(r){throw A(r,{scene:"error",sn:o}),r}}const T=a(`query${c(s)}`,m,B);return _(U({},T),{[s]:h,[`${s}Expired`]:E})}function L(t,s){if(typeof t!="object"||!t||!t[$])throw Error("请配置 options.enhanceFirstArgument = true");const u=t;return arguments.length===2&&u.firstArgument===void 0?_(U({},u),{firstArgument:s}):u}e.unFirstArgumentEnhanced=L,e.useAsync=a,e.useAsyncData=H,e.useAsyncFunction=a,Object.defineProperty(e,Symbol.toStringTag,{value:"Module"})});

package/package.json

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