@e-mc/module 0.12.8 → 0.12.10

package/README.md

@@ -9,7 +9,7 @@
 
 ## Interface
 
-* [View Source](https://www.unpkg.com/@e-mc/types@0.12.7/lib/index.d.ts)
+* [View Source](https://www.unpkg.com/@e-mc/types@0.12.10/lib/index.d.ts)
 
 ```typescript
 import type { LogStatus } from "./squared";
@@ -93,7 +93,9 @@ interface IModule extends EventEmitter, IAbortComponent {
     checkFail(message: unknown, options: LogFailOptions): LogArguments | false | undefined;
     writeLog(component: LogComponent, queue?: boolean): void;
     writeLog(type: StatusType, value: unknown, options: LogOptions): void;
-    writeLog(type: StatusType, value: unknown, timeStamp?: LogDate, duration?: number): void;
+    writeLog(type: StatusType, value: unknown, from: string, source?: string): void;
+    writeLog(type: StatusType, value: unknown, timeStamp?: LogDate, from?: string, source?: string): void;
+    writeLog(type: StatusType, value: unknown, timeStamp?: LogDate, duration?: number, from?: string, source?: string): void;
     addLog(component: LogComponent, queue?: boolean): void;
     addLog(type: StatusType, value: unknown, options: LogOptions): void;
     addLog(type: StatusType, value: unknown, from: string, source?: string): void;
@@ -414,11 +416,11 @@ interface LoggerModule {
 
 ## References
 
-- https://www.unpkg.com/@e-mc/types@0.12.7/lib/core.d.ts
-- https://www.unpkg.com/@e-mc/types@0.12.7/lib/logger.d.ts
-- https://www.unpkg.com/@e-mc/types@0.12.7/lib/module.d.ts
-- https://www.unpkg.com/@e-mc/types@0.12.7/lib/node.d.ts
-- https://www.unpkg.com/@e-mc/types@0.12.7/lib/settings.d.ts
+- https://www.unpkg.com/@e-mc/types@0.12.10/lib/core.d.ts
+- https://www.unpkg.com/@e-mc/types@0.12.10/lib/logger.d.ts
+- https://www.unpkg.com/@e-mc/types@0.12.10/lib/module.d.ts
+- https://www.unpkg.com/@e-mc/types@0.12.10/lib/node.d.ts
+- https://www.unpkg.com/@e-mc/types@0.12.10/lib/settings.d.ts
 
 * https://www.npmjs.com/package/@types/node
 

package/index.js

@@ -159,7 +159,7 @@ function setPnpmVer() {
         let baseDir;
         try {
             let pathname = path.resolve("node_modules/.modules.yaml"), config;
-            if (fs.existsSync(pathname) && (0, types_1.isPlainObject)(config = parseYaml(pathname))) {
+            if (fs.existsSync(pathname) && (0, types_1.isObject)(config = parseYaml(pathname))) {
                 if (config.nodeLinker === 'hoisted') {
                     return PNPM_VER = true;
                 }
@@ -175,7 +175,7 @@ function setPnpmVer() {
                 if (!fs.existsSync(pathname = path.resolve(baseDir, "lock.yaml"))) {
                     baseDir = undefined;
                 }
-                else if ((0, types_1.isPlainObject)(config = parseYaml(pathname))) {
+                else if ((0, types_1.isObject)(config = parseYaml(pathname))) {
                     for (const name in config.packages) {
                         addPnpmPackage(items, name);
                     }
@@ -208,7 +208,7 @@ function setYarnVer() {
         try {
             const pathname = path.resolve(".yarnrc.yml");
             let config;
-            if (fs.existsSync(pathname) && (0, types_1.isPlainObject)(config = parseYaml(pathname)) && config.nodeLinker === 'node-modules') {
+            if (fs.existsSync(pathname) && (0, types_1.isObject)(config = parseYaml(pathname)) && config.nodeLinker === 'node-modules') {
                 return YARN_VER = true;
             }
         }
@@ -393,14 +393,14 @@ function tryCreateDir(value) {
     }
     return false;
 }
-function tryRemoveDir(value, empty, recursive) {
+function tryRemoveDir(srcDir, empty, recursive) {
     const temp = typeof empty === 'number';
     let options;
     if (!temp) {
         try {
-            fs.rmSync(value, { recursive, force: true });
+            fs.rmSync(srcDir, { recursive, force: true });
             if (empty) {
-                fs.mkdirSync(value);
+                fs.mkdirSync(srcDir);
             }
             return [];
         }
@@ -408,30 +408,11 @@ function tryRemoveDir(value, empty, recursive) {
         }
         options = { recursive };
     }
-    value = Module.normalizePath(value, 1);
     const failed = [];
-    const nameMap = new WeakMap();
-    let files;
-    if (temp) {
-        files = [];
-        fs.readdirSync(value).forEach(name => {
-            try {
-                const stat = fs.statSync(value + name);
-                nameMap.set(stat, name);
-                files.push(stat);
-            }
-            catch {
-                failed.push(value + name);
-            }
-        });
-    }
-    else {
-        files = fs.readdirSync(value, { withFileTypes: true });
-    }
     const current = Date.now();
-    for (let i = 0, length = files.length; i < length; ++i) {
-        const file = files[i];
-        const pathname = value + (file.name || nameMap.get(file));
+    let entry;
+    fs.readdirSync(srcDir, { withFileTypes: true }).forEach(file => {
+        const pathname = path.join(srcDir, file.name);
         try {
             if (file.isDirectory()) {
                 if (recursive) {
@@ -443,16 +424,16 @@ function tryRemoveDir(value, empty, recursive) {
                     }
                 }
             }
-            else if (!temp || file.ctimeMs + empty <= current) {
+            else if (!temp || (entry = fs.statSync(pathname)) && entry.ctimeMs + empty <= current) {
                 fs.unlinkSync(pathname);
             }
         }
         catch {
             failed.push(pathname);
         }
-    }
+    });
     if (!empty && failed.length === 0) {
-        fs.rmdirSync(value);
+        fs.rmdirSync(srcDir);
     }
     return failed;
 }
@@ -869,7 +850,7 @@ class Module extends EventEmitter {
     static LOG_STYLE_NOTICE = Object.freeze({ titleBgColor: 'bgGrey', titleColor: 'white' });
     static LOG_STYLE_REVERSE = Object.freeze({ titleBgColor: 'bgWhite', titleColor: 'black', messageBgColor: 'bgGrey' });
     static get VERSION() {
-        return "0.12.8";
+        return "0.12.10";
     }
     static get LOG_TYPE() {
         return types_1.LOG_TYPE;
@@ -1141,8 +1122,8 @@ class Module extends EventEmitter {
                         i = sessionIdColor || sessionIdBgColor || sessionIdBold ? formatLogColumn(i, sessionIdColor, sessionIdBgColor, sessionIdBold) : chalk.grey(i);
                     }
                     if ((m || unit) && SETTINGS.message !== false) {
+                        const formatMessage = format.message;
                         if (!error) {
-                            const formatMessage = format.message;
                             if (!messageColor && !messageBgColor) {
                                 ({ color: messageColor, bgColor: messageBgColor, bold: messageBold } = formatMessage);
                                 messageBold ??= formatMessage.bold;
@@ -1192,6 +1173,7 @@ class Module extends EventEmitter {
                             catch {
                                 m = chalk.redBright(L) + chalk.bgWhite.blackBright(m) + (R && chalk.redBright(R));
                             }
+                            m = chalk.blackBright(formatMessage.braces[0]) + m;
                         }
                     }
                     else {
@@ -1476,8 +1458,7 @@ class Module extends EventEmitter {
     }
     static isFile(value, type) {
         if (!type) {
-            value = asFile(value);
-            return !!value && this.isPath(value, true);
+            return this.isPath(value = asFile(value), true);
         }
         if (typeof value === 'string') {
             switch (type) {
@@ -1527,7 +1508,11 @@ class Module extends EventEmitter {
     }
     static isDir(value) {
         try {
-            return fs.statSync(value).isDirectory();
+            let target = fs.statSync(value);
+            if (target.isSymbolicLink()) {
+                target = fs.statSync(fs.realpathSync(value));
+            }
+            return target.isDirectory();
         }
         catch {
             return false;
@@ -1696,11 +1681,11 @@ class Module extends EventEmitter {
     }
     static async copyDir(src, dest, move, recursive) {
         const srcOut = sanitizePath(asFile(src));
-        if (!(srcOut && this.isDir(srcOut))) {
+        if (!this.isDir(srcOut)) {
             return Promise.reject(errorDirectory(asFile(src) || "Unknown"));
         }
         const destOut = sanitizePath(asFile(dest));
-        if (!(destOut && this.createDir(destOut))) {
+        if (!this.createDir(destOut)) {
             return Promise.reject(errorDirectory(asFile(dest) || "Unknown"));
         }
         let symFile, symDir, ignoreFile, ignoreDir, silent, overwrite;
@@ -1837,7 +1822,7 @@ class Module extends EventEmitter {
     }
     static async globDir(src, pattern, options) {
         const outDir = sanitizePath(asFile(src));
-        if (!(outDir && this.isDir(outDir))) {
+        if (!this.isDir(outDir)) {
             return Promise.reject(errorDirectory(asFile(src) || "Unknown"));
         }
         const pmOpts = PLATFORM_WIN32 ? { nocase: true, posixSlashes: true, windows: true } : {};
@@ -1911,7 +1896,7 @@ class Module extends EventEmitter {
             ({ minStreamSize = 0, encoding, signal, cache } = options);
         }
         const src = sanitizePath(asFile(value));
-        if (src && this.isPath(src, true)) {
+        if (this.isPath(src, true)) {
             return new Promise(async (resolve) => {
                 const fileSize = fs.statSync(src).size;
                 let data;
@@ -1948,7 +1933,7 @@ class Module extends EventEmitter {
             ({ minStreamSize, encoding, cache } = options);
         }
         const src = sanitizePath(asFile(value));
-        if (src && this.isPath(src, true)) {
+        if (this.isPath(src, true)) {
             let result;
             if (cache && (result = getCacheItem(CACHE_READTEXT, src))) {
                 return (minStreamSize !== undefined ? Promise.resolve(result) : result);
@@ -1977,7 +1962,7 @@ class Module extends EventEmitter {
             ({ minStreamSize, cache } = options);
         }
         const src = sanitizePath(asFile(value));
-        if (src && this.isPath(src, true)) {
+        if (this.isPath(src, true)) {
             let result;
             if (cache && (result = getCacheItem(CACHE_READBUFFER, src))) {
                 return (minStreamSize !== undefined ? Promise.resolve(result) : result);
@@ -2559,7 +2544,7 @@ class Module extends EventEmitter {
                     case 'process': {
                         const proc = logger.process;
                         if (proc) {
-                            if ((0, types_1.isObject)(proc)) {
+                            if ((0, types_1.isPlainObject)(proc)) {
                                 if ('cpu_bar_color' in proc) {
                                     const barColor = proc.cpu_bar_color;
                                     if (Array.isArray(barColor) && barColor.length === 3 && barColor.every(color => isBackgroundColor(color))) {
@@ -3270,7 +3255,7 @@ class Module extends EventEmitter {
     }
     writeFail(value, message, options) {
         let type;
-        if ((0, types_1.isPlainObject)(options)) {
+        if ((0, types_1.isObject)(options)) {
             ({ type } = options);
         }
         else {
@@ -3558,7 +3543,7 @@ class Module extends EventEmitter {
                 break;
         }
     }
-    writeLog(type, value, timeStamp, duration) {
+    writeLog(type, value, timeStamp, duration, from, source) {
         let queue = false;
         if ((0, types_1.isObject)(type)) {
             if (typeof value === 'boolean') {
@@ -3575,7 +3560,7 @@ class Module extends EventEmitter {
                 writeLine(output);
             }
         }
-        this.addLog(type, value, timeStamp, duration);
+        this.addLog(type, value, timeStamp, duration, from, source);
     }
     addLog(type, value, timeStamp, duration, from, source) {
         if (!this._logEnabled || SETTINGS.production && process.env.NODE_ENV === 'production' && (SETTINGS.production.includes(this.moduleName) || from && SETTINGS.production.includes(from))) {
@@ -3817,8 +3802,7 @@ class Module extends EventEmitter {
         options.sessionId ??= this.sessionId;
         let value = options.broadcastId;
         if (value === undefined) {
-            value = this.broadcastId;
-            if (value) {
+            if (value = this.broadcastId) {
                 options.broadcastId = this.supports('stripAnsi') ? value : { value, stripAnsi: false };
             }
         }
@@ -3866,20 +3850,19 @@ class Module extends EventEmitter {
         this.#sessionId = value;
     }
     get sessionId() {
-        return this.#sessionId || (this.host ? this.host.sessionId : '');
+        return this.#sessionId || this.host?.sessionId || '';
     }
     set broadcastId(value) {
         this.#broadcastId = value;
     }
     get broadcastId() {
-        return this.#broadcastId || (this.host ? this.host.broadcastId : '');
+        return this.#broadcastId || this.host?.broadcastId || '';
     }
     set permission(value) {
         this.#permission = value;
     }
     get permission() {
-        let host;
-        return this.#permission || (host = this.host) && host.permission;
+        return this.#permission || this.host?.permission || null;
     }
     get signal() {
         return this.#abortController.signal;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@e-mc/module",
-  "version": "0.12.8",
+  "version": "0.12.10",
   "description": "Module base class for E-mc.",
   "main": "index.js",
   "types": "index.d.ts",
@@ -19,7 +19,7 @@
   "license": "BSD-3-Clause",
   "homepage": "https://github.com/anpham6/e-mc#readme",
   "dependencies": {
-    "@e-mc/types": "0.12.8",
+    "@e-mc/types": "0.12.10",
     "chalk": "4.1.2",
     "file-type": "^18.7.0",
     "js-yaml": "^4.1.0",