@e-mc/module 0.10.7 → 0.10.9

package/README.md

@@ -9,7 +9,7 @@
 
 ## Interface
 
-* [View Source](https://www.unpkg.com/@e-mc/types@0.10.7/lib/index.d.ts)
+* [View Source](https://www.unpkg.com/@e-mc/types@0.10.9/lib/index.d.ts)
 
 ```typescript
 import type { LogStatus } from "./squared";
@@ -407,11 +407,11 @@ interface LoggerModule {
 
 ## References
 
-- https://www.unpkg.com/@e-mc/types@0.10.7/lib/core.d.ts
-- https://www.unpkg.com/@e-mc/types@0.10.7/lib/logger.d.ts
-- https://www.unpkg.com/@e-mc/types@0.10.7/lib/module.d.ts
-- https://www.unpkg.com/@e-mc/types@0.10.7/lib/node.d.ts
-- https://www.unpkg.com/@e-mc/types@0.10.7/lib/settings.d.ts
+- https://www.unpkg.com/@e-mc/types@0.10.9/lib/core.d.ts
+- https://www.unpkg.com/@e-mc/types@0.10.9/lib/logger.d.ts
+- https://www.unpkg.com/@e-mc/types@0.10.9/lib/module.d.ts
+- https://www.unpkg.com/@e-mc/types@0.10.9/lib/node.d.ts
+- https://www.unpkg.com/@e-mc/types@0.10.9/lib/settings.d.ts
 
 * https://www.npmjs.com/package/@types/node
 

package/index.js

@@ -142,7 +142,7 @@ const SUPPORTED_CANPARSE = (0, types_1.supported)(19, 9) || (0, types_1.supporte
 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_CLIOPTION = /^(-[^\s=]+|--[^-\s=][^\s=]*)(=)?\s*(.*)$/s;
 const REGEXP_ANSIESCAPE = /[\u001B\u009B]/;
 const LOG_CPUBARCOLOR = SETTINGS.process.cpu_bar_color;
 const LOG_DIVIDER = chalk.blackBright('|');
@@ -917,11 +917,10 @@ function truncateStart(value, length = LOG_MIN_WIDTH, style = false) {
 function truncateEnd(value, length) {
     return (REGEXP_ANSIESCAPE.test(value) ? stripansi(value) : value).length > length ? '...' + value.substring(value.length - length + 3) : 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;
 const hideAbort = (err) => err.name === 'AbortError' && SETTINGS.abort === false;
-const asFile = (value) => typeof value === 'string' ? value.trim() : value instanceof URL && value.protocol === 'file:' ? (0, url_1.fileURLToPath)(value) : '';
+const asFile = (value) => typeof value === 'string' ? PLATFORM_WIN32 ? value.trim() : value : value instanceof URL && value.protocol === 'file:' ? (0, url_1.fileURLToPath)(value) : '';
 const wrapQuote = (value) => '"' + value.replaceAll('"', '\\"') + '"';
 const isFunction = (value) => typeof value === 'function';
 const isFileURL = (value) => /^file:\/\//i.test(value);
@@ -961,7 +960,7 @@ class Module extends EventEmitter {
         this[_g] = null;
     }
     static get VERSION() {
-        return "0.10.7";
+        return "0.10.9";
     }
     static get LOG_TYPE() {
         return types_1.LOG_TYPE;
@@ -1049,7 +1048,7 @@ class Module extends EventEmitter {
         if (error && hideAbort(message)) {
             return;
         }
-        if (options.type) {
+        if (typeof options.type === 'number') {
             type |= options.type;
         }
         const BROADCAST_OUT = VALUES["broadcast.out"];
@@ -1534,7 +1533,7 @@ class Module extends EventEmitter {
             filename = undefined;
         }
         if (typeof value === 'string') {
-            let pathname = value.trim(), convert = true;
+            let pathname = PLATFORM_WIN32 ? value.trim() : value, convert = true;
             if (normalize) {
                 pathname = path.normalize(pathname);
                 convert = PLATFORM_WIN32;
@@ -1649,7 +1648,7 @@ class Module extends EventEmitter {
         return false;
     }
     static resolveFile(value) {
-        if (isFileURL(value = value instanceof URL ? value.toString() : value.trim())) {
+        if (isFileURL(value = value instanceof URL ? value.toString() : value)) {
             try {
                 return (0, url_1.fileURLToPath)(value);
             }
@@ -1664,7 +1663,7 @@ class Module extends EventEmitter {
     }
     static resolvePath(value, base) {
         try {
-            if (this.isURL(value = value.trim())) {
+            if (this.isURL(value)) {
                 return isFileURL(value) ? (0, url_1.fileURLToPath)(value) : new URL(value).href;
             }
             if (base instanceof URL || this.isURL(base)) {
@@ -1696,7 +1695,7 @@ class Module extends EventEmitter {
             flags = flags ? 2 : 0;
         }
         if (typeof value === 'string') {
-            let result = value.trim();
+            let result = PLATFORM_WIN32 ? value.trim() : value;
             result = flags & 1 ? path.resolve(result) : path.normalize(result);
             if ((flags & 2) && result.length > 0) {
                 result = ensureDir(result);
@@ -2353,7 +2352,7 @@ class Module extends EventEmitter {
                     value = opt[3];
                 }
                 if (value) {
-                    const quoted = /^(["'])(.*)\1$/.exec(value);
+                    const quoted = /^(["'])(.*)\1$/s.exec(value);
                     if (PLATFORM_WIN32) {
                         if (quoted) {
                             if (quoted[1] === '"') {
@@ -2366,33 +2365,19 @@ class Module extends EventEmitter {
                             value = wrapQuote(value);
                         }
                     }
-                    else {
-                        let type = doubleQuote;
-                        if (quoted) {
-                            if (quoted[1] === "'") {
-                                result[i] = leading + value;
-                                continue;
-                            }
-                            value = quoted[2];
-                            type = true;
-                        }
+                    else if (!quoted) {
                         if (REGEXP_CLIESCAPE.test(value)) {
-                            if (type) {
-                                value = '"' + escapeArg(value) + '"';
-                            }
-                            else {
-                                value = "'" + value.replaceAll("'", "'\\''") + "'";
-                            }
+                            value = doubleQuote ? `"${value.replace(/(?<!\\)"/g, '\\"')}"` : `'${value.replaceAll("'", "'\\''")}'`;
                         }
                         else if (RESERVED_SHELL.includes(value)) {
-                            value = "'" + value + "'";
+                            value = `'${value}'`;
                         }
                     }
                 }
                 else if (opt) {
                     leading = leading.trim();
                     if (!PLATFORM_WIN32 && leading.length > 2 && leading[1] !== '-') {
-                        leading = escapeArg(leading);
+                        leading.replace(REGEXP_CLIESCAPE, capture => '\\' + capture);
                     }
                 }
             }
@@ -3671,12 +3656,12 @@ class Module extends EventEmitter {
         }
     }
     writeLog(type, value, timeStamp, duration) {
-        let queue;
+        let queue = false;
         if ((0, types_1.isObject)(type)) {
             if (typeof value === 'boolean') {
                 queue = value;
             }
-            ({ type = types_1.STATUS_TYPE.UNKNOWN, value, timeStamp, duration } = type);
+            value = type.value;
         }
         const output = Module.asString(value);
         if (output) {
@@ -3704,7 +3689,7 @@ class Module extends EventEmitter {
             from = timeStamp;
             timeStamp = 0;
         }
-        else if ((0, types_1.isObject)(timeStamp)) {
+        else if ((0, types_1.isPlainObject)(timeStamp)) {
             ({ timeStamp, duration, from, source } = timeStamp);
         }
         const name = types_1.STATUS_TYPE[type] || types_1.STATUS_TYPE[type = 0];

package/package.json

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