@zwa73/utils 1.0.91 → 1.0.93

package/dist/UtilLogger.js

@@ -1,9 +1,35 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SLogger = void 0;
-const path = require("path");
-const winston = require("winston");
-const DailyRotateFile = require("winston-daily-rotate-file");
+const path = __importStar(require("path"));
+const winston = __importStar(require("winston"));
+const winston_daily_rotate_file_1 = __importDefault(require("winston-daily-rotate-file"));
 const util_1 = require("util");
 const logLevels = {
     fatal: 0,
@@ -56,7 +82,7 @@ class SLogger {
                 let messageList = message.split("\n");
                 return `[${info.timestamp}] [${level.toUpperCase()}]: ${messageList.join("\n")}`;
             }));
-            transports.push(new DailyRotateFile({
+            transports.push(new winston_daily_rotate_file_1.default({
                 filename: path.join(outFloder, 'log-%DATE%.txt'),
                 datePattern: 'YYYY-MM-DD',
                 level: fileLevel,
@@ -232,18 +258,18 @@ class SLogger {
             let format = '';
             let acc = 0;
             const maxAcc = 3;
-            let concat = function (num, sep, formatText, resultText) {
-                let hasResult = result.length > 0;
-                let need = (hasResult || num > 0) && (acc < maxAcc);
-                if (need) {
-                    if (result.length > 0)
-                        result += sep;
-                    if (format.length > 0)
-                        format += sep;
-                    result += resultText;
-                    format += formatText;
-                    acc++;
-                }
+            const concat = (num, sep, formatText, resultText) => {
+                const hasResult = result.length > 0;
+                const need = (hasResult || num > 0) && (acc < maxAcc);
+                if (!need)
+                    return;
+                if (result.length > 0)
+                    result += sep;
+                if (format.length > 0)
+                    format += sep;
+                result += resultText;
+                format += formatText;
+                acc++;
             };
             concat(Days, ':', 'dd', `${Days.toString()}`);
             concat(hours, ':', 'HH', `${hours.toString().padStart(2, '0')}`);
@@ -261,7 +287,7 @@ class SLogger {
             out = `${totalMilliseconds.toFixed(3)}ms`;
         }
         if (level !== null)
-            this.log(level, flag + ": " + out);
+            this.log(level, `${flag}: ${out}`);
         delete SLogger.timeTable[flag];
         return out;
     }
@@ -274,7 +300,7 @@ class SLogger {
     }
     /**让名称为default的logger 产生一条对应等级的log 返回自身
      * @param level    - log等级
-     * @param messages -  log消息
+     * @param messages - log消息
      * @returns 自身
      */
     static log(level, ...messages) {

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@zwa73/utils",
-  "version": "1.0.91",
+  "version": "1.0.93",
   "description": "my utils",
   "main": "index.js",
   "scripts": {
     "test": "call npm run compile && jest",
     "postinstall": "start node ./scripts/postinstall.js",
-    "release": "call release.bat",
+    "release": "call npm run compile && call node release.js && call npm publish --access public",
     "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"
   },

package/release.bat

@@ -1,4 +1,2 @@
-call npm run compile
-call node build.js
-call npm publish --access public
+call npm run release
 pause

package/src/QuickFunction.ts

@@ -9,6 +9,8 @@ export const {
     isFailed,
     isSafeNumber,
     isSuccess,
+    likeNone,
+    expect,
     assertType,
     assertLiteral,
     deepClone,