@zwa73/utils 1.0.223 → 1.0.225

package/dist/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, structEqual: typeof import("@zwa73/js-utils").JsFunc.structEqual;
+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, range: typeof import("@zwa73/js-utils").JsFunc.range;
 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/QuickExport.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.curry = exports.tap = exports.alt = exports.chain = exports.pipe = exports.flow = exports.map = exports.when = exports.currosizePath = exports.win32izePath = exports.posixizePath = exports.stylizePath = exports.structEqual = 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;
+exports.curry = exports.tap = exports.alt = exports.chain = exports.pipe = exports.flow = exports.map = exports.when = exports.currosizePath = exports.win32izePath = exports.posixizePath = exports.stylizePath = exports.range = exports.structEqual = 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.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.structEqual = UtilFunctions_1.UtilFunc.structEqual;
+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.structEqual = UtilFunctions_1.UtilFunc.structEqual, exports.range = UtilFunctions_1.UtilFunc.range;
 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, exports.tap = UtilFP_1.UtilFP.tap, exports.curry = UtilFP_1.UtilFP.curry;
 if (false) {

package/dist/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/UtilClass/Hbs.js

@@ -1,21 +1,19 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Hbs = void 0;
 const UtilLogger_1 = require("../UtilLogger");
-const handlebars_1 = __importDefault(require("handlebars"));
+const UtilFunctions_1 = require("../UtilFunctions");
 /**文本模板渲染器
  * @template T - 上下文对象的类型，默认为记录类型
  */
 class Hbs {
-    hbs = handlebars_1.default.create();
+    hbs;
     context;
     /**创建一个新的 Hbs 实例
     * @param context - 上下文对象，用于在渲染模板时提供数据
     */
-    constructor(context = {}) {
+    constructor(hbs, context = {}) {
+        this.hbs = hbs;
         this.context = context;
         this.hbs.registerHelper('def', (name, options) => {
             const value = options.fn(this.context).trim();
@@ -31,6 +29,15 @@ class Hbs {
             return '';
         });
     }
+    /**创建一个新的 Hbs 实例
+    * @param context - 上下文对象，用于在渲染模板时提供数据
+    */
+    static async create(context = {}) {
+        const Handlebars = await UtilFunctions_1.UtilFunc.dynamicImport('handlebars');
+        //console.log(Handlebars);
+        const hbs = Handlebars.create();
+        return new Hbs(hbs, context);
+    }
     /**渲染模板
      * @param template - 要渲染的 Handlebars 模板字符串
      * @returns 渲染后的字符串

package/dist/UtilClass/index.d.ts

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

package/dist/UtilClass/index.js

@@ -14,14 +14,14 @@ 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 });
-exports.Stream = exports.SmartCache = exports.PromiseQueue = exports.Piper = exports.DLinkedList = exports.Bridge = void 0;
+exports.Bridge = exports.DLinkedList = exports.Piper = exports.PromiseQueue = exports.SmartCache = exports.Spool = exports.Stream = void 0;
 __exportStar(require("./Hbs"), exports);
-//#region UtilClass转导
 var js_utils_1 = require("@zwa73/js-utils");
-Object.defineProperty(exports, "Bridge", { enumerable: true, get: function () { return js_utils_1.Bridge; } });
-Object.defineProperty(exports, "DLinkedList", { enumerable: true, get: function () { return js_utils_1.DLinkedList; } });
-Object.defineProperty(exports, "Piper", { enumerable: true, get: function () { return js_utils_1.Piper; } });
-Object.defineProperty(exports, "PromiseQueue", { enumerable: true, get: function () { return js_utils_1.PromiseQueue; } });
-Object.defineProperty(exports, "SmartCache", { enumerable: true, get: function () { return js_utils_1.SmartCache; } });
 Object.defineProperty(exports, "Stream", { enumerable: true, get: function () { return js_utils_1.Stream; } });
+Object.defineProperty(exports, "Spool", { enumerable: true, get: function () { return js_utils_1.Spool; } });
+Object.defineProperty(exports, "SmartCache", { enumerable: true, get: function () { return js_utils_1.SmartCache; } });
+Object.defineProperty(exports, "PromiseQueue", { enumerable: true, get: function () { return js_utils_1.PromiseQueue; } });
+Object.defineProperty(exports, "Piper", { enumerable: true, get: function () { return js_utils_1.Piper; } });
+Object.defineProperty(exports, "DLinkedList", { enumerable: true, get: function () { return js_utils_1.DLinkedList; } });
+Object.defineProperty(exports, "Bridge", { enumerable: true, get: function () { return js_utils_1.Bridge; } });
 //#endregion

package/dist/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/UtilCodecs.js

@@ -25,7 +25,10 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.UtilCodec = void 0;
 const he = __importStar(require("html-entities"));
-const tiktoken_1 = require("tiktoken");
+const UtilFunctions_1 = require("./UtilFunctions");
+async function importTikToken() {
+    return await UtilFunctions_1.UtilFunc.dynamicImport("tiktoken");
+}
 /**编码/解码器 */
 var UtilCodec;
 (function (UtilCodec) {
@@ -58,18 +61,19 @@ var UtilCodec;
     //p50k_base	Code models, text-davinci-002, text-davinci-003
     //r50k_base (or gpt2)	GPT-3 models like davinci
     //避免在nextjs调用时出错
-    function initTikTokenEncoder() {
+    async function initTikTokenEncoder() {
         if (encoderCl100kBase != null && encoderP50kBase != null)
             return;
-        encoderCl100kBase = (0, tiktoken_1.get_encoding)("cl100k_base");
-        encoderP50kBase = (0, tiktoken_1.get_encoding)("p50k_base");
+        const { get_encoding } = await importTikToken();
+        encoderCl100kBase = get_encoding("cl100k_base");
+        encoderP50kBase = get_encoding("p50k_base");
     }
     /**token长度计算器 Turbo模型
      * @param str = 所要计算的消息
      * @returns 整数长度结果
      */
-    function tokenNumTurbo(str) {
-        initTikTokenEncoder();
+    async function tokenNumTurbo(str) {
+        await initTikTokenEncoder();
         //return encoder.encode(str).length
         return encoderCl100kBase?.encode(str).length;
     }
@@ -78,8 +82,8 @@ var UtilCodec;
      * @param str = 所要计算的消息
      * @returns 整数长度结果
      */
-    function tokenNumDavinci(str) {
-        initTikTokenEncoder();
+    async function tokenNumDavinci(str) {
+        await initTikTokenEncoder();
         return encoderP50kBase?.encode(str).length;
     }
     UtilCodec.tokenNumDavinci = tokenNumDavinci;
@@ -87,8 +91,8 @@ var UtilCodec;
      * @param str = 所要计算的消息
      * @returns Token数组
      */
-    function encodeTokenTurbo(str) {
-        initTikTokenEncoder();
+    async function encodeTokenTurbo(str) {
+        await initTikTokenEncoder();
         return encoderCl100kBase?.encode(str);
     }
     UtilCodec.encodeTokenTurbo = encodeTokenTurbo;
@@ -96,8 +100,8 @@ var UtilCodec;
      * @param str = 所要计算的消息
      * @returns Token数组
      */
-    function encodeTokenDavinci(str) {
-        initTikTokenEncoder();
+    async function encodeTokenDavinci(str) {
+        await initTikTokenEncoder();
         return encoderP50kBase?.encode(str);
     }
     UtilCodec.encodeTokenDavinci = encodeTokenDavinci;
@@ -105,8 +109,8 @@ var UtilCodec;
      * @param arr = Token数组
      * @returns 消息字符串
      */
-    function decodeTokenTurbo(arr) {
-        initTikTokenEncoder();
+    async function decodeTokenTurbo(arr) {
+        await initTikTokenEncoder();
         if (Array.isArray(arr))
             arr = new Uint32Array(arr);
         return textDecoder.decode(encoderCl100kBase?.decode(arr));
@@ -116,8 +120,8 @@ var UtilCodec;
      * @param arr = Token数组
      * @returns 消息字符串
      */
-    function decodeTokenDavinci(arr) {
-        initTikTokenEncoder();
+    async function decodeTokenDavinci(arr) {
+        await initTikTokenEncoder();
         if (Array.isArray(arr))
             arr = new Uint32Array(arr);
         return textDecoder.decode(encoderP50kBase?.decode(arr));

package/dist/UtilDecorators.d.ts

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

package/dist/UtilDecorators.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AwaitInited = exports.PostProcess = exports.LogTrace = void 0;
-//#region UtilDecorators转导
 var js_utils_1 = require("@zwa73/js-utils");
 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; } });

package/dist/UtilFileTools.d.ts

@@ -20,6 +20,8 @@ type FileSearchGlobOpt = Partial<{
     ingore: string | string[];
     /**忽略目录 默认 true */
     nodir: boolean;
+    /**忽略大小写 默认 跟随系统 mac/win为true 其他false */
+    nocese: boolean;
 }>;
 /**regex搜索选项 */
 type FileSearchRegexOpt = Partial<{
@@ -154,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    - 正则表达式
@@ -176,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[]>;
@@ -184,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[];

package/dist/UtilFileTools.js

@@ -223,8 +223,8 @@ var UtilFT;
         if (style === undefined)
             return filePath;
         return UtilFunctions_1.UtilFunc.match(style, {
-            posix: (nor) => filePath.replaceAll("\\", "/"),
-            win32: (nor) => filePath.replaceAll("/", "\\"),
+            posix: nor => filePath.replaceAll("\\", "/"),
+            win32: nor => filePath.replaceAll("/", "\\"),
         });
     }
     UtilFT.stylizePath = stylizePath;
@@ -257,11 +257,13 @@ var UtilFT;
     UtilFT.currosizePath = currosizePath;
     /**逐级寻找node_modules文件夹
      * @param basePath - 基础位置
+     * @param extpaths - 额外的路径 如 .bin
+     * @returns node_modules文件夹路径 包含额外路径
      */
-    async function findNodeModulesDir(basePath) {
+    async function findNodeModulesDir(basePath, ...extpaths) {
         let currentDir = basePath;
         while (currentDir) {
-            const nodeModulesPath = pathe_1.default.join(currentDir, 'node_modules');
+            const nodeModulesPath = pathe_1.default.join(currentDir, 'node_modules', ...extpaths);
             if (await UtilFT.pathExists(nodeModulesPath))
                 return nodeModulesPath;
             const parentDir = pathe_1.default.dirname(currentDir);
@@ -344,7 +346,9 @@ var 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 文件绝对路径数组
      */
     async function fileSearchGlob(dir, globPattern, opt) {
@@ -359,7 +363,9 @@ var 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, globPattern, opt) {

package/dist/UtilFunctions.d.ts

@@ -1,6 +1,6 @@
 import { LogLevel } from "./UtilInterfaces";
 import { JsFunc } from "@zwa73/js-utils";
-export { PromiseRetries, PromiseRetryResult } from "@zwa73/js-utils";
+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];
 /**执行选项 */
@@ -39,26 +39,8 @@ declare class _UtilFunc {
         stdout: string;
         stderr: string;
     }>;
-    private static publicIp?;
     /**获取当前公网ipv4 */
     static getPublicIpv4(): Promise<string>;
-    /**动态导入模块的函数。这个函数是为了在TypeScript的模块系统配置为CommonJS时，防止动态import被转译为require而设计的。
-     * 使用这个函数，你可以在TypeScript中动态地导入模块，而不需要担心import()被转译为require()。
-     * 请注意，这个函数使用了eval()，可能会带来安全风险。
-     *
-     * @param moduleName - 需要导入的模块的名称。
-     * @returns 返回一个Promise。当模块被成功导入时，这个Promise会解析为导入的模块。如果导入失败，这个Promise会被拒绝。
-     *
-     * @example
-     * async function main() {
-     *   const pip = (await dynamicImport('public-ip')).default;
-     *   console.log(await pip.v4());
-     * }
-     * main();
-     *
-     * @since Node.js 13.2，Node.js开始支持动态import。
-     */
-    static dynamicImport(moduleName: string): Promise<any>;
 }
-export declare const UtilFunc: import("@zwa73/modular-mixer").ComposedClass<typeof _UtilFunc, typeof JsFunc, "__jsUtils", "match" | "failed" | "success" | "prototype" | "genUUID" | "range" | "concurrency" | "getTime" | "initField" | "initObject" | "unifyApply" | "sleep" | "getNeverResolvedPromise" | "retryPromise" | "timelimitPromise" | "mapEntries" | "eachField" | "stringifyJToken" | "assertType" | "assertLiteral" | "deepClone" | "isSafeNumber" | "dedent" | "throwError" | "getFuncLoc" | "cachePool" | "memoize" | "asyncize" | "splitToChunk" | "mergeFromChunk" | "structEqual" | "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" | "dynamicImport" | "outcome" | "isStatus" | "eitherize" | "parseSrtTime" | "formatSrtTime" | "parseSrt" | "createSrt" | "ivk" | "s2l" | "l2s">;
 export type UtilFunc = typeof UtilFunc;

package/dist/UtilFunctions.js

@@ -77,10 +77,10 @@ class _UtilFunc {
         return new Promise(async (resolve, reject) => {
             // 创建一个新的环境变量对象，并将项目的 node_modules/.bin 目录添加到 PATH 环境变量中
             const env = Object.create(process.env);
-            const penv = path_1.default.join(opt?.nodeModules
-                ? UtilFileTools_1.UtilFT.currosizePath(opt.nodeModules)
-                : UtilFileTools_1.UtilFT.currosizePath(await exports.UtilFunc.memoize(UtilFileTools_1.UtilFT.findNodeModulesDir)(process.cwd()) ?? ''), '.bin');
-            if (_UtilFunc.checkEnv && !await UtilFileTools_1.UtilFT.pathExists(penv)) {
+            const penv = opt?.nodeModules
+                ? path_1.default.join(UtilFileTools_1.UtilFT.currosizePath(opt.nodeModules), '.bin')
+                : UtilFileTools_1.UtilFT.currosizePath(await exports.UtilFunc.memoize(UtilFileTools_1.UtilFT.findNodeModulesDir)(process.cwd(), '.bin') ?? '');
+            if (_UtilFunc.checkEnv && (penv == "" || !await UtilFileTools_1.UtilFT.pathExists(penv))) {
                 UtilLogger_1.SLogger.warn(`UtilFunc.exec 错误, 没有检测到 node_modules/.bin 环境 penv:${penv}`);
                 _UtilFunc.checkEnv = false;
             }
@@ -115,31 +115,12 @@ class _UtilFunc {
             });
         });
     }
-    static publicIp;
     /**获取当前公网ipv4 */
     static async getPublicIpv4() {
-        if (_UtilFunc.publicIp === undefined)
-            _UtilFunc.publicIp = await _UtilFunc.dynamicImport('public-ip');
-        return _UtilFunc.publicIp.publicIpv4();
-    }
-    /**动态导入模块的函数。这个函数是为了在TypeScript的模块系统配置为CommonJS时，防止动态import被转译为require而设计的。
-     * 使用这个函数，你可以在TypeScript中动态地导入模块，而不需要担心import()被转译为require()。
-     * 请注意，这个函数使用了eval()，可能会带来安全风险。
-     *
-     * @param moduleName - 需要导入的模块的名称。
-     * @returns 返回一个Promise。当模块被成功导入时，这个Promise会解析为导入的模块。如果导入失败，这个Promise会被拒绝。
-     *
-     * @example
-     * async function main() {
-     *   const pip = (await dynamicImport('public-ip')).default;
-     *   console.log(await pip.v4());
-     * }
-     * main();
-     *
-     * @since Node.js 13.2，Node.js开始支持动态import。
-     */
-    static async dynamicImport(moduleName) {
-        return await eval(`import('${moduleName}')`);
+        const pip = await js_utils_1.JsFunc.dynamicImport('public-ip');
+        //if(_UtilFunc.publicIp===undefined)
+        //    _UtilFunc.publicIp = await import("public-ip");
+        return pip.publicIpv4();
     }
 }
 const key = '__jsUtils';

package/dist/UtilInterfaces.d.ts

@@ -1 +1 @@
-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";
+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, NeedInit, PRecord, MPromise, SPromise, SMPromise, NotPromise, AnyRecord, CmtTuple, Flasy, SrtSegment, ILogger, LogLevel, Asyncize } from "@zwa73/js-utils";

package/dist/UtilSymbol.d.ts

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

package/dist/UtilSymbol.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NoneOut = exports.Timeout = exports.Terminated = exports.Completed = exports.Uninited = exports.None = exports.Failed = exports.Success = void 0;
-//#region UtilSymbol转导
 var js_utils_1 = require("@zwa73/js-utils");
 Object.defineProperty(exports, "Success", { enumerable: true, get: function () { return js_utils_1.Success; } });
 Object.defineProperty(exports, "Failed", { enumerable: true, get: function () { return js_utils_1.Failed; } });

package/package.json

@@ -1,8 +1,8 @@
 {
 	"name": "@zwa73/utils",
-	"version": "1.0.223",
+	"version": "1.0.225",
 	"description": "my utils",
-	"main": "index.js",
+	"main": "dist/index.js",
 	"scripts": {
 		"test": "jest",
 		"release": "powershell scripts/release",

package/index.d.ts

@@ -1 +0,0 @@
-export * from './dist';

package/index.js

@@ -1 +0,0 @@
-module.exports = require("./dist");