@e-mc/module 0.11.0 → 0.11.2

package/README.md

@@ -9,7 +9,7 @@
 
 ## Interface
 
-* [View Source](https://www.unpkg.com/@e-mc/types@0.11.0/lib/index.d.ts)
+* [View Source](https://www.unpkg.com/@e-mc/types@0.11.2/lib/index.d.ts)
 
 ```typescript
 import type { LogStatus } from "./squared";
@@ -263,6 +263,9 @@ interface NodeModule {
         npm?: boolean;
         inline?: boolean;
     };
+    posix?: {
+        strict?: boolean;
+    };
     settings?: {
         package_manager?: "npm" | "yarn" | "pnpm";
     };
@@ -407,11 +410,11 @@ interface LoggerModule {
 
 ## References
 
-- https://www.unpkg.com/@e-mc/types@0.11.0/lib/core.d.ts
-- https://www.unpkg.com/@e-mc/types@0.11.0/lib/logger.d.ts
-- https://www.unpkg.com/@e-mc/types@0.11.0/lib/module.d.ts
-- https://www.unpkg.com/@e-mc/types@0.11.0/lib/node.d.ts
-- https://www.unpkg.com/@e-mc/types@0.11.0/lib/settings.d.ts
+- https://www.unpkg.com/@e-mc/types@0.11.2/lib/core.d.ts
+- https://www.unpkg.com/@e-mc/types@0.11.2/lib/logger.d.ts
+- https://www.unpkg.com/@e-mc/types@0.11.2/lib/module.d.ts
+- https://www.unpkg.com/@e-mc/types@0.11.2/lib/node.d.ts
+- https://www.unpkg.com/@e-mc/types@0.11.2/lib/settings.d.ts
 
 * https://www.npmjs.com/package/@types/node
 

package/index.js

@@ -116,6 +116,7 @@ const VALUES = {
     ["node.process.cpu_usage"]: true,
     ["node.process.memory_usage"]: true,
     ["node.process.inline"]: true,
+    ["node.posix.strict"]: false,
     ["node.settings.package_manager"]: '',
     ["temp.dir"]: "tmp",
     ["temp.write"]: false,
@@ -139,12 +140,13 @@ const MEMORY_CACHE_DISK = {
     include: null,
     exclude: null
 };
-const SUPPORTED_CANPARSE = (0, types_1.supported)(19, 9) || (0, types_1.supported)(18, 17, 0, true);
+const SUPPORTED_CANPARSE = (0, types_1.supported)(19, 9) || (0, types_1.supported)(18, 17, true);
 const REGEXP_TORRENT = /^(?:magnet:\?xt=|(?:https?|s?ftp):\/\/[^/][^\n]*?\.(?:torrent|metalink|meta4)(?:\?[^\n]*)?$)/i;
 const REGEXP_PROTOCOL = /^([a-z][a-z\d+-.]*):\/\/[^@:[\]\\^<>|\s]/i;
 const REGEXP_CLIESCAPE = /[^\w+-.,/:@]/g;
 const REGEXP_CLIOPTION = /^(-[^\s=]+|--[^-\s=][^\s=]*)(=)?\s*(.*)$/;
 const REGEXP_ANSIESCAPE = /[\u001B\u009B]/;
+const REGEXP_PATHEND = new RegExp(`${path.sep}+$`);
 const LOG_CPUBARCOLOR = SETTINGS.process.cpu_bar_color;
 const LOG_DIVIDER = chalk.blackBright('|');
 const RESERVED_SHELL = [
@@ -935,6 +937,10 @@ function truncateStart(value, length = LOG_MIN_WIDTH, style = false) {
 function truncateEnd(value, length) {
     return (REGEXP_ANSIESCAPE.test(value) ? (0, node_util_1.stripVTControlCharacters)(value) : value).length > length ? '...' + value.substring(value.length - length + 3) : value;
 }
+function isPathUNC(value) {
+    value = value.toString();
+    return (VALUES["node.posix.strict"] && value.includes('/') ? /^\/\/[\w.-]+\/[\w-]+\$?\/[^\n]*?[^/]$/ : /^(?:\\\\|\/\/)[\w.-]+[\\/][\w-]+\$?[\\/][^\n]*?[^\\/]$/).test(value);
+}
 const escapeArg = (value) => value.replace(REGEXP_CLIESCAPE, capture => capture === '\n' ? "'\n'" : (capture === '$' || capture === '`' ? '\\' : '') + '\\' + capture);
 const isMeterUnit = (type, ident) => (type & 256) === 256 && !ident;
 const formatLogMessage = (type, message, unit, ident) => isMeterUnit(type, ident) ? (unit + LOG_DIVIDER + message).trimEnd() : unit ? (message + (ident ? '' : ' ') + unit).trimStart() : message;
@@ -944,7 +950,7 @@ const wrapQuote = (value) => '"' + value.replaceAll('"', '\\"') + '"';
 const isFunction = (value) => typeof value === 'function';
 const isFileURL = (value) => /^file:\/\//i.test(value);
 const sanitizePath = (value) => value ? path.resolve(value) : '';
-const stripPath = (value) => path.normalize(value).replace(/[\\/]+$/, '');
+const stripPath = (value) => path.normalize(value).replace(REGEXP_PATHEND, '');
 const ensureDir = (value) => value.endsWith(path.sep) ? value : value + path.sep;
 const trimDir = (value) => value.endsWith(path.sep) ? value.substring(0, value.length - 1) : value;
 const getExtension = (value) => path.extname(value).toLowerCase().substring(1);
@@ -979,7 +985,7 @@ class Module extends EventEmitter {
         this[_g] = null;
     }
     static get VERSION() {
-        return "0.11.0";
+        return "0.11.2";
     }
     static get LOG_TYPE() {
         return types_1.LOG_TYPE;
@@ -1017,6 +1023,7 @@ class Module extends EventEmitter {
             case "node.process.cpu_usage":
             case "node.process.memory_usage":
             case "node.process.inline":
+            case "node.posix.strict":
             case "temp.write":
             case "permission.home_read":
             case "permission.home_write":
@@ -1594,7 +1601,7 @@ class Module extends EventEmitter {
                 case 'http/s':
                     return /^https?:\/\/[^/]/i.test(value);
                 case 'unc':
-                    return /^(?:\\\\|\/\/)[\w.-]+[\\/][\w-]+\$?[\\/][^\n]*?[^\\/]$/.test(value);
+                    return isPathUNC(value);
                 case 'ftp':
                     return /^ftp:\/\/[^/]/i.test(value);
                 case 'sftp':
@@ -1616,7 +1623,7 @@ class Module extends EventEmitter {
                 case 'http/s':
                     return value.protocol === 'http:' || value.protocol === 'https:';
                 case 'unc':
-                    return /^(?:\\\\|\/\/)[\w.-]+[\\/][\w-]+\$?[\\/][^\n]*?[^\\/]$/.test(value.toString());
+                    return isPathUNC(value);
                 case 'ftp':
                     return value.protocol === 'ftp:';
                 case 'sftp':
@@ -1653,7 +1660,8 @@ class Module extends EventEmitter {
                         return false;
                     }
                 case 'unc':
-                    return /^(?:\\\\|\/\/)[\w.-]+[\\/][\w-]+\$?(?:[\\/]?|[\\/][^\n]+)$/.test(asFile(value));
+                    value = asFile(value);
+                    return (VALUES["node.posix.strict"] && value.includes('/') ? /^\/\/[\w.-]+\/[\w-]+\$?(?:\/?|\/[^\n]+)$/ : /^(?:\\\\|\/\/)[\w.-]+[\\/][\w-]+\$?(?:[\\/]?|[\\/][^\n]+)$/).test(value);
             }
         }
         catch (err) {
@@ -1726,7 +1734,7 @@ class Module extends EventEmitter {
     }
     static fromLocalPath(value) {
         const ch = value[0];
-        if (ch === '.' && /^\.{1,2}[\\/][^\\/]/.test(value)) {
+        if (ch === '.' && (VALUES["node.posix.strict"] && value.includes('/') ? /^\.{1,2}\/[^/]/ : /^\.{1,2}[\\/][^\\/]/).test(value)) {
             return path.join(PROCESS_CWD, value);
         }
         if (ch === '~' && value[1] === '/') {
@@ -1964,7 +1972,8 @@ class Module extends EventEmitter {
                 const items = Array.isArray(exclude) ? exclude : [exclude];
                 exclude = [];
                 for (const value of items) {
-                    if (/^[^\\/][^*]+[\\/]$/.test(value) && !(0, types_1.hasGlob)(value)) {
+                    const dirEnd = value.endsWith('/') ? /^[^/][^*]+\/$/ : value.endsWith('\\') ? /^[^\\][^*]+\\$/ : null;
+                    if (dirEnd?.test(value) && !(0, types_1.hasGlob)(value)) {
                         (excludeDir ||= []).push(this.normalizePath(value, 4));
                     }
                     else {
@@ -2226,7 +2235,7 @@ class Module extends EventEmitter {
         }
         const folders = [PROCESS_CWD];
         if (startDir && withinDir(startDir = path.normalize(startDir), PROCESS_CWD)) {
-            startDir = startDir.replace(/[\\/]+$/, '');
+            startDir = startDir.replace(REGEXP_PATHEND, '');
             let i = -1, j = PROCESS_CWD.length + 1;
             while ((i = startDir.indexOf(path.sep, j)) !== -1) {
                 const current = startDir.substring(0, i);
@@ -2398,14 +2407,14 @@ class Module extends EventEmitter {
                         }
                         if (REGEXP_CLIESCAPE.test(value)) {
                             if (type) {
-                                value = '"' + escapeArg(value) + '"';
+                                value = `"${escapeArg(value)}"`;
                             }
                             else {
-                                value = "'" + value.replaceAll("'", "'\\''") + "'";
+                                value = `'${value.replaceAll("'", "'\\''")}'`;
                             }
                         }
                         else if (RESERVED_SHELL.includes(value)) {
-                            value = "'" + value + "'";
+                            value = `'${value}'`;
                         }
                     }
                 }
@@ -2491,7 +2500,7 @@ class Module extends EventEmitter {
         }
         const { temp, node, permission, memory, error, logger } = settings;
         if (node) {
-            const { process: proc, require: req } = node;
+            const { process: proc, require: req, posix } = node;
             if (proc) {
                 const { cpu_usage, memory_usage, inline } = proc;
                 if (typeof cpu_usage === 'boolean') {
@@ -2526,6 +2535,9 @@ class Module extends EventEmitter {
                     VALUES["node.require.inline"] = inline;
                 }
             }
+            if (typeof posix?.strict === 'boolean') {
+                VALUES["node.posix.strict"] = posix.strict;
+            }
             const manager = node.settings?.package_manager;
             switch (manager) {
                 case 'npm':
@@ -3429,7 +3441,7 @@ class Module extends EventEmitter {
         const increment = options.meterIncrement || (http ? meter.http
             : type & 2048 ? meter.image
                 : type & 8 ? meter.compress
-                    : meter.process) || 250;
+                    : meter.process) || types_1.THRESHOLD.LOGGER_METER_INCREMENT;
         const duration = getTimeOffset(startTime, 0);
         let meterTime = duration, delayTime = options.delayTime;
         if (typeof delayTime === 'bigint' || Array.isArray(delayTime)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@e-mc/module",
-  "version": "0.11.0",
+  "version": "0.11.2",
   "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.11.0",
+    "@e-mc/types": "0.11.2",
     "chalk": "4.1.2",
     "file-type": "^18.7.0",
     "js-yaml": "^4.1.0",