vue-asyncx 1.0.4 → 1.2.0

package/dist/vue-asyncx.d.ts

@@ -1,11 +1,12 @@
 import { Ref } 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 Function>(fn: Fn, options?: UseAsyncOptions): UseAsyncResult<Fn, 'method'>;
+declare function useAsync<Fn extends (...args: any) => any>(fn: Fn, options?: UseAsyncOptions): UseAsyncResult<Fn, 'method'>;
 
-declare function useAsync<Fn extends Function, 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): UseAsyncResult<Fn, Name>;
 export { useAsync }
 export { useAsync as useAsyncFunction }
 
@@ -20,14 +21,17 @@ declare type UseAsyncDataResult<Fn extends (...args: any) => any, DataName exten
 };
 
 declare type UseAsyncOptions = {
-    immediate?: boolean;
     watch?: WatchSource;
+    watchOptions?: WatchOptions;
+    immediate?: boolean;
 };
 
-declare type UseAsyncResult<Fn extends Function, Name extends string> = {
+declare type UseAsyncResult<Fn extends (...args: any) => any, Name extends string> = {
     [K in StringDefaultWhenEmpty<Name, 'method'>]: Fn;
 } & {
     [K in `${StringDefaultWhenEmpty<Name, 'method'>}Loading`]: Ref<boolean>;
+} & {
+    [K in `${StringDefaultWhenEmpty<Name, 'method'>}Arguments`]: Ref<Parameters<Fn>>;
 };
 
 export { }

package/dist/vue-asyncx.js

@@ -1,42 +1,70 @@
-import { ref as a, watch as y } from "vue";
-function l(...e) {
-  if (!Array.isArray(e) || !e.length) throw TypeError("参数错误：未传递");
-  const { name: t, fn: r, options: n } = typeof e[0] == "function" ? { name: "method", fn: e[0], options: e[1] } : { name: e[0] || "method", fn: e[1], options: e[2] };
+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 r != "function") throw TypeError("参数错误：fn");
-  const o = a(!1);
-  function f(...u) {
-    o.value = !0;
-    const i = r(...u);
-    return i instanceof Promise ? i.finally(() => o.value = !1) : o.value = !1, i;
+  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;
+    };
+    s();
+    const u = o(...e);
+    return u instanceof Promise ? u.finally(() => f()) : f(), u;
   }
-  return n != null && n.watch ? y(n.watch, () => f(), { immediate: n == null ? void 0 : n.immediate }) : n != null && n.immediate && f(), {
-    [t]: f,
-    [`${t}Loading`]: o
+  if (i) {
+    const e = () => {
+    }, s = Object.assign(
+      {},
+      "immediate" in i ? { immediate: i.immediate } : {},
+      (p = i.watchOptions) != null ? p : {}
+    ), { watch: f } = i;
+    O(f != null ? f : e, () => a(), s);
+  }
+  return {
+    [t]: a,
+    [`${t}Loading`]: r,
+    [`${t}Arguments`]: c
   };
 }
-function p(e) {
-  if (!e) return "";
-  const t = e[0], r = e.slice(1);
-  return t.toUpperCase() + r;
+function b(n) {
+  if (!n) return "";
+  const t = n[0], o = n.slice(1);
+  return t.toUpperCase() + o;
 }
-function h(...e) {
-  if (!Array.isArray(e) || !e.length) throw TypeError("参数错误：未传递");
-  const { name: t, fn: r, options: n } = typeof e[0] == "function" ? { name: "data", fn: e[0], options: e[1] } : { name: e[0] || "data", fn: e[1], options: e[2] };
+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 r != "function") throw TypeError("参数错误：fn");
-  const o = a();
-  function f(...i) {
-    const c = r(...i);
-    return c instanceof Promise ? c.then((m) => o.value = m) : o.value = c, c;
+  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;
   }
-  return {
-    ...l(`query${p(t)}`, f, n),
-    [t]: o
-  };
+  const a = $(`query${b(t)}`, c, i);
+  return d(h({}, a), {
+    [t]: r
+  });
 }
 export {
-  l as useAsync,
-  h as useAsyncData,
-  l as useAsyncFunction
+  $ as useAsync,
+  j as useAsyncData,
+  $ as useAsyncFunction
 };

package/dist/vue-asyncx.umd.cjs

@@ -1 +1 @@
-(function(t,f){typeof exports=="object"&&typeof module<"u"?f(exports,require("vue")):typeof define=="function"&&define.amd?define(["exports","vue"],f):(t=typeof globalThis<"u"?globalThis:t||self,f(t.VueAsyncx={},t.Vue))})(this,function(t,f){"use strict";function s(...e){if(!Array.isArray(e)||!e.length)throw TypeError("参数错误：未传递");const{name:o,fn:r,options:n}=typeof e[0]=="function"?{name:"method",fn:e[0],options:e[1]}:{name:e[0]||"method",fn:e[1],options:e[2]};if(typeof o!="string")throw TypeError("参数错误：name");if(typeof r!="function")throw TypeError("参数错误：fn");const i=f.ref(!1);function u(...y){i.value=!0;const c=r(...y);return c instanceof Promise?c.finally(()=>i.value=!1):i.value=!1,c}return n!=null&&n.watch?f.watch(n.watch,()=>u(),{immediate:n==null?void 0:n.immediate}):n!=null&&n.immediate&&u(),{[o]:u,[`${o}Loading`]:i}}function d(e){if(!e)return"";const o=e[0],r=e.slice(1);return o.toUpperCase()+r}function l(...e){if(!Array.isArray(e)||!e.length)throw TypeError("参数错误：未传递");const{name:o,fn:r,options:n}=typeof e[0]=="function"?{name:"data",fn:e[0],options:e[1]}:{name:e[0]||"data",fn:e[1],options:e[2]};if(typeof o!="string")throw TypeError("参数错误：name");if(typeof r!="function")throw TypeError("参数错误：fn");const i=f.ref();function u(...c){const a=r(...c);return a instanceof Promise?a.then(m=>i.value=m):i.value=a,a}return{...s(`query${d(o)}`,u,n),[o]:i}}t.useAsync=s,t.useAsyncData=l,t.useAsyncFunction=s,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 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"})});

package/package.json

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