@zwa73/utils 1.0.223 → 1.0.224

package/dist/{UtilClass → cjs/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 → cjs/UtilClass}/index.js

@@ -16,7 +16,6 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Stream = exports.SmartCache = exports.PromiseQueue = exports.Piper = exports.DLinkedList = exports.Bridge = 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; } });

package/dist/{UtilCodecs.js → cjs/UtilCodecs.js}

@@ -25,7 +25,14 @@ 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");
+let tiktoken = undefined;
+async function importTikToken() {
+    if (tiktoken != null)
+        return tiktoken;
+    tiktoken = await UtilFunctions_1.UtilFunc.dynamicImport("tiktoken");
+    return tiktoken;
+}
 /**编码/解码器 */
 var UtilCodec;
 (function (UtilCodec) {
@@ -58,18 +65,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 +86,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 +95,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 +104,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 +113,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 +124,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.js → cjs/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.js → cjs/UtilFileTools.js}

@@ -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.js → cjs/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;
             }
@@ -120,6 +120,8 @@ class _UtilFunc {
     static async getPublicIpv4() {
         if (_UtilFunc.publicIp === undefined)
             _UtilFunc.publicIp = await _UtilFunc.dynamicImport('public-ip');
+        //if(_UtilFunc.publicIp===undefined)
+        //    _UtilFunc.publicIp = await import("public-ip");
         return _UtilFunc.publicIp.publicIpv4();
     }
     /**动态导入模块的函数。这个函数是为了在TypeScript的模块系统配置为CommonJS时，防止动态import被转译为require而设计的。
@@ -139,7 +141,10 @@ class _UtilFunc {
      * @since Node.js 13.2，Node.js开始支持动态import。
      */
     static async dynamicImport(moduleName) {
-        return await eval(`import('${moduleName}')`);
+        const mod = await eval(`import('${moduleName}')`);
+        if ('default' in mod)
+            return mod.default;
+        return mod;
     }
 }
 const key = '__jsUtils';

package/dist/{UtilSymbol.js → cjs/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/dist/mjs/QuickExport.mjs

@@ -0,0 +1,35 @@
+import { UtilFT } from "./UtilFileTools.mjs";
+import { UtilFP } from "./UtilFP.mjs";
+import { UtilFunc } from "./UtilFunctions.mjs";
+export const { outcome, success, failed, match, isSafeNumber, assertType, assertLiteral, deepClone, sleep, stringifyJToken, getTime, mapEntries, dedent, throwError, eitherize, memoize, ivk, l2s, s2l, structEqual, } = UtilFunc;
+export const { stylizePath, posixizePath, win32izePath, currosizePath, } = UtilFT;
+export const { when, map, flow, pipe, chain, alt, tap, curry, } = UtilFP;
+if (false) {
+    //let aaser = assertLiteral({a:1});
+    //let a:"asd"|"dsa" = null as any;
+    //const r = matchProc(a,{
+    //    "asd":(a)=>"ssa" as const,
+    //    "dsa":(b)=>"ssb" as const,
+    //});
+    //let b:Outcome<"a","123">|NoneOut = null as any;
+    //const r1 = matchProc(b,{
+    //    "a":(a,s)=>"ssa" as const,
+    //    [None]:(b,s)=>"ssb" as const,
+    //});
+    //let udt = outcome("ssa","None");
+    //type test = Outcome<"a"|"b",any> extends Outcome<"a",12>|Outcome<"b",34>
+    //    ? "suc" : "fal"
+    //let assa = isFailed(null as any as Failed);
+    //let assb = isFailed(null as any as Failed|Success);
+    //let assc = isFailed(null as any as Success);
+    //let asssc = isFailed(null);
+    //let assa1 = isFailed(null as any as Outcome<Failed,unknown>);
+    //let assb1 = isFailed(null as any as Outcome<Failed|Success,unknown>);
+    //let assc1 = isFailed(null as any as Outcome<Success,unknown>);
+    //let proct = sucesProc(null as any as Outcome<Failed|Success,"123">|Outcome<Failed,"1234">|Outcome<Success,"1s23">,
+    //    (s)=>"ssa" as const,
+    //    (f)=>"ssad" as const,
+    //    ()=>123 as const);
+    //let matt = matchProc(null as any as Outcome<symbol,123>,{
+    //});
+}

package/dist/mjs/UtilClass/Hbs.mjs

@@ -0,0 +1,51 @@
+import { SLogger } from '../UtilLogger.mjs';
+import { UtilFunc } from '../UtilFunctions.mjs';
+/**文本模板渲染器
+ * @template T - 上下文对象的类型，默认为记录类型
+ */
+export class Hbs {
+    hbs;
+    context;
+    /**创建一个新的 Hbs 实例
+    * @param context - 上下文对象，用于在渲染模板时提供数据
+    */
+    constructor(hbs, context = {}) {
+        this.hbs = hbs;
+        this.context = context;
+        this.hbs.registerHelper('def', (name, options) => {
+            const value = options.fn(this.context).trim();
+            this.context[name] = value;
+            return '';
+        });
+        this.hbs.registerHelper('defli', (name, options) => {
+            const rawvalue = options.fn(this.context);
+            const values = rawvalue
+                .split('[[br]]')
+                .map(value => value.trim());
+            this.context[name] = values;
+            return '';
+        });
+    }
+    /**创建一个新的 Hbs 实例
+    * @param context - 上下文对象，用于在渲染模板时提供数据
+    */
+    static async create(context = {}) {
+        const Handlebars = await UtilFunc.dynamicImport('handlebars');
+        //console.log(Handlebars);
+        const hbs = Handlebars.create();
+        return new Hbs(hbs, context);
+    }
+    /**渲染模板
+     * @param template - 要渲染的 Handlebars 模板字符串
+     * @returns 渲染后的字符串
+     */
+    render(template) {
+        try {
+            return this.hbs.compile(template)(this.context);
+        }
+        catch (e) {
+            SLogger.error(e);
+            return '';
+        }
+    }
+}

package/dist/mjs/UtilClass/index.mjs

@@ -0,0 +1,3 @@
+export * from './Hbs.mjs';
+export { Bridge, DLinkedList, Piper, PromiseQueue, SmartCache, Stream } from "@zwa73/js-utils";
+//#endregion

package/dist/mjs/UtilCodecs.mjs

@@ -0,0 +1,109 @@
+import * as he from 'html-entities';
+import { UtilFunc } from './UtilFunctions.mjs';
+let tiktoken = undefined;
+async function importTikToken() {
+    if (tiktoken != null)
+        return tiktoken;
+    tiktoken = await UtilFunc.dynamicImport("tiktoken");
+    return tiktoken;
+}
+/**编码/解码器 */
+export var UtilCodec;
+(function (UtilCodec) {
+    /**gpt-4, gpt-3.5-turbo, text-embedding-ada-002, text-embedding-3-small, text-embedding-3-large
+     */
+    let encoderCl100kBase = null;
+    /**Codex models, text-davinci-002, text-davinci-003
+     */
+    let encoderP50kBase = null;
+    const textDecoder = new TextDecoder();
+    /**HTML实体解码 将一个字符串中的HTML实体转换为对应的字符
+     * @param str - 要转换的字符串
+     * @returns 转换后的字符串
+     */
+    function decodeHtmlEntities(str) {
+        return he.decode(str);
+    }
+    UtilCodec.decodeHtmlEntities = decodeHtmlEntities;
+    /**HTML实体编码 将一个字符串中的 需编码字符转换为 HTML实体
+     * @param str - 要转换的字符串
+     * @returns 转换后的字符串
+     */
+    function encodeHtmlEntities(str) {
+        return he.encode(str);
+    }
+    UtilCodec.encodeHtmlEntities = encodeHtmlEntities;
+    //#region LAM
+    //token长度计算器
+    //cl100k_base	ChatGPT models, text-embedding-ada-002
+    //p50k_base	Code models, text-davinci-002, text-davinci-003
+    //r50k_base (or gpt2)	GPT-3 models like davinci
+    //避免在nextjs调用时出错
+    async function initTikTokenEncoder() {
+        if (encoderCl100kBase != null && encoderP50kBase != null)
+            return;
+        const { get_encoding } = await importTikToken();
+        encoderCl100kBase = get_encoding("cl100k_base");
+        encoderP50kBase = get_encoding("p50k_base");
+    }
+    /**token长度计算器 Turbo模型
+     * @param str = 所要计算的消息
+     * @returns 整数长度结果
+     */
+    async function tokenNumTurbo(str) {
+        await initTikTokenEncoder();
+        //return encoder.encode(str).length
+        return encoderCl100kBase?.encode(str).length;
+    }
+    UtilCodec.tokenNumTurbo = tokenNumTurbo;
+    /**token长度计算器 Davinci模型
+     * @param str = 所要计算的消息
+     * @returns 整数长度结果
+     */
+    async function tokenNumDavinci(str) {
+        await initTikTokenEncoder();
+        return encoderP50kBase?.encode(str).length;
+    }
+    UtilCodec.tokenNumDavinci = tokenNumDavinci;
+    /**token编码 Turbo模型
+     * @param str = 所要计算的消息
+     * @returns Token数组
+     */
+    async function encodeTokenTurbo(str) {
+        await initTikTokenEncoder();
+        return encoderCl100kBase?.encode(str);
+    }
+    UtilCodec.encodeTokenTurbo = encodeTokenTurbo;
+    /**token编码 Davinci模型
+     * @param str = 所要计算的消息
+     * @returns Token数组
+     */
+    async function encodeTokenDavinci(str) {
+        await initTikTokenEncoder();
+        return encoderP50kBase?.encode(str);
+    }
+    UtilCodec.encodeTokenDavinci = encodeTokenDavinci;
+    /**token解码 Turbo模型
+     * @param arr = Token数组
+     * @returns 消息字符串
+     */
+    async function decodeTokenTurbo(arr) {
+        await initTikTokenEncoder();
+        if (Array.isArray(arr))
+            arr = new Uint32Array(arr);
+        return textDecoder.decode(encoderCl100kBase?.decode(arr));
+    }
+    UtilCodec.decodeTokenTurbo = decodeTokenTurbo;
+    /**token解码 Davinci模型
+     * @param arr = Token数组
+     * @returns 消息字符串
+     */
+    async function decodeTokenDavinci(arr) {
+        await initTikTokenEncoder();
+        if (Array.isArray(arr))
+            arr = new Uint32Array(arr);
+        return textDecoder.decode(encoderP50kBase?.decode(arr));
+    }
+    UtilCodec.decodeTokenDavinci = decodeTokenDavinci;
+    //#endregion
+})(UtilCodec || (UtilCodec = {}));

package/dist/mjs/UtilDecorators.mjs

@@ -0,0 +1,2 @@
+export { LogTrace, PostProcess, AwaitInited } from "@zwa73/js-utils";
+//#endregion

package/dist/mjs/UtilFP.mjs

@@ -0,0 +1,2 @@
+import { JsFP } from "@zwa73/js-utils";
+export const UtilFP = JsFP;