@e-mc/module 0.11.10 → 0.11.11

package/README.md

@@ -9,7 +9,7 @@
 
 ## Interface
 
-* [View Source](https://www.unpkg.com/@e-mc/types@0.11.10/lib/index.d.ts)
+* [View Source](https://www.unpkg.com/@e-mc/types@0.11.11/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.10/lib/core.d.ts
-- https://www.unpkg.com/@e-mc/types@0.11.10/lib/logger.d.ts
-- https://www.unpkg.com/@e-mc/types@0.11.10/lib/module.d.ts
-- https://www.unpkg.com/@e-mc/types@0.11.10/lib/node.d.ts
-- https://www.unpkg.com/@e-mc/types@0.11.10/lib/settings.d.ts
+- https://www.unpkg.com/@e-mc/types@0.11.11/lib/core.d.ts
+- https://www.unpkg.com/@e-mc/types@0.11.11/lib/logger.d.ts
+- https://www.unpkg.com/@e-mc/types@0.11.11/lib/module.d.ts
+- https://www.unpkg.com/@e-mc/types@0.11.11/lib/node.d.ts
+- https://www.unpkg.com/@e-mc/types@0.11.11/lib/settings.d.ts
 
 * https://www.npmjs.com/package/@types/node
 

package/index.js

@@ -418,14 +418,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 [];
         }
@@ -433,30 +433,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) {
@@ -468,16 +449,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;
 }
@@ -983,7 +964,7 @@ class Module extends EventEmitter {
         this[_g] = null;
     }
     static get VERSION() {
-        return "0.11.10";
+        return "0.11.11";
     }
     static get LOG_TYPE() {
         return types_1.LOG_TYPE;
@@ -1253,8 +1234,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;
@@ -1304,6 +1285,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 {
@@ -1590,8 +1572,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) {
@@ -1810,11 +1791,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;
@@ -1951,7 +1932,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 } : {};
@@ -2025,7 +2006,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;
@@ -2062,7 +2043,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);
@@ -2091,7 +2072,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.11.10",
+  "version": "0.11.11",
   "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.10",
+    "@e-mc/types": "0.11.11",
     "chalk": "4.1.2",
     "file-type": "^18.7.0",
     "js-yaml": "^4.1.0",

package/lib-v4.js

@@ -1,158 +0,0 @@
-"use strict";
-exports.validateUUID = exports.renameExt = exports.isString = exports.isPlainObject = exports.isObject = exports.formatSize = exports.escapePattern = exports.toTimeMs = exports.coerceObject = exports.cloneObject = exports.asFunction = void 0;
-exports.hasSize = hasSize;
-exports.getSize = getSize;
-exports.hasSameStat = hasSameStat;
-exports.byteLength = byteLength;
-exports.cleanupStream = cleanupStream;
-exports.generateUUID = generateUUID;
-exports.existsSafe = existsSafe;
-exports.isFileHTTP = isFileHTTP;
-exports.isFileUNC = isFileUNC;
-exports.isPathUNC = isPathUNC;
-exports.readFileSafe = readFileSafe;
-exports.getFunctions = getFunctions;
-exports.allSettled = allSettled;
-const path = require("path");
-const fs = require("fs");
-const types_1 = require("@e-mc/types");
-Object.defineProperty(exports, "asFunction", { enumerable: true, get: function () { return types_1.asFunction; } });
-Object.defineProperty(exports, "cloneObject", { enumerable: true, get: function () { return types_1.cloneObject; } });
-Object.defineProperty(exports, "coerceObject", { enumerable: true, get: function () { return types_1.coerceObject; } });
-Object.defineProperty(exports, "toTimeMs", { enumerable: true, get: function () { return types_1.convertTime; } });
-Object.defineProperty(exports, "escapePattern", { enumerable: true, get: function () { return types_1.escapePattern; } });
-Object.defineProperty(exports, "formatSize", { enumerable: true, get: function () { return types_1.formatSize; } });
-Object.defineProperty(exports, "isObject", { enumerable: true, get: function () { return types_1.isObject; } });
-Object.defineProperty(exports, "isPlainObject", { enumerable: true, get: function () { return types_1.isPlainObject; } });
-Object.defineProperty(exports, "isString", { enumerable: true, get: function () { return types_1.isString; } });
-Object.defineProperty(exports, "renameExt", { enumerable: true, get: function () { return types_1.renameExt; } });
-Object.defineProperty(exports, "validateUUID", { enumerable: true, get: function () { return types_1.validateUUID; } });
-const index_1 = require("@e-mc/module");
-function hasSize(value, keepEmpty) {
-    try {
-        const statSrc = fs.statSync(value);
-        if (statSrc.size > 0) {
-            return true;
-        }
-        if (!keepEmpty) {
-            fs.unlinkSync(value);
-        }
-    }
-    catch {
-    }
-    return false;
-}
-function getSize(value, diskUsed) {
-    try {
-        return fs[diskUsed ? 'lstatSync' : 'statSync'](value).size;
-    }
-    catch {
-        return 0;
-    }
-}
-function hasSameStat(src, dest, keepEmpty) {
-    try {
-        if (fs.existsSync(dest)) {
-            const { size, mtimeMs } = fs.statSync(src);
-            if (size > 0) {
-                const statDest = fs.statSync(dest);
-                return size === statDest.size && mtimeMs === statDest.mtimeMs;
-            }
-            if (!keepEmpty) {
-                fs.unlinkSync(src);
-            }
-        }
-    }
-    catch {
-    }
-    return false;
-}
-function byteLength(value, encoding) {
-    return typeof value === 'string' && (path.isAbsolute(value) || index_1.isPath(value)) ? getSize(value) : Buffer.byteLength(value, encoding && (0, types_1.getEncoding)(encoding));
-}
-function cleanupStream(stream, uri) {
-    stream.removeAllListeners();
-    stream.destroy();
-    try {
-        if (uri && fs.existsSync(uri)) {
-            fs.unlinkSync(uri);
-        }
-    }
-    catch (err) {
-        if (!index_1.isErrorCode(err, 'ENOENT')) {
-            index_1.writeFail(["Unable to delete file", path.basename(uri)], err, 32);
-        }
-    }
-}
-function generateUUID(format, dictionary) {
-    return format ? (0, types_1.randomString)(format, dictionary) : (0, types_1.generateUUID)();
-}
-function existsSafe(value, isFile) {
-    return index_1.isPath(value, isFile);
-}
-function isFileHTTP(value) {
-    return index_1.isFile(value, 'http/s');
-}
-function isFileUNC(value) {
-    return index_1.isFile(value, 'unc');
-}
-function isPathUNC(value) {
-    return index_1.isPath(value, 'unc');
-}
-async function readFileSafe(value, encoding, cache) {
-    return encoding === 'buffer' ? index_1.readBuffer(value, cache) : index_1.readText(value, encoding, cache);
-}
-function getFunctions(values, absolute, sync = true, outFailed) {
-    let options, context;
-    if ((0, types_1.isObject)(absolute)) {
-        options = absolute;
-        ({ context, outFailed } = absolute);
-        if (options.external === undefined) {
-            options.external = true;
-        }
-    }
-    else {
-        options = { external: true, absolute, sync };
-    }
-    const result = [];
-    for (const value of values) {
-        let method = null;
-        if (typeof value === 'string') {
-            method = index_1.parseFunction(value, options);
-        }
-        else if (typeof value === 'function') {
-            method = value;
-            if (context !== undefined) {
-                method.bind(context);
-            }
-        }
-        if (method) {
-            result.push(method);
-        }
-        else if (outFailed) {
-            outFailed.push(index_1.asString(value) || "Unknown");
-        }
-    }
-    return result;
-}
-async function allSettled(tasks, rejected, options) {
-    if (rejected) {
-        return Promise.allSettled(tasks).then(result => {
-            const items = [];
-            for (const item of result) {
-                if (item.status === 'fulfilled') {
-                    items.push(item);
-                }
-                else if (item.reason) {
-                    index_1.writeFail(rejected, item.reason, options);
-                }
-            }
-            return items;
-        })
-            .catch((err) => {
-            index_1.writeFail(rejected, err, options);
-            return [];
-        });
-    }
-    return Promise.allSettled(tasks);
-}