@zwa73/utils 1.0.47 → 1.0.49

package/dist/test/test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/test/test.js

@@ -0,0 +1,187 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const UtilFunctions_1 = require("../UtilFunctions");
+const compKeys = ["getData", "getA"];
+class A {
+    abc = 223;
+    /**A的getData */
+    getData() {
+        return this.abc;
+    }
+    /**获取A */
+    getA() {
+        return this;
+    }
+}
+class C {
+    abc = 3333;
+    /**A的getData */
+    resetData() {
+        return this.abc;
+    }
+    /**获取C */
+    getC() {
+        return this;
+    }
+    /**获取C */
+    getC1() {
+        return this;
+    }
+}
+class B {
+    _bc;
+    constructor() {
+        const tb = this;
+        this._bc = UtilFunctions_1.UtilFunc.composePartClass(tb, new A(), ...compKeys);
+    }
+    static init() {
+        return new B()._bc;
+    }
+    /**B的getData */
+    getData1() { return "BGetdata"; }
+    getTest() { return this._bc.getData(); }
+}
+const BComp = {
+    init() {
+        return B.init();
+    }
+};
+let c = BComp.init();
+console.log(1);
+let d = c.getData(); //?
+c.getA;
+c.getData1(); //?
+c.getTest(); //?
+let r3 = null;
+class Monster {
+    constructor(a) { }
+    monfunc() {
+        return "mon";
+    }
+}
+class Monster1 {
+    constructor(a) { }
+    m1num = 123;
+    monfunc1() {
+        return "mon1";
+    }
+}
+const OtherMonster = {
+    init() {
+        let mon = new Monster(123);
+        let mon1 = new Monster1(223);
+        let om = {
+            om: "123", mon
+        };
+        return UtilFunctions_1.UtilFunc.composeClass(om, mon, mon1);
+    }
+};
+let om = OtherMonster.init(); //?
+om.monfunc(); //?
+om.monfunc1(); //?
+om.m1num; //?
+const BASE_MAX = { 攻击: 24, 生命: 54, 防御: 16, 暴击: 5, 暴击伤害: 5, 攻击加成: 3.8, 生命加成: 3.8, 防御加成: 3.8 };
+const 精调前 = [
+    { 攻击: 17, 生命: 0, 防御: 0, 暴击: 0, 暴击伤害: 3.5, 攻击加成: 3.0, 生命加成: 0, 防御加成: 3.4 },
+    { 攻击: 19, 生命: 0, 防御: 0, 暴击: 4.5, 暴击伤害: 4.5, 攻击加成: 3.4, 生命加成: 0, 防御加成: 0 },
+    { 攻击: 21, 生命: 0, 防御: 10, 暴击: 0, 暴击伤害: 0, 攻击加成: 3.8, 生命加成: 0, 防御加成: 3.0 },
+    { 攻击: 17, 生命: 48, 防御: 14, 暴击: 0, 暴击伤害: 0, 攻击加成: 2.6, 生命加成: 0, 防御加成: 0 },
+    { 攻击: 23, 生命: 0, 防御: 0, 暴击: 5, 暴击伤害: 0, 攻击加成: 3.4, 生命加成: 0, 防御加成: 0 },
+    { 攻击: 17, 生命: 53, 防御: 0, 暴击: 0, 暴击伤害: 0, 攻击加成: 3.4, 生命加成: 0, 防御加成: 0 },
+    { 攻击: 21, 生命: 0, 防御: 0, 暴击: 3.5, 暴击伤害: 0, 攻击加成: 3.0, 生命加成: 0, 防御加成: 0 },
+    { 攻击: 17, 生命: 0, 防御: 3.8, 暴击: 0, 暴击伤害: 0, 攻击加成: 2.6, 生命加成: 0, 防御加成: 0 },
+    { 攻击: 19, 生命: 38, 防御: 0, 暴击: 0, 暴击伤害: 0, 攻击加成: 3.4, 生命加成: 0, 防御加成: 0 }, // 机枪 双重对策 折叠脚架
+];
+const 精调后 = [
+    { 攻击: 26, 生命: 0, 防御: 0, 暴击: 0, 暴击伤害: 8.1, 攻击加成: 7.5, 生命加成: 0, 防御加成: 5.8 },
+    { 攻击: 31, 生命: 0, 防御: 0, 暴击: 10.4, 暴击伤害: 10.4, 攻击加成: 7.5, 生命加成: 0, 防御加成: 0 },
+    { 攻击: 49, 生命: 0, 防御: 17, 暴击: 0, 暴击伤害: 0, 攻击加成: 7.6, 生命加成: 0, 防御加成: 6.9 },
+    { 攻击: 46, 生命: 116, 防御: 27, 暴击: 0, 暴击伤害: 0, 攻击加成: 5.0, 生命加成: 0, 防御加成: 0 },
+    { 攻击: 42, 生命: 0, 防御: 0, 暴击: 11.5, 暴击伤害: 0, 攻击加成: 6.8, 生命加成: 0, 防御加成: 0 },
+    { 攻击: 34, 生命: 101, 防御: 0, 暴击: 0, 暴击伤害: 0, 攻击加成: 6.5, 生命加成: 0, 防御加成: 0 },
+    { 攻击: 38, 生命: 0, 防御: 0, 暴击: 8.4, 暴击伤害: 0, 攻击加成: 4.8, 生命加成: 0, 防御加成: 0 },
+    { 攻击: 43, 生命: 0, 防御: 8.0, 暴击: 0, 暴击伤害: 0, 攻击加成: 7.3, 生命加成: 0, 防御加成: 0 },
+    { 攻击: 42, 生命: 54, 防御: 0, 暴击: 0, 暴击伤害: 0, 攻击加成: 6.2, 生命加成: 0, 防御加成: 0 }, // 机枪 双重对策 折叠脚架
+];
+const Pointify = (ed) => UtilFunctions_1.UtilFunc.mapObject(ed, (k, v) => v ? v / BASE_MAX[k] : 0);
+const Sump = (ed) => Object.values(ed).reduce((r, v) => r + v);
+const pipeFunc = UtilFunctions_1.UtilFunc.pipeline(Pointify, Sump);
+const Display = (list) => list.reduce((r, v) => `${r}\t${v.toFixed(2)}`, "").trim();
+const pre = 精调前.map((v) => pipeFunc(v));
+const aft = 精调后.map((v) => pipeFunc(v));
+const div = pre.map((dv, i) => aft[i] / dv);
+Display(pre); //?
+Display(aft); //?
+Display(div); //?
+// 定义一个函数，它将作为构造函数
+function MyObject() {
+    // @ts-ignore
+    this.a = 123;
+}
+let asloop = [
+    {
+        type: "effect_of_condition",
+        id: "loop",
+        effect: [
+            { if: { math: ["i", ">", "0"] },
+                then: [
+                    { u_message: "hello world" },
+                    { math: ["i", "-=", "1"] },
+                    { run_eocs: "loop" },
+                ] }
+        ]
+    },
+    {
+        type: "effect_of_condition",
+        id: "main",
+        effect: [
+            { math: ["i", "=", "10"] },
+            { run_eocs: "loop" }
+        ]
+    }
+];
+let asaloop = [
+    {
+        type: "effect_of_condition",
+        id: "loop",
+        effect: [
+            { u_message: "hello world" }
+        ]
+    },
+    {
+        type: "effect_of_condition",
+        id: "main",
+        effect: [
+            {
+                run_eoc_with: "efl",
+                variables: {
+                    i: "0",
+                    length: "10",
+                    eoc: "loop"
+                }
+            }
+        ]
+    }
+];
+const testa = {
+    _a: 123
+};
+Object.defineProperty(testa, 'a', {
+    get: () => 1,
+    set: function (value) {
+        console.log('Set:', value);
+    },
+    enumerable: true
+});
+Object.defineProperty(testa, 'c', {
+    value: 123,
+    writable: true,
+    enumerable: true,
+    configurable: true
+});
+testa.constructor.prototype; //?
+testa; //?
+let testkeys = [];
+for (let k in testa)
+    testkeys.push(k);
+testkeys; //?

package/dist/test/test2.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/test/test2.js

@@ -0,0 +1,35 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const path = require("path");
+const UtilFileTools_1 = require("../UtilFileTools");
+// 将字符串转换为十六进制
+function stringToHex(str) {
+    const buf = Buffer.from(str, 'utf8');
+    return buf.toString('hex');
+}
+// 将十六进制转换为字符串
+function hexToString(hex) {
+    const buf = Buffer.from(hex, 'hex');
+    return buf.toString('utf8');
+}
+// 示例
+let str = "Hello World";
+let hex = "0B0000002D";
+console.log(stringToHex(str)); // 输出字符串对应的十六进制
+console.log(hexToString(hex)); // 输出十六进制对应的字符串
+hexToString("556E6974794653"); //?
+/**
+首先我有一个文件夹./in
+我在里面存放了一些整合加密的二进制文件，文件名符合正则/.*\.bk/
+我需要你帮我写解密程序，将其解密并分离为单独的文件，接下来我告诉你解密方式:
+读取文件后，我们先用split(hexToString(hex))对文本进行分割成多块，然后在每一块找到第二个"UnityFS"，
+再从第二个UnityFS的开头截取到每一块的末尾
+我举一个例子，假设我们有一段分割完成的文本块 "112233 UnityFS sasasd UnityFS我需要的内容"
+那么它截取完成之后应该是"UnityFS我需要的内容"
+最后，我们在将所有截取完成的文本块作为文件输出到./out/{filename}
+文件名就是 {原文件名+块编号.bs}
+开始写吧
+**/
+path.parse("123.bs").name; //?
+let filepath = "F:\\Sosarciel\\SosarcielCore\\NodeJs\\utils\\src";
+UtilFileTools_1.UtilFT.fileSearchGlob(`${filepath}/**/*.ts`, "**/test/**/*.ts"); //?

package/package.json

@@ -1,10 +1,11 @@
 {
   "name": "@zwa73/utils",
-  "version": "1.0.47",
+  "version": "1.0.49",
   "description": "my utils",
   "main": "index.js",
   "scripts": {
-    "test": "node test"
+    "test": "node test",
+    "postinstall": "node postinstall.js"
   },
   "keywords": [
     "zwa73"
@@ -16,6 +17,7 @@
     "esm": "^3.2.25",
     "esm-resolve": "^1.0.8",
     "fluent-ffmpeg": "^2.1.2",
+    "glob": "^10.3.10",
     "html-entities": "^2.3.3",
     "http-proxy-agent": "^5.0.0",
     "https-proxy-agent": "^5.0.1",

package/postinstall.js

@@ -0,0 +1,39 @@
+const currentVersion = require('./package.json').version;
+const path = require('path');
+const { UtilFT } = require("./index");
+const dataPath = path.join(__dirname,"..","version.json");
+UtilFT.ensurePathExists(dataPath);
+let dataTable = UtilFT.loadJSONFileSync(dataPath,{});
+dataTable.utils = dataTable.utils??{};
+let prevVersion = dataTable.utils.version;
+dataTable.utils.version = currentVersion;
+
+console.log(`${currentVersion} 版本已安装`);
+
+// 将版本号转换为可以比较的数字
+function versionToNumber(version) {
+    if(version==undefined) return 0;
+    return version.split('.').map(Number).reduce((acc, val) => acc * 1000 + val);
+}
+//提示表
+const infoTable = {
+    "1.0.17":"fileSearch 函数进入 UtilFT 命名空间",
+    "1.0.47":"UtilFT.fileSearch 函数与返回值发生变动, 请使用fileSearchRegex 或 fileSearchGlob"
+}
+//显示提示
+function showUpgradeMessages(prevVersion, currentVersion, infoTable) {
+    let prevVersionNumber = versionToNumber(prevVersion);
+    let currentVersionNumber = versionToNumber(currentVersion);
+    // 遍历infoTable中的所有版本
+    for (let version in infoTable) {
+        let versionNumber = versionToNumber(version);
+        // 如果用户的上一个版本低于这个版本，而当前版本高于或等于这个版本
+        if (versionNumber > prevVersionNumber && versionNumber <= currentVersionNumber) {
+            // 显示这个版本的提示信息
+            console.log(infoTable[version]);
+        }
+    }
+}
+
+// 使用这个函数来显示升级信息
+showUpgradeMessages(prevVersion, currentVersion, infoTable);

package/publish.bat

@@ -1,2 +1,2 @@
-npm publish --access public
+call npm publish --access public
 pause

package/src/UtilClass.ts

@@ -981,3 +981,71 @@ class SKVC {
 
     constructor() {}
 }
+
+/**函数组合器 */
+export class Composer<Result,PreArg = Result> {
+    /**组合函数列表 */
+    private funcs: Function[] = [];
+    private constructor(){};
+    /**添加单个参数与返回值不同的函数 */
+    public static push<Result,Arg>(func: (arg: Arg) => Result): Composer<Result,Arg>;
+    /**添加多个参数与返回值相同的函数 */
+    public static push<Result>(func:((arg: Result) => Result), ...funcs: ((arg: Result) => Result)[]): Composer<Result>;
+    public static push(...funcs: Function[]){
+        const newComposer = new Composer<any>();
+        newComposer.funcs = [...funcs];
+        return newComposer;
+    }
+
+    /**添加单个参数与返回值不同的函数 */
+    public push<T>(func: (arg: T) => PreArg): Composer<Result,T>;
+    /**添加多个参数与返回值相同的函数 */
+    public push(func:((arg: Result) => Result), ...funcs: ((arg: PreArg) => PreArg)[]): Composer<Result,PreArg>;
+    public push(...funcs: Function[]): Composer<Result,any> {
+        const newComposer = new Composer<Result>();
+        newComposer.funcs = [...this.funcs, ...funcs];
+        return newComposer;
+    }
+    /**组合函数 */
+    public compose():(arg:PreArg)=>Result {
+        return (arg:PreArg) => this.funcs.reduceRight((value, func) => func(value), arg) as any as Result;
+    }
+    /**直接调用 */
+    public invoke(arg:PreArg):Result {
+        return this.funcs.reduceRight((value, func) => func(value), arg) as any as Result;
+    }
+}
+/**函数管道器 */
+export class Piper<Arg, Result = Arg> {
+    /**管道函数列表 */
+    private funcs: Function[] = [];
+    private constructor(){};
+    /**添加单个参数与返回值不同的函数 */
+    public static pipe<Arg, Result>(func: (arg: Arg) => Result): Piper<Arg, Result>;
+    /**添加多个参数与返回值相同的函数 */
+    public static pipe<Arg>(func:((arg: Arg) => Arg), ...funcs: ((arg: Arg) => Arg)[]): Piper<Arg>;
+    public static pipe(...funcs: Function[]){
+        const newPiper = new Piper<any>();
+        newPiper.funcs = [...funcs];
+        return newPiper;
+    }
+
+    /**添加单个参数与返回值不同的函数 */
+    public pipe<T>(func: (arg: Result) => T): Piper<Arg, T>;
+    /**添加多个参数与返回值相同的函数 */
+    public pipe(func:((arg: Result) => Result), ...funcs: ((arg: Result) => Result)[]): Piper<Arg, Result>;
+    public pipe(...funcs: Function[]): Piper<Arg, any> {
+        const newPiper = new Piper<Arg>();
+        newPiper.funcs = [...this.funcs, ...funcs];
+        return newPiper;
+    }
+    /**管道函数 */
+    public pipeline():(arg:Arg)=>Result {
+        return (arg:Arg) => this.funcs.reduce((value, func) => func(value), arg) as any as Result;
+    }
+    /**直接调用 */
+    public invoke(arg:Arg):Result {
+        return this.funcs.reduce((value, func) => func(value), arg) as any as Result;
+    }
+}
+

package/src/UtilCom.ts

@@ -22,7 +22,7 @@ function sPost(posttype:"http"|"https",json:JObject,options:Object,timeLimit:num
         timeLimit*=1000
 
     const jsonStr = stringifyJToken(json);
-    const funcName = "s"+posttype+"Psot";
+    const funcName = `s${posttype}Psot`;
 
     return new Promise((resolve, rejecte)=>{
         const resFunc = (res:http.IncomingMessage)=>{
@@ -31,7 +31,7 @@ function sPost(posttype:"http"|"https",json:JObject,options:Object,timeLimit:num
                 if(hasTimeLimit){
                     res.setTimeout(timeLimit, ()=>{
                         //res.abort();
-                        SLogger.warn(funcName+" 接收反馈超时: "+timeLimit+" ms");
+                        SLogger.warn(`${funcName} 接收反馈超时: ${timeLimit} ms`);
                         resolve(null);
                         return;
                     });
@@ -42,7 +42,7 @@ function sPost(posttype:"http"|"https",json:JObject,options:Object,timeLimit:num
                 res.on('data',(chunk)=>resdata+=chunk);
 
                 res.on('error',(e)=>{
-                    SLogger.warn(funcName+" 接收反馈错误:"+e);
+                    SLogger.warn(`${funcName} 接收反馈错误:${e}`);
                     resolve(null);
                     return;
                 });
@@ -60,7 +60,7 @@ function sPost(posttype:"http"|"https",json:JObject,options:Object,timeLimit:num
                         return;
                     }
                     catch(e){
-                        SLogger.warn(funcName+" 接收反馈错误:"+e+"\n原始字符串:"+resdata);
+                        SLogger.warn(`${funcName} 接收反馈错误:${e}\n原始字符串:${resdata}`);
                         resolve(null);
                         return;
                     }
@@ -81,13 +81,13 @@ function sPost(posttype:"http"|"https",json:JObject,options:Object,timeLimit:num
         //请求超时
         if(hasTimeLimit){
             req.setTimeout(timeLimit, ()=>{
-                SLogger.warn(funcName+" 发送请求超时: "+timeLimit+" ms");
+                SLogger.warn(`${funcName} 发送请求超时: ${timeLimit} ms`);
                 req.destroy();
             });
         }
 
         req.on('error', (e)=>{
-            SLogger.warn(funcName+" 发送请求错误:"+e);
+            SLogger.warn(`${funcName} 发送请求错误:${e}`);
             resolve(null);
         });
 

package/src/UtilDecorators.ts

@@ -1,9 +1,7 @@
 import { SLogger } from "./UtilLogger";
 
 
-/**用于打印方法的调用
- * @returns {void}
- */
+/**用于打印方法的调用 */
 export function DLogger(){
     return function (target:any, propertyKey:string, descriptor:PropertyDescriptor){
         const originalMethod = descriptor.value;
@@ -15,9 +13,7 @@ export function DLogger(){
     }
 }
 
-/**用于打印异步方法的调用
- * @returns {void}
- */
+/**用于打印异步方法的调用 */
 export function DLoggerAsync(){
     return function (target:any, propertyKey:string, descriptor:PropertyDescriptor){
         const originalMethod = descriptor.value;
@@ -28,10 +24,42 @@ export function DLoggerAsync(){
         }
     }
 }
+/**try-finally包装 */
+export function Defer(deferLogic: () => void) {
+    return function (target: any, propertyKey: string, descriptor: PropertyDescriptor) {
+        const originalMethod = descriptor.value;
+        descriptor.value = function (...args: any[]) {
+            try {
+                const result = originalMethod.apply(this, args);
+                deferLogic();
+                return result;
+            } catch(e) {
+                deferLogic();
+                throw e;
+            }
+        };
+        return descriptor;
+    };
+}
+/**异步的try-finally包装 */
+export function DeferAsync(deferLogic: () => void) {
+    return function (target: any, propertyKey: string, descriptor: PropertyDescriptor) {
+        const originalMethod = descriptor.value;
+        descriptor.value = async function (...args: any[]) {
+            try {
+                const result = await originalMethod.apply(this, args);
+                deferLogic();
+                return result;
+            } catch(e) {
+                deferLogic();
+                throw e;
+            }
+        };
+        return descriptor;
+    };
+}
 
-/**用于捕获方法中的错误
- * @returns {void}
- */
+/**用于捕获方法中的错误 */
 export function DCatchErrors() {
     return function (target: any, propertyKey: string, descriptor: PropertyDescriptor) {
         const originalMethod = descriptor.value;
@@ -45,9 +73,7 @@ export function DCatchErrors() {
     };
 }
 
-/**用于捕获异步方法中的错误
- * @returns {void}
- */
+/**用于捕获异步方法中的错误 */
 export function DCatchErrorsAsync() {
     return function (target: any, propertyKey: string, descriptor: PropertyDescriptor) {
         const originalMethod = descriptor.value;
@@ -60,3 +86,31 @@ export function DCatchErrorsAsync() {
         };
     };
 }
+
+
+function AddNumberDecorator(n: number) {
+    type NumberToNumberFunc = (num: number) => number;
+    return function(
+        this:any,
+        target: Object,
+        propertyKey: string,
+        descriptor: TypedPropertyDescriptor<NumberToNumberFunc>
+    ) {
+        const originalMethod = descriptor.value!;
+        descriptor.value = function (num: number) {
+            const result = originalMethod.apply(this, [num]);
+            return result + n;
+        };
+        return descriptor;
+    };
+}
+
+class Example {
+    @AddNumberDecorator(10)
+    myMethod(num: number): number {
+        return num;
+    }
+}
+
+//let a = new Example();
+//a.myMethod(10);//?

package/src/UtilFileTools.ts

@@ -3,6 +3,7 @@ import * as path from "path";
 import { JObject, JToken, stringifyJToken } from "./UtilInterfaces";
 import { SLogger } from "./UtilLogger";
 import * as JSON5 from 'json5';
+import { globSync } from "glob";
 
 /**文件工具 */
 export namespace UtilFT{
@@ -201,25 +202,36 @@ export async function writeJSONFile(
 /**搜索路径符合正则表达式的文件
  * @param folder - 文件夹路径
  * @param traitRegex - 正则表达式
- * @returns {Record<string, string>} 文件名与路径的映射 Record<fileName,filePath>
+ * @returns 文件名路径数组
  */
-export function fileSearch(folder: string, traitRegex: string) {
-    let outMap: Record<string, string> = {};
+export function fileSearchRegex(folder: string, traitRegex: string) {
+    let outArray: string[] = [];
     let subFiles = fs.readdirSync(folder);
     let regex = new RegExp(traitRegex);
     for (let subFile of subFiles) {
         let subFilePath = path.join(folder, subFile);
-        subFilePath = subFilePath.replace(/\\/g, "/");
         let stat = fs.lstatSync(subFilePath);
-
         //判断是否是文件夹，递归调用
         if (stat.isDirectory()) {
-            let subMap = fileSearch(path.join(subFilePath, path.sep), traitRegex);
-            for (let key in subMap) outMap[key] = subMap[key];
+            outArray.push(...fileSearchRegex(path.join(subFilePath, path.sep), traitRegex));
             continue;
         }
-        if (regex.test(subFilePath)) outMap[subFile] = subFilePath;
+        if (regex.test(subFilePath)) outArray.push(subFilePath);
     }
-    return outMap;
+    return outArray;
+}
+/**搜索符合Glob匹配的文件
+ * @param globPattern - glob匹配
+ * @param ignore - 忽略的文件
+ * @returns 文件绝对路径数组
+ */
+export function fileSearchGlob(globPattern:string|string[],ignore?:string|string[]){
+    return globSync(globPattern,{ignore,absolute:true});
+}
+/**
+ * @deprecated 请使用 fileSearchRegex 或 fileSearchGlob
+ */
+export function fileSearch(...patams:any[]){
+    throw "请使用 fileSearchRegex 或 fileSearchGlob"
 }
 }