@e-mc/module 0.6.3 → 0.6.5

package/LICENSE

@@ -1,4 +1,4 @@
-Copyright 2023 Ninja Scroll
+Copyright 2024 An Pham
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

package/README.md

@@ -1,6 +1,6 @@
 # @e-mc/module
 
-PEP 402 - Forever Kagerō
+PEP 402 - Forever Any Mayo
 
 ## LICENSE
 

package/index.js

@@ -152,7 +152,7 @@ function applyStyle(options, style) {
 }
 function checkColorOptions(type, settings, options) {
     var _h, _j, _k, _l;
-    if (typeof settings !== 'object') {
+    if (!(0, types_1.isObject)(settings)) {
         return false;
     }
     let result = false;
@@ -499,14 +499,15 @@ 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%';
     }
-    if (value === Math.floor(value)) {
+    if (value === (value | 0)) {
         return value + '00%';
     }
-    return (value * 100).toPrecision(precision) + '%';
+    value *= 100;
+    return value.toPrecision(value < 1 ? 2 : precision) + '%';
 }
 function tryIncrementDir(value, increment) {
     const baseDir = trimDir(value);
@@ -559,7 +560,7 @@ class Module extends EventEmitter {
         this[_f] = new AbortController();
         this[_g] = null;
     }
-    static get VERSION() { return "0.6.3"; }
+    static get VERSION() { return "0.6.5"; }
     static get LOG_TYPE() { return types_1.LOG_TYPE; }
     static get STATUS_TYPE() { return types_1.STATUS_TYPE; }
     static get MAX_TIMEOUT() { return 2147483647; }
@@ -1581,7 +1582,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;
@@ -1611,7 +1612,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;
@@ -1642,7 +1643,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) {
@@ -1652,7 +1653,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;
@@ -2188,53 +2189,50 @@ class Module extends EventEmitter {
                 });
             }
         }
-        {
-            let dir = settings.temp_dir, write;
-            if ((0, types_1.isPlainObject)(temp)) {
-                dir || (dir = temp.dir);
-                write = temp.write;
-            }
-            let modified;
-            if ((0, types_1.isString)(dir) && path.isAbsolute(dir = path.normalize(dir).replace(/[\\/]$/, ''))) {
-                if (withinDir(dir, PROCESS_CWD)) {
-                    dir = dir.substring(ensureDir(PROCESS_CWD).length);
-                }
-                else {
-                    this.formatMessage(1, 'WARN', 'Temp directory can only be relative', dir, { ...this.LOG_STYLE_WARN, newline: true });
-                    dir = undefined;
-                }
-            }
-            if (!(0, types_1.isString)(dir)) {
-                dir = VALUES["temp.dir"];
+        let dir = settings.temp_dir, write, modified;
+        if ((0, types_1.isPlainObject)(temp)) {
+            dir || (dir = temp.dir);
+            write = temp.write;
+        }
+        if ((0, types_1.isString)(dir) && path.isAbsolute(dir = path.normalize(dir).replace(/[\\/]$/, ''))) {
+            if (withinDir(dir, PROCESS_CWD)) {
+                dir = dir.substring(ensureDir(PROCESS_CWD).length);
             }
-            if (typeof write === 'boolean') {
-                modified = VALUES["temp.write"] !== write;
-                VALUES["temp.write"] = write;
+            else {
+                this.formatMessage(1, 'WARN', 'Temp directory can only be relative', dir, { ...this.LOG_STYLE_WARN, newline: true });
+                dir = undefined;
             }
-            do {
-                const [output, index] = tryIncrementDir(path.join(PROCESS_CWD, dir), 5);
-                if ((0, types_1.isString)(output)) {
-                    if (index > 0) {
-                        dir = trimDir(dir) + '_' + index;
-                    }
-                    if (dir !== VALUES["temp.dir"]) {
-                        VALUES["temp.dir"] = dir;
-                        modified = true;
-                    }
-                    (0, types_1.setTempDir)(TEMP_DIR = output);
-                    break;
+        }
+        if (!(0, types_1.isString)(dir)) {
+            dir = VALUES["temp.dir"];
+        }
+        if (typeof write === 'boolean') {
+            modified = VALUES["temp.write"] !== write;
+            VALUES["temp.write"] = write;
+        }
+        do {
+            const [output, index] = tryIncrementDir(path.join(PROCESS_CWD, dir), 5);
+            if ((0, types_1.isString)(output)) {
+                if (index > 0) {
+                    dir = trimDir(dir) + '_' + index;
                 }
-                if (output instanceof Error) {
-                    this.writeFail(["Unable to create temp directory", dir], output, 32);
+                if (dir !== VALUES["temp.dir"]) {
+                    VALUES["temp.dir"] = dir;
+                    modified = true;
                 }
-            } while ((dir !== "tmp") && (dir = "tmp"));
-            if (modified) {
-                this.formatMessage(1, 'TEMP', ["Directory was modified", dir], TEMP_DIR + (VALUES["temp.write"] ? ' - writeable' : ''), { ...this.LOG_STYLE_NOTICE, newline: true });
+                (0, types_1.setTempDir)(TEMP_DIR = output);
+                break;
             }
-            settings.temp_dir = dir;
-            if ((0, types_1.isPlainObject)(temp)) {
-                temp.dir = dir;
+            if (output instanceof Error) {
+                this.writeFail(["Unable to create temp directory", dir], output, 32);
             }
+        } while ((dir !== "tmp") && (dir = "tmp"));
+        if (modified) {
+            this.formatMessage(1, 'TEMP', ["Directory was modified", dir], TEMP_DIR + (VALUES["temp.write"] ? ' - writeable' : ''), { ...this.LOG_STYLE_NOTICE, newline: true });
+        }
+        settings.temp_dir = dir;
+        if ((0, types_1.isPlainObject)(temp)) {
+            temp.dir = dir;
         }
         return true;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@e-mc/module",
-  "version": "0.6.3",
+  "version": "0.6.5",
   "description": "Module base class for E-mc.",
   "main": "index.js",
   "types": "index.d.ts",
@@ -20,7 +20,7 @@
   "license": "MIT",
   "homepage": "https://github.com/anpham6/e-mc#readme",
   "dependencies": {
-    "@e-mc/types": "0.6.3",
+    "@e-mc/types": "0.6.5",
     "abort-controller": "^3.0.0",
     "chalk": "4.1.2",
     "event-target-shim": "^5.0.1",