@e-mc/module 0.9.1 → 0.9.3

package/README.md

@@ -9,7 +9,7 @@
 
 ## Interface
 
-* [View Source](https://www.unpkg.com/@e-mc/types@0.9.1/lib/index.d.ts)
+* [View Source](https://www.unpkg.com/@e-mc/types@0.9.3/lib/index.d.ts)
 
 ```typescript
 import type { LogStatus } from "./squared";
@@ -391,11 +391,11 @@ type ForegroundColor = typeof IForegroundColor | `#${string}`;
 
 ## References
 
-- https://www.unpkg.com/@e-mc/types@0.9.1/lib/core.d.ts
-- https://www.unpkg.com/@e-mc/types@0.9.1/lib/logger.d.ts
-- https://www.unpkg.com/@e-mc/types@0.9.1/lib/module.d.ts
-- https://www.unpkg.com/@e-mc/types@0.9.1/lib/node.d.ts
-- https://www.unpkg.com/@e-mc/types@0.9.1/lib/settings.d.ts
+- https://www.unpkg.com/@e-mc/types@0.9.3/lib/core.d.ts
+- https://www.unpkg.com/@e-mc/types@0.9.3/lib/logger.d.ts
+- https://www.unpkg.com/@e-mc/types@0.9.3/lib/module.d.ts
+- https://www.unpkg.com/@e-mc/types@0.9.3/lib/node.d.ts
+- https://www.unpkg.com/@e-mc/types@0.9.3/lib/settings.d.ts
 
 * https://www.npmjs.com/package/@types/node
 

package/index.js

@@ -9,6 +9,7 @@ const filetype = require("file-type");
 const mime = require("mime-types");
 const pm = require("picomatch");
 const chalk = require("chalk");
+const yaml = require("js-yaml");
 const stripansi = require("strip-ansi");
 const EventEmitter = require("events");
 const types_1 = require("@e-mc/types");
@@ -134,7 +135,7 @@ let TEMP_DIR = path.join(PROCESS_CWD, "tmp");
 let PNPM_VER;
 let YARN_VER;
 function parseYaml(pathname) {
-    return require('js-yaml').load(fs.readFileSync(pathname, 'utf-8'));
+    return yaml.load(fs.readFileSync(pathname, 'utf-8'));
 }
 function setPnpmVer() {
     if (PNPM_VER === undefined) {
@@ -648,7 +649,7 @@ function withinDir(value, base) {
     value = path.normalize(value);
     return (PLATFORM_WIN32 ? value.toLowerCase() : value).startsWith(ensureDir(PLATFORM_WIN32 ? base.toLowerCase() : base));
 }
-function formatPercent(value, precision = 3) {
+function formatPercent(value, precision) {
     if (value <= 0) {
         return '0%';
     }
@@ -694,7 +695,7 @@ class Module extends EventEmitter {
         this[_f] = new AbortController();
         this[_g] = null;
     }
-    static get VERSION() { return "0.9.1"; }
+    static get VERSION() { return "0.9.3"; }
     static get LOG_TYPE() { return types_1.LOG_TYPE; }
     static get STATUS_TYPE() { return types_1.STATUS_TYPE; }
     static get MAX_TIMEOUT() { return 2147483647; }
@@ -994,7 +995,7 @@ class Module extends EventEmitter {
             value = getValue();
         }
         const unit = options.messageUnit ? type & 256 ? options.messageUnit.padStart(options.messageUnitMinWidth || 0) : options.messageUnit : '';
-        const getMessage = (m, u) => type & 256 && messageUnitIndent === undefined ? (u + m).trimEnd() : u ? (m + (messageUnitIndent === undefined ? ' ' : '') + u).trimStart() : m;
+        const getMessage = (m, u) => (type & 256) && messageUnitIndent === undefined ? (u + m).trimEnd() : u ? (m + (messageUnitIndent === undefined ? ' ' : '') + u).trimStart() : m;
         if (coloring) {
             let { titleColor, titleBgColor, valueColor, valueBgColor, valueBold, messageWidth, messageColor, messageBgColor, messageBold } = options;
             if (!titleColor && !titleBgColor) {
@@ -1807,7 +1808,7 @@ class Module extends EventEmitter {
                     const usage = user + system;
                     result = usage > 0 ? Math.min(usage / value, 1) * (typeof SETTINGS.process === 'object' && SETTINGS.process.cpu_single_core ? 1 : CPU_CORETOTAL) : 0;
                 }
-                return format ? formatPercent(result) : result;
+                return format ? formatPercent(result, 3) : result;
             }
         }
         return format ? '' : 0;
@@ -1837,7 +1838,7 @@ class Module extends EventEmitter {
                     return (0, types_1.formatSize)(result, { unit });
             }
         }
-        return format ? formatPercent(result / MEM_TOTAL) : result;
+        return format ? formatPercent(result / MEM_TOTAL, 3) : result;
     }
     static formatCpuMem(start, all) {
         let cpu, cpu_bar, cpu_single_core, mem, mem_format;
@@ -1868,7 +1869,7 @@ class Module extends EventEmitter {
                 }
                 const unit = Math.max(bar, 10);
                 const length = Math.floor(usage * unit);
-                const hint = usage === 1 ? "MAX" : usage < 0 ? "N/A" : formatPercent(usage, 2);
+                const hint = usage === 1 ? "MAX" : usage < 0 ? "N/A" : formatPercent(usage, 2).padStart(3);
                 result += chalk[usage >= red ? 'bgRed' : usage >= yellow ? 'bgYellow' : 'bgBlue'].white(':'.repeat(length)) + chalk.bgGrey.white(':'.repeat(unit - length)) + (hint ? chalk.bgWhite.grey(` ${hint} `) : '');
             }
             else if (usage) {
@@ -1878,7 +1879,7 @@ class Module extends EventEmitter {
         if (mem || all) {
             const usage = this.getMemUsage(mem_format || true);
             if (usage) {
-                result += (result ? ' ' : '') + usage + ' MEM';
+                result += (result ? ' ' : '') + usage.padStart(7) + ' MEM';
             }
         }
         return result;
@@ -2288,7 +2289,7 @@ class Module extends EventEmitter {
                 if ((0, types_1.isArray)(include)) {
                     MEMORY_CACHE_DISK.include = include.map(value => this.toPosix(value, true));
                 }
-                else if ((0, types_1.isArray)(exclude)) {
+                if ((0, types_1.isArray)(exclude)) {
                     MEMORY_CACHE_DISK.exclude = exclude.map(value => this.toPosix(value, true));
                 }
             }
@@ -2697,7 +2698,7 @@ class Module extends EventEmitter {
                         if (!err) {
                             setCache(data);
                         }
-                        (callback)(err, data);
+                        callback(err, data);
                     });
                 }
                 return;
@@ -2734,7 +2735,7 @@ class Module extends EventEmitter {
                     if (!err) {
                         this.emit('file:write', outSrc, options);
                     }
-                    (callback)(err);
+                    callback(err);
                 });
                 return;
             }
@@ -2771,7 +2772,7 @@ class Module extends EventEmitter {
                     if (!err) {
                         this.emit('file:delete', outSrc, options);
                     }
-                    (callback)(err);
+                    callback(err);
                 });
                 return;
             }
@@ -2826,7 +2827,7 @@ class Module extends EventEmitter {
                         if (!err) {
                             this.emit('file:copy', outDest, options);
                         }
-                        (callback)(err);
+                        callback(err);
                     });
                     return;
                 }
@@ -2905,7 +2906,7 @@ class Module extends EventEmitter {
                         if (!err) {
                             this.emit('file:move', outDest, options);
                         }
-                        (callback)(err);
+                        callback(err);
                     });
                     return;
                 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@e-mc/module",
-  "version": "0.9.1",
+  "version": "0.9.3",
   "description": "Module base class for E-mc.",
   "main": "index.js",
   "types": "index.d.ts",
@@ -20,7 +20,7 @@
   "license": "BSD 3-Clause",
   "homepage": "https://github.com/anpham6/e-mc#readme",
   "dependencies": {
-    "@e-mc/types": "0.9.1",
+    "@e-mc/types": "0.9.3",
     "chalk": "4.1.2",
     "file-type": "16.5.4",
     "js-yaml": "^4.1.0",