@e-mc/module 0.11.2 → 0.11.4

package/README.md

@@ -9,7 +9,7 @@
 
 ## Interface
 
-* [View Source](https://www.unpkg.com/@e-mc/types@0.11.2/lib/index.d.ts)
+* [View Source](https://www.unpkg.com/@e-mc/types@0.11.4/lib/index.d.ts)
 
 ```typescript
 import type { LogStatus } from "./squared";
@@ -225,13 +225,17 @@ interface ModuleConstructor {
     getMemUsage(format: true): string;
     getMemUsage(format?: boolean): number;
     formatCpuMem(start: CpuUsage, all?: boolean): string;
+    /** @deprecated */
     getPackageVersion(name: string | [string, string], startDir: string, baseDir?: string): string;
+    /** @deprecated */
     getPackageVersion(name: string | [string, string], unstable?: boolean, startDir?: string, baseDir?: string): string;
     checkSemVer(name: string | [string, string], options: CheckSemVerOptions): boolean;
-    checkSemVer(name: string | [string, string], min: number | string, max?: number | string, unstable?: boolean, startDir?: string): boolean;
     checkSemVer(name: string | [string, string], min: number | string, max: number | string, options?: Omit<CheckSemVerOptions, "min" | "max" | "equals">): boolean;
+    /** @deprecated */
     sanitizeCmd(value: string): string;
+    /** @deprecated */
     sanitizeArgs(value: string, doubleQuote?: boolean): string;
+    /** @deprecated */
     sanitizeArgs(values: string[], doubleQuote?: boolean): string[];
     purgeMemory(percent: number, parent: boolean): Promise<number>;
     purgeMemory(percent: number, limit: number, parent?: boolean): Promise<number>;
@@ -410,11 +414,11 @@ interface LoggerModule {
 
 ## References
 
-- 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.unpkg.com/@e-mc/types@0.11.4/lib/core.d.ts
+- https://www.unpkg.com/@e-mc/types@0.11.4/lib/logger.d.ts
+- https://www.unpkg.com/@e-mc/types@0.11.4/lib/module.d.ts
+- https://www.unpkg.com/@e-mc/types@0.11.4/lib/node.d.ts
+- https://www.unpkg.com/@e-mc/types@0.11.4/lib/settings.d.ts
 
 * https://www.npmjs.com/package/@types/node
 

package/index.js

@@ -144,7 +144,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 REGEXP_PATHEND = new RegExp(`${path.sep}+$`);
 const LOG_CPUBARCOLOR = SETTINGS.process.cpu_bar_color;
@@ -941,11 +941,10 @@ 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;
 const hideAbort = (err) => err.name === 'AbortError' && SETTINGS.abort === false;
-const asFile = (value) => typeof value === 'string' ? value.trim() : value instanceof URL && value.protocol === 'file:' ? (0, node_url_1.fileURLToPath)(value) : '';
+const asFile = (value) => typeof value === 'string' ? PLATFORM_WIN32 ? value.trim() : value : value instanceof URL && value.protocol === 'file:' ? (0, node_url_1.fileURLToPath)(value) : '';
 const wrapQuote = (value) => '"' + value.replaceAll('"', '\\"') + '"';
 const isFunction = (value) => typeof value === 'function';
 const isFileURL = (value) => /^file:\/\//i.test(value);
@@ -985,7 +984,7 @@ class Module extends EventEmitter {
         this[_g] = null;
     }
     static get VERSION() {
-        return "0.11.2";
+        return "0.11.4";
     }
     static get LOG_TYPE() {
         return types_1.LOG_TYPE;
@@ -1075,7 +1074,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"];
@@ -1560,7 +1559,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;
@@ -1676,7 +1675,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, node_url_1.fileURLToPath)(value);
             }
@@ -1691,7 +1690,7 @@ class Module extends EventEmitter {
     }
     static resolvePath(value, base) {
         try {
-            if (this.isURL(value = value.trim())) {
+            if (this.isURL(value)) {
                 return isFileURL(value) ? (0, node_url_1.fileURLToPath)(value) : new URL(value).href;
             }
             if (base instanceof URL || this.isURL(base)) {
@@ -1723,7 +1722,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);
@@ -2382,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] === '"') {
@@ -2395,23 +2394,9 @@ 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}'`;
@@ -2421,7 +2406,7 @@ class Module extends EventEmitter {
                 else if (opt) {
                     leading = leading.trim();
                     if (!PLATFORM_WIN32 && leading.length > 2 && leading[1] !== '-') {
-                        leading = escapeArg(leading);
+                        leading = leading.replace(REGEXP_CLIESCAPE, capture => '\\' + capture);
                     }
                 }
             }
@@ -3718,7 +3703,7 @@ class Module extends EventEmitter {
             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) {
@@ -3746,7 +3731,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/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.2",
+  "version": "0.11.4",
   "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.2",
+    "@e-mc/types": "0.11.4",
     "chalk": "4.1.2",
     "file-type": "^18.7.0",
     "js-yaml": "^4.1.0",