@zwa73/utils 1.0.288 → 1.0.290

package/dist/UtilFunctions.d.ts

@@ -57,6 +57,6 @@ declare class _UtilFunc {
      */
     static resolveDataStore<T>(source: ParseableDataStore<T>): DataStore<T>;
 }
-export declare const UtilFunc: import("@zwa73/modular-mixer").ComposedClass<typeof _UtilFunc, typeof JsFunc, "__jsUtils", "prototype" | "preset" | "assignOption" | "genUUID" | "getTime" | "initField" | "initObject" | "afterward" | "sleep" | "getNeverResolvedPromise" | "retryPromise" | "timelimitPromise" | "mapEntries" | "eachField" | "stringifyJToken" | "sortJToken" | "assertType" | "assertLiteral" | "deepClone" | "isSafeNumber" | "dedent" | "throwError" | "getStack" | "getFuncLoc" | "cachePool" | "memoize" | "asyncize" | "lazyFunction" | "splitToChunk" | "mergeFromChunk" | "structEqual" | "concurrent" | "dynamicImport" | "createInjectable" | "createAsyncProxy" | "checkSharpSchema" | "unwarpReadonly" | "outcome" | "extractOutcome" | "success" | "failed" | "match" | "isStatus" | "eitherize" | "parseSrtTime" | "formatSrtTime" | "parseSrt" | "createSrt" | "ivk" | "range" | "s2l" | "l2s">;
+export declare const UtilFunc: import("@zwa73/modular-mixer").ComposedClass<typeof _UtilFunc, typeof JsFunc, "__jsUtils", "prototype" | "preset" | "assignOption" | "genUUID" | "getTime" | "initField" | "initObject" | "afterward" | "sleep" | "getNeverResolvedPromise" | "retryPromise" | "timelimitPromise" | "mapEntries" | "eachField" | "stringifyJToken" | "sortJToken" | "assertType" | "assertLiteral" | "deepClone" | "isSafeNumber" | "dedent" | "throwError" | "getStack" | "getFuncLoc" | "cachePool" | "memoize" | "asyncize" | "lazyFunction" | "iocify" | "splitToChunk" | "mergeFromChunk" | "structEqual" | "concurrent" | "dynamicImport" | "createInjectable" | "createAsyncProxy" | "checkSharpSchema" | "unwarpReadonly" | "outcome" | "extractOutcome" | "success" | "failed" | "match" | "isStatus" | "eitherize" | "parseSrtTime" | "formatSrtTime" | "parseSrt" | "createSrt" | "ivk" | "range" | "s2l" | "l2s">;
 export type UtilFunc = typeof UtilFunc;
 export {};

package/dist/UtilFunctions.js

@@ -76,15 +76,15 @@ class _UtilFunc {
      * @param opt.cwd          - 执行目录
      * @param opt.env          - 额外环境变量
      */
-    static async exec(command, opt) {
+    static async exec(command, opt = {}) {
         return new Promise(async (resolve, reject) => {
             // 创建一个新的环境变量对象，并将项目的 node_modules/.bin 目录添加到 PATH 环境变量中
-            const env = Object.assign(Object.create(process.env), opt?.env ?? {});
-            const penv = opt?.nodeModules
+            const env = Object.assign(Object.create(process.env), opt.env ?? {});
+            const penv = opt.nodeModules
                 ? opt.nodeModules == 'None' ? ''
                     : 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 (opt?.nodeModules != "None" && (_UtilFunc.checkEnv && (penv == "" || !await UtilFileTools_1.UtilFT.pathExists(penv)))) {
+            if (opt.nodeModules != "None" && (_UtilFunc.checkEnv && (penv == "" || !await UtilFileTools_1.UtilFT.pathExists(penv)))) {
                 UtilLogger_1.SLogger.warn(`UtilFunc.exec 错误, 没有检测到 node_modules/.bin 环境 penv:${penv}`);
                 _UtilFunc.checkEnv = false;
             }
@@ -93,28 +93,28 @@ class _UtilFunc {
             _UtilFunc.originalExecTitle = _UtilFunc.originalExecTitle == UtilSymbol_1.None
                 ? process.title
                 : _UtilFunc.originalExecTitle;
-            const cwd = opt?.cwd ?? process.cwd();
+            const cwd = opt.cwd ?? process.cwd();
             const child = cp.spawn(command, { shell: true, env, cwd });
             let stdout = '';
             let stderr = '';
             child.stdout.on('data', (data) => {
                 stdout += data;
-                if (opt?.outlvl) {
+                if (opt.outlvl != undefined && opt.outlvl != 'none') {
                     const text = data.toString().replace(/\r?\n$/, '');
                     if (typeof opt.outlvl === "function")
                         opt.outlvl(text);
                     else
-                        UtilLogger_1.SLogger.log(opt?.outlvl, text);
+                        UtilLogger_1.SLogger.log(opt.outlvl, text);
                 }
             });
             child.stderr.on('data', (data) => {
                 stderr += data;
-                if (opt?.errlvl) {
+                if (opt.errlvl != undefined && opt.errlvl != 'none') {
                     const text = data.toString().replace(/\r?\n$/, '');
                     if (typeof opt.errlvl === "function")
                         opt.errlvl(text);
                     else
-                        UtilLogger_1.SLogger.log(opt?.errlvl, text);
+                        UtilLogger_1.SLogger.log(opt.errlvl, text);
                 }
             });
             child.on('error', reject);

package/dist/UtilHttp.js

@@ -178,7 +178,7 @@ class UtilHttp {
                 }
                 try {
                     const obj = JSON.parse(data.trim());
-                    UtilLogger_1.SLogger.log(opt.logLevel, `accept json 接受信息 data:`, UtilFunctions_1.UtilFunc.stringifyJToken(obj, { compress: true, space: 2 }), `result:`, UtilFunctions_1.UtilFunc.stringifyJToken(rest, { compress: true, space: 2 }));
+                    UtilLogger_1.SLogger.log(opt.logLevel ?? 'none', `accept json 接受信息 data:`, UtilFunctions_1.UtilFunc.stringifyJToken(obj, { compress: true, space: 2 }), `result:`, UtilFunctions_1.UtilFunc.stringifyJToken(rest, { compress: true, space: 2 }));
                     return { ...rest, data: obj };
                 }
                 catch (err) {

package/dist/UtilInterfaces.d.ts

@@ -1,2 +1,2 @@
-export type { JToken, JValue, JArray, JObject, IJData, AnyFunc, Keyable, DeepReadonly, DeepWritable, PartialOption, ProperSubset, ProperSubsetCheck, IncludeCheck, UnionCheck, Literal, LiteralCheck, AllExtends, AssignObject, Writeable, Requireify, Inverted, FixedLengthTuple, Increment, RangeTuple, AnyString, UnionToIntersection, ExclusiveRecord, ExclusiveJObject, PromiseStatus, StatusVerifyFn, Await, FuncPropNames, ExtendThen, RequiredOnly, WithPrefix, Outcome, Either, Matchable, MatchableFlag, ExtractOutcome, ExtractMatchable, NeedInit, PRecord, MPromise, SPromise, SMPromise, NotPromise, AnyRecord, MReturnType, CmtTuple, Flasy, SrtSegment, ILogger, LogLevel, Asyncize, SharpSchema, ExpandSharpSchema, Preset, PresetOption, PresetFinal } from "@zwa73/js-utils";
+export type { JToken, JValue, JArray, JObject, IJData, AnyFunc, Keyable, DeepReadonly, DeepWritable, PartialOption, ProperSubset, ProperSubsetCheck, IncludeCheck, UnionCheck, Literal, LiteralCheck, AllExtends, AssignObject, Writeable, Requireify, Inverted, FixedLengthTuple, Increment, RangeTuple, AnyString, UnionToIntersection, ExclusiveRecord, ExclusiveJObject, PromiseStatus, StatusVerifyFn, Await, FuncPropNames, ExtendThen, RequiredOnly, WithPrefix, Outcome, Either, Matchable, MatchableFlag, ExtractOutcome, ExtractMatchable, NeedInit, PRecord, MPromise, SPromise, SMPromise, NotPromise, AnyRecord, ReturnTypeOrNever, CmtTuple, Flasy, SrtSegment, ILogger, LogLevel, Asyncize, SharpSchema, ExpandSharpSchema, Preset, PresetOption, PresetFinal, NotFunc, MFunc, MReturnType, IoCDepTable, IoCDepCtorRtn, IoCDepCtor, StaticClass } from "@zwa73/js-utils";
 export type { StringifyOpt, PromiseRetries, PromiseRetryResult } from "@zwa73/js-utils";

package/dist/UtilLogger.d.ts

@@ -85,10 +85,10 @@ export declare class SLogger {
     time(flag: string): HRTimeLog;
     /**根据之前记录的时间戳计算经过的时间 并输出log
      * @param flag  - 记录的命名
-     * @param level - log等级 === null时不产生log
+     * @param level - log等级
      * @returns 格式化的时间字符串
      */
-    timeEnd(flag: string, level?: LogLevel | null): string | undefined;
+    timeEnd(flag: string, level?: LogLevel): string | undefined;
     /**名称为default的slogger实例 */
     private static get defaultInstance();
     /**让名称为default的logger 产生一条对应等级的log 返回自身

package/dist/UtilLogger.js

@@ -133,6 +133,8 @@ class SLogger {
      * @returns 自身
      */
     log(level, ...messages) {
+        if (level == 'none')
+            return this;
         level ??= "silly";
         const strMessages = [];
         //上一条是字符串字符串
@@ -228,7 +230,7 @@ class SLogger {
     }
     /**根据之前记录的时间戳计算经过的时间 并输出log
      * @param flag  - 记录的命名
-     * @param level - log等级 === null时不产生log
+     * @param level - log等级
      * @returns 格式化的时间字符串
      */
     timeEnd(flag, level = "info") {
@@ -284,7 +286,7 @@ class SLogger {
         else {
             out = `${totalMilliseconds.toFixed(3)}ms`;
         }
-        if (level !== null)
+        if (level !== 'none')
             this.log(level, `${flag}: ${out}`);
         delete SLogger.timeTable[flag];
         return out;
@@ -302,6 +304,8 @@ class SLogger {
      * @returns 自身
      */
     static log(level, ...messages) {
+        if (level == null)
+            return this.defaultInstance;
         level = level ?? "silly";
         this.defaultInstance.log(level, ...messages);
         return this.defaultInstance;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@zwa73/utils",
-	"version": "1.0.288",
+	"version": "1.0.290",
 	"description": "my utils",
 	"main": "dist/index.js",
 	"scripts": {