@pawover/kit 0.2.1 → 0.2.2

package/package.json

@@ -6,7 +6,7 @@
     "url": "https://github.com/pawover"
   },
   "description": "一个基于 TypeScript 的开发工具包",
-  "version": "0.2.1",
+  "version": "0.2.2",
   "type": "module",
   "engines": {
     "node": ">=22.20.0"
@@ -51,34 +51,34 @@
     "./zod/*": "./packages/zod/dist/*"
   },
   "devDependencies": {
-    "@commitlint/cli": "^21.1.0",
-    "@commitlint/config-conventional": "^21.1.0",
-    "@eslint-react/eslint-plugin": "^5.10.0",
-    "@pawover/eslint-rules": "^0.2.1",
+    "@commitlint/cli": "^21.2.1",
+    "@commitlint/config-conventional": "^21.2.0",
+    "@eslint-react/eslint-plugin": "^5.14.6",
+    "@pawover/eslint-rules": "^0.2.2",
     "@playwright/test": "^1.61.1",
     "@stylistic/eslint-plugin": "^6.0.0-beta.5",
     "@types/fs-extra": "^11.0.4",
-    "@types/node": "^26.0.1",
+    "@types/node": "^26.1.1",
     "@vitejs/plugin-react": "^6.0.3",
-    "@vitest/browser-playwright": "^4.1.9",
+    "@vitest/browser-playwright": "^4.1.10",
     "commitizen": "^4.3.2",
     "cz-customizable": "^7.5.4",
-    "eslint": "^10.6.0",
+    "eslint": "^10.7.0",
     "eslint-plugin-antfu": "^3.2.3",
     "eslint-plugin-import-lite": "^0.6.0",
     "eslint-plugin-react-hooks": "^7.1.1",
-    "fs-extra": "^11.3.5",
+    "fs-extra": "^11.3.6",
     "husky": "^9.1.7",
     "jsdom": "^29.1.1",
     "lint-staged": "^17.0.8",
-    "prettier": "^3.9.1",
+    "prettier": "^3.9.5",
     "rimraf": "^6.1.3",
     "taze": "^19.14.1",
-    "tsdown": "^0.22.3",
-    "turbo": "^2.10.0",
+    "tsdown": "^0.22.7",
+    "turbo": "^2.10.4",
     "typescript": "^6.0.3",
-    "typescript-eslint": "^8.62.1",
-    "vitest": "^4.1.9"
+    "typescript-eslint": "^8.63.0",
+    "vitest": "^4.1.10"
   },
   "peerDependencies": {
     "alova": "^3.3.0",

package/packages/hooks/dist/alova.d.ts

@@ -1,9 +1,8 @@
 import { AlovaFrontMiddlewareContext, AlovaMethodHandler, CompleteHandler, ErrorHandler, PaginationHookConfig, RequestHookConfig, SuccessHandler, WatcherHookConfig } from "alova/client";
 import { AlovaGenerics, Method } from "alova";
-
 //#region src/alova/useAlovaPagination.d.ts
 interface HookOptions$2<AG extends AlovaGenerics, L extends any[], Args extends any[]> extends PaginationHookConfig<AG, L> {
-  onBeforeRequest?: ((context: AlovaFrontMiddlewareContext<AG, any[]>) => void) | undefined;
+  onBeforeRequest?: BeforeRequestHandler<AG, any[]> | undefined;
   onSuccess?: SuccessHandler<AG, Args> | undefined;
   onError?: ErrorHandler<AG, Args> | undefined;
   onComplete?: CompleteHandler<AG, Args> | undefined;
@@ -12,7 +11,7 @@ declare function useAlovaPagination<AG extends AlovaGenerics, L extends any[], A
 //#endregion
 //#region src/alova/useAlovaRequest.d.ts
 interface HookOptions$1<AG extends AlovaGenerics, Args extends any[]> extends RequestHookConfig<AG, Args> {
-  onBeforeRequest?: ((context: AlovaFrontMiddlewareContext<AG, Args>) => void) | undefined;
+  onBeforeRequest?: BeforeRequestHandler<AG, Args> | undefined;
   onSuccess?: SuccessHandler<AG, Args> | undefined;
   onError?: ErrorHandler<AG, Args> | undefined;
   onComplete?: CompleteHandler<AG, Args> | undefined;
@@ -21,10 +20,14 @@ declare function useAlovaRequest<AG extends AlovaGenerics, Args extends any[] =
 //#endregion
 //#region src/alova/useAlovaWatcher.d.ts
 interface HookOptions<AG extends AlovaGenerics, Args extends any[]> extends WatcherHookConfig<AG, Args> {
+  onBeforeRequest?: BeforeRequestHandler<AG, Args> | undefined;
   onSuccess?: SuccessHandler<AG, Args> | undefined;
   onError?: ErrorHandler<AG, Args> | undefined;
   onComplete?: CompleteHandler<AG, Args> | undefined;
 }
 declare function useAlovaWatcher<AG extends AlovaGenerics, Args extends any[] = any[]>(methodHandler: Method<AG> | AlovaMethodHandler<AG, Args>, watchingStates: AG["StatesExport"]["Watched"][], hookOptions?: HookOptions<AG, Args>): import("alova/client").UseHookExposure<AG, Args, unknown>;
 //#endregion
-export { useAlovaPagination, useAlovaRequest, useAlovaWatcher };
+//#region src/alova/index.d.ts
+type BeforeRequestHandler<AG extends AlovaGenerics, Args extends any[] = any[]> = (context: AlovaFrontMiddlewareContext<AG, Args>) => void;
+//#endregion
+export { BeforeRequestHandler, useAlovaPagination, useAlovaRequest, useAlovaWatcher };

package/packages/hooks/dist/alova.js

@@ -1,23 +1,20 @@
 import { usePagination, useRequest, useWatcher } from "alova/client";
+//#region src/alova/createBeforeRequestMiddleware.ts
+function createBeforeRequestMiddleware(middleware, onBeforeRequest) {
+	return async (context, next) => {
+		onBeforeRequest?.(context);
+		if (middleware) return middleware(context, next);
+		return next();
+	};
+}
+//#endregion
 //#region src/alova/useAlovaPagination.ts
 function useAlovaPagination(methodHandler, hookOptions) {
 	const options = {
 		...hookOptions,
 		immediate: hookOptions?.immediate ?? true
 	};
-	let isBeforeExecuted = false;
-	let isMiddlewareExecuted = false;
-	if (options.onBeforeRequest) {
-		const middleware = options.middleware;
-		options.middleware = async (context, next) => {
-			!isBeforeExecuted && options.onBeforeRequest?.(context);
-			isBeforeExecuted = true;
-			if (middleware && !isMiddlewareExecuted) {
-				isMiddlewareExecuted = true;
-				await middleware?.(context, next);
-			} else await next();
-		};
-	}
+	if (options.onBeforeRequest) options.middleware = createBeforeRequestMiddleware(options.middleware, options.onBeforeRequest);
 	const exposure = usePagination(methodHandler, options);
 	if (options.onSuccess) exposure.onSuccess(options.onSuccess);
 	if (options.onError) exposure.onError(options.onError);
@@ -31,19 +28,7 @@ function useAlovaRequest(methodHandler, hookOptions) {
 		...hookOptions,
 		immediate: hookOptions?.immediate ?? true
 	};
-	let isBeforeExecuted = false;
-	let isMiddlewareExecuted = false;
-	if (options.onBeforeRequest) {
-		const middleware = options.middleware;
-		options.middleware = async (context, next) => {
-			!isBeforeExecuted && options.onBeforeRequest?.(context);
-			isBeforeExecuted = true;
-			if (middleware && !isMiddlewareExecuted) {
-				isMiddlewareExecuted = true;
-				await middleware?.(context, next);
-			} else await next();
-		};
-	}
+	if (options.onBeforeRequest) options.middleware = createBeforeRequestMiddleware(options.middleware, options.onBeforeRequest);
 	const exposure = useRequest(methodHandler, options);
 	if (options.onSuccess) exposure.onSuccess(options.onSuccess);
 	if (options.onError) exposure.onError(options.onError);
@@ -53,7 +38,8 @@ function useAlovaRequest(methodHandler, hookOptions) {
 //#endregion
 //#region src/alova/useAlovaWatcher.ts
 function useAlovaWatcher(methodHandler, watchingStates, hookOptions = {}) {
-	const options = hookOptions || {};
+	const options = { ...hookOptions };
+	if (options.onBeforeRequest) options.middleware = createBeforeRequestMiddleware(options.middleware, options.onBeforeRequest);
 	const exposure = useWatcher(methodHandler, watchingStates, options);
 	if (options.onSuccess) exposure.onSuccess(options.onSuccess);
 	if (options.onError) exposure.onError(options.onError);

package/packages/hooks/dist/react.d.ts

@@ -1,5 +1,4 @@
 import { EffectCallback, RefObject } from "react";
-
 //#region src/react/useLatest.d.ts
 /**
  * 返回当前最新值的 Hook
@@ -13,7 +12,6 @@ declare function useLatest<T>(value: T): RefObject<T>;
 type AnyFunction<P extends any[] = any[], R = any> = (...arg: P) => R;
 /** 描述异步函数类型 */
 type AnyAsyncFunction<P extends any[] = any[], R = any> = (...args: P) => Promise<R>;
-/** 描述生成器函数类型 */
 //#endregion
 //#region src/react/useMount.d.ts
 /**
@@ -36,7 +34,7 @@ type AnyAsyncFunction<P extends any[] = any[], R = any> = (...args: P) => Promis
  */
 declare function useMount(effect: EffectCallback | AnyAsyncFunction): void;
 //#endregion
-//#region ../../node_modules/.pnpm/type-fest@5.7.0/node_modules/type-fest/source/tuple-to-union.d.ts
+//#region ../../node_modules/.pnpm/type-fest@5.8.0/node_modules/type-fest/source/tuple-to-union.d.ts
 /**
 Convert a tuple/array into a union type of its elements.
 

package/packages/hooks/dist/react.js

@@ -1666,6 +1666,23 @@ function useMount(effect) {
 	}, [effectRef]);
 }
 //#endregion
+//#region ../../node_modules/.pnpm/es-toolkit@1.49.0/node_modules/es-toolkit/dist/_internal/globalThis.mjs
+const globalThis_ = typeof globalThis === "object" && globalThis || typeof window === "object" && window || typeof self === "object" && self || typeof global === "object" && global || (function() {
+	return this;
+})();
+//#endregion
+//#region ../../node_modules/.pnpm/es-toolkit@1.49.0/node_modules/es-toolkit/dist/function/noop.mjs
+/**
+* A no-operation function that does nothing.
+* This can be used as a placeholder or default function.
+*
+* @example
+* noop(); // Does nothing
+*
+* @returns This function does not return anything.
+*/
+function noop() {}
+//#endregion
 //#region ../../node_modules/.pnpm/es-toolkit@1.49.0/node_modules/es-toolkit/dist/predicate/isPrimitive.mjs
 /**
 * Checks whether a value is a JavaScript primitive.
@@ -1770,17 +1787,28 @@ function clone(obj) {
 	return obj;
 }
 //#endregion
-//#region ../../node_modules/.pnpm/es-toolkit@1.49.0/node_modules/es-toolkit/dist/function/noop.mjs
+//#region ../../node_modules/.pnpm/es-toolkit@1.49.0/node_modules/es-toolkit/dist/predicate/isBuffer.mjs
 /**
-* A no-operation function that does nothing.
-* This can be used as a placeholder or default function.
+* Checks if the given value is a Buffer instance.
+*
+* This function tests whether the provided value is an instance of Buffer.
+* It returns `true` if the value is a Buffer, and `false` otherwise.
+*
+* This function can also serve as a type predicate in TypeScript, narrowing the type of the argument to `Buffer`.
+*
+* @param x - The value to check if it is a Buffer.
+* @returns Returns `true` if `x` is a Buffer, else `false`.
 *
 * @example
-* noop(); // Does nothing
+* const buffer = Buffer.from("test");
+* console.log(isBuffer(buffer)); // true
 *
-* @returns This function does not return anything.
+* const notBuffer = "not a buffer";
+* console.log(isBuffer(notBuffer)); // false
 */
-function noop() {}
+function isBuffer(x) {
+	return typeof globalThis_.Buffer !== "undefined" && globalThis_.Buffer.isBuffer(x);
+}
 //#endregion
 //#region ../../node_modules/.pnpm/es-toolkit@1.49.0/node_modules/es-toolkit/dist/compat/_internal/getSymbols.mjs
 function getSymbols(object) {
@@ -1827,34 +1855,6 @@ const bigInt64ArrayTag = "[object BigInt64Array]";
 const float32ArrayTag = "[object Float32Array]";
 const float64ArrayTag = "[object Float64Array]";
 //#endregion
-//#region ../../node_modules/.pnpm/es-toolkit@1.49.0/node_modules/es-toolkit/dist/_internal/globalThis.mjs
-const globalThis_ = typeof globalThis === "object" && globalThis || typeof window === "object" && window || typeof self === "object" && self || typeof global === "object" && global || (function() {
-	return this;
-})();
-//#endregion
-//#region ../../node_modules/.pnpm/es-toolkit@1.49.0/node_modules/es-toolkit/dist/predicate/isBuffer.mjs
-/**
-* Checks if the given value is a Buffer instance.
-*
-* This function tests whether the provided value is an instance of Buffer.
-* It returns `true` if the value is a Buffer, and `false` otherwise.
-*
-* This function can also serve as a type predicate in TypeScript, narrowing the type of the argument to `Buffer`.
-*
-* @param x - The value to check if it is a Buffer.
-* @returns Returns `true` if `x` is a Buffer, else `false`.
-*
-* @example
-* const buffer = Buffer.from("test");
-* console.log(isBuffer(buffer)); // true
-*
-* const notBuffer = "not a buffer";
-* console.log(isBuffer(notBuffer)); // false
-*/
-function isBuffer(x) {
-	return typeof globalThis_.Buffer !== "undefined" && globalThis_.Buffer.isBuffer(x);
-}
-//#endregion
 //#region ../../node_modules/.pnpm/es-toolkit@1.49.0/node_modules/es-toolkit/dist/predicate/isPlainObject.mjs
 /**
 * Checks if a given value is a plain object.