@e-mc/module 0.9.2 → 0.9.4

package/README.md

@@ -9,7 +9,7 @@
 
 ## Interface
 
-* [View Source](https://www.unpkg.com/@e-mc/types@0.9.2/lib/index.d.ts)
+* [View Source](https://www.unpkg.com/@e-mc/types@0.9.4/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.2/lib/core.d.ts
-- https://www.unpkg.com/@e-mc/types@0.9.2/lib/logger.d.ts
-- https://www.unpkg.com/@e-mc/types@0.9.2/lib/module.d.ts
-- https://www.unpkg.com/@e-mc/types@0.9.2/lib/node.d.ts
-- https://www.unpkg.com/@e-mc/types@0.9.2/lib/settings.d.ts
+- https://www.unpkg.com/@e-mc/types@0.9.4/lib/core.d.ts
+- https://www.unpkg.com/@e-mc/types@0.9.4/lib/logger.d.ts
+- https://www.unpkg.com/@e-mc/types@0.9.4/lib/module.d.ts
+- https://www.unpkg.com/@e-mc/types@0.9.4/lib/node.d.ts
+- https://www.unpkg.com/@e-mc/types@0.9.4/lib/settings.d.ts
 
 * https://www.npmjs.com/package/@types/node
 

package/index.js

@@ -218,7 +218,7 @@ function applyStyle(options, style) {
     return options;
 }
 function checkColorOptions(type, settings, options) {
-    if (typeof settings !== 'object') {
+    if (!(0, types_1.isObject)(settings)) {
         return false;
     }
     let result = false;
@@ -649,14 +649,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) + '%';
 }
 const hideAbort = (err) => err.name === 'AbortError' && SETTINGS.abort === false;
 const asFile = (value) => typeof value === 'string' ? value.trim() : value instanceof URL && value.protocol === 'file:' ? url.fileURLToPath(value) : '';
@@ -695,7 +696,7 @@ class Module extends EventEmitter {
         this[_f] = new AbortController();
         this[_g] = null;
     }
-    static get VERSION() { return "0.9.2"; }
+    static get VERSION() { return "0.9.4"; }
     static get LOG_TYPE() { return types_1.LOG_TYPE; }
     static get STATUS_TYPE() { return types_1.STATUS_TYPE; }
     static get MAX_TIMEOUT() { return 2147483647; }
@@ -1808,7 +1809,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;
@@ -1838,7 +1839,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;
@@ -1869,7 +1870,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) {
@@ -1879,7 +1880,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;
@@ -2289,7 +2290,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));
                 }
             }
@@ -2470,52 +2471,50 @@ class Module extends EventEmitter {
                 });
             }
         }
-        {
-            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);
-                }
-                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.9.2",
+  "version": "0.9.4",
   "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.2",
+    "@e-mc/types": "0.9.4",
     "chalk": "4.1.2",
     "file-type": "16.5.4",
     "js-yaml": "^4.1.0",