@e-mc/module 0.10.13 → 0.10.15

package/README.md

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

package/index.js

@@ -415,14 +415,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 [];
         }
@@ -430,30 +430,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) {
@@ -465,16 +446,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;
 }
@@ -959,7 +940,7 @@ class Module extends EventEmitter {
         this[_g] = null;
     }
     static get VERSION() {
-        return "0.10.13";
+        return "0.10.15";
     }
     static get LOG_TYPE() {
         return types_1.LOG_TYPE;
@@ -1227,8 +1208,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;
@@ -1278,6 +1259,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 {
@@ -1459,35 +1441,35 @@ class Module extends EventEmitter {
         return cacheKey ? crypto.randomUUID() : '';
     }
     static asHash(data, algorithm, digest) {
-        if (!algorithm && !digest) {
-            return crypto.createHash("sha256").update(data).digest("hex");
-        }
-        let options;
-        if ((0, types_1.isObject)(algorithm)) {
-            options = { ...algorithm };
-            if ('algorithm' in options) {
-                algorithm = options.algorithm;
-                delete options.algorithm;
+        try {
+            if (!algorithm && !digest) {
+                return crypto.createHash("sha256").update(data).digest("hex");
             }
-            else {
-                algorithm = undefined;
+            let options;
+            if ((0, types_1.isObject)(algorithm)) {
+                options = { ...algorithm };
+                if ('algorithm' in options) {
+                    algorithm = options.algorithm;
+                    delete options.algorithm;
+                }
+                else {
+                    algorithm = undefined;
+                }
+                if ('digest' in options) {
+                    digest = options.digest;
+                    delete options.digest;
+                }
+                else {
+                    digest = undefined;
+                }
             }
-            if ('digest' in options) {
-                digest = options.digest;
-                delete options.digest;
+            else if ((0, types_1.isObject)(digest)) {
+                options = digest;
+                digest = undefined;
             }
-            else {
+            else if (typeof digest !== 'string') {
                 digest = undefined;
             }
-        }
-        else if ((0, types_1.isObject)(digest)) {
-            options = digest;
-            digest = undefined;
-        }
-        else if (typeof digest !== 'string') {
-            digest = undefined;
-        }
-        try {
             return crypto.createHash(algorithm || "sha256", options).update(data).digest(digest || "hex");
         }
         catch {
@@ -1564,8 +1546,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) {
@@ -1680,11 +1661,13 @@ class Module extends EventEmitter {
         if (typeof values[values.length - 1] === 'boolean') {
             normalize = values.pop();
         }
-        const paths = values.map(item => typeof item === 'string' ? item.trim() : '').filter(item => item).map(value => this.toPosix(value, normalize));
+        const paths = values.filter(item => (0, types_1.isString)(item)).map(value => this.toPosix(value, normalize));
         let result = paths[0] || '';
         for (let i = 1; i < paths.length; ++i) {
             const trailing = paths[i];
-            result += (!trailing.startsWith('/') && !result.endsWith('/') ? '/' : '') + trailing;
+            if (trailing) {
+                result += (!trailing.startsWith('/') && !result.endsWith('/') ? '/' : '') + trailing;
+            }
         }
         return result;
     }
@@ -1781,11 +1764,11 @@ class Module extends EventEmitter {
     }
     static async copyDir(src, dest, move, recursive = true) {
         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;
@@ -1921,7 +1904,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, windows: true, posixSlashes: true } : {};
@@ -1995,7 +1978,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;
@@ -2032,7 +2015,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);
@@ -2061,7 +2044,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);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@e-mc/module",
-  "version": "0.10.13",
+  "version": "0.10.15",
   "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.10.13",
+    "@e-mc/types": "0.10.15",
     "chalk": "4.1.2",
     "file-type": "^18.7.0",
     "js-yaml": "^4.1.0",