@e-mc/module 0.10.8 → 0.10.10

package/README.md

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

package/index.js

@@ -917,10 +917,9 @@ function truncateStart(value, length = LOG_MIN_WIDTH, style = false) {
 function truncateEnd(value, length) {
     return (REGEXP_ANSIESCAPE.test(value) ? stripansi(value) : value).length > length ? '...' + value.substring(value.length - length + 3) : value;
 }
-const isMeterUnit = (type, ident) => (type & 256) === 256 && !ident;
-const formatLogMessage = (type, message, unit, ident) => isMeterUnit(type, ident) ? (unit + LOG_DIVIDER + message).trimEnd() : unit ? (message + (ident ? '' : ' ') + unit).trimStart() : message;
+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' ? value.trim() : value instanceof URL && value.protocol === 'file:' ? (0, url_1.fileURLToPath)(value) : '';
+const asFile = (value) => typeof value === 'string' ? PLATFORM_WIN32 ? value.trim() : value : value instanceof URL && value.protocol === 'file:' ? (0, url_1.fileURLToPath)(value) : '';
 const wrapQuote = (value) => '"' + value.replaceAll('"', '\\"') + '"';
 const isFunction = (value) => typeof value === 'function';
 const isFileURL = (value) => /^file:\/\//i.test(value);
@@ -960,7 +959,7 @@ class Module extends EventEmitter {
         this[_g] = null;
     }
     static get VERSION() {
-        return "0.10.8";
+        return "0.10.10";
     }
     static get LOG_TYPE() {
         return types_1.LOG_TYPE;
@@ -1048,7 +1047,7 @@ class Module extends EventEmitter {
         if (error && hideAbort(message)) {
             return;
         }
-        if (options.type) {
+        if (typeof options.type === 'number') {
             type |= options.type;
         }
         const BROADCAST_OUT = VALUES["broadcast.out"];
@@ -1249,7 +1248,7 @@ class Module extends EventEmitter {
                             const logOptions = { maxLength: messageWidth ?? formatMessage.width, outLength: 0, messageTextWrap };
                             m = formatLogColumn(m, messageColor, messageBgColor, messageBold, messageUnitIndent ? format.meter.bgAltColor : undefined, logOptions);
                             if (u && messageTextWrap && messageTextWrap !== 'none' && LOG_MIN_WIDTH + logOptions.outLength + stripansi(unit).length + (messageUnitIndent ? 0 : 1) > PROCESS_STDOUT.columns) {
-                                if (isMeterUnit(type, messageUnitIndent)) {
+                                if ((type & 256) && !messageUnitIndent) {
                                     m = '';
                                     if (LOG_MIN_WIDTH + stripansi(u).length > PROCESS_STDOUT.columns) {
                                         u = '';
@@ -1533,7 +1532,7 @@ class Module extends EventEmitter {
             filename = undefined;
         }
         if (typeof value === 'string') {
-            let pathname = value.trim(), convert = true;
+            let pathname = PLATFORM_WIN32 ? value.trim() : value, convert = true;
             if (normalize) {
                 pathname = path.normalize(pathname);
                 convert = PLATFORM_WIN32;
@@ -1648,7 +1647,7 @@ class Module extends EventEmitter {
         return false;
     }
     static resolveFile(value) {
-        if (isFileURL(value = value instanceof URL ? value.toString() : value.trim())) {
+        if (isFileURL(value = value instanceof URL ? value.toString() : value)) {
             try {
                 return (0, url_1.fileURLToPath)(value);
             }
@@ -1663,7 +1662,7 @@ class Module extends EventEmitter {
     }
     static resolvePath(value, base) {
         try {
-            if (this.isURL(value = value.trim())) {
+            if (this.isURL(value)) {
                 return isFileURL(value) ? (0, url_1.fileURLToPath)(value) : new URL(value).href;
             }
             if (base instanceof URL || this.isURL(base)) {
@@ -1695,7 +1694,7 @@ class Module extends EventEmitter {
             flags = flags ? 2 : 0;
         }
         if (typeof value === 'string') {
-            let result = value.trim();
+            let result = PLATFORM_WIN32 ? value.trim() : value;
             result = flags & 1 ? path.resolve(result) : path.normalize(result);
             if ((flags & 2) && result.length > 0) {
                 result = ensureDir(result);
@@ -3656,12 +3655,12 @@ class Module extends EventEmitter {
         }
     }
     writeLog(type, value, timeStamp, duration) {
-        let queue;
+        let queue = false;
         if ((0, types_1.isObject)(type)) {
             if (typeof value === 'boolean') {
                 queue = value;
             }
-            ({ type = types_1.STATUS_TYPE.UNKNOWN, value, timeStamp, duration } = type);
+            value = type.value;
         }
         const output = Module.asString(value);
         if (output) {
@@ -3689,7 +3688,7 @@ class Module extends EventEmitter {
             from = timeStamp;
             timeStamp = 0;
         }
-        else if ((0, types_1.isObject)(timeStamp)) {
+        else if ((0, types_1.isPlainObject)(timeStamp)) {
             ({ timeStamp, duration, from, source } = timeStamp);
         }
         const name = types_1.STATUS_TYPE[type] || types_1.STATUS_TYPE[type = 0];

package/package.json

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