@e-mc/module 0.8.6 → 0.8.7

package/README.md

@@ -9,7 +9,7 @@
 
 ## Interface
 
-- https://www.unpkg.com/@e-mc/types@0.8.6/lib/index.d.ts
+- https://www.unpkg.com/@e-mc/types@0.8.7/lib/index.d.ts
 
 ```typescript
 import type { LogStatus } from "./squared";
@@ -213,8 +213,8 @@ interface ModuleConstructor {
     getMemUsage(format: true): string;
     getMemUsage(format?: boolean): number;
     formatCpuMem(start: CpuUsage, all?: boolean): string;
-    getPackageVersion(name: string | [string, string], startDir: string): string;
-    getPackageVersion(name: string | [string, string], unstable?: boolean, startDir?: string): string;
+    getPackageVersion(name: string | [string, string], startDir: string, baseDir?: string): string;
+    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, options: CheckSemVerOptions): boolean;
     checkSemVer(name: string | [string, string], min: number | string, max?: number | string, unstable?: boolean, startDir?: string): boolean;
@@ -232,10 +232,10 @@ interface ModuleConstructor {
 
 ## References
 
-- https://www.unpkg.com/@e-mc/types@0.8.6/lib/core.d.ts
-- https://www.unpkg.com/@e-mc/types@0.8.6/lib/logger.d.ts
-- https://www.unpkg.com/@e-mc/types@0.8.6/lib/module.d.ts
-- https://www.unpkg.com/@e-mc/types@0.8.6/lib/node.d.ts
+- https://www.unpkg.com/@e-mc/types@0.8.7/lib/core.d.ts
+- https://www.unpkg.com/@e-mc/types@0.8.7/lib/logger.d.ts
+- https://www.unpkg.com/@e-mc/types@0.8.7/lib/module.d.ts
+- https://www.unpkg.com/@e-mc/types@0.8.7/lib/node.d.ts
 
 ## LICENSE
 

package/index.js

@@ -132,28 +132,84 @@ const REGEXP_TORRENT = /^(?:magnet:\?xt=|(?:https?|s?ftp):\/\/[^/][^\n]*?\.(?:to
 let LOG_NEWLINE = true;
 let LOG_EMPTYLINE = false;
 let TEMP_DIR = path.join(PROCESS_CWD, "tmp");
-const PNPM_VER = (function () {
-    try {
-        const pathname = path.resolve('./node_modules/.modules.yaml');
-        if (fs.existsSync(pathname)) {
-            return fs.readFileSync(pathname, 'utf-8');
+let PNPM_VER;
+let YARN_VER;
+function parseYaml(pathname) {
+    return require('js-yaml').load(fs.readFileSync(pathname, 'utf-8'));
+}
+function setPnpmVer() {
+    if (PNPM_VER === undefined) {
+        PNPM_VER = false;
+        const items = [];
+        let baseDir;
+        try {
+            let pathname = path.resolve("node_modules/.modules.yaml"), config;
+            if (fs.existsSync(pathname) && (0, types_1.isPlainObject)(config = parseYaml(pathname))) {
+                if (config.nodeLinker === 'hoisted') {
+                    return PNPM_VER = true;
+                }
+                if (config.nodeLinker === 'pnp') {
+                    return false;
+                }
+                const addPackage = (value) => {
+                    let index = value.indexOf('(');
+                    if (index !== -1) {
+                        value = value.substring(0, index);
+                    }
+                    index = value.lastIndexOf(value.indexOf('@', 2) !== -1 ? '@' : '/');
+                    const name = value.substring(1, index);
+                    const version = value.substring(index + 1);
+                    if (!items.find(item => item[0] === name && item[1] === version)) {
+                        items.push([name, version]);
+                    }
+                };
+                for (const name in config.hoistedDependencies) {
+                    addPackage(name);
+                }
+                if (!path.isAbsolute(baseDir = config.virtualStoreDir)) {
+                    baseDir = path.resolve('node_modules', baseDir);
+                }
+                if (!fs.existsSync(pathname = path.resolve(baseDir, "lock.yaml"))) {
+                    baseDir = undefined;
+                }
+                else if ((0, types_1.isPlainObject)(config = parseYaml(pathname))) {
+                    for (const name in config.packages) {
+                        addPackage(name);
+                    }
+                }
+            }
         }
-    }
-    catch {
-    }
-    return '';
-})();
-const YARN_VER = (function () {
-    try {
-        const pathname = path.resolve('./.pnp.cjs');
-        if (fs.existsSync(pathname)) {
-            return require(pathname);
+        catch {
+        }
+        if (items.length) {
+            PNPM_VER = { baseDir, items };
         }
     }
-    catch {
+    return PNPM_VER;
+}
+function setYarnVer() {
+    if (YARN_VER === undefined) {
+        YARN_VER = false;
+        try {
+            const pathname = path.resolve(".yarnrc.yml");
+            let config;
+            if (fs.existsSync(pathname) && (0, types_1.isPlainObject)(config = parseYaml(pathname)) && config.nodeLinker === 'node-modules') {
+                return YARN_VER = true;
+            }
+        }
+        catch {
+        }
+        try {
+            const pathname = path.resolve(".pnp.cjs");
+            if (fs.existsSync(pathname)) {
+                return YARN_VER = require(pathname);
+            }
+        }
+        catch {
+        }
     }
-    return null;
-})();
+    return YARN_VER;
+}
 function applyStyle(options, style) {
     var _h;
     for (const attr in style) {
@@ -627,7 +683,7 @@ class Module extends EventEmitter {
         this[_f] = new AbortController();
         this[_g] = null;
     }
-    static get VERSION() { return "0.8.6"; }
+    static get VERSION() { return "0.8.7"; }
     static get LOG_TYPE() { return types_1.LOG_TYPE; }
     static get STATUS_TYPE() { return types_1.STATUS_TYPE; }
     static get MAX_TIMEOUT() { return 2147483647; }
@@ -1191,7 +1247,7 @@ class Module extends EventEmitter {
             }
         }
         catch (err) {
-            if (err instanceof Error && err.code === 'ENOENT') {
+            if (this.isErrorCode(err, 'ENOENT')) {
                 throw err;
             }
         }
@@ -1811,8 +1867,11 @@ class Module extends EventEmitter {
         }
         return result;
     }
-    static getPackageVersion(value, unstable, startDir) {
+    static getPackageVersion(value, unstable, startDir, baseDir) {
         if (typeof unstable === 'string') {
+            if (typeof startDir === 'string') {
+                baseDir = startDir;
+            }
             startDir = unstable;
             unstable = false;
         }
@@ -1834,7 +1893,10 @@ class Module extends EventEmitter {
             folders.push(startDir);
             folders.reverse();
         }
-        for (const folder of folders) {
+        for (let folder of folders) {
+            if (baseDir) {
+                folder = path.join(baseDir, folder.substring(PROCESS_CWD.length));
+            }
             try {
                 const pkg = path.join(folder, `node_modules/${value}/package.json`);
                 if (fs.existsSync(pkg)) {
@@ -1887,18 +1949,18 @@ class Module extends EventEmitter {
             }
             return result[0];
         };
-        if (PNPM_VER) {
-            const result = [];
-            const pattern = new RegExp(`/${(0, types_1.escapePattern)(value)}/([^:]+):`, 'g');
-            let match;
-            while (match = pattern.exec(PNPM_VER)) {
-                result.push(match[1]);
-            }
-            if (result.length) {
-                return latest(result);
+        if (setPnpmVer()) {
+            if ((0, types_1.isObject)(PNPM_VER)) {
+                if (startDir && !baseDir) {
+                    return this.getPackageVersion(value, unstable, startDir, PNPM_VER.baseDir || path.join(PROCESS_CWD, 'node_modules/.pnpm'));
+                }
+                const result = PNPM_VER.items.filter(item => item[0] === value).map(item => item[1]);
+                if (result.length) {
+                    return latest(result);
+                }
             }
         }
-        if (YARN_VER) {
+        else if (setYarnVer() && (0, types_1.isObject)(YARN_VER)) {
             folders.forEach((folder, index) => {
                 folder = ensureDir(folder).replace(path.sep + 'node_modules' + path.sep, path.sep + 'packages' + path.sep);
                 folders[index] = PLATFORM_WIN32 ? folder.toLowerCase() : folder;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@e-mc/module",
-  "version": "0.8.6",
+  "version": "0.8.7",
   "description": "Module base class for E-mc.",
   "main": "index.js",
   "types": "index.d.ts",
@@ -20,11 +20,12 @@
   "license": "BSD 3-Clause",
   "homepage": "https://github.com/anpham6/e-mc#readme",
   "dependencies": {
-    "@e-mc/types": "0.8.6",
+    "@e-mc/types": "0.8.7",
     "abort-controller": "^3.0.0",
     "chalk": "4.1.2",
     "event-target-shim": "^5.0.1",
     "file-type": "16.5.4",
+    "js-yaml": "^4.1.0",
     "mime-types": "^2.1.35",
     "picomatch": "^3.0.1",
     "strip-ansi": "6.0.1"