@e-mc/module 0.10.2 → 0.10.4

package/README.md

@@ -9,7 +9,7 @@
 
 ## Interface
 
-* [View Source](https://www.unpkg.com/@e-mc/types@0.10.2/lib/index.d.ts)
+* [View Source](https://www.unpkg.com/@e-mc/types@0.10.4/lib/index.d.ts)
 
 ```typescript
 import type { LogStatus } from "./squared";
@@ -17,7 +17,7 @@ import type { LogStatus } from "./squared";
 import type { IHost } from "./index";
 import type { IAbortComponent, IPermission } from "./core";
 import type { LOG_TYPE, STATUS_TYPE, ExecCommand, LogArguments, LogComponent, LogDate, LogFailOptions, LogMessageOptions, LogOptions, LogProcessOptions, LogTime, LogType, LogValue, LoggerFormat, StatusType } from "./logger";
-import type { AsHashOptions, CheckSemVerOptions, CopyDirOptions, CopyDirResult, CopyFileOptions, CreateDirOptions, DeleteFileOptions, MoveFileOptions, ParseFunctionOptions, PermissionOptions, ProtocolType, ReadBufferOptions, ReadFileCallback, ReadFileOptions, ReadHashOptions, ReadTextOptions, RemoveDirOptions, TempDirOptions, WriteFileOptions } from "./module";
+import type { AsHashOptions, CheckSemVerOptions, CopyDirOptions, CopyDirResult, CopyFileOptions, CreateDirOptions, DeleteFileOptions, GlobDirOptions, MoveFileOptions, ParseFunctionOptions, PermissionOptions, ProtocolType, ReadBufferOptions, ReadFileCallback, ReadFileOptions, ReadHashOptions, ReadTextOptions, RemoveDirOptions, TempDirOptions, WriteFileOptions } from "./module";
 import type { Settings } from "./node";
 import type { LoggerFormatSettings } from "/settings";
 
@@ -205,6 +205,8 @@ interface ModuleConstructor {
     removeDir(value: string | URL, empty?: boolean, recursive?: boolean): boolean;
     copyDir(src: string | URL, dest: string | URL, move?: boolean, recursive?: boolean): Promise<CopyDirResult>;
     copyDir(src: string | URL, dest: string | URL, options?: CopyDirOptions): Promise<CopyDirResult>;
+    globDir(src: string | URL, pattern: string | string[], recursive: boolean | number): Promise<string[]>;
+    globDir(src: string | URL, pattern: string | string[], options?: GlobDirOptions): Promise<string[]>;
     renameFile(src: string | URL, dest: string | URL, throws?: boolean): boolean;
     streamFile(src: string, cache: boolean): Promise<Buffer | string>;
     streamFile(src: string, options: ReadBufferOptions): Promise<Buffer | string>;
@@ -261,6 +263,9 @@ interface NodeModule {
         npm?: boolean;
         inline?: boolean;
     };
+    settings?: {
+        package_manager?: "npm" | "yarn" | "pnpm";
+    };
 }
 
 interface ProcessModule {
@@ -402,11 +407,11 @@ interface LoggerModule {
 
 ## References
 
-- https://www.unpkg.com/@e-mc/types@0.10.2/lib/core.d.ts
-- https://www.unpkg.com/@e-mc/types@0.10.2/lib/logger.d.ts
-- https://www.unpkg.com/@e-mc/types@0.10.2/lib/module.d.ts
-- https://www.unpkg.com/@e-mc/types@0.10.2/lib/node.d.ts
-- https://www.unpkg.com/@e-mc/types@0.10.2/lib/settings.d.ts
+- https://www.unpkg.com/@e-mc/types@0.10.4/lib/core.d.ts
+- https://www.unpkg.com/@e-mc/types@0.10.4/lib/logger.d.ts
+- https://www.unpkg.com/@e-mc/types@0.10.4/lib/module.d.ts
+- https://www.unpkg.com/@e-mc/types@0.10.4/lib/node.d.ts
+- https://www.unpkg.com/@e-mc/types@0.10.4/lib/settings.d.ts
 
 * https://www.npmjs.com/package/@types/node
 

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]);
@@ -629,6 +629,23 @@ function getCacheTotal() {
 function isMatch(key, value) {
     return pm.isMatch(key, value, { nocase: PLATFORM_WIN32, matchBase: value.startsWith('*') });
 }
+function listDir(src, paths, depth, include, exclude, excludeDir, 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()) {
+            const subDirs = paths.concat(file.name);
+            if (!excludeDir?.includes(subDirs.join('/') + '/')) {
+                listDir(src, subDirs, depth - 1, include, exclude, excludeDir, outFiles);
+            }
+        }
+    });
+}
 function checkFunction(value) {
     if (typeof value === 'function') {
         Object.defineProperty(value, "__cjs__", { value: true, writable: false, enumerable: false });
@@ -899,7 +916,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;
@@ -943,7 +960,7 @@ class Module extends EventEmitter {
         this[_g] = null;
     }
     static get VERSION() {
-        return "0.10.2";
+        return "0.10.4";
     }
     static get LOG_TYPE() {
         return types_1.LOG_TYPE;
@@ -1904,6 +1921,51 @@ 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 };
+        const prependSrc = (value) => {
+            if (pmOpts.matchBase) {
+                return value;
+            }
+            return (Array.isArray(value) ? value : [value]).map(item => path.join(outDir, item));
+        };
+        let exclude, excludeDir, 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);
+            if (exclude) {
+                const items = Array.isArray(exclude) ? exclude : [exclude];
+                exclude = [];
+                for (const value of items) {
+                    if (/^[^\\/][^*]+[\\/]$/.test(value) && !(0, types_1.hasGlob)(value)) {
+                        (excludeDir ||= []).push(this.normalizePath(value, 4));
+                    }
+                    else {
+                        exclude.push(value);
+                    }
+                }
+            }
+        }
+        else {
+            recursive = options;
+        }
+        recursive ??= true;
+        const result = [];
+        listDir(outDir, [], !recursive ? 0 : typeof recursive === 'number' ? recursive : Infinity, pm(prependSrc(pattern), pmOpts), exclude?.length ? pm(prependSrc(exclude), pmOpts) : undefined, excludeDir, result);
+        return result;
+    }
     static renameFile(src, dest, throws = true) {
         try {
             fs.renameSync(src, dest);

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,6 +1,6 @@
 {
   "name": "@e-mc/module",
-  "version": "0.10.2",
+  "version": "0.10.4",
   "description": "Module base class for E-mc.",
   "main": "index.js",
   "types": "index.d.ts",
@@ -17,10 +17,10 @@
     "squared-functions"
   ],
   "author": "An Pham <anpham6@gmail.com>",
-  "license": "BSD 3-Clause",
+  "license": "BSD-3-Clause",
   "homepage": "https://github.com/anpham6/e-mc#readme",
   "dependencies": {
-    "@e-mc/types": "0.10.2",
+    "@e-mc/types": "0.10.4",
     "chalk": "4.1.2",
     "file-type": "^18.7.0",
     "js-yaml": "^4.1.0",