@e-mc/module 0.9.10 → 0.9.12

package/README.md

@@ -9,7 +9,7 @@
 
 ## Interface
 
-* [View Source](https://www.unpkg.com/@e-mc/types@0.9.10/lib/index.d.ts)
+* [View Source](https://www.unpkg.com/@e-mc/types@0.9.12/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, GetTempDirOptions, MoveFileOptions, NormalizeFlags, ParseFunctionOptions, PermissionOptions, ProtocolType, ReadBufferOptions, ReadFileCallback, ReadFileOptions, ReadHashOptions, ReadTextOptions, RemoveDirOptions, WriteFileOptions } from "./module";
+import type { AsHashOptions, CheckSemVerOptions, CopyDirOptions, CopyDirResult, CopyFileOptions, CreateDirOptions, DeleteFileOptions, GetTempDirOptions, GlobDirOptions, MoveFileOptions, NormalizeFlags, ParseFunctionOptions, PermissionOptions, ProtocolType, ReadBufferOptions, ReadFileCallback, ReadFileOptions, ReadHashOptions, ReadTextOptions, RemoveDirOptions, WriteFileOptions } from "./module";
 import type { Settings } from "./node";
 import type { LoggerFormatSettings } from "/settings";
 
@@ -200,6 +200,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>;
@@ -256,6 +258,9 @@ interface NodeModule {
         npm?: boolean;
         inline?: boolean;
     };
+    settings?: {
+        package_manager?: "npm" | "yarn" | "pnpm";
+    };
 }
 
 interface ProcessModule {
@@ -389,11 +394,11 @@ type ForegroundColor = typeof IForegroundColor | `#${string}`;
 
 ## References
 
-- https://www.unpkg.com/@e-mc/types@0.9.10/lib/core.d.ts
-- https://www.unpkg.com/@e-mc/types@0.9.10/lib/logger.d.ts
-- https://www.unpkg.com/@e-mc/types@0.9.10/lib/module.d.ts
-- https://www.unpkg.com/@e-mc/types@0.9.10/lib/node.d.ts
-- https://www.unpkg.com/@e-mc/types@0.9.10/lib/settings.d.ts
+- https://www.unpkg.com/@e-mc/types@0.9.12/lib/core.d.ts
+- https://www.unpkg.com/@e-mc/types@0.9.12/lib/logger.d.ts
+- https://www.unpkg.com/@e-mc/types@0.9.12/lib/module.d.ts
+- https://www.unpkg.com/@e-mc/types@0.9.12/lib/node.d.ts
+- https://www.unpkg.com/@e-mc/types@0.9.12/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

@@ -106,6 +106,7 @@ const VALUES = {
     ["node.process.cpu_usage"]: true,
     ["node.process.memory_usage"]: true,
     ["node.process.inline"]: true,
+    ["node.settings.package_manager"]: '',
     ["temp.dir"]: "tmp",
     ["temp.write"]: false,
     ["process.password"]: '',
@@ -171,12 +172,12 @@ function setPnpmVer() {
                     return false;
                 }
                 const addPackage = (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]);
@@ -548,6 +549,20 @@ function addCacheItem(map, key, data, cache) {
         map.set(key, [Date.now(), data]);
     }
 }
+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 });
@@ -720,7 +735,7 @@ class Module extends EventEmitter {
         this[_f] = new AbortController();
         this[_g] = null;
     }
-    static get VERSION() { return "0.9.10"; }
+    static get VERSION() { return "0.9.12"; }
     static get LOG_TYPE() { return types_1.LOG_TYPE; }
     static get STATUS_TYPE() { return types_1.STATUS_TYPE; }
     static get MAX_TIMEOUT() { return 2147483647; }
@@ -763,6 +778,7 @@ class Module extends EventEmitter {
             case "error.fatal":
                 return VALUES[key];
             case "node.require.ext":
+            case "node.settings.package_manager":
             case "process.password":
             case "process.cipher.algorithm":
                 return VALUES[key] !== '';
@@ -1685,6 +1701,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);
@@ -2072,7 +2115,7 @@ class Module extends EventEmitter {
             maxVersion = [Infinity];
         }
         else {
-            maxVersion = [max - 1];
+            maxVersion = [(max | 0) - 1];
             maxRange = true;
         }
         let version = this.getPackageVersion(name, unstable, startDir);
@@ -2107,8 +2150,8 @@ class Module extends EventEmitter {
     }
     static sanitizeArgs(values, doubleQuote) {
         const result = typeof values === 'string' ? [values] : values;
-        const pattern = /[^0-9a-z%+-./:=@_]/gi;
-        const sanitize = (value) => value.replace(pattern, capture => (capture === '$' || capture === '`' ? '\\' : '') + '\\' + capture);
+        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 !== '--') {
@@ -2277,6 +2320,17 @@ class Module extends EventEmitter {
                     VALUES["node.require.inline"] = inline;
                 }
             }
+            const manager = node.settings?.package_manager;
+            switch (manager) {
+                case 'npm':
+                case 'yarn':
+                case 'pnpm':
+                    VALUES["node.settings.package_manager"] = manager;
+                    break;
+                default:
+                    VALUES["node.settings.package_manager"] = '';
+                    break;
+            }
         }
         if ((0, types_1.isPlainObject)(settings.process)) {
             const { env, cipher, password: pwd } = settings.process;
@@ -3369,7 +3423,7 @@ class Module extends EventEmitter {
             if (typeof options === 'number') {
                 options = undefined;
             }
-            this.writeFail("Unknown", err, { ...options, type: types_1.LOG_TYPE.SYSTEM, code: types_1.ERR_CODE.MODULE_NOT_FOUND, exec: { command: 'npm', args: ['i', name] } });
+            this.writeFail("Unknown", err, { ...options, type: types_1.LOG_TYPE.SYSTEM, code: types_1.ERR_CODE.MODULE_NOT_FOUND, exec: { command: VALUES["node.settings.package_manager"] || (setPnpmVer() ? 'pnpm' : setYarnVer() ? 'yarn' : 'npm'), args: ['install', name] } });
             return true;
         }
         if (value) {

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.9.10",
+  "version": "0.9.12",
   "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.10",
+    "@e-mc/types": "0.9.12",
     "chalk": "4.1.2",
     "file-type": "16.5.4",
     "js-yaml": "^4.1.0",