@e-mc/module 0.7.20 → 0.7.22

package/index.js

@@ -555,6 +555,7 @@ function tryIncrementDir(value, increment) {
     } while (increment-- > 0);
     return [outErr, -1];
 }
+const isErrorNo = (value) => value instanceof Error && (0, types_1.isString)(value.code);
 const asFile = (value) => typeof value === 'string' ? PLATFORM_WIN32 ? value.trim() : value : value instanceof URL && value.protocol === 'file:' ? url.fileURLToPath(value) : '';
 const wrapQuote = (value) => '"' + value.replace(/"/g, '\\"') + '"';
 const isFunction = (value) => typeof value === 'function';
@@ -588,7 +589,7 @@ class Module extends EventEmitter {
         this[_f] = new AbortController();
         this[_g] = null;
     }
-    static get VERSION() { return "0.7.20"; }
+    static get VERSION() { return "0.7.22"; }
     static get LOG_TYPE() { return types_1.LOG_TYPE; }
     static get STATUS_TYPE() { return types_1.STATUS_TYPE; }
     static get MAX_TIMEOUT() { return 2147483647; }
@@ -1172,22 +1173,28 @@ class Module extends EventEmitter {
             filename = undefined;
         }
         if (typeof value === 'string') {
-            let pathname = PLATFORM_WIN32 ? value.trim() : value, convert = true;
+            let pathname = PLATFORM_WIN32 ? value.trim() : value;
             if (normalize) {
                 pathname = path.normalize(pathname);
-                convert = PLATFORM_WIN32;
             }
-            if (convert) {
+            if (PLATFORM_WIN32) {
                 pathname = pathname.replace(/(?:^\\|\\+)/g, '/');
             }
-            if (pathname = pathname.replace(/\/+$/, '')) {
+            if (pathname) {
+                pathname = pathname.replace(/(?<!^)\/+$/, '');
                 if (normalize && PLATFORM_WIN32) {
                     const match = /^([A-Z]):\//.exec(pathname);
                     if (match) {
                         pathname = match[1].toLowerCase() + pathname.substring(1);
                     }
                 }
-                return pathname + (filename ? '/' + filename : '');
+                if (!filename) {
+                    return pathname;
+                }
+                if (pathname !== '/') {
+                    pathname += '/';
+                }
+                return pathname + filename;
             }
         }
         return filename || '';
@@ -1272,11 +1279,7 @@ class Module extends EventEmitter {
         }
     }
     static isErrorCode(err, ...code) {
-        if (err instanceof Error) {
-            const value = err.code;
-            return typeof value === 'string' && code.includes(value);
-        }
-        return false;
+        return isErrorNo(err) && code.includes(err.code);
     }
     static resolveFile(value) {
         if (isFileURL(value = value instanceof URL ? value.toString() : value)) {
@@ -2937,9 +2940,6 @@ class Module extends EventEmitter {
         else if (result === false) {
             return;
         }
-        if (options.passThrough) {
-            message = null;
-        }
         const args = [(type | 512), title, value, message, applyStyle(options, Module.LOG_STYLE_FAIL)];
         applyLogId.call(this, options);
         if (options.queue !== false && !options.passThrough && !this._logFlushed) {
@@ -3069,11 +3069,11 @@ class Module extends EventEmitter {
             options = value;
             value = undefined;
         }
-        if (err instanceof Error && err.code === types_1.ERR_CODE.MODULE_NOT_FOUND && (0, types_1.isString)(name)) {
+        if (name && isErrorNo(err) && err.code.endsWith(types_1.ERR_CODE.MODULE_NOT_FOUND)) {
             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("Package not found", err, { ...options, type: types_1.LOG_TYPE.SYSTEM, code: err.code, exec: { command: 'npm', args: ['i', name] } });
             return true;
         }
         if (value) {
@@ -3082,38 +3082,32 @@ class Module extends EventEmitter {
         return false;
     }
     checkFail(message, options) {
-        const code = options.code;
-        if (code && message instanceof Error) {
-            const valid = message.code === code;
-            switch (code) {
-                case types_1.ERR_CODE.MODULE_NOT_FOUND: {
-                    const exec = options.exec;
-                    if (exec) {
-                        if (valid && !this.aborted) {
-                            const command = exec.command + (exec.args ? ' ' + exec.args.join(' ') : '');
-                            const target = this.host || this;
-                            let session = CACHE_EXEC.get(target);
-                            if (!session) {
-                                CACHE_EXEC.set(target, session = []);
-                            }
-                            if (session.includes(command)) {
-                                return false;
-                            }
-                            session.push(command);
-                            let type = options.type || 0;
-                            type |= 4096;
-                            type &= ~1;
-                            if (options.passThrough) {
-                                options.passThrough = false;
-                                message = null;
-                            }
-                            return { type, value: ["Install required?", command], message };
-                        }
-                        delete options.exec;
-                    }
-                    break;
+        let { code, exec } = options;
+        if (!code && isErrorNo(message)) {
+            code = message.code;
+        }
+        if (exec && (code === null || code === void 0 ? void 0 : code.endsWith(types_1.ERR_CODE.MODULE_NOT_FOUND))) {
+            if (!this.aborted) {
+                const command = exec.command + (exec.args ? ' ' + exec.args.join(' ') : '');
+                const target = this.host || this;
+                let session = CACHE_EXEC.get(target);
+                if (!session) {
+                    CACHE_EXEC.set(target, session = []);
+                }
+                if (session.includes(command)) {
+                    return false;
+                }
+                session.push(command);
+                let type = options.type || 0;
+                type |= 4096;
+                type &= ~1;
+                if (options.passThrough) {
+                    options.passThrough = false;
+                    message = null;
                 }
+                return { type, value: ["Install required?", command], message };
             }
+            delete options.exec;
         }
     }
     writeLog(type, value, timeStamp, duration) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@e-mc/module",
-  "version": "0.7.20",
+  "version": "0.7.22",
   "description": "Module base class for E-mc.",
   "main": "index.js",
   "types": "index.d.ts",
@@ -20,7 +20,7 @@
   "license": "MIT",
   "homepage": "https://github.com/anpham6/e-mc#readme",
   "dependencies": {
-    "@e-mc/types": "0.7.20",
+    "@e-mc/types": "0.7.22",
     "abort-controller": "^3.0.0",
     "chalk": "4.1.2",
     "event-target-shim": "^5.0.1",