@e-mc/module 0.10.1 → 0.10.3

package/index.d.ts

@@ -1,5 +1,5 @@
-import type { ModuleConstructor } from '../types/lib';
-
-declare const Module: ModuleConstructor;
-
+import type { ModuleConstructor } from '@e-mc/types/lib';
+
+declare const Module: ModuleConstructor;
+
 export = Module;

package/index.js

@@ -141,7 +141,7 @@ const MEMORY_CACHE_DISK = {
 const SUPPORTED_CANPARSE = (0, types_1.supported)(19, 9) || (0, types_1.supported)(18, 17, 0, true);
 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_CLIESCAPE = /[^\w+-.,/:@]/g;
 const REGEXP_CLIOPTION = /^(-[^\s=]+|--[^-\s=][^\s=]*)(=)?\s*(.*)$/;
 const REGEXP_ANSIESCAPE = /[\u001B\u009B]/;
 const LOG_CPUBARCOLOR = SETTINGS.process.cpu_bar_color;
@@ -214,12 +214,12 @@ function setPnpmVer() {
     return PNPM_VER;
 }
 function addPnpmPackage(items, value) {
-    let index = value.indexOf('(');
+    let index = (value = value.replace(/^\//, '')).indexOf('(');
     if (index !== -1) {
         value = value.substring(0, index);
     }
-    index = value.lastIndexOf(value.indexOf('@', 2) !== -1 ? '@' : '/');
-    const name = value.substring(1, index);
+    index = value.lastIndexOf(value.indexOf('@', 1) !== -1 ? '@' : '/');
+    const name = value.substring(0, index);
     const version = value.substring(index + 1);
     if (!items.find(item => item[0] === name && item[1] === version)) {
         items.push([name, version]);
@@ -298,9 +298,8 @@ function getLatestRelease(result, unstable = false) {
     return result[0];
 }
 function applyStyle(options, style) {
-    var _h;
     for (const attr in style) {
-        (_h = options)[attr] ?? (_h[attr] = style[attr]);
+        options[attr] ??= style[attr];
     }
     return options;
 }
@@ -310,51 +309,51 @@ function checkColorOptions(type, settings, options) {
     }
     let result = false;
     if (settings.valueColor) {
-        options.valueColor || (options.valueColor = settings.valueColor);
+        options.valueColor ||= settings.valueColor;
         result = true;
     }
     if (settings.valueBgColor) {
-        options.valueBgColor || (options.valueBgColor = settings.valueBgColor);
+        options.valueBgColor ||= settings.valueBgColor;
         result = true;
     }
     if (typeof settings.valueBold === 'boolean') {
-        options.valueBold ?? (options.valueBold = settings.valueBold);
+        options.valueBold ??= settings.valueBold;
     }
     if (settings.hintColor) {
-        options.hintColor || (options.hintColor = settings.hintColor);
+        options.hintColor ||= settings.hintColor;
         result = true;
     }
     if (settings.hintBgColor) {
-        options.hintBgColor || (options.hintBgColor = settings.hintBgColor);
+        options.hintBgColor ||= settings.hintBgColor;
         result = true;
     }
     if (typeof settings.hintBold === 'boolean') {
-        options.hintBold ?? (options.hintBold = settings.hintBold);
+        options.hintBold ??= settings.hintBold;
     }
     if (type & types_1.LOG_TYPE.FAIL) {
         return result;
     }
     if (settings.titleColor) {
-        options.titleColor || (options.titleColor = settings.titleColor);
+        options.titleColor ||= settings.titleColor;
         result = true;
     }
     if (settings.titleBgColor) {
-        options.titleBgColor || (options.titleBgColor = settings.titleBgColor);
+        options.titleBgColor ||= settings.titleBgColor;
         result = true;
     }
     if (typeof settings.titleBold === 'boolean') {
-        options.titleBold ?? (options.titleBold = settings.titleBold);
+        options.titleBold ??= settings.titleBold;
     }
     if (settings.messageColor) {
-        options.messageColor || (options.messageColor = settings.messageColor);
+        options.messageColor ||= settings.messageColor;
         result = true;
     }
     if (settings.messageBgColor) {
-        options.messageBgColor || (options.messageBgColor = settings.messageBgColor);
+        options.messageBgColor ||= settings.messageBgColor;
         result = true;
     }
     if (typeof settings.messageBold === 'boolean') {
-        options.messageBold ?? (options.messageBold = settings.messageBold);
+        options.messageBold ??= settings.messageBold;
     }
     return result;
 }
@@ -630,6 +629,20 @@ function getCacheTotal() {
 function isMatch(key, value) {
     return pm.isMatch(key, value, { nocase: PLATFORM_WIN32, matchBase: value.startsWith('*') });
 }
+function listDir(src, paths, depth, include, exclude, outFiles) {
+    const srcDir = path.join(src, ...paths);
+    fs.readdirSync(srcDir, { withFileTypes: true }).forEach(file => {
+        if (file.isFile()) {
+            const pathname = path.join(srcDir, file.name);
+            if (include(pathname) && !exclude?.(pathname)) {
+                outFiles.push(pathname);
+            }
+        }
+        else if (depth > 0 && file.isDirectory()) {
+            listDir(src, paths.concat(file.name), depth - 1, include, exclude, outFiles);
+        }
+    });
+}
 function checkFunction(value) {
     if (typeof value === 'function') {
         Object.defineProperty(value, "__cjs__", { value: true, writable: false, enumerable: false });
@@ -638,12 +651,11 @@ function checkFunction(value) {
     return null;
 }
 function encryptMessage(data, cipher, algorithm) {
-    var _h;
     if (cipher?.key && cipher.iv) {
-        algorithm || (algorithm = cipher.algorithm || 'aes-256-gcm');
+        algorithm ||= cipher.algorithm || 'aes-256-gcm';
         const result = (0, types_1.encryptUTF8)(algorithm, cipher.key, cipher.iv, data);
         if (result) {
-            VALUES[_h = "process.cipher.algorithm"] || (VALUES[_h] = algorithm);
+            VALUES["process.cipher.algorithm"] ||= algorithm;
             return result;
         }
     }
@@ -768,7 +780,7 @@ function checkExDev(err, src, dest) {
     return false;
 }
 function applySessionId(instance, options) {
-    options.sessionId ?? (options.sessionId = instance.sessionId);
+    options.sessionId ??= instance.sessionId;
     let value = options.broadcastId;
     if (value === undefined) {
         value = instance.broadcastId;
@@ -901,7 +913,7 @@ 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 === '$' || capture === '`' ? '\\' : '') + '\\' + capture);
+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;
@@ -945,7 +957,7 @@ class Module extends EventEmitter {
         this[_g] = null;
     }
     static get VERSION() {
-        return "0.10.1";
+        return "0.10.3";
     }
     static get LOG_TYPE() {
         return types_1.LOG_TYPE;
@@ -1106,7 +1118,7 @@ class Module extends EventEmitter {
                 else if (type & 2) {
                     if (!checkColorOptions(type, SETTINGS.node, options)) {
                         applyStyle(options, this.LOG_STYLE_REVERSE);
-                        options.hintColor || (options.hintColor = 'yellow');
+                        options.hintColor ||= 'yellow';
                     }
                     titleJustify = 'center';
                 }
@@ -1140,7 +1152,7 @@ class Module extends EventEmitter {
                 }
                 if (type & 128) {
                     if (!checkColorOptions(type, SETTINGS.time_elapsed, options)) {
-                        options.hintColor || (options.hintColor = 'yellow');
+                        options.hintColor ||= 'yellow';
                     }
                     if (options.titleBgColor) {
                         titleJustify = 'center';
@@ -1148,7 +1160,7 @@ class Module extends EventEmitter {
                 }
                 else if (type & 256) {
                     if (options.failed) {
-                        options.messageBgColor || (options.messageBgColor = 'bgGrey');
+                        options.messageBgColor ||= 'bgGrey';
                     }
                     else {
                         const { color, bgColor, bold } = format.meter;
@@ -1161,7 +1173,7 @@ class Module extends EventEmitter {
                             }
                         }
                         if (bold) {
-                            options.messageBold ?? (options.messageBold = true);
+                            options.messageBold ??= true;
                         }
                     }
                 }
@@ -1180,7 +1192,7 @@ class Module extends EventEmitter {
                 }
                 if (!hintColor && !hintBgColor) {
                     ({ color: hintColor, bgColor: hintBgColor } = formatHint);
-                    hintBold ?? (hintBold = formatHint.bold);
+                    hintBold ??= formatHint.bold;
                 }
                 value = getValue();
                 hint = coloring ? (L && chalk.blackBright(L)) + formatLogColumn(truncateEnd(hint, hintWidth), hintColor, hintBgColor, hintBold) + chalk.blackBright(R) : L + truncateEnd(hint, hintWidth) + R;
@@ -1204,7 +1216,7 @@ class Module extends EventEmitter {
                 }
                 if (!valueColor && !valueBgColor) {
                     ({ color: valueColor, bgColor: valueBgColor } = formatValue);
-                    valueBold ?? (valueBold = formatValue.bold);
+                    valueBold ??= formatValue.bold;
                 }
                 try {
                     let v = value, i = id, m = message;
@@ -1217,7 +1229,7 @@ class Module extends EventEmitter {
                             const formatMessage = format.message;
                             if (!messageColor && !messageBgColor) {
                                 ({ color: messageColor, bgColor: messageBgColor, bold: messageBold } = formatMessage);
-                                messageBold ?? (messageBold = formatMessage.bold);
+                                messageBold ??= formatMessage.bold;
                             }
                             const [L, R] = formatMessage.braces;
                             let u = unit;
@@ -1371,7 +1383,7 @@ class Module extends EventEmitter {
                     }
                 }
                 try {
-                    result || (result = (0, types_1.asFunction)(fs.readFileSync(pathname, 'utf-8'), sync));
+                    result ||= (0, types_1.asFunction)(fs.readFileSync(pathname, 'utf-8'), sync);
                 }
                 catch (err) {
                     this.writeFail(["Unable to read file", value], err, 32);
@@ -1906,6 +1918,33 @@ class Module extends EventEmitter {
             });
         });
     }
+    static async globDir(src, pattern, options) {
+        const outDir = sanitizePath(asFile(src));
+        if (!(outDir && this.isDir(outDir))) {
+            return Promise.reject(errorDirectory(asFile(src) || "Unknown"));
+        }
+        const pmOpts = { posixSlashes: true, windows: true, nocase: PLATFORM_WIN32 };
+        let exclude, recursive;
+        if ((0, types_1.isObject)(options)) {
+            if (options.matchBase) {
+                pmOpts.matchBase = true;
+            }
+            if (options.contains) {
+                pmOpts.contains = true;
+            }
+            if (options.dot) {
+                pmOpts.dot = true;
+            }
+            ({ exclude, recursive } = options);
+        }
+        else {
+            recursive = options;
+        }
+        recursive ??= true;
+        const result = [];
+        listDir(outDir, [], !recursive ? 0 : typeof recursive === 'number' ? recursive : Infinity, pm(pattern, pmOpts), exclude ? pm(exclude, pmOpts) : undefined, result);
+        return result;
+    }
     static renameFile(src, dest, throws = true) {
         try {
             fs.renameSync(src, dest);
@@ -2030,7 +2069,7 @@ class Module extends EventEmitter {
         return (minStreamSize !== undefined ? Promise.resolve(null) : null);
     }
     static async resolveMime(data) {
-        FILETYPE_ESM || (FILETYPE_ESM = await (0, types_1.importESM)('file-type'));
+        FILETYPE_ESM ||= await (0, types_1.importESM)('file-type');
         return typeof data === 'string' ? FILETYPE_ESM.fileTypeFromFile(data) : data instanceof stream.Readable ? FILETYPE_ESM.fileTypeFromStream(data) : FILETYPE_ESM.fileTypeFromBuffer(data);
     }
     static lookupMime(value, extension) {
@@ -2225,11 +2264,19 @@ class Module extends EventEmitter {
         return '0.0.0';
     }
     static checkSemVer(name, min = 0, max = Infinity, unstable, startDir) {
+        let equals, includes;
         if ((0, types_1.isObject)(min)) {
-            ({ min = 0, max = Infinity, unstable, startDir } = min);
+            ({ min = 0, max = Infinity, unstable, startDir, equals, includes } = min);
         }
         else if ((0, types_1.isObject)(unstable)) {
-            ({ unstable, startDir } = unstable);
+            ({ unstable, startDir, includes } = unstable);
+        }
+        let version = this.getPackageVersion(name, unstable, startDir);
+        if (version === '0.0.0') {
+            return false;
+        }
+        if (equals) {
+            return equals === version;
         }
         if (typeof min === 'number' && Math.floor(min) !== min) {
             min = min.toString();
@@ -2238,7 +2285,7 @@ class Module extends EventEmitter {
             max = max.toString();
         }
         const minVersion = typeof min === 'string' ? min.split('.').map(ver => parseInt(ver)) : [min];
-        let maxVersion, maxRange;
+        let maxVersion, maxRange = false;
         if (typeof max === 'string') {
             maxVersion = max.split('.').map(ver => parseInt(ver));
         }
@@ -2246,13 +2293,9 @@ class Module extends EventEmitter {
             maxVersion = [Infinity];
         }
         else {
-            maxVersion = [max - 1];
+            maxVersion = [max - (includes ? 0 : 1)];
             maxRange = true;
         }
-        let version = this.getPackageVersion(name, unstable, startDir);
-        if (version === '0.0.0') {
-            return false;
-        }
         version = version.split('.').map(ver => parseInt(ver));
         for (let i = 0, length = Math.max(version.length, minVersion.length), lower = false, upper = false; i < length; ++i) {
             const ver = version[i] || 0;
@@ -2393,7 +2436,6 @@ class Module extends EventEmitter {
         }
     }
     static loadSettings(settings, password) {
-        var _h;
         const current = VALUES["process.password"];
         if (current) {
             const proc = settings.process || {};
@@ -2455,7 +2497,7 @@ class Module extends EventEmitter {
                 VALUES["process.env.apply"] = env.apply;
             }
             if ((0, types_1.isString)(pwd)) {
-                VALUES[_h = "process.password"] || (VALUES[_h] = encryptMessage(pwd, cipher, null));
+                VALUES["process.password"] ||= encryptMessage(pwd, cipher, null);
             }
         }
         if (memory?.settings) {
@@ -2706,7 +2748,7 @@ class Module extends EventEmitter {
         }
         let dir = settings.temp_dir, env, write, modified;
         if ((0, types_1.isPlainObject)(temp)) {
-            dir || (dir = temp.dir);
+            dir ||= temp.dir;
             if (temp.env) {
                 env = process.env[temp.env];
             }
@@ -2747,7 +2789,7 @@ class Module extends EventEmitter {
             } while ((dir !== "tmp") && (dir = "tmp"));
         }
         if (typeof write === 'boolean') {
-            modified || (modified = VALUES["temp.write"] !== write);
+            modified ||= VALUES["temp.write"] !== write;
             VALUES["temp.write"] = write;
         }
         if (modified) {
@@ -2793,11 +2835,11 @@ class Module extends EventEmitter {
         let result;
         if ((0, types_1.isString)(pathname)) {
             leading.push(pathname);
-            createDir ?? (createDir = true);
+            createDir ??= true;
         }
         if (uuidDir) {
             leading.push(crypto.randomUUID());
-            createDir ?? (createDir = true);
+            createDir ??= true;
         }
         if ((createDir || increment > 0) && !Module.isDir(result = path.join(...leading))) {
             const [output] = tryIncrementDir(result, increment);
@@ -2871,7 +2913,7 @@ class Module extends EventEmitter {
         [options, promises, callback] = parseFileArgs(options, callback);
         if (outSrc = hasFileSystem(this, 0, src, options)) {
             let { encoding, requireExt, minStreamSize, cache } = options;
-            encoding && (encoding = (0, types_1.getEncoding)(encoding));
+            encoding &&= (0, types_1.getEncoding)(encoding);
             const setCache = (data, cjs) => {
                 if (data) {
                     if (cache || cache !== false && autoMemoryCache()) {
@@ -2896,7 +2938,7 @@ class Module extends EventEmitter {
                 }
             }
             if (cache) {
-                result || (result = (encoding ? getCacheItem(CACHE_READTEXT, outSrc) : getCacheItem(CACHE_READBUFFER, outSrc)));
+                result ||= (encoding ? getCacheItem(CACHE_READTEXT, outSrc) : getCacheItem(CACHE_READBUFFER, outSrc));
             }
             try {
                 if (!isNaN(minStreamSize = (0, types_1.alignSize)(minStreamSize)) || promises && fs.statSync(outSrc).size >= 2097152000) {
@@ -3301,7 +3343,7 @@ class Module extends EventEmitter {
         return false;
     }
     async allSettled(tasks, rejected, options) {
-        rejected || (rejected = "Unknown");
+        rejected ||= "Unknown";
         return Promise.allSettled(tasks).then(result => {
             const items = [];
             for (const item of result) {
@@ -3396,7 +3438,7 @@ class Module extends EventEmitter {
             message = value;
             value = '';
         }
-        value || (value = isFailed(options) ? "Failed" : "Success");
+        value ||= isFailed(options) ? "Failed" : "Success";
         const duration = getTimeOffset(startTime, 0);
         const args = [
             (128 | type),
@@ -3457,7 +3499,7 @@ class Module extends EventEmitter {
                 if ((0, types_1.isPlainObject)(output)) {
                     output = { ...output };
                     if (Array.isArray(output.warn)) {
-                        (exec.warn || (exec.warn = [])).push(...output.warn);
+                        (exec.warn ||= []).push(...output.warn);
                     }
                     delete output.command;
                     delete output.warn;

package/lib-v4.d.ts

@@ -1,5 +1,5 @@
-import type { IModuleLibV4 } from '../types/lib/compat-v4';
-
-declare const LibV4: IModuleLibV4;
-
+import type { IModuleLibV4 } from '@e-mc/types/lib/compat-v4';
+
+declare const LibV4: IModuleLibV4;
+
 export = LibV4;

package/package.json

@@ -1,31 +1,31 @@
-{
-  "name": "@e-mc/module",
-  "version": "0.10.1",
-  "description": "Module base class for E-mc.",
-  "main": "index.js",
-  "types": "index.d.ts",
-  "publishConfig": {
-    "access": "public"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/anpham6/e-mc.git",
-    "directory": "src/module"
-  },
-  "keywords": [
-    "squared",
-    "squared-functions"
-  ],
-  "author": "An Pham <anpham6@gmail.com>",
-  "license": "BSD 3-Clause",
-  "homepage": "https://github.com/anpham6/e-mc#readme",
-  "dependencies": {
-    "@e-mc/types": "0.10.1",
-    "chalk": "4.1.2",
-    "file-type": "^18.7.0",
-    "js-yaml": "^4.1.0",
-    "mime-types": "^2.1.35",
-    "picomatch": "^4.0.2",
-    "strip-ansi": "6.0.1"
-  }
-}
+{
+  "name": "@e-mc/module",
+  "version": "0.10.3",
+  "description": "Module base class for E-mc.",
+  "main": "index.js",
+  "types": "index.d.ts",
+  "publishConfig": {
+    "access": "public"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/anpham6/e-mc.git",
+    "directory": "src/module"
+  },
+  "keywords": [
+    "squared",
+    "squared-functions"
+  ],
+  "author": "An Pham <anpham6@gmail.com>",
+  "license": "BSD-3-Clause",
+  "homepage": "https://github.com/anpham6/e-mc#readme",
+  "dependencies": {
+    "@e-mc/types": "0.10.3",
+    "chalk": "4.1.2",
+    "file-type": "^18.7.0",
+    "js-yaml": "^4.1.0",
+    "mime-types": "^2.1.35",
+    "picomatch": "^4.0.2",
+    "strip-ansi": "6.0.1"
+  }
+}