@e-mc/module 0.7.8 → 0.7.10

package/index.js

@@ -117,6 +117,25 @@ const VALUES = {
     ["logger.level"]: -1
 };
 const REGEXP_TORRENT = /^(?:magnet:\?xt=|(?:https?|s?ftp):\/\/[^/][^\n]*?\.(?:torrent|metalink|meta4)(?:\?[^\n]*)?$)/i;
+const RESERVED_SHELL = [
+    'if',
+    'then',
+    'elif',
+    'else',
+    'fi',
+    'time',
+    'for',
+    'in',
+    'until',
+    'while',
+    'do',
+    'done',
+    'case',
+    'esac',
+    'coproc',
+    'select',
+    'function'
+];
 let LOG_NEWLINE = true;
 let LOG_EMPTYLINE = false;
 let TEMP_DIR = path.join(PROCESS_CWD, "tmp");
@@ -392,7 +411,7 @@ function addCacheItem(map, key, data) {
 }
 function checkFunction(value) {
     if (typeof value === 'function') {
-        Object.defineProperty(value, "__cjs__", { value: true });
+        Object.defineProperty(value, "__cjs__", { value: true, writable: false, enumerable: false });
         return value;
     }
     return null;
@@ -495,9 +514,16 @@ function applyLogId(options) {
     }
     return options;
 }
-function withinDir(value, base) {
+function withinDir(value, base, override = false) {
     value = path.normalize(value);
-    return (PLATFORM_WIN32 ? value.toLowerCase() : value).startsWith(ensureDir(PLATFORM_WIN32 ? base.toLowerCase() : base));
+    if (PLATFORM_WIN32) {
+        value = value.toLowerCase();
+        base = ensureDir(base.toLowerCase());
+    }
+    else {
+        base = ensureDir(base);
+    }
+    return value.startsWith(base) && (value !== base || override);
 }
 function formatPercent(value, precision) {
     if (value <= 0) {
@@ -560,7 +586,7 @@ class Module extends EventEmitter {
         this[_f] = new AbortController();
         this[_g] = null;
     }
-    static get VERSION() { return "0.7.8"; }
+    static get VERSION() { return "0.7.10"; }
     static get LOG_TYPE() { return types_1.LOG_TYPE; }
     static get STATUS_TYPE() { return types_1.STATUS_TYPE; }
     static get MAX_TIMEOUT() { return 2147483647; }
@@ -848,10 +874,14 @@ class Module extends EventEmitter {
                 ({ color: hintColor, bgColor: hintBgColor } = formatHint);
                 hintBold !== null && hintBold !== void 0 ? hintBold : (hintBold = formatHint.bold);
             }
-            value = getValue() + (coloring ? chalk.blackBright('[') + formatColumn(truncateEnd(hint, hintWidth), hintColor, hintBgColor, hintBold) + chalk.blackBright(']') : `[${truncateEnd(hint, hintWidth)}]`);
-        }
-        else if (title) {
             value = getValue();
+            hint = coloring ? chalk.blackBright('[') + formatColumn(truncateEnd(hint, hintWidth), hintColor, hintBgColor, hintBold) + chalk.blackBright(']') : `[${truncateEnd(hint, hintWidth)}]`;
+        }
+        else {
+            if (title) {
+                value = getValue();
+            }
+            hint = '';
         }
         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;
@@ -896,19 +926,19 @@ class Module extends EventEmitter {
                     }
                 }
                 else {
-                    if (!i) {
+                    if (!i && !hint) {
                         v = v.trim();
                     }
                     m = '';
                 }
-                output = (titleIndent !== -1 ? title : title ? formatColumn(title, titleColor || 'green', titleBgColor, (_k = (options.titleBold || formatTitle.bold)) !== null && _k !== void 0 ? _k : false) + chalk.blackBright(':') + ' ' : '') + formatColumn(v, valueColor, valueBgColor, valueBold) + (i ? i : ' ') + m;
+                output = (titleIndent !== -1 ? title : title ? formatColumn(title, titleColor || 'green', titleBgColor, (_k = (options.titleBold || formatTitle.bold)) !== null && _k !== void 0 ? _k : false) + chalk.blackBright(':') + ' ' : '') + formatColumn(v, valueColor, valueBgColor, valueBold) + hint + (i ? i : ' ') + m;
             }
             catch {
             }
         }
         if (!output) {
-            const m = truncateStart(this.asString(message), (_l = options.messageWidth) !== null && _l !== void 0 ? _l : format.message.width);
-            output = (titleIndent !== -1 ? title : title ? title + ': ' : '') + value + (id ? id : ' ') + (m && SETTINGS.message !== false ? (error ? '{' : '(') + getMessage(m, unit) + (error ? '}' : ')') : '');
+            const m = truncateStart(stripansi(this.asString(message)), (_l = options.messageWidth) !== null && _l !== void 0 ? _l : format.message.width);
+            output = (titleIndent !== -1 ? title : title ? title + ': ' : '') + stripansi(value) + stripansi(hint) + (id ? id : ' ') + (m && SETTINGS.message !== false ? (error ? '{' : '(') + getMessage(m, unit) + (error ? '}' : ')') : '');
         }
         if (broadcastId) {
             if (BROADCAST_OUT) {
@@ -1922,6 +1952,9 @@ class Module extends EventEmitter {
                                 value = "'" + value.replace(/'/g, "'\\''") + "'";
                             }
                         }
+                        else if (RESERVED_SHELL.includes(value)) {
+                            value = "'" + value + "'";
+                        }
                     }
                 }
                 else if (opt) {
@@ -2346,7 +2379,7 @@ class Module extends EventEmitter {
         if (permission && (Module.isFile(uri, 'unc') ? permission.hasUNCRead(path.normalize(uri)) || ownPermissionOnly && !permission.getUNCRead() : path.isAbsolute(uri = path.resolve(uri)) && (permission.hasDiskRead(uri) || ownPermissionOnly && !permission.getDiskRead()))) {
             return true;
         }
-        return VALUES["permission.home_read"] && withinDir(uri, OS_HOMEDIR);
+        return VALUES["permission.home_read"] && withinDir(uri, OS_HOMEDIR, true);
     }
     canWrite(uri, options) {
         let permission = this.permission, ownPermissionOnly = false;
@@ -2367,7 +2400,7 @@ class Module extends EventEmitter {
         if (permission && (Module.isFile(uri, 'unc') ? permission.hasUNCWrite(path.normalize(uri)) || ownPermissionOnly && !permission.getUNCWrite() : path.isAbsolute(uri = path.resolve(uri)) && (permission.hasDiskWrite(uri) || ownPermissionOnly && !permission.getDiskWrite()))) {
             return true;
         }
-        return VALUES["temp.write"] && withinDir(uri, TEMP_DIR) || VALUES["permission.home_write"] && withinDir(uri, OS_HOMEDIR);
+        return VALUES["temp.write"] && withinDir(uri, TEMP_DIR, true) || VALUES["permission.home_write"] && withinDir(uri, OS_HOMEDIR, true);
     }
     readFile(src, options = {}, callback) {
         let promises, outSrc;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@e-mc/module",
-  "version": "0.7.8",
+  "version": "0.7.10",
   "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.7.8",
+    "@e-mc/types": "0.7.10",
     "abort-controller": "^3.0.0",
     "chalk": "4.1.2",
     "event-target-shim": "^5.0.1",