@zwa73/utils 1.0.209 → 1.0.211

package/dist/QuickExport.d.ts

@@ -1,3 +1,4 @@
 import { UtilFT } from "./UtilFileTools";
-export declare const outcome: typeof import("@zwa73/js-utils").JsFunc.outcome, match: typeof import("@zwa73/js-utils").JsFunc.match, matchProc: typeof import("@zwa73/js-utils").JsFunc.matchProc, sucesProc: typeof import("@zwa73/js-utils").JsFunc.sucesProc, isFailed: typeof import("@zwa73/js-utils").JsFunc.isFailed, isSafeNumber: typeof import("@zwa73/js-utils").JsFunc.isSafeNumber, isSuccess: typeof import("@zwa73/js-utils").JsFunc.isSuccess, likeNone: typeof import("@zwa73/js-utils").JsFunc.likeNone, expect: typeof import("@zwa73/js-utils").JsFunc.expect, assertType: typeof import("@zwa73/js-utils").JsFunc.assertType, assertLiteral: typeof import("@zwa73/js-utils").JsFunc.assertLiteral, deepClone: typeof import("@zwa73/js-utils").JsFunc.deepClone, sleep: typeof import("@zwa73/js-utils").JsFunc.sleep, stringifyJToken: typeof import("@zwa73/js-utils").JsFunc.stringifyJToken, getTime: typeof import("@zwa73/js-utils").JsFunc.getTime, mapEntries: typeof import("@zwa73/js-utils").JsFunc.mapEntries, dedent: typeof import("@zwa73/js-utils").JsFunc.dedent, throwError: typeof import("@zwa73/js-utils").JsFunc.throwError, eitherize: typeof import("@zwa73/js-utils").JsFunc.eitherize, taskEitherize: typeof import("@zwa73/js-utils").JsFunc.taskEitherize, memoize: typeof import("@zwa73/js-utils").JsFunc.memoize, ivk: typeof import("@zwa73/js-utils").JsFunc.ivk, l2s: typeof import("@zwa73/js-utils").JsFunc.l2s, s2l: typeof import("@zwa73/js-utils").JsFunc.s2l;
+export declare const outcome: typeof import("@zwa73/js-utils").JsFunc.outcome, success: typeof import("@zwa73/js-utils").JsFunc.success, failed: typeof import("@zwa73/js-utils").JsFunc.failed, match: typeof import("@zwa73/js-utils").JsFunc.match, isSafeNumber: typeof import("@zwa73/js-utils").JsFunc.isSafeNumber, assertType: typeof import("@zwa73/js-utils").JsFunc.assertType, assertLiteral: typeof import("@zwa73/js-utils").JsFunc.assertLiteral, deepClone: typeof import("@zwa73/js-utils").JsFunc.deepClone, sleep: typeof import("@zwa73/js-utils").JsFunc.sleep, stringifyJToken: typeof import("@zwa73/js-utils").JsFunc.stringifyJToken, getTime: typeof import("@zwa73/js-utils").JsFunc.getTime, mapEntries: typeof import("@zwa73/js-utils").JsFunc.mapEntries, dedent: typeof import("@zwa73/js-utils").JsFunc.dedent, throwError: typeof import("@zwa73/js-utils").JsFunc.throwError, eitherize: typeof import("@zwa73/js-utils").JsFunc.eitherize, memoize: typeof import("@zwa73/js-utils").JsFunc.memoize, ivk: typeof import("@zwa73/js-utils").JsFunc.ivk, l2s: typeof import("@zwa73/js-utils").JsFunc.l2s, s2l: typeof import("@zwa73/js-utils").JsFunc.s2l;
 export declare const stylizePath: typeof UtilFT.stylizePath, posixizePath: typeof UtilFT.posixizePath, win32izePath: typeof UtilFT.win32izePath, currosizePath: typeof UtilFT.currosizePath;
+export declare const when: <S extends import("@zwa73/js-utils").Keyable, T, R>(stat: import("@zwa73/js-utils").Literal<S>, f: (arg: Extract<T, import("@zwa73/js-utils").Matchable<S>>) => R) => (arg: T) => ("E" extends import("@zwa73/js-utils").ProperSubsetCheck<symbol, T> ? T | R : import("@zwa73/js-utils").MatchableFlag<T> extends S ? R : import("@zwa73/js-utils").MatchableFlag<T> extends Exclude<S, import("@zwa73/js-utils").MatchableFlag<T>> ? T : Exclude<T, import("@zwa73/js-utils").Matchable<S>> | R), map: typeof import("@zwa73/js-utils").JsFP.map, flow: typeof import("@zwa73/js-utils").JsFP.flow, pipe: typeof import("@zwa73/js-utils").JsFP.pipe, chain: <T, R>(f: (arg: Extract<T, import("@zwa73/js-utils").Matchable<typeof import("@zwa73/js-utils").Success>>) => R) => (arg: T) => ("E" extends import("@zwa73/js-utils").ProperSubsetCheck<symbol, T> ? T | R : import("@zwa73/js-utils").MatchableFlag<T> extends typeof import("@zwa73/js-utils").Success ? R : import("@zwa73/js-utils").MatchableFlag<T> extends Exclude<typeof import("@zwa73/js-utils").Success, import("@zwa73/js-utils").MatchableFlag<T>> ? T : Exclude<T, import("@zwa73/js-utils").Matchable<typeof import("@zwa73/js-utils").Success>> | R), alt: <T, R>(f: (arg: Extract<T, import("@zwa73/js-utils").Matchable<typeof import("@zwa73/js-utils").Failed>>) => R) => (arg: T) => ("E" extends import("@zwa73/js-utils").ProperSubsetCheck<symbol, T> ? T | R : import("@zwa73/js-utils").MatchableFlag<T> extends typeof import("@zwa73/js-utils").Failed ? R : import("@zwa73/js-utils").MatchableFlag<T> extends Exclude<typeof import("@zwa73/js-utils").Failed, import("@zwa73/js-utils").MatchableFlag<T>> ? T : Exclude<T, import("@zwa73/js-utils").Matchable<typeof import("@zwa73/js-utils").Failed>> | R);

package/dist/QuickExport.js

@@ -1,10 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.currosizePath = exports.win32izePath = exports.posixizePath = exports.stylizePath = exports.s2l = exports.l2s = exports.ivk = exports.memoize = exports.taskEitherize = exports.eitherize = exports.throwError = exports.dedent = exports.mapEntries = exports.getTime = exports.stringifyJToken = exports.sleep = exports.deepClone = exports.assertLiteral = exports.assertType = exports.expect = exports.likeNone = exports.isSuccess = exports.isSafeNumber = exports.isFailed = exports.sucesProc = exports.matchProc = exports.match = exports.outcome = void 0;
+exports.alt = exports.chain = exports.pipe = exports.flow = exports.map = exports.when = exports.currosizePath = exports.win32izePath = exports.posixizePath = exports.stylizePath = exports.s2l = exports.l2s = exports.ivk = exports.memoize = exports.eitherize = exports.throwError = exports.dedent = exports.mapEntries = exports.getTime = exports.stringifyJToken = exports.sleep = exports.deepClone = exports.assertLiteral = exports.assertType = exports.isSafeNumber = exports.match = exports.failed = exports.success = exports.outcome = void 0;
 const UtilFileTools_1 = require("./UtilFileTools");
+const UtilFP_1 = require("./UtilFP");
 const UtilFunctions_1 = require("./UtilFunctions");
-exports.outcome = UtilFunctions_1.UtilFunc.outcome, exports.match = UtilFunctions_1.UtilFunc.match, exports.matchProc = UtilFunctions_1.UtilFunc.matchProc, exports.sucesProc = UtilFunctions_1.UtilFunc.sucesProc, exports.isFailed = UtilFunctions_1.UtilFunc.isFailed, exports.isSafeNumber = UtilFunctions_1.UtilFunc.isSafeNumber, exports.isSuccess = UtilFunctions_1.UtilFunc.isSuccess, exports.likeNone = UtilFunctions_1.UtilFunc.likeNone, exports.expect = UtilFunctions_1.UtilFunc.expect, exports.assertType = UtilFunctions_1.UtilFunc.assertType, exports.assertLiteral = UtilFunctions_1.UtilFunc.assertLiteral, exports.deepClone = UtilFunctions_1.UtilFunc.deepClone, exports.sleep = UtilFunctions_1.UtilFunc.sleep, exports.stringifyJToken = UtilFunctions_1.UtilFunc.stringifyJToken, exports.getTime = UtilFunctions_1.UtilFunc.getTime, exports.mapEntries = UtilFunctions_1.UtilFunc.mapEntries, exports.dedent = UtilFunctions_1.UtilFunc.dedent, exports.throwError = UtilFunctions_1.UtilFunc.throwError, exports.eitherize = UtilFunctions_1.UtilFunc.eitherize, exports.taskEitherize = UtilFunctions_1.UtilFunc.taskEitherize, exports.memoize = UtilFunctions_1.UtilFunc.memoize, exports.ivk = UtilFunctions_1.UtilFunc.ivk, exports.l2s = UtilFunctions_1.UtilFunc.l2s, exports.s2l = UtilFunctions_1.UtilFunc.s2l;
+exports.outcome = UtilFunctions_1.UtilFunc.outcome, exports.success = UtilFunctions_1.UtilFunc.success, exports.failed = UtilFunctions_1.UtilFunc.failed, exports.match = UtilFunctions_1.UtilFunc.match, exports.isSafeNumber = UtilFunctions_1.UtilFunc.isSafeNumber, exports.assertType = UtilFunctions_1.UtilFunc.assertType, exports.assertLiteral = UtilFunctions_1.UtilFunc.assertLiteral, exports.deepClone = UtilFunctions_1.UtilFunc.deepClone, exports.sleep = UtilFunctions_1.UtilFunc.sleep, exports.stringifyJToken = UtilFunctions_1.UtilFunc.stringifyJToken, exports.getTime = UtilFunctions_1.UtilFunc.getTime, exports.mapEntries = UtilFunctions_1.UtilFunc.mapEntries, exports.dedent = UtilFunctions_1.UtilFunc.dedent, exports.throwError = UtilFunctions_1.UtilFunc.throwError, exports.eitherize = UtilFunctions_1.UtilFunc.eitherize, exports.memoize = UtilFunctions_1.UtilFunc.memoize, exports.ivk = UtilFunctions_1.UtilFunc.ivk, exports.l2s = UtilFunctions_1.UtilFunc.l2s, exports.s2l = UtilFunctions_1.UtilFunc.s2l;
 exports.stylizePath = UtilFileTools_1.UtilFT.stylizePath, exports.posixizePath = UtilFileTools_1.UtilFT.posixizePath, exports.win32izePath = UtilFileTools_1.UtilFT.win32izePath, exports.currosizePath = UtilFileTools_1.UtilFT.currosizePath;
+exports.when = UtilFP_1.UtilFP.when, exports.map = UtilFP_1.UtilFP.map, exports.flow = UtilFP_1.UtilFP.flow, exports.pipe = UtilFP_1.UtilFP.pipe, exports.chain = UtilFP_1.UtilFP.chain, exports.alt = UtilFP_1.UtilFP.alt;
 if (false) {
     //let aaser = assertLiteral({a:1});
     //let a:"asd"|"dsa" = null as any;

package/dist/UtilCom.js

@@ -67,7 +67,7 @@ class UtilCom {
     }
     /**设置agent */
     proxyAgent(url) {
-        this._data.agent = UtilFunctions_1.UtilFunc.matchProc(this._data['protocol'], {
+        this._data.agent = UtilFunctions_1.UtilFunc.match(this._data['protocol'], {
             'http:': () => (0, http_proxy_agent_1.default)(url),
             'https:': () => (0, https_proxy_agent_1.default)(url),
         });

package/dist/UtilDecorators.d.ts

@@ -1 +1 @@
-export { ParamsDecoratorsGener, BaseDecoratorsGener, LogTime, LogTimeAsync, LogCall, LogCallAsync, LogErr, LogErrAsync, Defer, DeferAsync, Catch, CatchAsync, AwaitInited } from "@zwa73/js-utils";
+export { ParamsDecoratorsGener, BaseDecoratorsGener, LogTraceOpt, LogTrace, PostProcessOpt, PostProcess, AwaitInited } from "@zwa73/js-utils";

package/dist/UtilDecorators.js

@@ -1,17 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AwaitInited = exports.CatchAsync = exports.Catch = exports.DeferAsync = exports.Defer = exports.LogErrAsync = exports.LogErr = exports.LogCallAsync = exports.LogCall = exports.LogTimeAsync = exports.LogTime = void 0;
+exports.AwaitInited = exports.PostProcess = exports.LogTrace = void 0;
 //#region UtilDecorators转导
 var js_utils_1 = require("@zwa73/js-utils");
-Object.defineProperty(exports, "LogTime", { enumerable: true, get: function () { return js_utils_1.LogTime; } });
-Object.defineProperty(exports, "LogTimeAsync", { enumerable: true, get: function () { return js_utils_1.LogTimeAsync; } });
-Object.defineProperty(exports, "LogCall", { enumerable: true, get: function () { return js_utils_1.LogCall; } });
-Object.defineProperty(exports, "LogCallAsync", { enumerable: true, get: function () { return js_utils_1.LogCallAsync; } });
-Object.defineProperty(exports, "LogErr", { enumerable: true, get: function () { return js_utils_1.LogErr; } });
-Object.defineProperty(exports, "LogErrAsync", { enumerable: true, get: function () { return js_utils_1.LogErrAsync; } });
-Object.defineProperty(exports, "Defer", { enumerable: true, get: function () { return js_utils_1.Defer; } });
-Object.defineProperty(exports, "DeferAsync", { enumerable: true, get: function () { return js_utils_1.DeferAsync; } });
-Object.defineProperty(exports, "Catch", { enumerable: true, get: function () { return js_utils_1.Catch; } });
-Object.defineProperty(exports, "CatchAsync", { enumerable: true, get: function () { return js_utils_1.CatchAsync; } });
+Object.defineProperty(exports, "LogTrace", { enumerable: true, get: function () { return js_utils_1.LogTrace; } });
+Object.defineProperty(exports, "PostProcess", { enumerable: true, get: function () { return js_utils_1.PostProcess; } });
 Object.defineProperty(exports, "AwaitInited", { enumerable: true, get: function () { return js_utils_1.AwaitInited; } });
 //#endregion

package/dist/UtilFP.d.ts

@@ -1,120 +1,2 @@
-import { AnyRecord, Keyable, Literal, Matchable, MatchableFlag, ProperSubsetCheck } from "./UtilInterfaces";
-import { FailedLike } from "./UtilSymbol";
-/**常用函数式编程库 */
-export declare namespace UtilFP {
-    /**柯里化函数类型 */
-    type CurryFunc<T, PrevArgs extends unknown[] = []> = T extends (...args: infer Args) => infer Result ? Args extends [infer Arg, ...infer RestArgs] ? RestArgs extends [] ? ((...args: [...PrevArgs, Arg]) => Result) : ((...args: [...PrevArgs, Arg]) => CurryFunc<(...rest: RestArgs) => Result>) & (CurryFunc<(...args: RestArgs) => Result, [...PrevArgs, Arg]>) : Args extends [] ? () => Result : "CurryFunc错误 默认参数可选无法被识别" & Error : "CurryFunc错误 传入的并非函数" & Error;
-    /**柯里化转换
-    * @param {T} fn - 将要转换的函数
-    * @returns {CurryFunc<T>} 柯里化的函数
-    */
-    export function curry<T extends Function>(fn: T): CurryFunc<T>;
-    /**可组合的函数 */
-    type CompFunc<T, R> = (arg: T) => R;
-    /**函数管道组合
-     * 从左到右执行
-     * @param fs - 待组合的函数
-     * @returns 组合完成的函数
-     */
-    export function flow<I, R1, R2, R3, R4, R5, R6, R7, R8, R9, R10, R11, R12, R13, R14, R15, R16, R17, R18, R19, R20>(f1: CompFunc<I, R1>, f2: CompFunc<R1, R2>, f3: CompFunc<R2, R3>, f4: CompFunc<R3, R4>, f5: CompFunc<R4, R5>, f6: CompFunc<R5, R6>, f7: CompFunc<R6, R7>, f8: CompFunc<R7, R8>, f9: CompFunc<R8, R9>, f10: CompFunc<R9, R10>, f11: CompFunc<R10, R11>, f12: CompFunc<R11, R12>, f13: CompFunc<R12, R13>, f14: CompFunc<R13, R14>, f15: CompFunc<R14, R15>, f16: CompFunc<R15, R16>, f17: CompFunc<R16, R17>, f18: CompFunc<R17, R18>, f19: CompFunc<R18, R19>, f20: CompFunc<R19, R20>, ...fs: CompFunc<R20, R20>[]): CompFunc<I, R20>;
-    export function flow<I, R1, R2, R3, R4, R5, R6, R7, R8, R9, R10, R11, R12, R13, R14, R15, R16, R17, R18, R19>(f1: CompFunc<I, R1>, f2: CompFunc<R1, R2>, f3: CompFunc<R2, R3>, f4: CompFunc<R3, R4>, f5: CompFunc<R4, R5>, f6: CompFunc<R5, R6>, f7: CompFunc<R6, R7>, f8: CompFunc<R7, R8>, f9: CompFunc<R8, R9>, f10: CompFunc<R9, R10>, f11: CompFunc<R10, R11>, f12: CompFunc<R11, R12>, f13: CompFunc<R12, R13>, f14: CompFunc<R13, R14>, f15: CompFunc<R14, R15>, f16: CompFunc<R15, R16>, f17: CompFunc<R16, R17>, f18: CompFunc<R17, R18>, f19: CompFunc<R18, R19>, ...fs: CompFunc<R19, R19>[]): CompFunc<I, R19>;
-    export function flow<I, R1, R2, R3, R4, R5, R6, R7, R8, R9, R10, R11, R12, R13, R14, R15, R16, R17, R18>(f1: CompFunc<I, R1>, f2: CompFunc<R1, R2>, f3: CompFunc<R2, R3>, f4: CompFunc<R3, R4>, f5: CompFunc<R4, R5>, f6: CompFunc<R5, R6>, f7: CompFunc<R6, R7>, f8: CompFunc<R7, R8>, f9: CompFunc<R8, R9>, f10: CompFunc<R9, R10>, f11: CompFunc<R10, R11>, f12: CompFunc<R11, R12>, f13: CompFunc<R12, R13>, f14: CompFunc<R13, R14>, f15: CompFunc<R14, R15>, f16: CompFunc<R15, R16>, f17: CompFunc<R16, R17>, f18: CompFunc<R17, R18>, ...fs: CompFunc<R18, R18>[]): CompFunc<I, R18>;
-    export function flow<I, R1, R2, R3, R4, R5, R6, R7, R8, R9, R10, R11, R12, R13, R14, R15, R16, R17>(f1: CompFunc<I, R1>, f2: CompFunc<R1, R2>, f3: CompFunc<R2, R3>, f4: CompFunc<R3, R4>, f5: CompFunc<R4, R5>, f6: CompFunc<R5, R6>, f7: CompFunc<R6, R7>, f8: CompFunc<R7, R8>, f9: CompFunc<R8, R9>, f10: CompFunc<R9, R10>, f11: CompFunc<R10, R11>, f12: CompFunc<R11, R12>, f13: CompFunc<R12, R13>, f14: CompFunc<R13, R14>, f15: CompFunc<R14, R15>, f16: CompFunc<R15, R16>, f17: CompFunc<R16, R17>, ...fs: CompFunc<R17, R17>[]): CompFunc<I, R17>;
-    export function flow<I, R1, R2, R3, R4, R5, R6, R7, R8, R9, R10, R11, R12, R13, R14, R15, R16>(f1: CompFunc<I, R1>, f2: CompFunc<R1, R2>, f3: CompFunc<R2, R3>, f4: CompFunc<R3, R4>, f5: CompFunc<R4, R5>, f6: CompFunc<R5, R6>, f7: CompFunc<R6, R7>, f8: CompFunc<R7, R8>, f9: CompFunc<R8, R9>, f10: CompFunc<R9, R10>, f11: CompFunc<R10, R11>, f12: CompFunc<R11, R12>, f13: CompFunc<R12, R13>, f14: CompFunc<R13, R14>, f15: CompFunc<R14, R15>, f16: CompFunc<R15, R16>, ...fs: CompFunc<R16, R16>[]): CompFunc<I, R16>;
-    export function flow<I, R1, R2, R3, R4, R5, R6, R7, R8, R9, R10, R11, R12, R13, R14, R15>(f1: CompFunc<I, R1>, f2: CompFunc<R1, R2>, f3: CompFunc<R2, R3>, f4: CompFunc<R3, R4>, f5: CompFunc<R4, R5>, f6: CompFunc<R5, R6>, f7: CompFunc<R6, R7>, f8: CompFunc<R7, R8>, f9: CompFunc<R8, R9>, f10: CompFunc<R9, R10>, f11: CompFunc<R10, R11>, f12: CompFunc<R11, R12>, f13: CompFunc<R12, R13>, f14: CompFunc<R13, R14>, f15: CompFunc<R14, R15>, ...fs: CompFunc<R15, R15>[]): CompFunc<I, R15>;
-    export function flow<I, R1, R2, R3, R4, R5, R6, R7, R8, R9, R10, R11, R12, R13, R14>(f1: CompFunc<I, R1>, f2: CompFunc<R1, R2>, f3: CompFunc<R2, R3>, f4: CompFunc<R3, R4>, f5: CompFunc<R4, R5>, f6: CompFunc<R5, R6>, f7: CompFunc<R6, R7>, f8: CompFunc<R7, R8>, f9: CompFunc<R8, R9>, f10: CompFunc<R9, R10>, f11: CompFunc<R10, R11>, f12: CompFunc<R11, R12>, f13: CompFunc<R12, R13>, f14: CompFunc<R13, R14>, ...fs: CompFunc<R14, R14>[]): CompFunc<I, R14>;
-    export function flow<I, R1, R2, R3, R4, R5, R6, R7, R8, R9, R10, R11, R12, R13>(f1: CompFunc<I, R1>, f2: CompFunc<R1, R2>, f3: CompFunc<R2, R3>, f4: CompFunc<R3, R4>, f5: CompFunc<R4, R5>, f6: CompFunc<R5, R6>, f7: CompFunc<R6, R7>, f8: CompFunc<R7, R8>, f9: CompFunc<R8, R9>, f10: CompFunc<R9, R10>, f11: CompFunc<R10, R11>, f12: CompFunc<R11, R12>, f13: CompFunc<R12, R13>, ...fs: CompFunc<R13, R13>[]): CompFunc<I, R13>;
-    export function flow<I, R1, R2, R3, R4, R5, R6, R7, R8, R9, R10, R11, R12>(f1: CompFunc<I, R1>, f2: CompFunc<R1, R2>, f3: CompFunc<R2, R3>, f4: CompFunc<R3, R4>, f5: CompFunc<R4, R5>, f6: CompFunc<R5, R6>, f7: CompFunc<R6, R7>, f8: CompFunc<R7, R8>, f9: CompFunc<R8, R9>, f10: CompFunc<R9, R10>, f11: CompFunc<R10, R11>, f12: CompFunc<R11, R12>, ...fs: CompFunc<R12, R12>[]): CompFunc<I, R12>;
-    export function flow<I, R1, R2, R3, R4, R5, R6, R7, R8, R9, R10, R11>(f1: CompFunc<I, R1>, f2: CompFunc<R1, R2>, f3: CompFunc<R2, R3>, f4: CompFunc<R3, R4>, f5: CompFunc<R4, R5>, f6: CompFunc<R5, R6>, f7: CompFunc<R6, R7>, f8: CompFunc<R7, R8>, f9: CompFunc<R8, R9>, f10: CompFunc<R9, R10>, f11: CompFunc<R10, R11>, ...fs: CompFunc<R11, R11>[]): CompFunc<I, R11>;
-    export function flow<I, R1, R2, R3, R4, R5, R6, R7, R8, R9, R10>(f1: CompFunc<I, R1>, f2: CompFunc<R1, R2>, f3: CompFunc<R2, R3>, f4: CompFunc<R3, R4>, f5: CompFunc<R4, R5>, f6: CompFunc<R5, R6>, f7: CompFunc<R6, R7>, f8: CompFunc<R7, R8>, f9: CompFunc<R8, R9>, f10: CompFunc<R9, R10>, ...fs: CompFunc<R10, R10>[]): CompFunc<I, R10>;
-    export function flow<I, R1, R2, R3, R4, R5, R6, R7, R8, R9>(f1: CompFunc<I, R1>, f2: CompFunc<R1, R2>, f3: CompFunc<R2, R3>, f4: CompFunc<R3, R4>, f5: CompFunc<R4, R5>, f6: CompFunc<R5, R6>, f7: CompFunc<R6, R7>, f8: CompFunc<R7, R8>, f9: CompFunc<R8, R9>, ...fs: CompFunc<R9, R9>[]): CompFunc<I, R9>;
-    export function flow<I, R1, R2, R3, R4, R5, R6, R7, R8>(f1: CompFunc<I, R1>, f2: CompFunc<R1, R2>, f3: CompFunc<R2, R3>, f4: CompFunc<R3, R4>, f5: CompFunc<R4, R5>, f6: CompFunc<R5, R6>, f7: CompFunc<R6, R7>, f8: CompFunc<R7, R8>, ...fs: CompFunc<R8, R8>[]): CompFunc<I, R8>;
-    export function flow<I, R1, R2, R3, R4, R5, R6, R7>(f1: CompFunc<I, R1>, f2: CompFunc<R1, R2>, f3: CompFunc<R2, R3>, f4: CompFunc<R3, R4>, f5: CompFunc<R4, R5>, f6: CompFunc<R5, R6>, f7: CompFunc<R6, R7>, ...fs: CompFunc<R7, R7>[]): CompFunc<I, R7>;
-    export function flow<I, R1, R2, R3, R4, R5, R6>(f1: CompFunc<I, R1>, f2: CompFunc<R1, R2>, f3: CompFunc<R2, R3>, f4: CompFunc<R3, R4>, f5: CompFunc<R4, R5>, f6: CompFunc<R5, R6>, ...fs: CompFunc<R6, R6>[]): CompFunc<I, R6>;
-    export function flow<I, R1, R2, R3, R4, R5>(f1: CompFunc<I, R1>, f2: CompFunc<R1, R2>, f3: CompFunc<R2, R3>, f4: CompFunc<R3, R4>, f5: CompFunc<R4, R5>, ...fs: CompFunc<R5, R5>[]): CompFunc<I, R5>;
-    export function flow<I, R1, R2, R3, R4>(f1: CompFunc<I, R1>, f2: CompFunc<R1, R2>, f3: CompFunc<R2, R3>, f4: CompFunc<R3, R4>, ...fs: CompFunc<R4, R4>[]): CompFunc<I, R4>;
-    export function flow<I, R1, R2, R3>(f1: CompFunc<I, R1>, f2: CompFunc<R1, R2>, f3: CompFunc<R2, R3>, ...fs: CompFunc<R3, R3>[]): CompFunc<I, R3>;
-    export function flow<I, R1, R2>(f1: CompFunc<I, R1>, f2: CompFunc<R1, R2>, ...fs: CompFunc<R2, R2>[]): CompFunc<I, R2>;
-    export function flow<I, R1>(f1: CompFunc<I, R1>, ...fs: CompFunc<R1, R1>[]): CompFunc<I, R1>;
-    export function flow<I>(...fs: CompFunc<I, I>[]): CompFunc<I, I>;
-    /**函数管道
-     * 从左到右执行
-     * @param input - 初始输入值
-     * @param fs    - 待组合的函数
-     * @returns 经过所有函数处理后的结果
-     */
-    export function pipe<I, R1, R2, R3, R4, R5, R6, R7, R8, R9, R10, R11, R12, R13, R14, R15, R16, R17, R18, R19, R20>(input: I, f1: CompFunc<I, R1>, f2: CompFunc<R1, R2>, f3: CompFunc<R2, R3>, f4: CompFunc<R3, R4>, f5: CompFunc<R4, R5>, f6: CompFunc<R5, R6>, f7: CompFunc<R6, R7>, f8: CompFunc<R7, R8>, f9: CompFunc<R8, R9>, f10: CompFunc<R9, R10>, f11: CompFunc<R10, R11>, f12: CompFunc<R11, R12>, f13: CompFunc<R12, R13>, f14: CompFunc<R13, R14>, f15: CompFunc<R14, R15>, f16: CompFunc<R15, R16>, f17: CompFunc<R16, R17>, f18: CompFunc<R17, R18>, f19: CompFunc<R18, R19>, f20: CompFunc<R19, R20>, ...fs: CompFunc<R20, R20>[]): R20;
-    export function pipe<I, R1, R2, R3, R4, R5, R6, R7, R8, R9, R10, R11, R12, R13, R14, R15, R16, R17, R18, R19>(input: I, f1: CompFunc<I, R1>, f2: CompFunc<R1, R2>, f3: CompFunc<R2, R3>, f4: CompFunc<R3, R4>, f5: CompFunc<R4, R5>, f6: CompFunc<R5, R6>, f7: CompFunc<R6, R7>, f8: CompFunc<R7, R8>, f9: CompFunc<R8, R9>, f10: CompFunc<R9, R10>, f11: CompFunc<R10, R11>, f12: CompFunc<R11, R12>, f13: CompFunc<R12, R13>, f14: CompFunc<R13, R14>, f15: CompFunc<R14, R15>, f16: CompFunc<R15, R16>, f17: CompFunc<R16, R17>, f18: CompFunc<R17, R18>, f19: CompFunc<R18, R19>, ...fs: CompFunc<R19, R19>[]): R19;
-    export function pipe<I, R1, R2, R3, R4, R5, R6, R7, R8, R9, R10, R11, R12, R13, R14, R15, R16, R17, R18>(input: I, f1: CompFunc<I, R1>, f2: CompFunc<R1, R2>, f3: CompFunc<R2, R3>, f4: CompFunc<R3, R4>, f5: CompFunc<R4, R5>, f6: CompFunc<R5, R6>, f7: CompFunc<R6, R7>, f8: CompFunc<R7, R8>, f9: CompFunc<R8, R9>, f10: CompFunc<R9, R10>, f11: CompFunc<R10, R11>, f12: CompFunc<R11, R12>, f13: CompFunc<R12, R13>, f14: CompFunc<R13, R14>, f15: CompFunc<R14, R15>, f16: CompFunc<R15, R16>, f17: CompFunc<R16, R17>, f18: CompFunc<R17, R18>, ...fs: CompFunc<R18, R18>[]): R18;
-    export function pipe<I, R1, R2, R3, R4, R5, R6, R7, R8, R9, R10, R11, R12, R13, R14, R15, R16, R17>(input: I, f1: CompFunc<I, R1>, f2: CompFunc<R1, R2>, f3: CompFunc<R2, R3>, f4: CompFunc<R3, R4>, f5: CompFunc<R4, R5>, f6: CompFunc<R5, R6>, f7: CompFunc<R6, R7>, f8: CompFunc<R7, R8>, f9: CompFunc<R8, R9>, f10: CompFunc<R9, R10>, f11: CompFunc<R10, R11>, f12: CompFunc<R11, R12>, f13: CompFunc<R12, R13>, f14: CompFunc<R13, R14>, f15: CompFunc<R14, R15>, f16: CompFunc<R15, R16>, f17: CompFunc<R16, R17>, ...fs: CompFunc<R17, R17>[]): R17;
-    export function pipe<I, R1, R2, R3, R4, R5, R6, R7, R8, R9, R10, R11, R12, R13, R14, R15, R16>(input: I, f1: CompFunc<I, R1>, f2: CompFunc<R1, R2>, f3: CompFunc<R2, R3>, f4: CompFunc<R3, R4>, f5: CompFunc<R4, R5>, f6: CompFunc<R5, R6>, f7: CompFunc<R6, R7>, f8: CompFunc<R7, R8>, f9: CompFunc<R8, R9>, f10: CompFunc<R9, R10>, f11: CompFunc<R10, R11>, f12: CompFunc<R11, R12>, f13: CompFunc<R12, R13>, f14: CompFunc<R13, R14>, f15: CompFunc<R14, R15>, f16: CompFunc<R15, R16>, ...fs: CompFunc<R16, R16>[]): R16;
-    export function pipe<I, R1, R2, R3, R4, R5, R6, R7, R8, R9, R10, R11, R12, R13, R14, R15>(input: I, f1: CompFunc<I, R1>, f2: CompFunc<R1, R2>, f3: CompFunc<R2, R3>, f4: CompFunc<R3, R4>, f5: CompFunc<R4, R5>, f6: CompFunc<R5, R6>, f7: CompFunc<R6, R7>, f8: CompFunc<R7, R8>, f9: CompFunc<R8, R9>, f10: CompFunc<R9, R10>, f11: CompFunc<R10, R11>, f12: CompFunc<R11, R12>, f13: CompFunc<R12, R13>, f14: CompFunc<R13, R14>, f15: CompFunc<R14, R15>, ...fs: CompFunc<R15, R15>[]): R15;
-    export function pipe<I, R1, R2, R3, R4, R5, R6, R7, R8, R9, R10, R11, R12, R13, R14>(input: I, f1: CompFunc<I, R1>, f2: CompFunc<R1, R2>, f3: CompFunc<R2, R3>, f4: CompFunc<R3, R4>, f5: CompFunc<R4, R5>, f6: CompFunc<R5, R6>, f7: CompFunc<R6, R7>, f8: CompFunc<R7, R8>, f9: CompFunc<R8, R9>, f10: CompFunc<R9, R10>, f11: CompFunc<R10, R11>, f12: CompFunc<R11, R12>, f13: CompFunc<R12, R13>, f14: CompFunc<R13, R14>, ...fs: CompFunc<R14, R14>[]): R14;
-    export function pipe<I, R1, R2, R3, R4, R5, R6, R7, R8, R9, R10, R11, R12, R13>(input: I, f1: CompFunc<I, R1>, f2: CompFunc<R1, R2>, f3: CompFunc<R2, R3>, f4: CompFunc<R3, R4>, f5: CompFunc<R4, R5>, f6: CompFunc<R5, R6>, f7: CompFunc<R6, R7>, f8: CompFunc<R7, R8>, f9: CompFunc<R8, R9>, f10: CompFunc<R9, R10>, f11: CompFunc<R10, R11>, f12: CompFunc<R11, R12>, f13: CompFunc<R12, R13>, ...fs: CompFunc<R13, R13>[]): R13;
-    export function pipe<I, R1, R2, R3, R4, R5, R6, R7, R8, R9, R10, R11, R12>(input: I, f1: CompFunc<I, R1>, f2: CompFunc<R1, R2>, f3: CompFunc<R2, R3>, f4: CompFunc<R3, R4>, f5: CompFunc<R4, R5>, f6: CompFunc<R5, R6>, f7: CompFunc<R6, R7>, f8: CompFunc<R7, R8>, f9: CompFunc<R8, R9>, f10: CompFunc<R9, R10>, f11: CompFunc<R10, R11>, f12: CompFunc<R11, R12>, ...fs: CompFunc<R12, R12>[]): R12;
-    export function pipe<I, R1, R2, R3, R4, R5, R6, R7, R8, R9, R10, R11>(input: I, f1: CompFunc<I, R1>, f2: CompFunc<R1, R2>, f3: CompFunc<R2, R3>, f4: CompFunc<R3, R4>, f5: CompFunc<R4, R5>, f6: CompFunc<R5, R6>, f7: CompFunc<R6, R7>, f8: CompFunc<R7, R8>, f9: CompFunc<R8, R9>, f10: CompFunc<R9, R10>, f11: CompFunc<R10, R11>, ...fs: CompFunc<R11, R11>[]): R11;
-    export function pipe<I, R1, R2, R3, R4, R5, R6, R7, R8, R9, R10>(input: I, f1: CompFunc<I, R1>, f2: CompFunc<R1, R2>, f3: CompFunc<R2, R3>, f4: CompFunc<R3, R4>, f5: CompFunc<R4, R5>, f6: CompFunc<R5, R6>, f7: CompFunc<R6, R7>, f8: CompFunc<R7, R8>, f9: CompFunc<R8, R9>, f10: CompFunc<R9, R10>, ...fs: CompFunc<R10, R10>[]): R10;
-    export function pipe<I, R1, R2, R3, R4, R5, R6, R7, R8, R9>(input: I, f1: CompFunc<I, R1>, f2: CompFunc<R1, R2>, f3: CompFunc<R2, R3>, f4: CompFunc<R3, R4>, f5: CompFunc<R4, R5>, f6: CompFunc<R5, R6>, f7: CompFunc<R6, R7>, f8: CompFunc<R7, R8>, f9: CompFunc<R8, R9>, ...fs: CompFunc<R9, R9>[]): R9;
-    export function pipe<I, R1, R2, R3, R4, R5, R6, R7, R8>(input: I, f1: CompFunc<I, R1>, f2: CompFunc<R1, R2>, f3: CompFunc<R2, R3>, f4: CompFunc<R3, R4>, f5: CompFunc<R4, R5>, f6: CompFunc<R5, R6>, f7: CompFunc<R6, R7>, f8: CompFunc<R7, R8>, ...fs: CompFunc<R8, R8>[]): R8;
-    export function pipe<I, R1, R2, R3, R4, R5, R6, R7>(input: I, f1: CompFunc<I, R1>, f2: CompFunc<R1, R2>, f3: CompFunc<R2, R3>, f4: CompFunc<R3, R4>, f5: CompFunc<R4, R5>, f6: CompFunc<R5, R6>, f7: CompFunc<R6, R7>, ...fs: CompFunc<R7, R7>[]): R7;
-    export function pipe<I, R1, R2, R3, R4, R5, R6>(input: I, f1: CompFunc<I, R1>, f2: CompFunc<R1, R2>, f3: CompFunc<R2, R3>, f4: CompFunc<R3, R4>, f5: CompFunc<R4, R5>, f6: CompFunc<R5, R6>, ...fs: CompFunc<R6, R6>[]): R6;
-    export function pipe<I, R1, R2, R3, R4, R5>(input: I, f1: CompFunc<I, R1>, f2: CompFunc<R1, R2>, f3: CompFunc<R2, R3>, f4: CompFunc<R3, R4>, f5: CompFunc<R4, R5>, ...fs: CompFunc<R5, R5>[]): R5;
-    export function pipe<I, R1, R2, R3, R4>(input: I, f1: CompFunc<I, R1>, f2: CompFunc<R1, R2>, f3: CompFunc<R2, R3>, f4: CompFunc<R3, R4>, ...fs: CompFunc<R4, R4>[]): R4;
-    export function pipe<I, R1, R2, R3>(input: I, f1: CompFunc<I, R1>, f2: CompFunc<R1, R2>, f3: CompFunc<R2, R3>, ...fs: CompFunc<R3, R3>[]): R3;
-    export function pipe<I, R1, R2>(input: I, f1: CompFunc<I, R1>, f2: CompFunc<R1, R2>, ...fs: CompFunc<R2, R2>[]): R2;
-    export function pipe<I, R1>(input: I, f1: CompFunc<I, R1>, ...fs: CompFunc<R1, R1>[]): R1;
-    export function pipe<I>(input: I, ...fs: CompFunc<I, I>[]): I;
-    /**将一个字段加入一个对象中, 返回新类型 */
-    /**绑定一个键和一个值到一个基础对象上, 并返回一个新的对象
-     * 新的对象包含了基础对象的所有属性, 以及一个新的属性,
-     * 这个新的属性的键是`key`, 值是`value`
-     * @template K  - 要添加到对象的键的类型 必须为字面量
-     * @template V  - 要添加到对象的值的类型
-     * @param key   - 要添加到对象的键 必须为字面量
-     * @param value - 要添加到对象的值
-     * @returns 一个函数, 这个函数接受一个基础对象,
-     * 然后返回一个新的对象新的对象包含了基础对象的所有属性,
-     * 以及一个新的属性, 这个新的属性的键是`key`, 值是`value`
-     */
-    export function bind<K extends Keyable, V>(key: Literal<K>, value: V): <B extends AnyRecord>(base?: B) => keyof B extends K ? "Base中已有对应键" & Error : {
-        [P in K | keyof B]: P extends K ? V : P extends keyof B ? B[P] : never;
-    };
-    /**绑定一个键到一个基础对象上,
-     * 并返回一个新的对象新的对象包含了基础对象的所有属性,
-     * 以及一个新的属性, 这个新的属性的键是`key`, 值是基础对象
-     * @template K - 要添加到对象的键的类型 必须为字面量
-     * @param key  - 要添加到对象的键 必须为字面量
-     * @returns 一个函数, 这个函数接受一个基础对象,
-     * 然后返回一个新的对象新的对象包含了基础对象的所有属性,
-     * 以及一个新的属性, 这个新的属性的键是`key`, 值是基础对象
-     */
-    export function bind<K extends Keyable>(key: Literal<K>): <B extends AnyRecord>(base?: B) => {
-        [P in K]: B;
-    };
-    /**绑定一个键和一个值到一个基础对象上, 并返回一个新的对象
-     * 新的对象包含了基础对象的所有属性, 以及一个新的属性,
-     * 这个新的属性的键是`key`, 值是`value`
-     * @template K  - 要添加到对象的键的类型 必须为字面量
-     * @template V  - 要添加到对象的值的类型
-     * @template B  - 基础对象的类型
-     * @param key   - 要添加到对象的键 必须为字面量
-     * @param value - 要添加到对象的值
-     * @param base  - 基础对象
-     * @returns 完成绑定的基础对象
-     */
-    export function bind<K extends Keyable, V, B extends AnyRecord>(key: Literal<K>, value: V, base: B): keyof B extends K ? "Base中已有对应键" & Error : {
-        [P in K | keyof B]: P extends K ? V : P extends keyof B ? B[P] : never;
-    };
-    /**创建一个对对象的每个属性进行映射的函数
-     * @param func   - 映射函数, 接受一个属性值和它的键, 返回一个新的属性值
-     * @returns 一个函数, 这个函数接受一个对象, 然后返回一个新的对象新的对象的每个属性都是原始对象的属性经过映射函数处理后的结果
-     */
-    export function map<VAL, OUT, KEY extends symbol | string = string>(func: (input: VAL, k: KEY) => OUT): <OM extends Record<KEY, VAL>>(input: OM) => keyof OM extends KEY ? {
-        [P in keyof OM]: OUT;
-    } : "map函数传入的键类型无法处理此对象" & Error;
-    /**创建在传入值为失败时不运行的函数 */
-    export const chain: <T, R>(f: (arg: T) => R) => (arg: T) => "E" extends ProperSubsetCheck<symbol, T> ? T | R : T extends Matchable<FailedLike> ? T : MatchableFlag<T> extends Exclude<MatchableFlag<T>, FailedLike> ? R : T | R;
-    /**创建在传入值为失败时才会尝试运行的函数 */
-    export const alt: <T, R>(f: CompFunc<T, R>) => (arg: T) => "E" extends ProperSubsetCheck<symbol, T> ? T | R : T extends Matchable<FailedLike> ? R : MatchableFlag<T> extends Exclude<MatchableFlag<T>, FailedLike> ? T : T | R;
-    export {};
-}
+import { JsFP } from "@zwa73/js-utils";
+export declare const UtilFP: typeof JsFP;

package/dist/UtilFP.js

@@ -1,82 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.UtilFP = void 0;
-const QuickExport_1 = require("./QuickExport");
-/**常用函数式编程库 */
-var UtilFP;
-(function (UtilFP) {
-    /**柯里化转换
-    * @param {T} fn - 将要转换的函数
-    * @returns {CurryFunc<T>} 柯里化的函数
-    */
-    function curry(fn) {
-        return (function curried(...args) {
-            if (args.length >= fn.length)
-                return fn(...args);
-            return (...restArgs) => curried(...args, ...restArgs);
-        });
-    }
-    UtilFP.curry = curry;
-    //#endregion
-    function flow(...fs) {
-        return (arg) => {
-            return fs.reduce((value, func) => func(value), arg);
-        };
-    }
-    UtilFP.flow = flow;
-    //#endregion
-    function pipe(input, ...fs) {
-        return fs.reduce((value, func) => func(value), input);
-    }
-    UtilFP.pipe = pipe;
-    //#endregion
-    function bind(key, value, base) {
-        if (base !== undefined)
-            return { ...base, [key]: value };
-        if (value === undefined)
-            return (base) => ({ [key]: base });
-        return (base) => base !== undefined
-            ? { ...base, [key]: value }
-            : { [key]: value };
-    }
-    UtilFP.bind = bind;
-    /**创建一个对对象的每个属性进行映射的函数
-     * @param func   - 映射函数, 接受一个属性值和它的键, 返回一个新的属性值
-     * @returns 一个函数, 这个函数接受一个对象, 然后返回一个新的对象新的对象的每个属性都是原始对象的属性经过映射函数处理后的结果
-     */
-    function map(func) {
-        return (input) => {
-            return Reflect
-                .ownKeys(input)
-                .reduce((sum, curr) => ({ ...sum,
-                [curr]: func(input[curr], curr)
-            }), {});
-        };
-    }
-    UtilFP.map = map;
-    /**创建在传入值为失败时不运行的函数 */
-    UtilFP.chain = (f) => (arg) => (0, QuickExport_1.isFailed)(arg) ? arg : f(arg);
-    /**创建在传入值为失败时才会尝试运行的函数 */
-    UtilFP.alt = (f) => (arg) => (0, QuickExport_1.isFailed)(arg) ? f(arg) : arg;
-    /**
-    let asd = bindTo("sss",123,{abc:223});//?
-    let sumvoid = ()=>10;
-    let a = curry(sumvoid);//?
-    console.log(a());
-    let sum = (a:number,b:string,c:number,d:boolean)=>a+b+c+d;
-    let sumCu = curry(sum);//?
-    let suma = sumCu(1)("ss");//?
-    let sumb = sumCu(1,"1")(2);//?
-    let sumc = sumCu(4);//?
-    let sumz = sumCu(1,"b",3)(false);//?
-    console.log(suma(2,true));
-    console.log(sumb(true));
-    console.log(sumc("s",3,false));
-    
-    Reflect.ownKeys({[1]:1,[None]:2});//?
-    let as = "ssa" as string;//?
-    let asv = {"s":1};//?
-    let a = map((v:number,k)=>v*21);//?
-    let b = a({["ss"]:1})//?
-    */
-})(UtilFP || (exports.UtilFP = UtilFP = {}));
+const js_utils_1 = require("@zwa73/js-utils");
+exports.UtilFP = js_utils_1.JsFP;

package/dist/UtilFileTools.d.ts

@@ -21,7 +21,9 @@ type FileSearchGlobOpt = Partial<{
 /**regex搜索选项 */
 type FileSearchRegexOpt = Partial<{
     /**搜索子目录 默认 true */
-    relative: boolean;
+    recursive: boolean;
+    /**无效项 */
+    relative: never;
 }>;
 /**json文件加载选项 */
 type LoadJsonFileOpt<T> = Partial<{
@@ -153,7 +155,7 @@ export declare namespace UtilFT {
      * @param dir           - 起始目录
      * @param traitRegex    - 正则表达式
      * @param opt           - 可选参数
-     * @param opt.relative  - 搜索子目录
+     * @param opt.recursive - 搜索子目录
      * @returns 文件名路径数组
      */
     function fileSearchRegex(dir: string, traitRegex: string, opt?: FileSearchRegexOpt): Promise<string[]>;

package/dist/UtilFileTools.js

@@ -209,7 +209,7 @@ var UtilFT;
     function stylizePath(filePath, style) {
         if (style === undefined)
             return filePath;
-        return UtilFunctions_1.UtilFunc.matchProc(style, {
+        return UtilFunctions_1.UtilFunc.match(style, {
             posix: (nor) => filePath.replaceAll("\\", "/"),
             win32: (nor) => filePath.replaceAll("/", "\\"),
         });
@@ -263,11 +263,11 @@ var UtilFT;
      * @param dir           - 起始目录
      * @param traitRegex    - 正则表达式
      * @param opt           - 可选参数
-     * @param opt.relative  - 搜索子目录
+     * @param opt.recursive - 搜索子目录
      * @returns 文件名路径数组
      */
     async function fileSearchRegex(dir, traitRegex, opt) {
-        const relative = opt?.relative ?? true;
+        const recursive = opt?.recursive ?? true;
         const outArray = [];
         const subFiles = await fs.promises.readdir(dir, { withFileTypes: true });
         //如果使用 g 会导致 RegExp.lastIndex 更改, 将会导致匹配错误
@@ -276,8 +276,8 @@ var UtilFT;
             const subFilePath = pathe_1.default.join(dir, subFile.name);
             //判断是否是文件夹，递归调用
             if (subFile.isDirectory()) {
-                if (relative)
-                    outArray.push(...await fileSearchRegex(pathe_1.default.join(subFilePath, pathe_1.default.sep), traitRegex));
+                if (recursive)
+                    outArray.push(...await UtilFT.fileSearchRegex(pathe_1.default.join(subFilePath, pathe_1.default.sep), traitRegex));
                 return;
             }
             if (regex.test(subFilePath))
@@ -294,7 +294,7 @@ var UtilFT;
      * @returns 文件名路径数组
      */
     function fileSearchRegexSync(dir, traitRegex, opt) {
-        const relative = opt?.relative ?? true;
+        const recursive = opt?.recursive ?? true;
         const outArray = [];
         const subFiles = fs.readdirSync(dir, { withFileTypes: true });
         //如果使用 g 会导致 RegExp.lastIndex 更改, 将会导致匹配错误
@@ -303,7 +303,7 @@ var UtilFT;
             const subFilePath = pathe_1.default.join(dir, subFile.name);
             //判断是否是文件夹，递归调用
             if (subFile.isDirectory()) {
-                if (relative)
+                if (recursive)
                     outArray.push(...fileSearchRegexSync(pathe_1.default.join(subFilePath, pathe_1.default.sep), traitRegex));
                 continue;
             }

package/dist/UtilFunctions.d.ts

@@ -15,10 +15,6 @@ type ExecOpt = Partial<{
 }>;
 /**常用函数 */
 declare class _UtilFunc {
-    /**生成一串uuid
-     * @returns uuid
-     */
-    static genUUID(): string;
     /**计算Hash
      * @param str    - 待计算的字符串
      * @param method - hash算法
@@ -62,7 +58,5 @@ declare class _UtilFunc {
      */
     static dynamicImport(moduleName: string): Promise<any>;
 }
-declare const mixkey: "__utilFunc";
-declare const fields: Exclude<(keyof typeof _UtilFunc)[], "prototype" | "length" | "name">;
-export type UtilFunc = ComposedClass<typeof JsFunc, typeof _UtilFunc, typeof mixkey, typeof fields[number]>;
-export declare const UtilFunc: UtilFunc;
+export declare const UtilFunc: ComposedClass<typeof _UtilFunc, typeof JsFunc, "__jsUtils", "match" | "failed" | "success" | "prototype" | "genUUID" | "range" | "getTime" | "initField" | "initObject" | "unifyApply" | "sleep" | "getNeverResolvedPromise" | "retryPromise" | "timelimitPromise" | "mapEntries" | "eachField" | "stringifyJToken" | "assertType" | "assertLiteral" | "deepClone" | "isSafeNumber" | "dedent" | "throwError" | "getFuncLoc" | "cachePool" | "memoize" | "asyncize" | "splitToChunk" | "mergeFromChunk" | "pendingMap" | "queueProc" | "queueLength" | "outcome" | "isStatus" | "eitherize" | "parseSrtTime" | "formatSrtTime" | "parseSrt" | "createSrt" | "ivk" | "s2l" | "l2s">;
+export type UtilFunc = typeof UtilFunc;

package/dist/UtilFunctions.js

@@ -38,12 +38,6 @@ const modular_mixer_1 = require("@zwa73/modular-mixer");
 const HashMethodList = ["md5", "sha1", "sha256", "sha512", "sha3", "blake2", "blake3"];
 /**常用函数 */
 class _UtilFunc {
-    /**生成一串uuid
-     * @returns uuid
-     */
-    static genUUID() {
-        return crypto.randomBytes(16).toString("hex");
-    }
     /**计算Hash
      * @param str    - 待计算的字符串
      * @param method - hash算法
@@ -133,18 +127,13 @@ class _UtilFunc {
         return await eval(`import('${moduleName}')`);
     }
 }
-const mixkey = '__utilFunc';
-const fields = Object.getOwnPropertyNames(_UtilFunc).filter(k => k !== 'length' && k !== 'prototype' && k !== 'name');
-if (!(mixkey in js_utils_1.JsFunc)) {
-    (0, modular_mixer_1.composeClassPart)({
-        base: js_utils_1.JsFunc,
-        mixin: _UtilFunc,
-        key: mixkey,
-        fields: fields,
-        force: true
-    });
-}
-exports.UtilFunc = js_utils_1.JsFunc;
+const key = '__jsUtils';
+const fields = Object.getOwnPropertyNames(js_utils_1.JsFunc).filter(k => !['length', 'prototype', 'name'].includes(k));
+exports.UtilFunc = (0, modular_mixer_1.composeClassPart)({
+    base: _UtilFunc,
+    mixin: js_utils_1.JsFunc,
+    key, fields
+});
 //void (async ()=>{
 //    const p1 =  UtilFunc.getNeverResolvedPromise();
 //    const p2 =  UtilFunc.getNeverResolvedPromise();

package/dist/UtilInterfaces.d.ts

@@ -1 +1 @@
-export { JToken, JValue, JArray, JObject, IJData, AnyFunc, Keyable, PartialOption, ProperSubset, ProperSubsetCheck, Literal, LiteralCheck, AllExtends, AssignObject, Writeable, Inverted, FixedLengthTuple, AnyString, UnionToIntersection, ExclusiveRecord, ExclusiveJObject, PromiseStatus, StatusVerifyFn, Await, FuncPropNames, ExtendThen, RequiredOnly, WithPrefix, Outcome, Matchable, MatchableFlag, ExtractOutcome, SchemaString, NeedInit, PRecord, MPromise, AnyRecord, CmtTuple, Flasy, SrtSegment, ILogger, LogLevel } from "@zwa73/js-utils";
+export { JToken, JValue, JArray, JObject, IJData, AnyFunc, Keyable, PartialOption, ProperSubset, ProperSubsetCheck, IncludeCheck, UnionCheck, Literal, LiteralCheck, AllExtends, AssignObject, Writeable, Inverted, FixedLengthTuple, Increment, RangeTuple, AnyString, UnionToIntersection, ExclusiveRecord, ExclusiveJObject, PromiseStatus, StatusVerifyFn, Await, FuncPropNames, ExtendThen, RequiredOnly, WithPrefix, Outcome, Either, Matchable, MatchableFlag, ExtractOutcome, ExtractMatchable, SchemaString, NeedInit, PRecord, MPromise, SPromise, SMPromise, NotPromise, AnyRecord, CmtTuple, Flasy, SrtSegment, ILogger, LogLevel, Asyncize } from "@zwa73/js-utils";

package/dist/index.js

@@ -10,13 +10,27 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
 }));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const UtilLogger_1 = require("./UtilLogger");
 const js_utils_1 = require("@zwa73/js-utils");
-js_utils_1.JsUtilsInject.setLogger(UtilLogger_1.SLogger);
+const crypto = __importStar(require("crypto"));
+js_utils_1.JsDepInjector.inject('logger', UtilLogger_1.SLogger);
+js_utils_1.JsDepInjector.inject('genUUID', () => crypto.randomBytes(16).toString("hex"));
 __exportStar(require("./UtilFunctions"), exports);
 __exportStar(require("./UtilInterfaces"), exports);
 __exportStar(require("./UtilSymbol"), exports);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@zwa73/utils",
-	"version": "1.0.209",
+	"version": "1.0.211",
 	"description": "my utils",
 	"main": "index.js",
 	"scripts": {

package/dist/test/dist/bitcont.d.ts

@@ -1 +0,0 @@
-export const __esModule: true;