@e-mc/module 0.11.5 → 0.11.8

package/README.md

@@ -9,7 +9,7 @@
 
 ## Interface
 
-* [View Source](https://www.unpkg.com/@e-mc/types@0.11.5/lib/index.d.ts)
+* [View Source](https://www.unpkg.com/@e-mc/types@0.11.8/lib/index.d.ts)
 
 ```typescript
 import type { LogStatus } from "./squared";
@@ -414,11 +414,11 @@ interface LoggerModule {
 
 ## References
 
-- https://www.unpkg.com/@e-mc/types@0.11.5/lib/core.d.ts
-- https://www.unpkg.com/@e-mc/types@0.11.5/lib/logger.d.ts
-- https://www.unpkg.com/@e-mc/types@0.11.5/lib/module.d.ts
-- https://www.unpkg.com/@e-mc/types@0.11.5/lib/node.d.ts
-- https://www.unpkg.com/@e-mc/types@0.11.5/lib/settings.d.ts
+- https://www.unpkg.com/@e-mc/types@0.11.8/lib/core.d.ts
+- https://www.unpkg.com/@e-mc/types@0.11.8/lib/logger.d.ts
+- https://www.unpkg.com/@e-mc/types@0.11.8/lib/module.d.ts
+- https://www.unpkg.com/@e-mc/types@0.11.8/lib/node.d.ts
+- https://www.unpkg.com/@e-mc/types@0.11.8/lib/settings.d.ts
 
 * https://www.npmjs.com/package/@types/node
 

package/index.js

@@ -647,7 +647,7 @@ function getCacheTotal() {
     return CACHE_READTEXT.size + CACHE_READBUFFER.size + CACHE_READCJS.size;
 }
 function isMatch(key, value) {
-    return pm.isMatch(key, value, { posixSlashes: true, windows: true, nocase: PLATFORM_WIN32, matchBase: value.startsWith('*') });
+    return pm.isMatch(key, value, { nocase: PLATFORM_WIN32, matchBase: value.startsWith('*') && !value.includes('/') });
 }
 function listDir(src, paths, depth, include, exclude, excludeDir, outFiles) {
     const srcDir = path.join(src, ...paths);
@@ -941,6 +941,7 @@ function isPathUNC(value) {
     value = value.toString();
     return (VALUES["node.posix.strict"] && value.includes('/') ? /^\/\/[\w.-]+\/[\w-]+\$?\/[^\n]*?[^/]$/ : /^(?:\\\\|\/\/)[\w.-]+[\\/][\w-]+\$?[\\/][^\n]*?[^\\/]$/).test(value);
 }
+const isErrorNo = (value) => value instanceof Error && (0, types_1.isString)(value.code);
 const formatLogMessage = (type, message, unit, ident) => !ident && (type & 256) ? (unit + LOG_DIVIDER + message).trimEnd() : unit ? (type & 256) && ident ? unit + LOG_DIVIDER + message : (message + (ident ? '' : ' ') + unit).trimStart() : message;
 const hideAbort = (err) => err.name === 'AbortError' && SETTINGS.abort === false;
 const asFile = (value) => typeof value === 'string' ? PLATFORM_WIN32 ? value.trim() : value : value instanceof URL && value.protocol === 'file:' ? (0, node_url_1.fileURLToPath)(value) : '';
@@ -983,7 +984,7 @@ class Module extends EventEmitter {
         this[_g] = null;
     }
     static get VERSION() {
-        return "0.11.5";
+        return "0.11.8";
     }
     static get LOG_TYPE() {
         return types_1.LOG_TYPE;
@@ -1558,22 +1559,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 || '';
@@ -1667,11 +1674,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)) {
@@ -1953,7 +1956,7 @@ class Module extends EventEmitter {
         if (!(outDir && this.isDir(outDir))) {
             return Promise.reject(errorDirectory(asFile(src) || "Unknown"));
         }
-        const pmOpts = { posixSlashes: true, windows: true, nocase: Module.PLATFORM_WIN32 };
+        const pmOpts = PLATFORM_WIN32 ? { nocase: true, posixSlashes: true, windows: true } : {};
         let exclude, excludeDir, recursive;
         if ((0, types_1.isObject)(options)) {
             if (options.matchBase) {
@@ -1972,7 +1975,7 @@ class Module extends EventEmitter {
                 for (const value of items) {
                     const dirEnd = value.endsWith('/') ? /^[^/][^*]+\/$/ : value.endsWith('\\') ? /^[^\\][^*]+\\$/ : null;
                     if (dirEnd?.test(value) && !(0, types_1.hasGlob)(value)) {
-                        (excludeDir ||= []).push(this.normalizePath(value, 4));
+                        (excludeDir ||= []).push(this.toPosix(value, true));
                     }
                     else {
                         exclude.push(value);
@@ -3516,10 +3519,13 @@ 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)];
+        const args = [
+            (type | 512),
+            title,
+            value,
+            message,
+            applyStyle(options, Module.LOG_STYLE_FAIL)
+        ];
         applySessionId(this, options);
         if (options.queue !== false && !options.passThrough && !this._logFlushed) {
             if (VALUES["error.out"]) {
@@ -3648,12 +3654,12 @@ class Module extends EventEmitter {
             options = value;
             value = undefined;
         }
-        if (err instanceof Error && err.code === types_1.ERR_CODE.MODULE_NOT_FOUND && name) {
+        if (name && isErrorNo(err) && err.code.endsWith(types_1.ERR_CODE.MODULE_NOT_FOUND)) {
             if (typeof options === 'number') {
                 options = undefined;
             }
             const command = VALUES["node.settings.package_manager"] || (setPnpmVer() ? 'pnpm' : setYarnVer() ? 'yarn' : 'npm');
-            this.writeFail("Unknown", err, { ...options, type: types_1.LOG_TYPE.SYSTEM, code: types_1.ERR_CODE.MODULE_NOT_FOUND, exec: { command, args: [command === 'npm' ? 'i' : 'add', name] } });
+            this.writeFail("Package not found", err, { ...options, type: types_1.LOG_TYPE.SYSTEM, code: err.code, exec: { command, args: [command === 'npm' ? 'i' : 'add', name] } });
             return true;
         }
         if (value) {
@@ -3662,38 +3668,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?.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.11.5",
+  "version": "0.11.8",
   "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.11.5",
+    "@e-mc/types": "0.11.8",
     "chalk": "4.1.2",
     "file-type": "^18.7.0",
     "js-yaml": "^4.1.0",