@zwa73/utils 1.0.79 → 1.0.81

package/dist/UtilSymbol.js

@@ -1,13 +1,28 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Timeout = exports.None = exports.Terminated = exports.Failed = exports.Completed = void 0;
-/**完成 */
-exports.Completed = Symbol("Completed");
-/**失败 */
+exports.NoneOut = exports.Timeout = exports.Terminated = exports.Completed = exports.None = exports.Failed = exports.Success = void 0;
+/**成功 经过验证的结果 */
+exports.Success = Symbol("Success");
+/**失败 可重试的 */
 exports.Failed = Symbol("Failed");
-/**终止 */
-exports.Terminated = Symbol("Terminated");
-/**不存在 */
+/**不存在 无 */
 exports.None = Symbol("None");
-/**超时 */
+/**完成 未经验证/未超时的结果
+ * Success扩展
+ * 仅在Success同时出现时使用
+ */
+exports.Completed = Symbol("Completed");
+/**终止 熔断运行
+ * Failed扩展
+ * 仅在Failed同时出现时使用
+ */
+exports.Terminated = Symbol("Terminated");
+/**超时 超时类型的失败
+ * Failed扩展
+ * 仅在超时时使用
+ */
 exports.Timeout = Symbol("Timeout");
+exports.NoneOut = {
+    status: exports.None,
+    result: exports.None,
+};

package/dist/test/repeatTest.js

@@ -11,7 +11,7 @@ async function mockAsyncFunction() {
 }
 // 验证函数，只有当结果为 "Success" 时才认为成功
 function mockVerifyFunction(result) {
-    return result === "Success" ? __1.Completed : __1.Failed;
+    return result === "Success" ? __1.Success : __1.Failed;
 }
 // 测试 repeatPromise 函数
 __1.UtilFunc.repeatPromise(mockAsyncFunction, mockVerifyFunction, 3, 10)

package/dist/test/test.js

@@ -33,25 +33,25 @@ 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 },
+    { 攻击: 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 },
+    { 攻击: 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.mapEntries(ed, (k, v) => v ? v / BASE_MAX[k] : 0);

package/jest/UtilFunction/queueProc.test.ts

@@ -0,0 +1,23 @@
+import { UtilFunc } from '@';
+import { test, expect } from '@jest/globals';
+
+test('queueProc function', async () => {
+    const results:number[] = [];
+    const expectedResults:number[] = [];
+    const tasks = Array.from({length: 10}, (_, i) => {
+        const result = Math.floor(Math.random() * 100); // 随机生成结果
+        expectedResults.push(result);
+        return async () => {
+            await UtilFunc.sleep(Math.random() * 800); // 随机延迟
+            results.push(result); 
+        };
+    });
+    console.log("结果应该为:",expectedResults);
+
+    // 同时启动所有任务，但由于 queueProc 的设计，它们应该按顺序完成
+    const promises = tasks.map(task => UtilFunc.queueProc('test', task));
+    await Promise.all(promises);
+
+    // 检查结果是否按顺序
+    expect(results).toEqual(expectedResults);
+},10000);

package/jest/UtilFunction/repeatPromise.test.ts

@@ -0,0 +1,38 @@
+import { Completed, Failed, PromiseStat, PromiseVerifyFn, Success, UtilFunc } from "@";
+import { test, expect } from '@jest/globals';
+
+
+
+
+const timeList = [8000,1000,1000000] as const;
+const resList  = [Success,Failed,Failed] as const;
+let index = 0;
+
+// 模拟的异步函数，有一定几率失败
+async function mockAsyncFunction() {
+    return new Promise<Success|Failed>((resolve, reject) => {
+		let delay = timeList[index];
+		let result = resList[index];
+        console.log('当前预期 延迟:',delay,' 结果:',result);
+        setTimeout(() => {
+            resolve(result);
+        }, delay);
+		index++;
+    });
+}
+
+// 验证函数，只有当结果为 "Success" 时才认为成功
+function mockVerifyFunction(result:Success|Failed):PromiseStat {
+    return result === Success ? Success : Failed;
+}
+
+// 测试 repeatPromise 函数
+test('repeatPromise', async () => {
+    const repeatCount = 3;
+    const awaitTime = 5;
+    console.log("重试次数:",repeatCount," 超时时间:",awaitTime)
+    const result = await UtilFunc.repeatPromise(
+        mockAsyncFunction, mockVerifyFunction,
+        repeatCount, awaitTime);
+    expect(result).toBe(Success);
+},10000);

package/jest/jest.test.ts

@@ -0,0 +1,46 @@
+import { test, expect } from '@jest/globals';
+// main.test.ts
+const add = (a: number, b: number): number => a + b;
+
+test('1+2等于3', () => {
+    expect(add(1, 2)).toBe(3);
+});
+test('console.log test', () => {
+    const consoleSpy = jest.spyOn(console, 'log');
+
+    // 这里是你的函数，它会打印 "成功" 或 "失败"
+    function yourFunction() {
+        console.log('成功');
+    }
+
+    yourFunction();
+
+    expect(consoleSpy).toHaveBeenCalledWith('成功');
+
+    // 清理 spy
+    consoleSpy.mockRestore();
+});
+
+test('mult console.log test', () => {
+    const consoleSpy = jest.spyOn(console, 'log');
+
+    // 这里是你的函数
+    function yourFunction() {
+        console.log("xxxx1234");
+        console.log("111abc22");
+        console.log("11def");
+        console.log("xxxxxxx");
+    }
+
+    yourFunction();
+
+    // 检查 console.log 的输出中是否包含 "abc" 和 "def"
+    const hasAbc = consoleSpy.mock.calls.some(args => args.some(arg => arg.includes('abc')));
+    const hasDef = consoleSpy.mock.calls.some(args => args.some(arg => arg.includes('def')));
+
+    expect(hasAbc).toBe(true);
+    expect(hasDef).toBe(true);
+
+    // 清理 spy
+    consoleSpy.mockRestore();
+});

package/jest.config.js

@@ -0,0 +1,16 @@
+
+
+
+
+module.exports = {
+    roots: ['./jest'],
+    transform: {
+        '^.+\\.tsx?$': 'ts-jest',
+    },
+    moduleNameMapper: {
+        '^@src/(.*)$': '<rootDir>/dist/$1',
+        '^@/(.*)$': '<rootDir>/$1',
+        '^@$': '<rootDir>/index'
+    },
+    moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'json', 'node'],
+};

package/package.json

@@ -1,12 +1,14 @@
 {
   "name": "@zwa73/utils",
-  "version": "1.0.79",
+  "version": "1.0.81",
   "description": "my utils",
   "main": "index.js",
   "scripts": {
-    "test": "node test",
-    "postinstall": "start node postinstall.js",
-    "release": "call release.bat"
+    "test": "call npm run compile && jest",
+    "postinstall": "start node ./scripts/postinstall.js",
+    "release": "call release.bat",
+    "compile": "call tsc -p tsconfig.compile.json && call tsc-alias -p tsconfig.compile.json",
+    "watch": "start tsc-alias -w -p tsconfig.compile.json && start tsc -w -p tsconfig.compile.json"
   },
   "keywords": [
     "zwa73"
@@ -28,6 +30,11 @@
     "winston-daily-rotate-file": "^4.7.1"
   },
   "devDependencies": {
-    "@types/node": "^18.16.3"
+    "@types/jest": "^29.5.12",
+    "@types/node": "^18.16.3",
+    "jest": "^29.7.0",
+    "ts-jest": "^29.1.2",
+    "tsc-alias": "^1.8.8",
+    "typescript": "^5.3.3"
   }
 }

package/release.bat

@@ -1,5 +1,4 @@
-call tsc
-call tsc-alias
-node build.js
-npm publish --access public
+call npm run compile
+call node build.js
+call npm publish --access public
 pause

package/{postinstall.js → scripts/postinstall.js}

@@ -1,6 +1,6 @@
-const currentVersion = require('./package.json').version;
+const currentVersion = require('../package.json').version;
 const path = require('path');
-const { UtilFT } = require("./index");
+const { UtilFT } = require("../index");
 const readline = require('readline');
 
 // 将版本号转换为可以比较的数字

package/src/QuickFunction.ts

@@ -1,36 +1,56 @@
-import { ExtractOutcome, Keyable, Outcome } from "./UtilInterfaces";
+import { UtilFunc } from "./UtilFunctions";
+import { Outcome } from "./UtilInterfaces";
+import { Completed, Failed, FailedLike, None, NoneOut, StatusSymbol, Success, SuccessLike, Terminated, Timeout } from "./UtilSymbol";
 
-/**创建一个outcome */
-export function outcome<K extends Keyable,V> (key:K,value:V):Outcome<K,V>{
-    return {status:key,result:value}
-}
+export const {
+    outcome,
+    matchProc,
+    sucesProc,
+    isFailed,
+    isSafeNumber,
+    isSuccess,
+    assertType,
+    assertLiteral,
+    deepClone,
+    sleep,
+    stringifyJToken,
+    getTime,
+    mapEntries,
+    composeMixinable
+} = UtilFunc;
 
-/**处理联合 简单值
- * @param t       - 目标值
- * @param procObj - 所有可能的id组成的处理函数映射
- * @returns 任意处理函数的返回值
- */
-export function match<
-    T extends Keyable | Outcome<Keyable, unknown>,
-    P extends (T extends Keyable
-        ? {[K in T]:(k:K)=>unknown}
-        : T extends Outcome<Keyable,unknown> 
-            ? {[K in T['status']]:(k:K,v:ExtractOutcome<T,K>['result'])=>unknown}
-            : never)>
-    (t:T, procObj:P):
-    P extends Record<any,(...args:any)=>any>
-        ? {[K in keyof P]: ReturnType<P[K]>}[keyof P]
-        : never {
-    if (typeof t === 'string' || typeof t === 'number' || typeof t === 'symbol')
-        return (procObj as any)[t](t);
-    else
-        return (procObj as any)[t.status](t.status,t.result);
-}
 if(false){
+    let aaser = assertLiteral({a:1})
+
     let a:"asd"|"dsa" = null as any;
-    const r = match(a,{
+    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/src/UtilDecorators.ts

@@ -1,4 +1,5 @@
 import { UtilFunc } from "./UtilFunctions";
+import { UnwrapPromise } from "./UtilInterfaces";
 import { SLogger } from "./UtilLogger";
 
 type TDTg<T> = 
@@ -136,7 +137,7 @@ export function DeferAsync<T extends (...args:any)=>Promise<any>>
     };
 }
 /**try-catch包装 */
-export function DCatch<T extends (...args:any)=>any>
+export function Catch<T extends (...args:any)=>any>
     (catchLogic:(error: any, ...args:Parameters<T>)=>ReturnType<T>):TDTg<T> {
     return function(target, propertyKey, descriptor) {
         const originalMethod = descriptor.value!;
@@ -198,6 +199,7 @@ class Example {
     }
     @LogCall()
     @Defer((a,b)=>null)
+    @CatchAsync(async (a,b)=>123)
     static async myMethod1(num: number,ss:string) {
         return 312;
     }