@zwa73/utils 1.0.146 → 1.0.147

package/dist/ServiceManager.js

@@ -0,0 +1 @@
+"use strict";

package/dist/UtilFfmpegTools.js

@@ -37,7 +37,7 @@ const UtilClass_1 = require("./UtilClass");
 class SFfmpegTool {
     /**静态构造函数 */
     static init() {
-        const ffmpegPath = process.env.FFMPEG_PATH;
+        const ffmpegPath = process?.env?.FFMPEG_PATH;
         if (ffmpegPath != null) {
             const exepath = pathe_1.default.join(ffmpegPath, "ffmpeg.exe");
             SFfmpegTool.setFfmpegPath(exepath);

package/dist/UtilFunctions.d.ts

@@ -1,6 +1,7 @@
 import { AnyFunc, ComposedClass, ComposedMixinable, ComposedRefMixinable, ExtractOutcome, IJData, JObject, JToken, Keyable, Literal, Matchable, MatchableFlag, Mixinable, Outcome, ReqVerifyFn, ProperSubsetCheck, RefMixinable, UnionToIntersection, Await, AnyRecord } from "./UtilInterfaces";
 import { LogLevel } from "./UtilLogger";
 import { Failed, FailedLike, None, StatusSymbol, Success, SuccessLike, Timeout } from "./UtilSymbol";
+import { PRecord } from "..";
 declare const HashMethodList: readonly ["md5", "sha1", "sha256", "sha512", "sha3", "blake2", "blake3"];
 type HashMethod = typeof HashMethodList[number];
 /**执行选项 */
@@ -165,6 +166,16 @@ export declare class UtilFunc {
     }>>(t: T, procObj: P): P extends Record<any, AnyFunc> ? {
         [K in keyof P]: ReturnType<P[K]>;
     }[keyof P] : never;
+    /**处理部分联合值
+     * @param t       - 目标值
+     * @param procObj - 所有可能的id组成的处理函数映射 (status, result)=>any
+     * @returns 任意处理函数的返回值
+     */
+    static matchPartialProc<T extends Matchable<Keyable>, P extends Partial<{
+        [K in MatchableFlag<T>]: (k: K, v: ExtractOutcome<T, MatchableFlag<K>>['result']) => unknown;
+    }>>(t: T, procObj: P): (P extends PRecord<Keyable, AnyFunc> ? {
+        [K in keyof P]: P[K] extends AnyFunc ? ReturnType<P[K]> : undefined;
+    }[keyof P] : never) | undefined;
     /**根据典型的成功或失败状态运行函数
      * @param t - 目标值
      * @param sucessFunc - 成功则运行的函数 (result)=>any

package/dist/UtilFunctions.js

@@ -392,19 +392,20 @@ class UtilFunc {
         space = space === null ? undefined : space;
         if (!compress)
             return JSON.stringify(token, null, space);
+        const ec = '\uF121\uF122\uF123';
         const compressReplacer = (key, value) => {
             if (Array.isArray(value) && value.every(item => typeof item === 'number' || typeof item === 'string' ||
                 typeof item === 'boolean' || item == null))
-                return `@@@${JSON.stringify(value)}@@@`;
+                return `${ec}${JSON.stringify(value)}${ec}`;
             const str = JSON.stringify(value);
             if (typeof str != 'string')
                 return value;
             if (str.length <= 100)
-                return `@@@${str}@@@`;
+                return `${ec}${str}${ec}`;
             return value;
         };
         return JSON.stringify(token, compressReplacer, space)
-            .replace(/"@@@(.*?)@@@"/g, (match, p1) => p1.replace(/\\([\\"])/g, '$1'));
+            .replace(new RegExp(`"${ec}(.*?)${ec}"`, 'g'), (match, p1) => p1.replace(/\\([\\"])/g, '$1'));
     }
     /**代办表 用于队列处理等待 */
     static pendingMap = {};
@@ -486,6 +487,23 @@ class UtilFunc {
             return procObj[t.status](t.status, t.result);
         UtilFunc.throwError(`matchProc 传入了一个预料之外的值: ${String(t)}`, 'fatal');
     }
+    /**处理部分联合值
+     * @param t       - 目标值
+     * @param procObj - 所有可能的id组成的处理函数映射 (status, result)=>any
+     * @returns 任意处理函数的返回值
+     */
+    static matchPartialProc(t, procObj) {
+        if (typeof t === 'string' || typeof t === 'number' || typeof t === 'symbol') {
+            if (procObj[t])
+                return procObj[t](t);
+            else
+                return undefined;
+        }
+        else if (procObj[t.status])
+            return procObj[t.status](t.status, t.result);
+        UtilLogger_1.SLogger.warn(`matchPartialProc 传入了一个预料之外的值, 已返回undefined: ${String(t)}`);
+        return undefined;
+    }
     /**根据典型的成功或失败状态运行函数
      * @param t - 目标值
      * @param sucessFunc - 成功则运行的函数 (result)=>any

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@zwa73/utils",
-	"version": "1.0.146",
+	"version": "1.0.147",
 	"description": "my utils",
 	"main": "index.js",
 	"scripts": {
@@ -17,6 +17,7 @@
 	"author": "zwa73",
 	"license": "ISC",
 	"dependencies": {
+		"@deepkit/type": "^1.0.1-alpha.153",
 		"fluent-ffmpeg": "2.1.2",
 		"glob": "^10.4.1",
 		"html-entities": "^2.3.3",
@@ -32,11 +33,10 @@
 	"devDependencies": {
 		"@types/fluent-ffmpeg": "^2.1.21",
 		"@types/jest": "^29.5.12",
-		"@types/node": "^18.16.3",
+		"@types/node": "^20.14.11",
 		"@zwa73/dev-utils": "^1.0.58",
 		"jest": "^29.7.0",
 		"ts-jest": "^29.1.2",
-		"ts-morph": "^23.0.0",
 		"tsc-alias": "^1.8.8",
 		"typescript": "^5.3.3"
 	}

package/scripts/postinstall.js

@@ -1,5 +1,5 @@
 const path = require('path');
-const { UtilFT, SLogger } = require("../index");
+const { UtilFT } = require("../index");
 const readline = require('readline');
 
 const PACKAGE_PATH = path.join(__dirname,'..','package.json');
@@ -17,6 +17,7 @@ const INFO_TABLE = {
     "1.0.128":"fileSearch 添加Sync版本, 默认改为异步函数",
     "1.0.131":"repeatPromise 与 repeatPost 改为传入可选参数表模式",
 }
+const PKG_NAME = "utils";
 
 // 将版本号转换为可以比较的数字
 function versionToNumber(version) {
@@ -44,19 +45,18 @@ function showUpgradeMessages(prevVersion, currentVersion) {
 }
 
 
-
 async function main(){
     const packageTable = await UtilFT.loadJSONFile(PACKAGE_PATH);
     const currentVersion = packageTable.version;
     await UtilFT.ensurePathExists(VERSION_PATH);
-    const versionTable = await UtilFT.loadJSONFile(VERSION_PATH,{})
-    const prevVersion = versionTable.utils.version;
+    const versionTable = await UtilFT.loadJSONFile(VERSION_PATH,{default:{}});
+    const prevVersion = versionTable[PKG_NAME]?.version ?? "0.0.0";
 
     console.log(`${currentVersion} 版本已安装`);
     // 使用这个函数来显示升级信息
     const hasOut = showUpgradeMessages(prevVersion, currentVersion);
 
-    const ntable = Object.assign({},versionTable,{utils:{version:currentVersion}});
+    const ntable = Object.assign({},versionTable,{[PKG_NAME]:{version:currentVersion}});
     await UtilFT.writeJSONFile(VERSION_PATH, ntable);
 
     if(!hasOut) return;

package/src/UtilFfmpegTools.ts

@@ -15,7 +15,7 @@ export type IOMap = { [key: string]: string };
 class SFfmpegTool {
     /**静态构造函数 */
     static init() {
-        const ffmpegPath = process.env.FFMPEG_PATH;
+        const ffmpegPath = process?.env?.FFMPEG_PATH;
         if(ffmpegPath!=null){
             const exepath = path.join(ffmpegPath,"ffmpeg.exe");
             SFfmpegTool.setFfmpegPath(exepath);

package/src/UtilFunctions.ts

@@ -8,6 +8,7 @@ import opath from 'path';
 import { UtilFT } from "./UtilFileTools";
 import {inspect} from 'util';
 import type * as publicIp from 'public-ip';
+import { PRecord } from "..";
 
 const HashMethodList = ["md5","sha1","sha256","sha512","sha3","blake2","blake3"] as const;
 type HashMethod = typeof HashMethodList[number];
@@ -459,19 +460,21 @@ static stringifyJToken(token:JToken|IJData,opt?:StringifyOpt){
 
     if(!compress) return JSON.stringify(token,null,space);
 
+    const ec = '\uF121\uF122\uF123';
+
     const compressReplacer = (key: string, value: any)=> {
         if (Array.isArray(value) && value.every(item =>
             typeof item === 'number' || typeof item === 'string' ||
             typeof item === 'boolean' || item == null))
-            return `@@@${JSON.stringify(value)}@@@`;
+            return `${ec}${JSON.stringify(value)}${ec}`;
         const str = JSON.stringify(value);
         if(typeof str!='string') return value;
-        if(str.length<=100) return `@@@${str}@@@`;
+        if(str.length<=100) return `${ec}${str}${ec}`;
         return value;
     }
 
     return JSON.stringify(token,compressReplacer,space)
-        .replace(/"@@@(.*?)@@@"/g, (match, p1) =>
+        .replace(new RegExp(`"${ec}(.*?)${ec}"`,'g'), (match, p1) =>
             p1.replace(/\\([\\"])/g, '$1'));
 }
 
@@ -553,9 +556,10 @@ static outcome<K extends Keyable,V> (key:K,value:V):Outcome<K,V>{
  */
 static matchProc<
     T extends Matchable<Keyable>,
-    P extends UnionToIntersection<
-        { [K in MatchableFlag<T>] :
-            (k:K,v:ExtractOutcome<T,MatchableFlag<K>>['result'])=>unknown }>>
+    P extends UnionToIntersection<{//旧版本可能会将此映射处理为联合类型 所以需要UnionToIntersection
+        [K in MatchableFlag<T>] :
+            (k:K,v:ExtractOutcome<T,MatchableFlag<K>>['result'])=>unknown
+        }>>
     (t:T, procObj:P):
     P extends Record<any,AnyFunc>
         ? {[K in keyof P]: ReturnType<P[K]>}[keyof P]
@@ -569,6 +573,35 @@ static matchProc<
     UtilFunc.throwError(`matchProc 传入了一个预料之外的值: ${String(t)}`,'fatal');
 }
 
+/**处理部分联合值
+ * @param t       - 目标值
+ * @param procObj - 所有可能的id组成的处理函数映射 (status, result)=>any
+ * @returns 任意处理函数的返回值
+ */
+static matchPartialProc<
+    T extends Matchable<Keyable>,
+    P extends Partial<{
+        [K in MatchableFlag<T>] :
+            (k:K,v:ExtractOutcome<T,MatchableFlag<K>>['result'])=>unknown
+    }>>
+    (t:T, procObj:P):
+    (P extends PRecord<Keyable,AnyFunc>
+        ? {[K in keyof P]: P[K] extends AnyFunc
+            ? ReturnType<P[K]> : undefined
+        }[keyof P] : never ) | undefined {
+    if (typeof t === 'string' || typeof t === 'number' || typeof t === 'symbol'){
+        if ((procObj as any)[t])
+            return (procObj as any)[t](t);
+        else return undefined;
+    }
+    else if ((procObj as any)[t.status])
+        return (procObj as any)[t.status](t.status,(t as any).result);
+    SLogger.warn(`matchPartialProc 传入了一个预料之外的值, 已返回undefined: ${String(t)}`);
+    return undefined;
+}
+
+
+
 /**根据典型的成功或失败状态运行函数  
  * @param t - 目标值
  * @param sucessFunc - 成功则运行的函数 (result)=>any

package/dist/ServiceAdapter.d.ts

@@ -1,47 +0,0 @@
-import { Await, JToken, NeedInit } from "./UtilInterfaces";
-export type ServiceInstance = {
-    /**停止实例释放内存
-     * @async
-     */
-    kill: () => Promise<void> | void;
-};
-export type ServiceConfig = {
-    name: string;
-    opt: JToken;
-};
-export type CtorTable = {
-    [Type in string]: (opt: any) => Promise<ServiceInstance> | ServiceInstance;
-};
-export type CtorTable2FullCfgTable<CT extends CtorTable, Cfg> = {
-    [P in keyof CT]: P extends string ? CT[P] extends (opt: infer Opt) => any ? Cfg & {
-        type: P;
-        opt: Opt;
-    } : never : never;
-};
-export declare class ServiceAdapter<CTT extends CtorTable, CFG extends ServiceConfig, FCT extends CtorTable2FullCfgTable<CTT, CFG> = CtorTable2FullCfgTable<CTT, CFG>> implements NeedInit {
-    private _cfgPath;
-    private _ctorTable;
-    inited: Promise<void>;
-    protected _cfgTable: Record<string, FCT[keyof FCT]>;
-    protected _insPool: Record<string, Await<ReturnType<CTT[keyof CTT]>>>;
-    protected constructor(_cfgPath: string, _ctorTable: CTT);
-    start<T extends keyof FCT>(type: T, opt: FCT[T]['opt'], name?: string): Promise<void>;
-}
-type ITest1 = {
-    test1(): void;
-} & ServiceInstance;
-type ITest2 = {
-    test2(): void;
-} & ServiceInstance;
-type TCT = {
-    'Test1': (opt: {
-        t1: number;
-    }) => ITest1;
-    'Test2': (opt: {
-        t2: string;
-    }) => ITest2;
-};
-export type CfgSchema = CtorTable2FullCfgTable<TCT, {
-    ssa: string;
-}>;
-export {};

package/dist/ServiceAdapter.js

@@ -1,35 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ServiceAdapter = void 0;
-const UtilFileTools_1 = require("./UtilFileTools");
-const UtilFunctions_1 = require("./UtilFunctions");
-class ServiceAdapter {
-    _cfgPath;
-    _ctorTable;
-    inited;
-    _cfgTable = {};
-    _insPool = {};
-    constructor(_cfgPath, _ctorTable) {
-        this._cfgPath = _cfgPath;
-        this._ctorTable = _ctorTable;
-        this.inited = UtilFunctions_1.UtilFunc.ivk(async () => {
-            this._cfgTable = await UtilFileTools_1.UtilFT.loadJSONFile(_cfgPath);
-            for (const name in this._cfgTable) {
-                const cfg = this._cfgTable[name];
-                //@ts-ignore
-                this._insPool[name] = await this._ctorTable[cfg.type](cfg.opt);
-            }
-        });
-    }
-    async start(type, opt, name = 'default') {
-        if (this._insPool[name] != undefined)
-            await this._insPool[name].kill();
-        //@ts-ignore
-        this._insPool[name] = await this._ctorTable[type](opt);
-    }
-}
-exports.ServiceAdapter = ServiceAdapter;
-class TessClass extends ServiceAdapter {
-}
-let a = null;
-a.start('Test1', { t1: 100 });

package/src/ServiceAdapter.ts

@@ -1,73 +0,0 @@
-import { UtilFT } from "./UtilFileTools";
-import { UtilFunc } from "./UtilFunctions";
-import { Await, JToken, NeedInit } from "./UtilInterfaces";
-
-
-
-
-
-
-export type ServiceInstance = {
-    /**停止实例释放内存
-     * @async
-     */
-    kill:()=>Promise<void>|void;
-}
-export type ServiceConfig = {
-    name:string;
-    opt :JToken;
-};
-export type CtorTable = {
-    [Type in string]:(opt:any)=>Promise<ServiceInstance>|ServiceInstance
-}
-export type CtorTable2FullCfgTable<CT extends CtorTable,Cfg> = {
-    [P in keyof CT]: P extends string ?
-        CT[P] extends (opt:infer Opt)=>any 
-            ? Cfg&{type:P,opt:Opt}
-            : never
-        : never
-}
-export class ServiceAdapter
-    <CTT extends CtorTable,
-    CFG extends ServiceConfig,
-    FCT extends CtorTable2FullCfgTable<CTT,CFG> = CtorTable2FullCfgTable<CTT,CFG>>
-    implements NeedInit{
-    inited:Promise<void>;
-    protected _cfgTable :Record<string,FCT[keyof FCT]>={};
-    protected _insPool  :Record<string,Await<ReturnType<CTT[keyof CTT]>>>={};
-    protected constructor(private _cfgPath:string, private _ctorTable:CTT){
-        this.inited=UtilFunc.ivk(async ()=>{
-            this._cfgTable = await UtilFT.loadJSONFile(_cfgPath) as Record<string,FCT[keyof FCT]>;
-            for(const name in this._cfgTable){
-                const cfg = this._cfgTable[name];
-                //@ts-ignore
-                this._insPool[name] = await this._ctorTable[cfg.type](cfg.opt);
-            }
-        });
-    }
-    async start<T extends keyof FCT>(type:T,opt:FCT[T]['opt'],name:string='default'){
-        if(this._insPool[name]!=undefined)
-            await this._insPool[name].kill();
-        //@ts-ignore
-        this._insPool[name] = await this._ctorTable[type as keyof CTT](opt)
-    }
-}
-
-
-type ITest1 = {
-    test1():void;
-}&ServiceInstance;
-type ITest2 = {
-    test2():void;
-}&ServiceInstance;
-
-type TCT = {
-    'Test1':(opt:{t1:number})=>ITest1;
-    'Test2':(opt:{t2:string})=>ITest2;
-}
-class TessClass extends ServiceAdapter<TCT,{}&ServiceConfig>{
-}
-let a:TessClass = null as any;
-a.start('Test1',{t1:100});
-
-export type CfgSchema = CtorTable2FullCfgTable<TCT,{ssa:string}>;