@zwa73/utils 1.0.165 → 1.0.166

package/dist/UtilClass.d.ts

@@ -1,4 +1,5 @@
-import { Literal } from "./UtilInterfaces";
+import { Keyable, Literal } from "./UtilInterfaces";
+import Handlebars from 'handlebars';
 /**函数管道器 */
 export declare class Piper<Arg, Result = Arg> {
     /**管道函数列表 */
@@ -69,4 +70,20 @@ export declare class Stream<T> implements Iterable<T> {
     [Symbol.iterator](): Iterator<T>;
     get length(): number;
 }
+/**文本模板渲染器
+ * @template T - 上下文对象的类型，默认为记录类型
+ */
+export declare class Hbs<T extends Record<Keyable, any> = Record<Keyable, any>> {
+    hbs: typeof Handlebars;
+    context: T;
+    /**创建一个新的 Hbs 实例
+    * @param context - 上下文对象，用于在渲染模板时提供数据
+    */
+    constructor(context?: T);
+    /**渲染模板
+     * @param template - 要渲染的 Handlebars 模板字符串
+     * @returns 渲染后的字符串
+     */
+    render(template: string): string;
+}
 export {};

package/dist/UtilClass.js

@@ -1,7 +1,12 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Stream = exports.Piper = void 0;
+exports.Hbs = exports.Stream = exports.Piper = void 0;
 const QuickFunction_1 = require("./QuickFunction");
+const handlebars_1 = __importDefault(require("handlebars"));
+const UtilLogger_1 = require("./UtilLogger");
 /**函数管道器 */
 class Piper {
     /**管道函数列表 */
@@ -188,3 +193,44 @@ class Stream {
     }
 }
 exports.Stream = Stream;
+/**文本模板渲染器
+ * @template T - 上下文对象的类型，默认为记录类型
+ */
+class Hbs {
+    hbs = handlebars_1.default.create();
+    context;
+    /**创建一个新的 Hbs 实例
+    * @param context - 上下文对象，用于在渲染模板时提供数据
+    */
+    constructor(context = {}) {
+        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();
+            const values = rawvalue
+                .split('[[br]]')
+                .map(value => value.trim())
+                .map(value => this.hbs.compile(value)(this.context));
+            this.context[name] = values;
+            return '';
+        });
+    }
+    /**渲染模板
+     * @param template - 要渲染的 Handlebars 模板字符串
+     * @returns 渲染后的字符串
+     */
+    render(template) {
+        try {
+            return this.hbs.compile(template)(this.context);
+        }
+        catch (e) {
+            UtilLogger_1.SLogger.error(e);
+            return '';
+        }
+    }
+}
+exports.Hbs = Hbs;

package/dist/UtilFunctions.d.ts

@@ -1,4 +1,4 @@
-import { PRecord, AnyFunc, ExtractOutcome, IJData, JObject, JToken, Keyable, Literal, Matchable, MatchableFlag, Outcome, ReqVerifyFn, ProperSubsetCheck, UnionToIntersection, Await, AnyRecord, AllExtends } from "./UtilInterfaces";
+import { PRecord, AnyFunc, ExtractOutcome, IJData, JObject, JToken, Keyable, Literal, Matchable, MatchableFlag, Outcome, ReqVerifyFn, ProperSubsetCheck, UnionToIntersection, AnyRecord, AllExtends } from "./UtilInterfaces";
 import { LogLevel } from "./UtilLogger";
 import { Failed, FailedLike, None, StatusSymbol, Success, SuccessLike, Timeout } from "./UtilSymbol";
 declare const HashMethodList: readonly ["md5", "sha1", "sha256", "sha512", "sha3", "blake2", "blake3"];
@@ -222,10 +222,6 @@ export declare class UtilFunc {
      * @returns 是否安全
      */
     static isSafeNumber(num: unknown): boolean;
-    /**将一个字段加入一个对象中，将改变对象，返回新类型 */
-    static bindTo<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 input   - 需要处理的多行 字符串模板 或 字符串。
@@ -269,7 +265,7 @@ export declare class UtilFunc {
      * @param func - 待转换函数
      * @returns 转换完成的函数
      */
-    static taskEitherize<T extends (...args: any) => Promise<any>>(func: T): (...args: Parameters<T>) => Promise<Outcome<typeof Failed, Error> | Outcome<typeof Success, Await<ReturnType<T>>>>;
+    static taskEitherize<T extends (...args: any) => Promise<any>>(func: T): (...args: Parameters<T>) => Promise<Outcome<typeof Failed, Error> | Outcome<typeof Success, Awaited<ReturnType<T>>>>;
     /**动态导入模块的函数。这个函数是为了在TypeScript的模块系统配置为CommonJS时，防止动态import被转译为require而设计的。
      * 使用这个函数，你可以在TypeScript中动态地导入模块，而不需要担心import()被转译为require()。
      * 请注意，这个函数使用了eval()，可能会带来安全风险。

package/dist/UtilFunctions.js

@@ -543,13 +543,6 @@ class UtilFunc {
         }
         return false;
     }
-    /**将一个字段加入一个对象中，将改变对象，返回新类型 */
-    static bindTo(key, value, base) {
-        let out = base;
-        out = out ?? {};
-        out[key] = value;
-        return out;
-    }
     /**移除多行字符串中每行开始的最小空格数。
      *
      * @param input   - 需要处理的多行 字符串模板 或 字符串。

package/dist/UtilInterfaces.d.ts

@@ -101,7 +101,9 @@ export type ExclusiveJObject<B extends JObject, T extends JToken, K extends stri
 export type ReqStat = Success | Failed | Terminated;
 /**请求状态验证函数 */
 export type ReqVerifyFn<T> = (obj: T) => Promise<ReqStat> | ReqStat;
-/**获取Promise的结果类型 如同await那样 */
+/**获取Promise的结果类型 如同await那样
+ * @deprecated 请使用官方的 Awaited<T> 类型
+ */
 export type Await<T> = T extends Promise<infer U> ? U : T;
 /**类型中任意函数的字符串名称 */
 export type FuncPropNames<T> = {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@zwa73/utils",
-	"version": "1.0.165",
+	"version": "1.0.166",
 	"description": "my utils",
 	"main": "index.js",
 	"scripts": {
@@ -19,6 +19,7 @@
 		"@deepkit/type": "^1.0.1-alpha.153",
 		"fluent-ffmpeg": "2.1.2",
 		"glob": "^10.4.1",
+		"handlebars": "^4.7.8",
 		"html-entities": "^2.3.3",
 		"http-proxy-agent": "^5.0.0",
 		"https-proxy-agent": "^5.0.1",

package/src/UtilClass.ts

@@ -1,5 +1,7 @@
 import { matchProc } from "./QuickFunction";
-import { Literal } from "./UtilInterfaces";
+import { Keyable, Literal } from "./UtilInterfaces";
+import Handlebars from 'handlebars';
+import { SLogger } from "./UtilLogger";
 
 /**函数管道器 */
 export class Piper<Arg, Result = Arg> {
@@ -194,4 +196,49 @@ export class Stream<T> implements Iterable<T>{
     get length(): number {
         return this._list.length;
     }
-}
+}
+
+/**文本模板渲染器
+ * @template T - 上下文对象的类型，默认为记录类型
+ */
+export class Hbs<T extends Record<Keyable,any> = Record<Keyable,any>>{
+    hbs = Handlebars.create();
+    context:T;
+
+    /**创建一个新的 Hbs 实例
+    * @param context - 上下文对象，用于在渲染模板时提供数据
+    */
+    constructor(context:T={} as T) {
+        this.context = context;
+
+        this.hbs.registerHelper('def', (name, options)=> {
+            const value = options.fn(this.context).trim();
+            (this.context as any)[name] = value;
+            return '';
+        });
+
+        this.hbs.registerHelper('defli', (name,options)=> {
+            const rawvalue = options.fn() as string;
+
+            const values = rawvalue
+                .split('[[br]]')
+                .map(value => value.trim())
+                .map(value => this.hbs.compile(value)(this.context));
+            (this.context as any)[name] = values;
+            return '';
+        });
+    }
+
+    /**渲染模板
+     * @param template - 要渲染的 Handlebars 模板字符串
+     * @returns 渲染后的字符串
+     */
+    render(template:string):string{
+        try{
+            return this.hbs.compile(template)(this.context);
+        } catch(e){
+            SLogger.error(e);
+            return '';
+        }
+    }
+}

package/src/UtilDecorators.ts

@@ -1,5 +1,5 @@
 import { UtilFunc } from "./UtilFunctions";
-import { Await, NeedInit } from "./UtilInterfaces";
+import { NeedInit } from "./UtilInterfaces";
 import { SLogger } from "./UtilLogger";
 
 type TDTg<T> = 

package/src/UtilFunctions.ts

@@ -1,5 +1,5 @@
 import * as crypto from "crypto";
-import { PRecord, AnyFunc, ExtractOutcome, IJData, JObject, JToken, Keyable, Literal, Matchable, MatchableFlag, Outcome, ReqStat, ReqVerifyFn, ProperSubsetCheck, UnionToIntersection, Await, AnyRecord, AllExtends } from "@src/UtilInterfaces";
+import { PRecord, AnyFunc, ExtractOutcome, IJData, JObject, JToken, Keyable, Literal, Matchable, MatchableFlag, Outcome, ReqStat, ReqVerifyFn, ProperSubsetCheck, UnionToIntersection, AnyRecord, AllExtends } from "@src/UtilInterfaces";
 import * as cp from "child_process";
 import { LogLevel, SLogger } from "@src/UtilLogger";
 import { Completed, Failed, FailedLike, None, StatusSymbol, Success, SuccessLike, Terminated, Timeout } from "./UtilSymbol";
@@ -651,16 +651,6 @@ static isSafeNumber(num: unknown): boolean {
     return false;
 }
 
-/**将一个字段加入一个对象中，将改变对象，返回新类型 */
-static bindTo<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;}{
-    let out = base as any;
-    out = out??{};
-    out[key]=value;
-    return out;
-}
 /**移除多行字符串中每行开始的最小空格数。
  *
  * @param input   - 需要处理的多行 字符串模板 或 字符串。
@@ -754,7 +744,7 @@ static eitherize<T extends AnyFunc>(func:T) {
 static taskEitherize<T extends (...args:any)=>Promise<any>>(func:T) {
     return async (...args: Parameters<T>) => {
         try {
-            const result:Await<ReturnType<T>> = await func(...args as any);
+            const result:Awaited<ReturnType<T>> = await func(...args as any);
             return UtilFunc.outcome(Success,result);
         } catch (error) {
             if(error instanceof Error)

package/src/UtilInterfaces.ts

@@ -149,9 +149,12 @@ export type ReqStat = Success|Failed|Terminated;
 /**请求状态验证函数 */
 export type ReqVerifyFn<T> = (obj:T)=>Promise<ReqStat>|ReqStat;
 
-/**获取Promise的结果类型 如同await那样 */
+/**获取Promise的结果类型 如同await那样
+ * @deprecated 请使用官方的 Awaited<T> 类型
+ */
 export type Await<T> = T extends Promise<infer U> ? U : T;
 
+
 /**类型中任意函数的字符串名称 */
 export type FuncPropNames<T> = {
     [K in keyof T]: T[K] extends AnyFunc ? K : never;