@e-mc/module 0.10.6 → 0.10.8

package/README.md

@@ -9,7 +9,7 @@
 
 ## Interface
 
-* [View Source](https://www.unpkg.com/@e-mc/types@0.10.6/lib/index.d.ts)
+* [View Source](https://www.unpkg.com/@e-mc/types@0.10.8/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.6/lib/core.d.ts
-- https://www.unpkg.com/@e-mc/types@0.10.6/lib/logger.d.ts
-- https://www.unpkg.com/@e-mc/types@0.10.6/lib/module.d.ts
-- https://www.unpkg.com/@e-mc/types@0.10.6/lib/node.d.ts
-- https://www.unpkg.com/@e-mc/types@0.10.6/lib/settings.d.ts
+- https://www.unpkg.com/@e-mc/types@0.10.8/lib/core.d.ts
+- https://www.unpkg.com/@e-mc/types@0.10.8/lib/logger.d.ts
+- https://www.unpkg.com/@e-mc/types@0.10.8/lib/module.d.ts
+- https://www.unpkg.com/@e-mc/types@0.10.8/lib/node.d.ts
+- https://www.unpkg.com/@e-mc/types@0.10.8/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,7 +917,6 @@ 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;
@@ -961,7 +960,7 @@ class Module extends EventEmitter {
         this[_g] = null;
     }
     static get VERSION() {
-        return "0.10.6";
+        return "0.10.8";
     }
     static get LOG_TYPE() {
         return types_1.LOG_TYPE;
@@ -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);
                     }
                 }
             }

package/package.json

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