@e-mc/module 0.11.1 → 0.11.3

package/README.md

@@ -9,7 +9,7 @@
 
 ## Interface
 
-* [View Source](https://www.unpkg.com/@e-mc/types@0.11.1/lib/index.d.ts)
+* [View Source](https://www.unpkg.com/@e-mc/types@0.11.3/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.1/lib/core.d.ts
-- https://www.unpkg.com/@e-mc/types@0.11.1/lib/logger.d.ts
-- https://www.unpkg.com/@e-mc/types@0.11.1/lib/module.d.ts
-- https://www.unpkg.com/@e-mc/types@0.11.1/lib/node.d.ts
-- https://www.unpkg.com/@e-mc/types@0.11.1/lib/settings.d.ts
+- https://www.unpkg.com/@e-mc/types@0.11.3/lib/core.d.ts
+- https://www.unpkg.com/@e-mc/types@0.11.3/lib/logger.d.ts
+- https://www.unpkg.com/@e-mc/types@0.11.3/lib/module.d.ts
+- https://www.unpkg.com/@e-mc/types@0.11.3/lib/node.d.ts
+- https://www.unpkg.com/@e-mc/types@0.11.3/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,
@@ -143,8 +144,9 @@ 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 REGEXP_PATHEND = new RegExp(`${path.sep}+$`);
 const LOG_CPUBARCOLOR = SETTINGS.process.cpu_bar_color;
 const LOG_DIVIDER = chalk.blackBright('|');
 const RESERVED_SHELL = [
@@ -935,7 +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;
 }
-const escapeArg = (value) => value.replace(REGEXP_CLIESCAPE, capture => capture === '\n' ? "'\n'" : (capture === '$' || capture === '`' ? '\\' : '') + '\\' + capture);
+function isPathUNC(value) {
+    value = value.toString();
+    return (VALUES["node.posix.strict"] && value.includes('/') ? /^\/\/[\w.-]+\/[\w-]+\$?\/[^\n]*?[^/]$/ : /^(?:\\\\|\/\/)[\w.-]+[\\/][\w-]+\$?[\\/][^\n]*?[^\\/]$/).test(value);
+}
 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;
@@ -944,7 +949,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 +984,7 @@ class Module extends EventEmitter {
         this[_g] = null;
     }
     static get VERSION() {
-        return "0.11.1";
+        return "0.11.3";
     }
     static get LOG_TYPE() {
         return types_1.LOG_TYPE;
@@ -1017,6 +1022,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 +1600,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 +1622,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 +1659,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 +1733,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 +1971,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 +2234,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);
@@ -2373,7 +2381,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] === '"') {
@@ -2386,33 +2394,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 = leading.replace(REGEXP_CLIESCAPE, capture => '\\' + capture);
                     }
                 }
             }
@@ -2491,7 +2485,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 +2520,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 +3426,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/lib-v4.js

@@ -0,0 +1,158 @@
+"use strict";
+exports.validateUUID = exports.renameExt = exports.isString = exports.isPlainObject = exports.isObject = exports.formatSize = exports.escapePattern = exports.toTimeMs = exports.coerceObject = exports.cloneObject = exports.asFunction = void 0;
+exports.hasSize = hasSize;
+exports.getSize = getSize;
+exports.hasSameStat = hasSameStat;
+exports.byteLength = byteLength;
+exports.cleanupStream = cleanupStream;
+exports.generateUUID = generateUUID;
+exports.existsSafe = existsSafe;
+exports.isFileHTTP = isFileHTTP;
+exports.isFileUNC = isFileUNC;
+exports.isPathUNC = isPathUNC;
+exports.readFileSafe = readFileSafe;
+exports.getFunctions = getFunctions;
+exports.allSettled = allSettled;
+const path = require("path");
+const fs = require("fs");
+const types_1 = require("@e-mc/types");
+Object.defineProperty(exports, "asFunction", { enumerable: true, get: function () { return types_1.asFunction; } });
+Object.defineProperty(exports, "cloneObject", { enumerable: true, get: function () { return types_1.cloneObject; } });
+Object.defineProperty(exports, "coerceObject", { enumerable: true, get: function () { return types_1.coerceObject; } });
+Object.defineProperty(exports, "toTimeMs", { enumerable: true, get: function () { return types_1.convertTime; } });
+Object.defineProperty(exports, "escapePattern", { enumerable: true, get: function () { return types_1.escapePattern; } });
+Object.defineProperty(exports, "formatSize", { enumerable: true, get: function () { return types_1.formatSize; } });
+Object.defineProperty(exports, "isObject", { enumerable: true, get: function () { return types_1.isObject; } });
+Object.defineProperty(exports, "isPlainObject", { enumerable: true, get: function () { return types_1.isPlainObject; } });
+Object.defineProperty(exports, "isString", { enumerable: true, get: function () { return types_1.isString; } });
+Object.defineProperty(exports, "renameExt", { enumerable: true, get: function () { return types_1.renameExt; } });
+Object.defineProperty(exports, "validateUUID", { enumerable: true, get: function () { return types_1.validateUUID; } });
+const index_1 = require("@e-mc/module");
+function hasSize(value, keepEmpty) {
+    try {
+        const statSrc = fs.statSync(value);
+        if (statSrc.size > 0) {
+            return true;
+        }
+        if (!keepEmpty) {
+            fs.unlinkSync(value);
+        }
+    }
+    catch {
+    }
+    return false;
+}
+function getSize(value, diskUsed) {
+    try {
+        return fs[diskUsed ? 'lstatSync' : 'statSync'](value).size;
+    }
+    catch {
+        return 0;
+    }
+}
+function hasSameStat(src, dest, keepEmpty) {
+    try {
+        if (fs.existsSync(dest)) {
+            const { size, mtimeMs } = fs.statSync(src);
+            if (size > 0) {
+                const statDest = fs.statSync(dest);
+                return size === statDest.size && mtimeMs === statDest.mtimeMs;
+            }
+            if (!keepEmpty) {
+                fs.unlinkSync(src);
+            }
+        }
+    }
+    catch {
+    }
+    return false;
+}
+function byteLength(value, encoding) {
+    return typeof value === 'string' && (path.isAbsolute(value) || index_1.isPath(value)) ? getSize(value) : Buffer.byteLength(value, encoding && (0, types_1.getEncoding)(encoding));
+}
+function cleanupStream(stream, uri) {
+    stream.removeAllListeners();
+    stream.destroy();
+    try {
+        if (uri && fs.existsSync(uri)) {
+            fs.unlinkSync(uri);
+        }
+    }
+    catch (err) {
+        if (!index_1.isErrorCode(err, 'ENOENT')) {
+            index_1.writeFail(["Unable to delete file", path.basename(uri)], err, 32);
+        }
+    }
+}
+function generateUUID(format, dictionary) {
+    return format ? (0, types_1.randomString)(format, dictionary) : (0, types_1.generateUUID)();
+}
+function existsSafe(value, isFile) {
+    return index_1.isPath(value, isFile);
+}
+function isFileHTTP(value) {
+    return index_1.isFile(value, 'http/s');
+}
+function isFileUNC(value) {
+    return index_1.isFile(value, 'unc');
+}
+function isPathUNC(value) {
+    return index_1.isPath(value, 'unc');
+}
+async function readFileSafe(value, encoding, cache) {
+    return encoding === 'buffer' ? index_1.readBuffer(value, cache) : index_1.readText(value, encoding, cache);
+}
+function getFunctions(values, absolute, sync = true, outFailed) {
+    let options, context;
+    if ((0, types_1.isObject)(absolute)) {
+        options = absolute;
+        ({ context, outFailed } = absolute);
+        if (options.external === undefined) {
+            options.external = true;
+        }
+    }
+    else {
+        options = { external: true, absolute, sync };
+    }
+    const result = [];
+    for (const value of values) {
+        let method = null;
+        if (typeof value === 'string') {
+            method = index_1.parseFunction(value, options);
+        }
+        else if (typeof value === 'function') {
+            method = value;
+            if (context !== undefined) {
+                method.bind(context);
+            }
+        }
+        if (method) {
+            result.push(method);
+        }
+        else if (outFailed) {
+            outFailed.push(index_1.asString(value) || "Unknown");
+        }
+    }
+    return result;
+}
+async function allSettled(tasks, rejected, options) {
+    if (rejected) {
+        return Promise.allSettled(tasks).then(result => {
+            const items = [];
+            for (const item of result) {
+                if (item.status === 'fulfilled') {
+                    items.push(item);
+                }
+                else if (item.reason) {
+                    index_1.writeFail(rejected, item.reason, options);
+                }
+            }
+            return items;
+        })
+            .catch((err) => {
+            index_1.writeFail(rejected, err, options);
+            return [];
+        });
+    }
+    return Promise.allSettled(tasks);
+}

package/package.json

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