@zwa73/utils 1.0.222 → 1.0.224

package/dist/mjs/UtilLogger.mjs

@@ -0,0 +1,361 @@
+import path from 'pathe';
+import * as winston from 'winston';
+import DailyRotateFile from 'winston-daily-rotate-file';
+import { inspect } from 'util';
+const logLevels = {
+    fatal: 0,
+    error: 1,
+    warn: 2,
+    info: 3,
+    http: 4,
+    verbose: 5,
+    debug: 6,
+    silly: 7
+};
+const colorizer = winston.format.colorize();
+colorizer.addColors({
+    fatal: 'bold yellow redBG',
+    error: 'bold yellow',
+    warn: 'yellow',
+    info: 'white',
+    debug: 'bold cyan',
+    silly: 'bold magenta'
+});
+export class SLogger {
+    /**获取一个Logger，如不存在则用默认参数创建
+     * @param name - logger的名称 默认default
+     * @returns 获取的logger
+     */
+    static getLogger(name = "default") {
+        let out = SLogger.loggerTable[name];
+        if (out == null) {
+            SLogger.createLogger(name);
+            out = SLogger.loggerTable[name];
+        }
+        return out;
+    }
+    /**创建Logger
+     * @param name         - logger的名称 默认default
+     * @param consoleLevel - 输出到控制台的最低等级 默认info
+     * @param outFloder    - log的输出文件夹路径 如./log/
+     * @param fileLevel    - 输出到文件的最低等级   默认info
+     * @returns 创建完成的logger
+     */
+    static createLogger(name = "default", consoleLevel = "info", outFloder, fileLevel = "info") {
+        const transports = [];
+        if (outFloder != null) {
+            const fileFormat = winston.format.combine(winston.format.timestamp({ format: 'HH:mm:ss' }), winston.format.printf((info) => {
+                const level = info.level.toUpperCase();
+                const message = info.message;
+                //格式化
+                //let format = `[${info.timestamp}] [${level}]: `
+                //let space = " ".repeat(format.length);
+                const messageList = message.split("\n");
+                return `[${info.timestamp}] [${level.toUpperCase()}]: ${messageList.join("\n")}`;
+            }));
+            transports.push(new DailyRotateFile({
+                filename: path.join(outFloder, 'log-%DATE%.txt'),
+                datePattern: 'YYYY-MM-DD',
+                level: fileLevel,
+                format: fileFormat,
+            }));
+        }
+        const consoleFormat = winston.format.combine(winston.format.timestamp({ format: 'HH:mm:ss' }), winston.format.printf((info) => {
+            const level = info.level.toUpperCase();
+            const message = info.message;
+            const colorizedLevel = colorizer.colorize(info.level, level);
+            //格式化
+            //let format = `[${info.timestamp}] [${level}]: `
+            //let space = " ".repeat(format.length);
+            let messageList = message.split("\n");
+            messageList[0] = colorizer.colorize(info.level, messageList[0]);
+            for (let i = 1; i < messageList.length; i++)
+                messageList[i] = colorizer.colorize(info.level, messageList[i]);
+            let formattedMessage = messageList.join("\n");
+            const prefix = `[${info.timestamp}] [${colorizedLevel}]: `;
+            if (formattedMessage.startsWith(prefix))
+                formattedMessage = formattedMessage.slice(prefix.length);
+            return `${prefix}${formattedMessage}`;
+            //return `[${info.timestamp}] [${colorizedLevel}]: ${messageList.join("\n")}`;
+        }));
+        transports.push(new winston.transports.Console({
+            level: consoleLevel,
+            format: consoleFormat,
+        }));
+        const logger = winston.createLogger({
+            levels: logLevels,
+            transports: transports,
+        });
+        const out = new SLogger();
+        out._logger = logger;
+        if (SLogger.loggerTable[name] != null) {
+            let old = SLogger.loggerTable[name];
+            old._logger.transports.forEach(tp => {
+                if (tp.close != null)
+                    tp.close();
+            });
+        }
+        SLogger.loggerTable[name] = out;
+        return out;
+    }
+    constructor() { }
+    _logger = null;
+    /**记录Logger的表 */
+    static loggerTable = {};
+    /**记录Logger的表 */
+    static timeTable = {};
+    //———————————————————— function ——————————————————————//
+    /**产生一条对应等级的log 返回自身
+     * @param level    - log等级
+     * @param messages - log消息
+     * @returns 自身
+     */
+    log(level, ...messages) {
+        level ??= "silly";
+        const strMessages = [];
+        //上一条是字符串字符串
+        let preIsString = true;
+        for (let message of messages) {
+            let out;
+            //非string类型
+            if (typeof message !== "string") {
+                out = `<${typeof message}> ${inspect(message)}`;
+                preIsString = false;
+            }
+            else if (!preIsString) {
+                //如果上一条不是字符串则需要添加<string>类型标记
+                out = `<${typeof message}> ${inspect(message)}`;
+                preIsString = true;
+            }
+            else {
+                out = message;
+            }
+            strMessages.push(out);
+        }
+        const outMessage = strMessages.join("\n");
+        this._logger.log(level, outMessage);
+        return this;
+    }
+    /**产生一条fatal等级的log 返回自身
+     * @param messages - log消息
+     * @returns 自身
+     */
+    fatal(...messages) {
+        return this.log("fatal", ...messages);
+        ;
+    }
+    /**产生一条error等级的log 返回自身
+     * @param messages - log消息
+     * @returns 自身
+     */
+    error(...messages) {
+        return this.log("error", ...messages);
+        ;
+    }
+    /**产生一条warn等级的log 返回自身
+     * @param messages - log消息
+     * @returns 自身
+     */
+    warn(...messages) {
+        return this.log("warn", ...messages);
+        ;
+    }
+    /**产生一条info等级的log 返回自身
+     * @param messages - log消息
+     * @returns 自身
+     */
+    info(...messages) {
+        return this.log("info", ...messages);
+    }
+    /**产生一条http等级的log 返回自身
+     * @param messages - log消息
+     * @returns 自身
+     */
+    http(...messages) {
+        return this.log("http", ...messages);
+    }
+    /**产生一条verbose等级的log 返回自身
+     * @param messages - log消息
+     * @returns 自身
+     */
+    verbose(...messages) {
+        return this.log("verbose", ...messages);
+    }
+    /**产生一条debug等级的log 返回自身
+     * @param messages - log消息
+     * @returns 自身
+     */
+    debug(...messages) {
+        return this.log("debug", ...messages);
+    }
+    /**产生一条silly等级的log 返回自身
+     * @param messages - log消息
+     * @returns 自身
+     */
+    silly(...messages) {
+        return this.log("silly", ...messages);
+    }
+    /**记录当前时间戳并存入表
+     * @param flag     - 记录的命名
+     * @returns 记录的时间
+     */
+    time(flag) {
+        let hrtime = process.hrtime();
+        SLogger.timeTable[flag] = hrtime;
+        return hrtime;
+    }
+    /**根据之前记录的时间戳计算经过的时间 并输出log
+     * @param flag  - 记录的命名
+     * @param level - log等级 === null时不产生log
+     * @returns 格式化的时间字符串
+     */
+    timeEnd(flag, level = "info") {
+        const start = SLogger.timeTable[flag];
+        if (start == null) {
+            this.warn("SLogger.timeEnd 错误 flag:" + flag + " 不存在");
+            return;
+        }
+        const timelen = process.hrtime(start);
+        const totalMicroseconds = (timelen[0] * 1e9 + timelen[1]) / 1000;
+        const microseconds = totalMicroseconds % 1000;
+        const totalMilliseconds = totalMicroseconds / 1000;
+        const milliseconds = Math.floor(totalMilliseconds % 1000);
+        const totalSeconds = totalMilliseconds / 1000;
+        const seconds = Math.floor(totalSeconds % 60);
+        const totalMinutes = totalSeconds / 60;
+        const minutes = Math.floor(totalMinutes % 60);
+        const totalHours = totalMinutes / 60;
+        const hours = Math.floor(totalHours % 24);
+        const totalDay = totalHours / 24;
+        const Days = Math.floor(totalDay);
+        let out = '';
+        if (totalSeconds > 60) {
+            let result = '';
+            let format = '';
+            let acc = 0;
+            const maxAcc = 3;
+            const concat = (num, sep, formatText, resultText) => {
+                const hasResult = result.length > 0;
+                const need = (hasResult || num > 0) && (acc < maxAcc);
+                if (!need)
+                    return;
+                if (result.length > 0)
+                    result += sep;
+                if (format.length > 0)
+                    format += sep;
+                result += resultText;
+                format += formatText;
+                acc++;
+            };
+            concat(Days, ':', 'dd', `${Days.toString()}`);
+            concat(hours, ':', 'HH', `${hours.toString().padStart(2, '0')}`);
+            concat(minutes, ':', 'mm', `${minutes.toString().padStart(2, '0')}`);
+            concat(seconds, ':', 'ss', `${seconds.toString().padStart(2, '0')}`);
+            concat(milliseconds, '.', 'mmm', `${milliseconds.toString().padStart(3, '0')}`);
+            //result = result.replace(/^(0(?![^0-9]))+/, '');
+            result = result.replace(/^0+([0-9])/, "$1");
+            out = `${result} (${format})`;
+        }
+        else if (totalMilliseconds > 1000) {
+            out = `${totalSeconds.toFixed(3)}s`;
+        }
+        else {
+            out = `${totalMilliseconds.toFixed(3)}ms`;
+        }
+        if (level !== null)
+            this.log(level, `${flag}: ${out}`);
+        delete SLogger.timeTable[flag];
+        return out;
+    }
+    //———————————————————— static ——————————————————————//
+    /**名称为default的slogger实例 */
+    static get defaultInstance() {
+        if (SLogger.loggerTable.default == null)
+            SLogger.createLogger();
+        return SLogger.loggerTable.default;
+    }
+    /**让名称为default的logger 产生一条对应等级的log 返回自身
+     * @param level    - log等级
+     * @param messages - log消息
+     * @returns 自身
+     */
+    static log(level, ...messages) {
+        level = level ?? "silly";
+        this.defaultInstance.log(level, ...messages);
+        return this.defaultInstance;
+    }
+    /**让名称为default的logger 产生一条fatal等级的log 返回自身
+     * @param messages - log消息
+     * @returns 自身
+     */
+    static fatal(...messages) {
+        return this.log("fatal", ...messages);
+        ;
+    }
+    /**让名称为default的logger 产生一条error等级的log 返回自身
+     * @param messages - log消息
+     * @returns 自身
+     */
+    static error(...messages) {
+        return this.log("error", ...messages);
+        ;
+    }
+    /**让名称为default的logger 产生一条warn等级的log 返回自身
+     * @param messages - log消息
+     * @returns 自身
+     */
+    static warn(...messages) {
+        return this.log("warn", ...messages);
+        ;
+    }
+    /**让名称为default的logger 产生一条info等级的log 返回自身
+     * @param messages - log消息
+     * @returns 自身
+     */
+    static info(...messages) {
+        return this.log("info", ...messages);
+    }
+    /**让名称为default的logger 产生一条http等级的log 返回自身
+     * @param messages - log消息
+     * @returns 自身
+     */
+    static http(...messages) {
+        return this.log("http", ...messages);
+    }
+    /**让名称为default的logger 产生一条verbose等级的log 返回自身
+     * @param messages - log消息
+     * @returns 自身
+     */
+    static verbose(...messages) {
+        return this.log("verbose", ...messages);
+    }
+    /**让名称为default的logger 产生一条debug等级的log 返回自身
+     * @param messages - log消息
+     * @returns 自身
+     */
+    static debug(...messages) {
+        return this.log("debug", ...messages);
+    }
+    /**让名称为default的logger 产生一条silly等级的log 返回自身
+     * @param messages - log消息
+     * @returns 自身
+     */
+    static silly(...messages) {
+        return this.log("silly", ...messages);
+    }
+    /**让名称为default的logger 记录当前时间戳并存入表
+     * @param flag - 记录的命名
+     * @returns 记录的时间
+     */
+    static time(flag) {
+        return this.defaultInstance.time(flag);
+    }
+    /**让名称为default的logger 根据之前记录的时间戳计算经过的时间 并输出log
+     * @param flag  - 记录的命名
+     * @param level - log等级
+     * @returns
+     */
+    static timeEnd(flag, level = "info") {
+        this.defaultInstance.timeEnd(flag, level);
+    }
+}

package/dist/mjs/UtilSymbol.mjs

@@ -0,0 +1,2 @@
+export { Success, Failed, None, Uninited, Completed, Terminated, Timeout, NoneOut } from "@zwa73/js-utils";
+//#endregion

package/dist/mjs/index.mjs

@@ -0,0 +1,17 @@
+import { SLogger } from './UtilLogger.mjs';
+import { JsDepInjector } from '@zwa73/js-utils';
+import * as crypto from "crypto";
+JsDepInjector.inject('logger', SLogger);
+JsDepInjector.inject('genUUID', () => crypto.randomBytes(16).toString("hex"));
+export * from './UtilFunctions.mjs';
+export * from './UtilInterfaces.mjs';
+export * from './UtilSymbol.mjs';
+export * from './UtilClass/index.mjs';
+export * from './UtilHttp.mjs';
+export * from './UtilCodecs.mjs';
+export * from './UtilDecorators.mjs';
+export * from './UtilFileTools.mjs';
+export * from './UtilLogger.mjs';
+export * from './UtilFP.mjs';
+export * from './QuickExport.mjs';
+export * from './UtilI18n.mjs';

package/dist/{QuickExport.d.ts → types/QuickExport.d.ts}

@@ -1,4 +1,4 @@
 import { UtilFT } from "./UtilFileTools";
-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 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, structEqual: typeof import("@zwa73/js-utils").JsFunc.structEqual;
 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), tap: typeof import("@zwa73/js-utils").JsFP.tap, curry: typeof import("@zwa73/js-utils").JsFP.curry;

package/dist/{UtilClass → types/UtilClass}/Hbs.d.ts

@@ -1,15 +1,18 @@
 import { Keyable } from '@zwa73/js-utils';
-import Handlebars from 'handlebars';
 /**文本模板渲染器
  * @template T - 上下文对象的类型，默认为记录类型
  */
 export declare class Hbs<T extends Record<Keyable, any> = Record<Keyable, any>> {
-    hbs: typeof Handlebars;
+    private hbs;
     context: T;
     /**创建一个新的 Hbs 实例
     * @param context - 上下文对象，用于在渲染模板时提供数据
     */
-    constructor(context?: T);
+    private constructor();
+    /**创建一个新的 Hbs 实例
+    * @param context - 上下文对象，用于在渲染模板时提供数据
+    */
+    static create<T extends Record<Keyable, any> = Record<Keyable, any>>(context?: T): Promise<Hbs<T>>;
     /**渲染模板
      * @param template - 要渲染的 Handlebars 模板字符串
      * @returns 渲染后的字符串

package/dist/types/UtilClass/index.d.ts

@@ -0,0 +1,3 @@
+export * from './Hbs';
+export type { BridgeInterface, DListMiddleNode, DListHeadNode, DListTailNode, DListNode, DListMaybeNode, PromoseQueueOption } from "@zwa73/js-utils";
+export { Bridge, DLinkedList, Piper, PromiseQueue, SmartCache, Stream } from "@zwa73/js-utils";

package/dist/{UtilCodecs.d.ts → types/UtilCodecs.d.ts}

@@ -14,30 +14,30 @@ export declare namespace UtilCodec {
      * @param str = 所要计算的消息
      * @returns 整数长度结果
      */
-    function tokenNumTurbo(str: string): number;
+    function tokenNumTurbo(str: string): Promise<number>;
     /**token长度计算器 Davinci模型
      * @param str = 所要计算的消息
      * @returns 整数长度结果
      */
-    function tokenNumDavinci(str: string): number;
+    function tokenNumDavinci(str: string): Promise<number>;
     /**token编码 Turbo模型
      * @param str = 所要计算的消息
      * @returns Token数组
      */
-    function encodeTokenTurbo(str: string): Uint32Array;
+    function encodeTokenTurbo(str: string): Promise<Uint32Array>;
     /**token编码 Davinci模型
      * @param str = 所要计算的消息
      * @returns Token数组
      */
-    function encodeTokenDavinci(str: string): Uint32Array;
+    function encodeTokenDavinci(str: string): Promise<Uint32Array>;
     /**token解码 Turbo模型
      * @param arr = Token数组
      * @returns 消息字符串
      */
-    function decodeTokenTurbo(arr: Uint32Array | number[]): string;
+    function decodeTokenTurbo(arr: Uint32Array | number[]): Promise<string>;
     /**token解码 Davinci模型
      * @param arr = Token数组
      * @returns 消息字符串
      */
-    function decodeTokenDavinci(arr: Uint32Array | number[]): string;
+    function decodeTokenDavinci(arr: Uint32Array | number[]): Promise<string>;
 }

package/dist/types/UtilDecorators.d.ts

@@ -0,0 +1,2 @@
+export type { ParamsDecoratorsGener, BaseDecoratorsGener, LogTraceOpt, PostProcessOpt } from "@zwa73/js-utils";
+export { LogTrace, PostProcess, AwaitInited } from "@zwa73/js-utils";

package/dist/{UtilFileTools.d.ts → types/UtilFileTools.d.ts}

@@ -1,4 +1,5 @@
 import { JToken } from "./UtilInterfaces";
+import { HashAlgorithm } from "./UtilFunctions";
 /**创建文件选项 */
 type CreatePathOpt = Partial<{
     /**创建一个目录 默认 false
@@ -17,6 +18,10 @@ type EnsurePathExistsOpt = Partial<{
 type FileSearchGlobOpt = Partial<{
     /**忽略的文件 默认 undefined */
     ingore: string | string[];
+    /**忽略目录 默认 true */
+    nodir: boolean;
+    /**忽略大小写 默认 跟随系统 mac/win为true 其他false */
+    nocese: boolean;
 }>;
 /**regex搜索选项 */
 type FileSearchRegexOpt = Partial<{
@@ -24,6 +29,8 @@ type FileSearchRegexOpt = Partial<{
     recursive: boolean;
     /**无效项 */
     relative: never;
+    /**忽略目录 默认 true */
+    nodir: boolean;
 }>;
 /**json文件加载选项 */
 type LoadJsonFileOpt<T> = Partial<{
@@ -149,8 +156,10 @@ export declare namespace UtilFT {
     function currosizePath(filePath: string): string;
     /**逐级寻找node_modules文件夹
      * @param basePath - 基础位置
+     * @param extpaths - 额外的路径 如 .bin
+     * @returns node_modules文件夹路径 包含额外路径
      */
-    function findNodeModulesDir(basePath: string): Promise<string | undefined>;
+    function findNodeModulesDir(basePath: string, ...extpaths: string[]): Promise<string | undefined>;
     /**搜索路径符合正则表达式的文件
      * @param dir           - 起始目录
      * @param traitRegex    - 正则表达式
@@ -171,7 +180,9 @@ export declare namespace UtilFT {
      * @param dir         - 起始目录
      * @param globPattern - glob匹配
      * @param opt         - 可选参数
-     * @param opt.ignore  - 忽略的文件
+     * @param opt.ignore    - 忽略的文件
+     * @param opt.relative  - 忽略目录 默认 true
+     * @param opt.nodir     - 忽略大小写 默认 跟随系统 mac/win为true 其他false
      * @returns 文件绝对路径数组
      */
     function fileSearchGlob(dir: string, globPattern: string | string[], opt?: FileSearchGlobOpt): Promise<string[]>;
@@ -179,7 +190,9 @@ export declare namespace UtilFT {
      * @param dir         - 起始目录
      * @param globPattern - glob匹配
      * @param opt         - 可选参数
-     * @param opt.ignore  - 忽略的文件
+     * @param opt.ignore    - 忽略的文件
+     * @param opt.relative  - 忽略目录 默认 true
+     * @param opt.nodir     - 忽略大小写 默认 跟随系统 mac/win为true 其他false
      * @returns 文件绝对路径数组
      */
     function fileSearchGlobSync(dir: string, globPattern: string | string[], opt?: FileSearchGlobOpt): string[];
@@ -187,5 +200,23 @@ export declare namespace UtilFT {
      * @param filePath - 需要验证的文件路径
      */
     function isValidFilePath(filePath: string): boolean;
+    /**计算文件的部分md5
+     * @param filePath   - 目标文件路径
+     * @param opt        - 可选参数
+     * @param opt.algorithm  - hash算法 默认md5
+     * @param opt.sampled    - 抽取部分计算 默认false
+     * @param opt.chunkSize  - 抽取的块大小 默认1024
+     * @param opt.chunkCount - 抽取的块的数量 默认10
+     */
+    function calculateHash(filePath: string, opt?: {
+        /**hash算法 默认md5 */
+        algorithm?: HashAlgorithm;
+        /**抽取部分计算 默认false */
+        sampled?: boolean;
+        /**抽取的块大小 默认1024 */
+        chunkSize?: number;
+        /**抽取的块的数量 默认10 */
+        chunkCount?: number;
+    }): Promise<string>;
 }
 export {};

package/dist/{UtilFunctions.d.ts → types/UtilFunctions.d.ts}

@@ -1,9 +1,8 @@
 import { LogLevel } from "./UtilInterfaces";
 import { JsFunc } from "@zwa73/js-utils";
-import { ComposedClass } from "@zwa73/modular-mixer";
-export { PromiseRetries, PromiseRetryResult } from "@zwa73/js-utils";
-declare const HashMethodList: readonly ["md5", "sha1", "sha256", "sha512", "sha3", "blake2", "blake3"];
-type HashMethod = typeof HashMethodList[number];
+export type { PromiseRetries, PromiseRetryResult } from "@zwa73/js-utils";
+declare const HashAlgorithmList: readonly ["RSA-MD5", "RSA-RIPEMD160", "RSA-SHA1", "RSA-SHA1-2", "RSA-SHA224", "RSA-SHA256", "RSA-SHA3-224", "RSA-SHA3-256", "RSA-SHA3-384", "RSA-SHA3-512", "RSA-SHA384", "RSA-SHA512", "RSA-SHA512/224", "RSA-SHA512/256", "RSA-SM3", "blake2b512", "blake2s256", "id-rsassa-pkcs1-v1_5-with-sha3-224", "id-rsassa-pkcs1-v1_5-with-sha3-256", "id-rsassa-pkcs1-v1_5-with-sha3-384", "id-rsassa-pkcs1-v1_5-with-sha3-512", "md5", "md5-sha1", "md5WithRSAEncryption", "ripemd", "ripemd160", "ripemd160WithRSA", "rmd160", "sha1", "sha1WithRSAEncryption", "sha224", "sha224WithRSAEncryption", "sha256", "sha256WithRSAEncryption", "sha3-224", "sha3-256", "sha3-384", "sha3-512", "sha384", "sha384WithRSAEncryption", "sha512", "sha512-224", "sha512-224WithRSAEncryption", "sha512-256", "sha512-256WithRSAEncryption", "sha512WithRSAEncryption", "shake128", "shake256", "sm3", "sm3WithRSAEncryption", "ssl3-md5", "ssl3-sha1"];
+export type HashAlgorithm = typeof HashAlgorithmList[number];
 /**执行选项 */
 type ExecOpt = Partial<{
     outlvl: LogLevel;
@@ -20,7 +19,10 @@ declare class _UtilFunc {
      * @param method - hash算法
      * @returns hash
      */
-    static calcHash(str: string, method?: HashMethod): string;
+    static calcHash(str: string, opt?: {
+        /**hash算法 默认md5 */
+        algorithm?: HashAlgorithm;
+    }): string;
     /**是否需要检查环境 */
     private static checkEnv;
     /**是否有正在运行的exec */
@@ -56,7 +58,7 @@ declare class _UtilFunc {
      *
      * @since Node.js 13.2，Node.js开始支持动态import。
      */
-    static dynamicImport(moduleName: string): Promise<any>;
+    static dynamicImport<T = any>(moduleName: string): Promise<T>;
 }
-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" | "concurrencyProc" | "outcome" | "isStatus" | "eitherize" | "parseSrtTime" | "formatSrtTime" | "parseSrt" | "createSrt" | "ivk" | "s2l" | "l2s">;
+export declare const UtilFunc: import("@zwa73/modular-mixer").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" | "lazyize" | "splitToChunk" | "mergeFromChunk" | "structEqual" | "concurrent" | "outcome" | "isStatus" | "eitherize" | "parseSrtTime" | "formatSrtTime" | "parseSrt" | "createSrt" | "ivk" | "s2l" | "l2s">;
 export type UtilFunc = typeof UtilFunc;

package/dist/types/UtilInterfaces.d.ts

@@ -0,0 +1 @@
+export type { 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/types/UtilSymbol.d.ts

@@ -0,0 +1,2 @@
+export type { FailedLike, SuccessLike, StatusSymbol } from "@zwa73/js-utils";
+export { Success, Failed, None, Uninited, Completed, Terminated, Timeout, NoneOut } from "@zwa73/js-utils";

package/package.json

@@ -1,8 +1,14 @@
 {
 	"name": "@zwa73/utils",
-	"version": "1.0.222",
+	"version": "1.0.224",
 	"description": "my utils",
-	"main": "index.js",
+	"exports": {
+		".": {
+			"require": "./dist/cjs/index.js",
+			"import": "./dist/mjs/index.mjs",
+			"types": "./dist/types/index.d.ts"
+		}
+	},
 	"scripts": {
 		"test": "jest",
 		"release": "powershell scripts/release",

package/dist/UtilClass/index.d.ts

@@ -1,2 +0,0 @@
-export * from './Hbs';
-export { BridgeInterface, Bridge, DListMiddleNode, DListHeadNode, DListTailNode, DListNode, DListMaybeNode, DLinkedList, Piper, PromoseQueueOption, PromiseQueue, SmartCache, Stream } from "@zwa73/js-utils";

package/dist/UtilDecorators.d.ts

@@ -1 +0,0 @@
-export { ParamsDecoratorsGener, BaseDecoratorsGener, LogTraceOpt, LogTrace, PostProcessOpt, PostProcess, AwaitInited } from "@zwa73/js-utils";

package/dist/UtilInterfaces.d.ts

@@ -1 +0,0 @@
-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/UtilSymbol.d.ts

@@ -1 +0,0 @@
-export { Success, Failed, None, Uninited, Completed, Terminated, Timeout, FailedLike, SuccessLike, StatusSymbol, NoneOut } from "@zwa73/js-utils";