@zwa73/utils 1.0.33 → 1.0.34

package/dist/UtilClass.d.ts

@@ -67,7 +67,12 @@ interface SortCallback<T> {
 }
 export declare class SList<T> {
     private _arr;
-    constructor(obj?: Array<T> | number);
+    /**建立0长度的SList */
+    constructor();
+    /**建立一个长度为 obj 的SList */
+    constructor(obj: number);
+    /**根据obj建立SList */
+    constructor(obj: Array<T>);
     /**返回数组长度
      * @returns {number} - 长度
      */

package/dist/UtilCom.js

@@ -33,7 +33,7 @@ function sPost(type, json, options, timeLimit = -1) {
                         throw funcName + " 接收反馈错误: resdata 为空";
                     try {
                         let obj = JSON.parse(resdata);
-                        UtilLogger_1.SLogger.http(funcName + " 接受信息:", (0, UtilInterfaces_1.stringifyJToken)(obj));
+                        UtilLogger_1.SLogger.http(funcName + " 接受信息:", obj);
                         resolve(obj);
                         return;
                     }

package/dist/UtilInterfaces.d.ts

@@ -18,3 +18,7 @@ export interface IJData {
  * @returns 转换完成的字符串
  */
 export declare function stringifyJToken(token: JToken, space?: string | number | null | undefined): string;
+/**转为可写的 */
+export type Writeable<T> = {
+    -readonly [P in keyof T]: T[P];
+};

package/dist/UtilLogger.js

@@ -111,14 +111,23 @@ class SLogger {
     log(level, ...messages) {
         level = level || "silly";
         let strMessages = [];
+        //上一条是字符串字符串
+        let preIsString = true;
         for (let message of messages) {
             let out;
-            if (message == null)
-                out = `<${typeof message}> ${typeof message}`;
-            else if (typeof message !== "string")
+            //非string类型
+            if (typeof message !== "string") {
                 out = `<${typeof message}> ${(0, util_1.inspect)(message)}`;
-            else
+                preIsString = false;
+            }
+            else if (!preIsString) {
+                //如果上一条不是字符串则需要添加<string>类型标记
+                out = `<${typeof message}> ${(0, util_1.inspect)(message)}`;
+                preIsString = true;
+            }
+            else {
                 out = message;
+            }
             strMessages.push(out);
         }
         let outMessage = strMessages.join("\n");

package/package.json

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

package/src/UtilClass.ts

@@ -80,6 +80,12 @@ interface SortCallback<T> {
 
 export class SList<T> {
     private _arr: Array<T>;
+    /**建立0长度的SList */
+    constructor();
+    /**建立一个长度为 obj 的SList */
+    constructor(obj:number);
+    /**根据obj建立SList */
+    constructor(obj:Array<T>);
     constructor(obj?: Array<T> | number) {
         if (typeof obj == "number") this._arr = new Array<T>(obj);
         else if (Array.isArray(obj)) this._arr = obj;

package/src/UtilCom.ts

@@ -38,7 +38,7 @@ function sPost(type:"http"|"https",json:JObject,options:Object,timeLimit:number=
                         throw funcName+" 接收反馈错误: resdata 为空";
                     try{
                         let obj = JSON.parse(resdata);
-                        SLogger.http(funcName+" 接受信息:",stringifyJToken(obj));
+                        SLogger.http(funcName+" 接受信息:",obj);
                         resolve(obj);
                         return;
                     }

package/src/UtilInterfaces.ts

@@ -24,3 +24,6 @@ export function stringifyJToken(token:JToken,space:string|number|null|undefined=
 	return JSON.stringify(token,null,space);
 }
 
+/**转为可写的 */
+export type Writeable<T> = { -readonly [P in keyof T]: T[P] };
+

package/src/UtilLogger.ts

@@ -134,13 +134,21 @@ export class SLogger{
     log(level:LogLevel,...messages:Array<any>):SLogger{
         level = level||"silly";
         let strMessages:Array<string> = [];
+        //上一条是字符串字符串
+        let preIsString = true;
         for(let message of messages){
             let out:string;
-            if(message == null)
-                out = `<${typeof message}> ${typeof message}`;
-            else if(typeof message!=="string")
+            //非string类型
+            if(typeof message!=="string"){
                 out=`<${typeof message}> ${inspect(message)}`;
-            else out = message;
+                preIsString=false;
+            }else if(!preIsString){
+                //如果上一条不是字符串则需要添加<string>类型标记
+                out = `<${typeof message}> ${inspect(message)}`;
+                preIsString=true;
+            }else{
+                out = message;
+            }
             strMessages.push(out);
         }
         let outMessage = strMessages.join("\n");
@@ -258,20 +266,15 @@ export class SLogger{
                 }
             }
             concat(Days,':','dd',
-                `${Days.toString()}`,
-            );
+                `${Days.toString()}`);
             concat(hours,':','HH',
-                `${hours.toString().padStart(2, '0')}`
-            );
+                `${hours.toString().padStart(2, '0')}`);
             concat(minutes,':','mm',
-                `${minutes.toString().padStart(2, '0')}`
-            );
+                `${minutes.toString().padStart(2, '0')}`);
             concat(seconds,':','ss',
-                `${seconds.toString().padStart(2, '0')}`
-            );
+                `${seconds.toString().padStart(2, '0')}`);
             concat(milliseconds,'.','mmm',
-                `${milliseconds.toString().padStart(3, '0')}`
-            );
+                `${milliseconds.toString().padStart(3, '0')}`);
             //result = result.replace(/^(0(?![^0-9]))+/, '');
             result = result.replace(/^0+([0-9])/,"$1");
             out = `${result} (${format})`;