@e-mc/module 0.9.16 → 0.9.18

package/README.md

@@ -9,7 +9,7 @@
 
 ## Interface
 
-* [View Source](https://www.unpkg.com/@e-mc/types@0.9.16/lib/index.d.ts)
+* [View Source](https://www.unpkg.com/@e-mc/types@0.9.18/lib/index.d.ts)
 
 ```typescript
 import type { LogStatus } from "./squared";
@@ -394,11 +394,11 @@ type ForegroundColor = typeof IForegroundColor | `#${string}`;
 
 ## References
 
-- https://www.unpkg.com/@e-mc/types@0.9.16/lib/core.d.ts
-- https://www.unpkg.com/@e-mc/types@0.9.16/lib/logger.d.ts
-- https://www.unpkg.com/@e-mc/types@0.9.16/lib/module.d.ts
-- https://www.unpkg.com/@e-mc/types@0.9.16/lib/node.d.ts
-- https://www.unpkg.com/@e-mc/types@0.9.16/lib/settings.d.ts
+- https://www.unpkg.com/@e-mc/types@0.9.18/lib/core.d.ts
+- https://www.unpkg.com/@e-mc/types@0.9.18/lib/logger.d.ts
+- https://www.unpkg.com/@e-mc/types@0.9.18/lib/module.d.ts
+- https://www.unpkg.com/@e-mc/types@0.9.18/lib/node.d.ts
+- https://www.unpkg.com/@e-mc/types@0.9.18/lib/settings.d.ts
 
 * https://www.npmjs.com/package/@types/node
 

package/index.js

@@ -129,6 +129,8 @@ const MEMORY_CACHE_DISK = {
     exclude: null
 };
 const REGEXP_TORRENT = /^(?:magnet:\?xt=|(?:https?|s?ftp):\/\/[^/][^\n]*?\.(?:torrent|metalink|meta4)(?:\?[^\n]*)?$)/i;
+const REGEXP_CLIESCAPE = /[^\w+-.,/:@]/g;
+const REGEXP_CLIOPTION = /^(-[^\s=]+|--[^-\s=][^\s=]*)(=)?\s*(.*)$/s;
 const RESERVED_SHELL = [
     'if',
     'then',
@@ -702,7 +704,7 @@ function formatPercent(value, precision) {
     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) : '';
+const asFile = (value) => typeof value === 'string' ? PLATFORM_WIN32 ? value.trim() : value : value instanceof URL && value.protocol === 'file:' ? url.fileURLToPath(value) : '';
 const wrapQuote = (value) => '"' + value.replace(/"/g, '\\"') + '"';
 const isFunction = (value) => typeof value === 'function';
 const isFileURL = (value) => /^file:\/\//i.test(value);
@@ -738,7 +740,7 @@ class Module extends EventEmitter {
         this[_f] = new AbortController();
         this[_g] = null;
     }
-    static get VERSION() { return "0.9.16"; }
+    static get VERSION() { return "0.9.18"; }
     static get LOG_TYPE() { return types_1.LOG_TYPE; }
     static get STATUS_TYPE() { return types_1.STATUS_TYPE; }
     static get MAX_TIMEOUT() { return 2147483647; }
@@ -824,7 +826,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"];
@@ -1330,7 +1332,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;
@@ -1441,7 +1443,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 url.fileURLToPath(value);
             }
@@ -1456,7 +1458,7 @@ class Module extends EventEmitter {
     }
     static resolvePath(value, base) {
         try {
-            if (this.isURL(value = value.trim())) {
+            if (this.isURL(value)) {
                 return isFileURL(value) ? url.fileURLToPath(value) : new URL(value).href;
             }
             if (base instanceof URL || this.isURL(base)) {
@@ -1488,7 +1490,7 @@ class Module extends EventEmitter {
             if (typeof flags === 'boolean') {
                 flags = flags ? 2 : 0;
             }
-            let result = value.trim();
+            let result = PLATFORM_WIN32 ? value.trim() : value;
             result = flags & 1 ? path.resolve(result) : path.normalize(result);
             if ((flags & 3) && result.length) {
                 result = ensureDir(result);
@@ -2164,12 +2166,10 @@ class Module extends EventEmitter {
     }
     static sanitizeArgs(values, doubleQuote) {
         const result = typeof values === 'string' ? [values] : values;
-        const pattern = /[^\w+-.,/:@]/g;
-        const sanitize = (value) => value.replace(pattern, capture => capture === '\n' ? "'\n'" : (capture === '$' || capture === '`' ? '\\' : '') + '\\' + capture);
         for (let i = 0; i < result.length; ++i) {
             let value = result[i].trim(), leading = '';
             if (value !== '--') {
-                const opt = /^(-[^\s=]+|--[^-\s=][^\s=]*)(=)?\s*(.*)$/.exec(value);
+                const opt = REGEXP_CLIOPTION.exec(value);
                 if (opt) {
                     if (!opt[2] && !opt[3]) {
                         result[i] = opt[1];
@@ -2179,7 +2179,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] === '"') {
@@ -2192,33 +2192,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;
-                        }
-                        if (pattern.test(value)) {
-                            if (type) {
-                                value = '"' + sanitize(value) + '"';
-                            }
-                            else {
-                                value = "'" + value.replace(/'/g, "'\\''") + "'";
-                            }
+                    else if (!quoted) {
+                        if (REGEXP_CLIESCAPE.test(value)) {
+                            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 = sanitize(leading);
+                        leading.replace(REGEXP_CLIESCAPE, capture => '\\' + capture);
                     }
                 }
             }
@@ -3470,12 +3456,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) {
@@ -3503,7 +3489,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.9.16",
+  "version": "0.9.18",
   "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.16",
+    "@e-mc/types": "0.9.18",
     "chalk": "4.1.2",
     "file-type": "16.5.4",
     "js-yaml": "^4.1.0",