vue-asyncx 1.8.0 → 1.9.0

package/README.md

@@ -1,13 +1,14 @@
-优雅好用的异步函数/数据管理工具
+优雅好用的异步函数/数据管理工具 [![Ask DeepWiki](https://deepwiki.com/badge.svg)](https://deepwiki.com/xuyimingwork/vue-asyncx)
 
 ![](./docs/compare.png)
 
 ## 特性
 
-- 效率+：异步相关样板代码减少40%+
-- 可读+：异步操作命名指向明确、风格统一
-- 质量+：全 TS 支持 + 100% 单元测试
-- 维护+：易于写出符合“干净架构”理念的函数
+- 异步相关样板代码减少40%+
+- 关联状态变量自动命名、风格统一
+- 竟态条件自动处理
+- 完整 TS 类型支持
+- 100% 单元测试覆盖率
 
 ## 安装
 
@@ -139,44 +140,33 @@ const { user } = useAsyncData('user', getUserApi, {
 
 `{name}` 数据通常在异步函数调用执行结束时更新，但也可以在异步函数执行过程中更新。
 
-通过配置 `options.enhanceFirstArgument = true` 实现。
-
 ```js
-import { unFirstArgumentEnhanced, useAsyncData } from 'vue-asyncx'
+import { getAsyncDataContext, useAsyncData } from 'vue-asyncx'
 
 const wait = (ms: number) => new Promise((resolve) => setTimeout(resolve, ms))
 
 const { 
   progress,
   queryProgress
-} = useAsyncData('progress', async (init?: number) => {
-  const { getData, updateData } = unFirstArgumentEnhanced(init)
-  init = unFirstArgumentEnhanced(init).firstArgument
+} = useAsyncData('progress', async (init?: number = 0) => {
+  const { getData, updateData } = getAsyncDataContext()
   // 同步更新为入参 10
-  updateData(init || 0)
+  updateData(init)
   await wait(100)
   // 间隔 100ms 后，更新为 50
   updateData(50)
   await wait(100)
   // 间隔 100ms 后，返回 100，本次异步函数完全结束。
   return 100
-}, { 
-  enhanceFirstArgument: true
 })
 
 queryProgress(10)
 ```
 
-当 `options.enhanceFirstArgument = true` 后
-- 异步函数的首个参数 `init` 便被转换为 `FirstArgumentEnhanced` 类型，包含 `{ getData, updateData, firstArgument }` 属性。
-- 调用 `queryProgress(10)` 时传入的 `10` 在异步函数内部被赋在 `init.firstArgument` 上
-- `unFirstArgumentEnhanced(init)` 先解构出 `getData` 和 `updateData`，再将 `init` 重新赋值为传入的 `10`
-
-> 注意，异步函数的 `init` 不可以直接设置默认值。如：`(init: number = 0) => {}`，可以通过 `unFirstArgumentEnhanced(init, 0)` 设置默认值。
-
-> 注意，`queryProgress()` 时，`'firstArgument' in unFirstArgumentEnhanced(init)` === `false`，这可以用来区分 `queryProgress()` 与 `queryProgress(undefined)`
+> - `getAsyncDataContext` 只在同步调用时才可获取到正确的上下文
+> - `updateData` 内部已自动处理竟态条件，可以放心调用
 
-### Debounce
+### Debounce / Throttle
 
 ```ts
 import { debounce } from 'es-toolkit';
@@ -187,6 +177,7 @@ const {
 } = useAsyncData('user', getUserApi, { 
   immediate: true,
   setup(fn) {
+    // throttle 配置方式一致
     return debounce(fn, 500)
   }
 })
@@ -194,7 +185,37 @@ const {
 
 上面例子中，`queryUser` 等价于 `debounce(fn, 500)`。可以使用任意你喜欢的 `debounce` 函数
 
-> `fn` 是 `useAsyncData` 内部对 `getUserApi` 做的封装。`setup` 返回值为函数类型时，会成为最终返回的 `queryUser`，否则，`queryUser` === `fn`
+> `fn` 是 `useAsyncData` 内部对 `getUserApi` 做的封装。`setup` 返回值为函数类型时，会成为最终返回的 `queryUser`。
+
+### DOM/BOM 事件监听 / 轮询
+
+```ts
+import { debounce } from "es-toolkit"
+import { useEventListener, useIntervalFn } from '@vueuse/core'
+
+const { 
+  user, 
+  queryUser 
+} = useAsyncData('user', getUserApi, {
+  immediate: true,
+  setup(fn) {
+    useEventListener(document, 'visibilitychange', fn)
+    useIntervalFn(fn, 1000)
+    useEventListener('resize', debounce(fn, 500))
+  }
+})
+```
+
+在 `setup` 中可以像在 vue 组件的 `setup` 中一样注册外部监听器。在上面的例子中，`queryUser` 会：
+
+- 立即调用
+- 文档显示隐藏时调用
+- 间隔 1s 轮询
+- 窗口尺寸变化时调用（`debounce` 版本）
+
+注意到：`setup` 没返回函数，此时 `queryUser` === `fn`。
+
+> 注意，如果没有使用 `useEventListener` 等自动卸载的工具函数，你需要使用 vue 生命周期钩子手动卸载。
 
 ## API
 
@@ -219,6 +240,5 @@ const {
 | watchOptions.handlerCreator | 自定义传入 `watch` 的 `handler`                       | `(fn: Fn) => WatchCallback`                             | -         |
 | initialData                 | data 的初始值                                         | any                                                     | undefined |
 | shallow                     | 是否使用 `shallowRef` 保存 data，默认使用 `ref`       | boolean                                                 | false     |
-| enhanceFirstArgument        | 是否强化首个入参                                      | boolean                                                 | false     |
 | setup                       | 转换函数或执行其它初始化操作                          | `(fn: Fn) => ((...args: any) => any) \| void`           | -         |
 

package/dist/vue-asyncx.d.ts

@@ -14,10 +14,15 @@ declare type FirstArgumentEnhanced<T = any, D = any> = {
 
 declare const FLAG_FIRST_ARGUMENT_ENHANCED = "__va_fae";
 
+export declare function getAsyncDataContext(): {
+    getData: () => any;
+    updateData: (v: any) => void;
+};
+
 declare type StringDefaultWhenEmpty<S extends string, D extends string> = S extends '' ? D : S;
 
 /**
- *
+ * @deprecated 已废弃，请使用 getAsyncDataContext
  * @param arg 首个参数
  * @param defaultValue 当 arg === undefined 时的默认值
  * @returns 首个参数解构结果（符合 ts 类型要求）
@@ -37,6 +42,9 @@ export declare function useAsyncData<Data = any, Fn extends (...args: any) => Da
 declare interface UseAsyncDataOptions<Fn extends (...args: any) => any, Shallow extends boolean> extends UseAsyncOptions<Fn> {
     initialData?: any;
     shallow?: Shallow;
+    /**
+     * @deprecated 已废弃，请使用 getAsyncDataContext
+     */
     enhanceFirstArgument?: boolean;
 }
 

package/dist/vue-asyncx.js

@@ -1,191 +1,271 @@
-var G = Object.defineProperty, L = Object.defineProperties;
-var P = Object.getOwnPropertyDescriptors;
-var F = Object.getOwnPropertySymbols;
-var O = Object.prototype.hasOwnProperty, b = Object.prototype.propertyIsEnumerable;
-var H = (e, t, r) => t in e ? G(e, t, { enumerable: !0, configurable: !0, writable: !0, value: r }) : e[t] = r, T = (e, t) => {
-  for (var r in t || (t = {}))
-    O.call(t, r) && H(e, r, t[r]);
-  if (F)
-    for (var r of F(t))
-      b.call(t, r) && H(e, r, t[r]);
-  return e;
-}, x = (e, t) => L(e, P(t));
-var $ = (e, t) => {
-  var r = {};
-  for (var n in e)
-    O.call(e, n) && t.indexOf(n) < 0 && (r[n] = e[n]);
-  if (e != null && F)
-    for (var n of F(e))
-      t.indexOf(n) < 0 && b.call(e, n) && (r[n] = e[n]);
-  return r;
-};
-import { ref as E, computed as l, watch as U, shallowRef as C } from "vue";
-function q(e) {
-  if (!e) return "";
-  const t = e[0], r = e.slice(1);
-  return t.toUpperCase() + r;
-}
-function N() {
-  const e = E({
-    // 发起的调用
-    track: 0,
-    // 更新的调用
-    progress: 0,
-    // 完成的调用，包含报错情况
-    finished: 0,
-    // 完成（正常）的调用，不含报错情况
-    ok: 0
-  });
-  function t() {
-    const r = e.value, n = ++r.track;
-    return {
-      progress() {
-        r.progress >= n || (r.progress = n);
-      },
-      finish(u = !1) {
-        r.finished >= n || (r.finished = n, u || (r.ok = n));
-      },
-      expired(u) {
-        return u ? u === "progress" ? r.progress > n || r.finished >= n : u === "result:ok" ? r.progress > n || r.ok > n : r.progress > n || r.finished > n : r.track > n;
-      }
-    };
-  }
-  return t.tracking = l(() => e.value.track > 0), t.latest = {
-    // 已完成
-    finished: l(() => e.value.track === e.value.finished),
-    // 已成功
-    ok: l(() => e.value.track === e.value.ok)
-  }, t.has = {
-    // 存在完成
-    finished: l(() => e.value.finished > 0),
-    // 存在成功
-    ok: l(() => e.value.ok > 0),
-    // 存在更新
-    progress: l(() => e.value.progress > 0)
-  }, t;
-}
-function z(e, t) {
-  if (typeof t != "function") return e;
-  try {
-    const r = t(e);
-    return typeof r == "function" ? r : e;
-  } catch (r) {
-    return e;
-  }
-}
-function I(...e) {
-  var h;
-  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] };
-  if (typeof t != "string") throw TypeError("参数错误：name");
-  if (typeof r != "function") throw TypeError("参数错误：fn");
-  const u = E(!1), p = E(), _ = l(() => {
-    var a;
-    return (a = p.value) == null ? void 0 : a[0];
-  }), k = E(), y = N();
-  function v(...a) {
-    const d = y(), A = (c) => {
-      k.value = void 0, u.value = !0, p.value = c;
-    }, f = (c, { scene: s }) => {
-      d.finish(s === "error"), !d.expired() && (s === "error" && (k.value = c), u.value = !1, p.value = void 0);
-    };
-    A(a);
-    try {
-      const c = r(...a);
-      return c instanceof Promise ? c.then(
-        () => f(void 0, { scene: "normal" }),
-        (s) => f(s, { scene: "error" })
-      ) : f(void 0, { scene: "normal" }), c;
-    } catch (c) {
-      throw f(c, { scene: "error" }), c;
-    }
-  }
-  const m = z(v, n == null ? void 0 : n.setup);
-  if (n) {
-    const a = () => {
-    }, w = Object.assign(
-      {},
-      "immediate" in n ? { immediate: n.immediate } : {},
-      (h = n.watchOptions) != null ? h : {}
-    ), { handlerCreator: d } = w, A = $(w, ["handlerCreator"]), { watch: f } = n, s = (() => {
-      const i = () => m();
-      if (typeof d != "function") return i;
-      try {
-        const o = d(m);
-        return typeof o == "function" ? o : i;
-      } catch (o) {
-        return i;
-      }
-    })();
-    U(f != null ? f : a, s, A);
-  }
-  return {
-    [t]: m,
-    [`${t}Loading`]: u,
-    [`${t}Arguments`]: p,
-    [`${t}ArgumentFirst`]: _,
-    [`${t}Error`]: k
-  };
-}
-const R = "__va_fae";
-function Q(...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] };
-  if (typeof t != "string") throw TypeError("参数错误：name");
-  if (typeof r != "function") throw TypeError("参数错误：fn");
-  const c = n || {}, { enhanceFirstArgument: u, initialData: p, shallow: _ } = c, k = $(c, ["enhanceFirstArgument", "initialData", "shallow"]), y = _ ? C(p) : E(p), v = C();
-  function m(s, { track: i, scene: o }) {
-    o === "update" && i.progress(), !(o === "finish" && i.expired("result:ok")) && (o === "update" && i.expired("progress") || (y.value = s, v.value = i));
-  }
-  function h(s, { scene: i, track: o }) {
-    o.finish(i === "error"), i === "normal" && m(s, { track: o, scene: "finish" });
-  }
-  function w(s, {
-    enhanceFirstArgument: i,
-    track: o
-  }) {
-    if (!i) return s;
-    const [g, ...j] = s;
-    return [x(T({
-      [R]: !0
-    }, s.length ? { firstArgument: g } : {}), {
-      getData: () => y.value,
-      updateData: (D) => (m(D, { track: o, scene: "update" }), D)
-    }), ...j];
-  }
-  const a = N();
-  function d(...s) {
-    const i = a();
-    s = w(s, { enhanceFirstArgument: u, track: i });
-    try {
-      const o = r(...s);
-      return o instanceof Promise ? o.then(
-        // promise 正常结束
-        (g) => h(g, { scene: "normal", track: i }),
-        // promise 出现拒绝
-        (g) => h(g, { scene: "error", track: i })
-      ) : h(o, { scene: "normal", track: i }), o;
-    } catch (o) {
-      throw h(o, { scene: "error", track: i }), o;
-    }
-  }
-  const A = I(`query${q(t)}`, d, k), f = l(() => a.tracking.value ? v.value ? v.value.expired("result") : a.has.finished.value : !1);
-  return x(T({}, A), {
-    [t]: y,
-    [`${t}Expired`]: f
-  });
-}
-function S(e, t) {
-  if (!M(e)) throw Error("请配置 options.enhanceFirstArgument = true");
-  const r = e;
-  return arguments.length === 2 && r.firstArgument === void 0 ? x(T({}, r), { firstArgument: t }) : r;
-}
-function M(e) {
-  return typeof e == "object" && !!e && R in e;
-}
-export {
-  S as unFirstArgumentEnhanced,
-  I as useAsync,
-  Q as useAsyncData,
-  I as useAsyncFunction
+import { computed, ref, shallowRef, watch } from "vue";
+function upperFirst(e) {
+	if (!e) return "";
+	let a = e[0], o = e.slice(1);
+	return a.toUpperCase() + o;
+}
+function createFunctionTracker() {
+	let o = ref({
+		track: 0,
+		progress: 0,
+		finished: 0,
+		ok: 0
+	});
+	function s() {
+		let e = o.value, a = ++e.track;
+		return {
+			progress() {
+				e.progress >= a || (e.progress = a);
+			},
+			finish(o = !1) {
+				e.finished >= a || (e.finished = a, o || (e.ok = a));
+			},
+			expired(o) {
+				return o ? o === "progress" ? e.progress > a || e.finished >= a : o === "result:ok" ? e.progress > a || e.ok > a : e.progress > a || e.finished > a : e.track > a;
+			}
+		};
+	}
+	return s.tracking = computed(() => o.value.track > 0), s.latest = {
+		finished: computed(() => o.value.track === o.value.finished),
+		ok: computed(() => o.value.track === o.value.ok)
+	}, s.has = {
+		finished: computed(() => o.value.finished > 0),
+		ok: computed(() => o.value.ok > 0),
+		progress: computed(() => o.value.progress > 0)
+	}, s;
+}
+function _objectWithoutPropertiesLoose(e, a) {
+	if (e == null) return {};
+	var o = {};
+	for (var s in e) if ({}.hasOwnProperty.call(e, s)) {
+		if (a.includes(s)) continue;
+		o[s] = e[s];
+	}
+	return o;
+}
+function _objectWithoutProperties(e, a) {
+	if (e == null) return {};
+	var o, s, c = _objectWithoutPropertiesLoose(e, a);
+	if (Object.getOwnPropertySymbols) {
+		var l = Object.getOwnPropertySymbols(e);
+		for (s = 0; s < l.length; s++) o = l[s], a.includes(o) || {}.propertyIsEnumerable.call(e, o) && (c[o] = e[o]);
+	}
+	return c;
+}
+var _excluded$1 = ["handlerCreator"];
+function getFunction(e, a) {
+	if (typeof a != "function") return e;
+	try {
+		let o = a(e);
+		return typeof o == "function" ? o : e;
+	} catch (a) {
+		return e;
+	}
+}
+function useAsync(...o) {
+	if (!Array.isArray(o) || !o.length) throw TypeError("参数错误：未传递");
+	let { name: c, fn: u, options: p } = typeof o[0] == "function" ? {
+		name: "method",
+		fn: o[0],
+		options: o[1]
+	} : {
+		name: o[0] || "method",
+		fn: o[1],
+		options: o[2]
+	};
+	if (typeof c != "string") throw TypeError("参数错误：name");
+	if (typeof u != "function") throw TypeError("参数错误：fn");
+	let m = ref(!1), h = ref(), g = computed(() => {
+		var e;
+		return (e = h.value) == null ? void 0 : e[0];
+	}), _ = ref(), v = createFunctionTracker();
+	function y(...e) {
+		let a = v(), o = (e) => {
+			_.value = void 0, m.value = !0, h.value = e;
+		}, s = (e, { scene: o }) => {
+			a.finish(o === "error"), !a.expired() && (o === "error" && (_.value = e), m.value = !1, h.value = void 0);
+		};
+		o(e);
+		try {
+			let a = u(...e);
+			return a instanceof Promise ? a.then(() => s(void 0, { scene: "normal" }), (e) => s(e, { scene: "error" })) : s(void 0, { scene: "normal" }), a;
+		} catch (e) {
+			throw s(e, { scene: "error" }), e;
+		}
+	}
+	let b = getFunction(y, p == null ? void 0 : p.setup);
+	if (p) {
+		var x;
+		let e = () => {}, a = Object.assign({}, "immediate" in p ? { immediate: p.immediate } : {}, (x = p.watchOptions) == null ? {} : x), { handlerCreator: o } = a, c = _objectWithoutProperties(a, _excluded$1), { watch: l } = p, u = (() => {
+			let e = () => b();
+			if (typeof o != "function") return e;
+			try {
+				let a = o(b);
+				return typeof a == "function" ? a : e;
+			} catch (a) {
+				return e;
+			}
+		})();
+		watch(l == null ? e : l, u, c);
+	}
+	return {
+		[c]: b,
+		[`${c}Loading`]: m,
+		[`${c}Arguments`]: h,
+		[`${c}ArgumentFirst`]: g,
+		[`${c}Error`]: _
+	};
+}
+var currentContextGetter = () => {
+	throw Error("[vue-asyncx] getAsyncDataContext 必须在 useAsyncData 的封装函数内调用");
 };
+function prepareAsyncDataContext(e) {
+	let a = currentContextGetter, o = () => e;
+	currentContextGetter = o;
+	function s() {
+		if (o !== currentContextGetter) throw Error("[vue-asyncx] 嵌套 AsyncDataContext 必须顺序恢复");
+		currentContextGetter = a;
+	}
+	return s;
+}
+function getAsyncDataContext() {
+	return currentContextGetter();
+}
+function _typeof(e) {
+	"@babel/helpers - typeof";
+	return _typeof = typeof Symbol == "function" && typeof Symbol.iterator == "symbol" ? function(e) {
+		return typeof e;
+	} : function(e) {
+		return e && typeof Symbol == "function" && e.constructor === Symbol && e !== Symbol.prototype ? "symbol" : typeof e;
+	}, _typeof(e);
+}
+function toPrimitive(e, a) {
+	if (_typeof(e) != "object" || !e) return e;
+	var o = e[Symbol.toPrimitive];
+	if (o !== void 0) {
+		var s = o.call(e, a || "default");
+		if (_typeof(s) != "object") return s;
+		throw TypeError("@@toPrimitive must return a primitive value.");
+	}
+	return (a === "string" ? String : Number)(e);
+}
+function toPropertyKey(e) {
+	var a = toPrimitive(e, "string");
+	return _typeof(a) == "symbol" ? a : a + "";
+}
+function _defineProperty(e, a, o) {
+	return (a = toPropertyKey(a)) in e ? Object.defineProperty(e, a, {
+		value: o,
+		enumerable: !0,
+		configurable: !0,
+		writable: !0
+	}) : e[a] = o, e;
+}
+function ownKeys(e, a) {
+	var o = Object.keys(e);
+	if (Object.getOwnPropertySymbols) {
+		var s = Object.getOwnPropertySymbols(e);
+		a && (s = s.filter(function(a) {
+			return Object.getOwnPropertyDescriptor(e, a).enumerable;
+		})), o.push.apply(o, s);
+	}
+	return o;
+}
+function _objectSpread2(e) {
+	for (var a = 1; a < arguments.length; a++) {
+		var o = arguments[a] == null ? {} : arguments[a];
+		a % 2 ? ownKeys(Object(o), !0).forEach(function(a) {
+			_defineProperty(e, a, o[a]);
+		}) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(o)) : ownKeys(Object(o)).forEach(function(a) {
+			Object.defineProperty(e, a, Object.getOwnPropertyDescriptor(o, a));
+		});
+	}
+	return e;
+}
+var _excluded = [
+	"enhanceFirstArgument",
+	"initialData",
+	"shallow"
+], FLAG_FIRST_ARGUMENT_ENHANCED = "__va_fae";
+function useAsyncData(...s) {
+	if (!Array.isArray(s) || !s.length) throw TypeError("参数错误：未传递");
+	let { name: u, fn: d, options: f } = typeof s[0] == "function" ? {
+		name: "data",
+		fn: s[0],
+		options: s[1]
+	} : {
+		name: s[0] || "data",
+		fn: s[1],
+		options: s[2]
+	};
+	if (typeof u != "string") throw TypeError("参数错误：name");
+	if (typeof d != "function") throw TypeError("参数错误：fn");
+	let m = f || {}, { enhanceFirstArgument: g, initialData: _, shallow: v } = m, y = _objectWithoutProperties(m, _excluded), b = v ? shallowRef(_) : ref(_), x = shallowRef();
+	function S(e, { track: a, scene: o, error: s = !1 }) {
+		o === "update" && a.progress(), !(o === "update" && a.expired("progress")) && (o === "finish" && a.finish(s), !(o === "finish" && a.expired("result:ok")) && (o === "finish" && s || (b.value = e, x.value = a)));
+	}
+	function C(e, { scene: a, track: o }) {
+		S(e, {
+			track: o,
+			scene: "finish",
+			error: a === "error"
+		});
+	}
+	function w({ track: e }) {
+		return {
+			getData: () => b.value,
+			updateData: (a) => (S(a, {
+				track: e,
+				scene: "update"
+			}), a)
+		};
+	}
+	function T(e, { enhanceFirstArgument: a, track: o }) {
+		if (!a) return e;
+		let [s, ...c] = e;
+		return [_objectSpread2(_objectSpread2({ [FLAG_FIRST_ARGUMENT_ENHANCED]: !0 }, e.length ? { firstArgument: s } : {}), w({ track: o })), ...c];
+	}
+	let E = createFunctionTracker();
+	function D(...e) {
+		let a = E();
+		e = T(e, {
+			enhanceFirstArgument: g,
+			track: a
+		});
+		let o = prepareAsyncDataContext(w({ track: a }));
+		try {
+			let o = d(...e);
+			return o instanceof Promise ? o.then((e) => C(e, {
+				scene: "normal",
+				track: a
+			}), (e) => C(e, {
+				scene: "error",
+				track: a
+			})) : C(o, {
+				scene: "normal",
+				track: a
+			}), o;
+		} catch (e) {
+			throw C(e, {
+				scene: "error",
+				track: a
+			}), e;
+		} finally {
+			o();
+		}
+	}
+	let O = useAsync(`query${upperFirst(u)}`, D, y), k = computed(() => E.tracking.value ? x.value ? x.value.expired("result") : E.has.finished.value : !1);
+	return _objectSpread2(_objectSpread2({}, O), {}, {
+		[u]: b,
+		[`${u}Expired`]: k
+	});
+}
+function unFirstArgumentEnhanced(e, a) {
+	if (!isFirstArgumentEnhanced(e)) throw Error("请配置 options.enhanceFirstArgument = true");
+	let o = e;
+	return arguments.length === 2 && o.firstArgument === void 0 ? _objectSpread2(_objectSpread2({}, o), {}, { firstArgument: a }) : o;
+}
+function isFirstArgumentEnhanced(e) {
+	return typeof e == "object" && !!e && FLAG_FIRST_ARGUMENT_ENHANCED in e;
+}
+export { getAsyncDataContext, unFirstArgumentEnhanced, useAsync, useAsync as useAsyncFunction, useAsyncData };

package/dist/vue-asyncx.umd.cjs

@@ -1 +1 @@
-(function(r,t){typeof exports=="object"&&typeof module!="undefined"?t(exports,require("vue")):typeof define=="function"&&define.amd?define(["exports","vue"],t):(r=typeof globalThis!="undefined"?globalThis:r||self,t(r.VueAsyncx={},r.Vue))})(this,function(r,t){"use strict";var S=Object.defineProperty,U=Object.defineProperties;var V=Object.getOwnPropertyDescriptors;var x=Object.getOwnPropertySymbols;var C=Object.prototype.hasOwnProperty,N=Object.prototype.propertyIsEnumerable;var R=(r,t,f)=>t in r?S(r,t,{enumerable:!0,configurable:!0,writable:!0,value:f}):r[t]=f,_=(r,t)=>{for(var f in t||(t={}))C.call(t,f)&&R(r,f,t[f]);if(x)for(var f of x(t))N.call(t,f)&&R(r,f,t[f]);return r},D=(r,t)=>U(r,V(t));var O=(r,t)=>{var f={};for(var d in r)C.call(r,d)&&t.indexOf(d)<0&&(f[d]=r[d]);if(r!=null&&x)for(var d of x(r))t.indexOf(d)<0&&N.call(r,d)&&(f[d]=r[d]);return f};function f(e){if(!e)return"";const o=e[0],n=e.slice(1);return o.toUpperCase()+n}function d(){const e=t.ref({track:0,progress:0,finished:0,ok:0});function o(){const n=e.value,i=++n.track;return{progress(){n.progress>=i||(n.progress=i)},finish(p=!1){n.finished>=i||(n.finished=i,p||(n.ok=i))},expired(p){return p?p==="progress"?n.progress>i||n.finished>=i:p==="result:ok"?n.progress>i||n.ok>i:n.progress>i||n.finished>i:n.track>i}}}return o.tracking=t.computed(()=>e.value.track>0),o.latest={finished:t.computed(()=>e.value.track===e.value.finished),ok:t.computed(()=>e.value.track===e.value.ok)},o.has={finished:t.computed(()=>e.value.finished>0),ok:t.computed(()=>e.value.ok>0),progress:t.computed(()=>e.value.progress>0)},o}function P(e,o){if(typeof o!="function")return e;try{const n=o(e);return typeof n=="function"?n:e}catch(n){return e}}function $(...e){var y;if(!Array.isArray(e)||!e.length)throw TypeError("参数错误：未传递");const{name:o,fn:n,options:i}=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 n!="function")throw TypeError("参数错误：fn");const p=t.ref(!1),m=t.ref(),b=t.computed(()=>{var l;return(l=m.value)==null?void 0:l[0]}),g=t.ref(),E=d();function w(...l){const k=E(),v=a=>{g.value=void 0,p.value=!0,m.value=a},h=(a,{scene:u})=>{k.finish(u==="error"),!k.expired()&&(u==="error"&&(g.value=a),p.value=!1,m.value=void 0)};v(l);try{const a=n(...l);return a instanceof Promise?a.then(()=>h(void 0,{scene:"normal"}),u=>h(u,{scene:"error"})):h(void 0,{scene:"normal"}),a}catch(a){throw h(a,{scene:"error"}),a}}const A=P(w,i==null?void 0:i.setup);if(i){const l=()=>{},T=Object.assign({},"immediate"in i?{immediate:i.immediate}:{},(y=i.watchOptions)!=null?y:{}),{handlerCreator:k}=T,v=O(T,["handlerCreator"]),{watch:h}=i,u=(()=>{const c=()=>A();if(typeof k!="function")return c;try{const s=k(A);return typeof s=="function"?s:c}catch(s){return c}})();t.watch(h!=null?h:l,u,v)}return{[o]:A,[`${o}Loading`]:p,[`${o}Arguments`]:m,[`${o}ArgumentFirst`]:b,[`${o}Error`]:g}}const j="__va_fae";function q(...e){if(!Array.isArray(e)||!e.length)throw TypeError("参数错误：未传递");const{name:o,fn:n,options:i}=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 n!="function")throw TypeError("参数错误：fn");const a=i||{},{enhanceFirstArgument:p,initialData:m,shallow:b}=a,g=O(a,["enhanceFirstArgument","initialData","shallow"]),E=b?t.shallowRef(m):t.ref(m),w=t.shallowRef();function A(u,{track:c,scene:s}){s==="update"&&c.progress(),!(s==="finish"&&c.expired("result:ok"))&&(s==="update"&&c.expired("progress")||(E.value=u,w.value=c))}function y(u,{scene:c,track:s}){s.finish(c==="error"),c==="normal"&&A(u,{track:s,scene:"finish"})}function T(u,{enhanceFirstArgument:c,track:s}){if(!c)return u;const[F,...M]=u;return[D(_({[j]:!0},u.length?{firstArgument:F}:{}),{getData:()=>E.value,updateData:H=>(A(H,{track:s,scene:"update"}),H)}),...M]}const l=d();function k(...u){const c=l();u=T(u,{enhanceFirstArgument:p,track:c});try{const s=n(...u);return s instanceof Promise?s.then(F=>y(F,{scene:"normal",track:c}),F=>y(F,{scene:"error",track:c})):y(s,{scene:"normal",track:c}),s}catch(s){throw y(s,{scene:"error",track:c}),s}}const v=$(`query${f(o)}`,k,g),h=t.computed(()=>l.tracking.value?w.value?w.value.expired("result"):l.has.finished.value:!1);return D(_({},v),{[o]:E,[`${o}Expired`]:h})}function G(e,o){if(!L(e))throw Error("请配置 options.enhanceFirstArgument = true");const n=e;return arguments.length===2&&n.firstArgument===void 0?D(_({},n),{firstArgument:o}):n}function L(e){return typeof e=="object"&&!!e&&j in e}r.unFirstArgumentEnhanced=G,r.useAsync=$,r.useAsyncData=q,r.useAsyncFunction=$,Object.defineProperty(r,Symbol.toStringTag,{value:"Module"})});
+(function(e,t){typeof exports==`object`&&typeof module<`u`?t(exports,require(`vue`)):typeof define==`function`&&define.amd?define([`exports`,`vue`],t):(e=typeof globalThis<`u`?globalThis:e||self,t(e.VueAsyncx={},e.Vue))})(this,function(e,t){function n(e){if(!e)return``;let t=e[0],n=e.slice(1);return t.toUpperCase()+n}function r(){let e=(0,t.ref)({track:0,progress:0,finished:0,ok:0});function n(){let t=e.value,n=++t.track;return{progress(){t.progress>=n||(t.progress=n)},finish(e=!1){t.finished>=n||(t.finished=n,e||(t.ok=n))},expired(e){return e?e===`progress`?t.progress>n||t.finished>=n:e===`result:ok`?t.progress>n||t.ok>n:t.progress>n||t.finished>n:t.track>n}}}return n.tracking=(0,t.computed)(()=>e.value.track>0),n.latest={finished:(0,t.computed)(()=>e.value.track===e.value.finished),ok:(0,t.computed)(()=>e.value.track===e.value.ok)},n.has={finished:(0,t.computed)(()=>e.value.finished>0),ok:(0,t.computed)(()=>e.value.ok>0),progress:(0,t.computed)(()=>e.value.progress>0)},n}function i(e,t){if(e==null)return{};var n={};for(var r in e)if({}.hasOwnProperty.call(e,r)){if(t.includes(r))continue;n[r]=e[r]}return n}function a(e,t){if(e==null)return{};var n,r,a=i(e,t);if(Object.getOwnPropertySymbols){var o=Object.getOwnPropertySymbols(e);for(r=0;r<o.length;r++)n=o[r],t.includes(n)||{}.propertyIsEnumerable.call(e,n)&&(a[n]=e[n])}return a}var o=[`handlerCreator`];function s(e,t){if(typeof t!=`function`)return e;try{let n=t(e);return typeof n==`function`?n:e}catch(t){return e}}function c(...e){if(!Array.isArray(e)||!e.length)throw TypeError(`参数错误：未传递`);let{name:n,fn:i,options:c}=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 i!=`function`)throw TypeError(`参数错误：fn`);let l=(0,t.ref)(!1),u=(0,t.ref)(),d=(0,t.computed)(()=>{var e;return(e=u.value)==null?void 0:e[0]}),f=(0,t.ref)(),p=r();function m(...e){let t=p(),n=e=>{f.value=void 0,l.value=!0,u.value=e},r=(e,{scene:n})=>{t.finish(n===`error`),!t.expired()&&(n===`error`&&(f.value=e),l.value=!1,u.value=void 0)};n(e);try{let t=i(...e);return t instanceof Promise?t.then(()=>r(void 0,{scene:`normal`}),e=>r(e,{scene:`error`})):r(void 0,{scene:`normal`}),t}catch(e){throw r(e,{scene:`error`}),e}}let h=s(m,c==null?void 0:c.setup);if(c){var g;let e=()=>{},n=Object.assign({},`immediate`in c?{immediate:c.immediate}:{},(g=c.watchOptions)==null?{}:g),{handlerCreator:r}=n,i=a(n,o),{watch:s}=c,l=(()=>{let e=()=>h();if(typeof r!=`function`)return e;try{let t=r(h);return typeof t==`function`?t:e}catch(t){return e}})();(0,t.watch)(s==null?e:s,l,i)}return{[n]:h,[`${n}Loading`]:l,[`${n}Arguments`]:u,[`${n}ArgumentFirst`]:d,[`${n}Error`]:f}}var l=()=>{throw Error(`[vue-asyncx] getAsyncDataContext 必须在 useAsyncData 的封装函数内调用`)};function u(e){let t=l,n=()=>e;l=n;function r(){if(n!==l)throw Error(`[vue-asyncx] 嵌套 AsyncDataContext 必须顺序恢复`);l=t}return r}function d(){return l()}function f(e){"@babel/helpers - typeof";return f=typeof Symbol==`function`&&typeof Symbol.iterator==`symbol`?function(e){return typeof e}:function(e){return e&&typeof Symbol==`function`&&e.constructor===Symbol&&e!==Symbol.prototype?`symbol`:typeof e},f(e)}function p(e,t){if(f(e)!=`object`||!e)return e;var n=e[Symbol.toPrimitive];if(n!==void 0){var r=n.call(e,t||`default`);if(f(r)!=`object`)return r;throw TypeError(`@@toPrimitive must return a primitive value.`)}return(t===`string`?String:Number)(e)}function m(e){var t=p(e,`string`);return f(t)==`symbol`?t:t+``}function h(e,t,n){return(t=m(t))in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}function g(e,t){var n=Object.keys(e);if(Object.getOwnPropertySymbols){var r=Object.getOwnPropertySymbols(e);t&&(r=r.filter(function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable})),n.push.apply(n,r)}return n}function _(e){for(var t=1;t<arguments.length;t++){var n=arguments[t]==null?{}:arguments[t];t%2?g(Object(n),!0).forEach(function(t){h(e,t,n[t])}):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(n)):g(Object(n)).forEach(function(t){Object.defineProperty(e,t,Object.getOwnPropertyDescriptor(n,t))})}return e}var v=[`enhanceFirstArgument`,`initialData`,`shallow`],y=`__va_fae`;function b(...e){if(!Array.isArray(e)||!e.length)throw TypeError(`参数错误：未传递`);let{name:i,fn:o,options:s}=typeof e[0]==`function`?{name:`data`,fn:e[0],options:e[1]}:{name:e[0]||`data`,fn:e[1],options:e[2]};if(typeof i!=`string`)throw TypeError(`参数错误：name`);if(typeof o!=`function`)throw TypeError(`参数错误：fn`);let l=s||{},{enhanceFirstArgument:d,initialData:f,shallow:p}=l,m=a(l,v),h=p?(0,t.shallowRef)(f):(0,t.ref)(f),g=(0,t.shallowRef)();function b(e,{track:t,scene:n,error:r=!1}){n===`update`&&t.progress(),!(n===`update`&&t.expired(`progress`))&&(n===`finish`&&t.finish(r),!(n===`finish`&&t.expired(`result:ok`))&&(n===`finish`&&r||(h.value=e,g.value=t)))}function x(e,{scene:t,track:n}){b(e,{track:n,scene:`finish`,error:t===`error`})}function S({track:e}){return{getData:()=>h.value,updateData:t=>(b(t,{track:e,scene:`update`}),t)}}function C(e,{enhanceFirstArgument:t,track:n}){if(!t)return e;let[r,...i]=e;return[_(_({[y]:!0},e.length?{firstArgument:r}:{}),S({track:n})),...i]}let w=r();function T(...e){let t=w();e=C(e,{enhanceFirstArgument:d,track:t});let n=u(S({track:t}));try{let n=o(...e);return n instanceof Promise?n.then(e=>x(e,{scene:`normal`,track:t}),e=>x(e,{scene:`error`,track:t})):x(n,{scene:`normal`,track:t}),n}catch(e){throw x(e,{scene:`error`,track:t}),e}finally{n()}}let E=c(`query${n(i)}`,T,m),D=(0,t.computed)(()=>w.tracking.value?g.value?g.value.expired(`result`):w.has.finished.value:!1);return _(_({},E),{},{[i]:h,[`${i}Expired`]:D})}function x(e,t){if(!S(e))throw Error(`请配置 options.enhanceFirstArgument = true`);let n=e;return arguments.length===2&&n.firstArgument===void 0?_(_({},n),{},{firstArgument:t}):n}function S(e){return typeof e==`object`&&!!e&&y in e}e.getAsyncDataContext=d,e.unFirstArgumentEnhanced=x,e.useAsync=c,e.useAsyncFunction=c,e.useAsyncData=b});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue-asyncx",
-  "version": "1.8.0",
+  "version": "1.9.0",
   "description": "",
   "type": "module",
   "types": "dist/vue-asyncx.d.ts",
@@ -30,14 +30,14 @@
     "url": "git+https://github.com/xuyimingwork/vue-asyncx.git"
   },
   "devDependencies": {
-    "@types/node": "^20.14.11",
-    "@vitest/coverage-v8": "^2.0.4",
+    "@types/node": "^22.19.1",
+    "@vitest/coverage-v8": "^4.0.14",
+    "@vueuse/core": "^14.0.0",
     "es-toolkit": "^1.42.0",
     "jsdom": "^24.1.1",
-    "typescript": "^5.5.4",
-    "vite": "^5.3.4",
-    "vite-plugin-dts": "4.0.0-beta.1",
-    "vitest": "^2.0.4"
+    "vite": "^6.4.1",
+    "vite-plugin-dts": "^4.5.4",
+    "vitest": "^4.0.14"
   },
   "peerDependencies": {
     "vue": ">=3.0.0"