metalog 3.1.9 → 3.1.12

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2017-2022 Metarhia
+Copyright (c) 2017-2023 Metarhia
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/README.md

@@ -31,6 +31,6 @@ await logger.close();
 
 ## License & Contributors
 
-Copyright (c) 2017-2022 [Metarhia contributors](https://github.com/metarhia/metalog/graphs/contributors).
+Copyright (c) 2017-2023 [Metarhia contributors](https://github.com/metarhia/metalog/graphs/contributors).
 Metalog is [MIT licensed](./LICENSE).\
 Metalog is a part of [Metarhia](https://github.com/metarhia) technology stack.

package/metalog.d.ts

@@ -1,4 +1,4 @@
-import EventEmitter = require('events');
+import { EventEmitter } from 'node:events';
 
 interface LoggerOptions {
   path: string;

package/metalog.js

@@ -1,11 +1,11 @@
 'use strict';
 
-const fs = require('fs');
+const fs = require('node:fs');
 const fsp = fs.promises;
-const path = require('path');
-const util = require('util');
-const events = require('events');
-const readline = require('readline');
+const path = require('node:path');
+const util = require('node:util');
+const events = require('node:events');
+const readline = require('node:readline');
 const metautil = require('metautil');
 const concolor = require('concolor');
 
@@ -77,74 +77,74 @@ const getNextReopen = () => {
   return nextDate - curTime + DAY_MILLISECONDS;
 };
 
-const isError = (val) =>
-  Object.prototype.toString.call(val) === '[object Error]';
-
 class Console {
+  #write;
+  #groupIndent = 0;
+  #counts = new Map();
+  #times = new Map();
+  #readline = readline;
+
   constructor(write) {
-    this._write = write;
-    this._groupIndent = 0;
-    this._counts = new Map();
-    this._times = new Map();
+    this.#write = write;
   }
 
   assert(assertion, ...args) {
     try {
       console.assert(assertion, ...args);
     } catch (err) {
-      this._write('error', this._groupIndent, err.stack);
+      this.#write('error', this.#groupIndent, err.stack);
     }
   }
 
   clear() {
-    readline.cursorTo(process.stdout, 0, 0);
-    readline.clearScreenDown(process.stdout);
+    this.#readline.cursorTo(process.stdout, 0, 0);
+    this.#readline.clearScreenDown(process.stdout);
   }
 
   count(label = 'default') {
-    let cnt = this._counts.get(label) || 0;
+    let cnt = this.#counts.get(label) || 0;
     cnt++;
-    this._counts.set(label, cnt);
-    this._write('debug', this._groupIndent, `${label}: ${cnt}`);
+    this.#counts.set(label, cnt);
+    this.#write('debug', this.#groupIndent, `${label}: ${cnt}`);
   }
 
   countReset(label = 'default') {
-    this._counts.delete(label);
+    this.#counts.delete(label);
   }
 
   debug(...args) {
-    this._write('debug', this._groupIndent, ...args);
+    this.#write('debug', this.#groupIndent, ...args);
   }
 
   dir(...args) {
-    this._write('debug', this._groupIndent, ...args);
+    this.#write('debug', this.#groupIndent, ...args);
   }
 
   trace(...args) {
     const msg = util.format(...args);
     const err = new Error(msg);
-    this._write('debug', this._groupIndent, `Trace${err.stack}`);
+    this.#write('debug', this.#groupIndent, `Trace${err.stack}`);
   }
 
   info(...args) {
-    this._write('info', this._groupIndent, ...args);
+    this.#write('info', this.#groupIndent, ...args);
   }
 
   log(...args) {
-    this._write('log', this._groupIndent, ...args);
+    this.#write('log', this.#groupIndent, ...args);
   }
 
   warn(...args) {
-    this._write('warn', this._groupIndent, ...args);
+    this.#write('warn', this.#groupIndent, ...args);
   }
 
   error(...args) {
-    this._write('error', this._groupIndent, ...args);
+    this.#write('error', this.#groupIndent, ...args);
   }
 
   group(...args) {
     if (args.length !== 0) this.log(...args);
-    this._groupIndent += INDENT;
+    this.#groupIndent += INDENT;
   }
 
   groupCollapsed(...args) {
@@ -152,34 +152,34 @@ class Console {
   }
 
   groupEnd() {
-    if (this._groupIndent.length === 0) return;
-    this._groupIndent -= INDENT;
+    if (this.#groupIndent.length === 0) return;
+    this.#groupIndent -= INDENT;
   }
 
   table(tabularData) {
-    this._write('log', 0, JSON.stringify(tabularData));
+    this.#write('log', 0, JSON.stringify(tabularData));
   }
 
   time(label = 'default') {
-    this._times.set(label, process.hrtime());
+    this.#times.set(label, process.hrtime());
   }
 
   timeEnd(label = 'default') {
-    const startTime = this._times.get(label);
+    const startTime = this.#times.get(label);
     const totalTime = process.hrtime(startTime);
     const totalTimeMs = totalTime[0] * 1e3 + totalTime[1] / 1e6;
     this.timeLog(label, `${label}: ${totalTimeMs}ms`);
-    this._times.delete(label);
+    this.#times.delete(label);
   }
 
   timeLog(label, ...args) {
-    const startTime = this._times.get(label);
+    const startTime = this.#times.get(label);
     if (startTime === undefined) {
       const msg = `Warning: No such label '${label}'`;
-      this._write('warn', this._groupIndent, msg);
+      this.#write('warn', this.#groupIndent, msg);
       return;
     }
-    this._write('debug', this._groupIndent, ...args);
+    this.#write('debug', this.#groupIndent, ...args);
   }
 }
 
@@ -188,7 +188,7 @@ class Logger extends events.EventEmitter {
     super();
     const { workerId = 0, createStream = fs.createWriteStream } = args;
     const { writeInterval, writeBuffer, keepDays, home, json } = args;
-    const { toFile, toStdout } = args;
+    const { toFile = [], toStdout = [] } = args;
     this.active = false;
     this.path = args.path;
     this.workerId = `W${workerId}`;
@@ -205,7 +205,7 @@ class Logger extends events.EventEmitter {
     this.buffer = [];
     this.file = '';
     this.toFile = logTypes(toFile);
-    this.fsEnabled = Object.keys(this.toFile).length !== 0;
+    this.fsEnabled = toFile.length !== 0;
     this.toStdout = logTypes(toStdout);
     this.console = new Console((...args) => this.write(...args));
     return this.open();
@@ -216,10 +216,7 @@ class Logger extends events.EventEmitter {
       fs.access(this.path, (err) => {
         if (!err) resolve();
         fs.mkdir(this.path, (err) => {
-          if (!err || err.code === 'EEXIST') {
-            resolve();
-            return;
-          }
+          if (!err || err.code === 'EEXIST') return void resolve();
           const error = new Error(`Can not create directory: ${this.path}\n`);
           this.emit('error', error);
           reject();
@@ -277,10 +274,7 @@ class Logger extends events.EventEmitter {
     }
     return new Promise((resolve, reject) => {
       this.flush((err) => {
-        if (err) {
-          reject(err);
-          return;
-        }
+        if (err) return void reject(err);
         this.active = false;
         stream.end(() => {
           clearInterval(this.flushTimer);
@@ -351,13 +345,13 @@ class Logger extends events.EventEmitter {
       level: type,
       message: null,
     };
-    if (isError(args[0])) {
+    if (metautil.isError(args[0])) {
       log.err = this.expandError(args[0]);
       args = args.slice(1);
     } else if (typeof args[0] === 'object') {
       Object.assign(log, args[0]);
-      if (isError(log.err)) log.err = this.expandError(log.err);
-      if (isError(log.error)) log.error = this.expandError(log.error);
+      if (metautil.isError(log.err)) log.err = this.expandError(log.err);
+      if (metautil.isError(log.error)) log.error = this.expandError(log.error);
       args = args.slice(1);
     }
     log.message = util.format(...args);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "metalog",
-  "version": "3.1.9",
+  "version": "3.1.12",
   "author": "Timur Shemsedinov <timur.shemsedinov@gmail.com>",
   "description": "Logger for Metarhia",
   "license": "MIT",
@@ -38,10 +38,7 @@
   "main": "metalog.js",
   "types": "metalog.d.ts",
   "readmeFilename": "README.md",
-  "files": [
-    "types/",
-    "metalog.d.ts"
-  ],
+  "files": ["types/", "metalog.d.ts"],
   "scripts": {
     "test": "npm run lint && npm run types && metatests test/",
     "types": "tsc -p tsconfig.json",
@@ -49,21 +46,21 @@
     "fmt": "prettier --write \"**/*.js\" \"**/*.json\" \"**/*.md\" \"**/.*rc\" \"**/*.ts\""
   },
   "engines": {
-    "node": "14 || 16 || 18"
+    "node": "16 || 18 || 19 || 20"
   },
   "dependencies": {
-    "concolor": "^1.0.3",
-    "metautil": "^3.5.21"
+    "concolor": "^1.0.6",
+    "metautil": "^3.10.0"
   },
   "devDependencies": {
-    "@types/node": "^18.0.3",
-    "eslint": "^8.19.0",
-    "eslint-config-metarhia": "^8.1.0",
-    "eslint-config-prettier": "^8.5.0",
-    "eslint-plugin-import": "^2.25.4",
-    "eslint-plugin-prettier": "^4.0.0",
+    "@types/node": "^20.4.1",
+    "eslint": "^8.44.0",
+    "eslint-config-metarhia": "^8.2.0",
+    "eslint-config-prettier": "^8.7.0",
+    "eslint-plugin-import": "^2.27.5",
+    "eslint-plugin-prettier": "^5.0.0-alpha.2",
     "metatests": "^0.8.2",
-    "prettier": "^2.6.0",
-    "typescript": "^4.6.2"
+    "prettier": "^3.0.0",
+    "typescript": "^5.1.6"
   }
 }

package/CHANGELOG.md

@@ -1,88 +0,0 @@
-# Changelog
-
-## [Unreleased][unreleased]
-
-## [3.1.9][] - 2022-07-07
-
-- Package maintenance
-
-## [3.1.8][] - 2022-03-30
-
-- Add support for json-only logs
-
-## [3.1.7][] - 2022-03-17
-
-- Fix unlink empty files
-- Improve error handling
-- Update dependencies and package maintenance
-
-## [3.1.6][] - 2021-12-08
-
-- Fix typings
-- Remove useless code from tests
-- Fix unlink file bug
-
-## [3.1.5][] - 2021-10-11
-
-- Update dependencies and npm audit fix
-
-## [3.1.4][] - 2021-09-10
-
-- Update dependencies
-
-## [3.1.3][] - 2021-07-22
-
-- Improve code style
-- Move types to package root
-
-## [3.1.2][] - 2021-05-24
-
-- Package maintenance
-
-## [3.1.1][] - 2021-01-15
-
-- Remove code duplication: use metautil.replace
-- Remove unneeded code and comments
-- Add examples to README.md
-- Add .d.ts typings
-
-## [3.1.0][] - 2021-01-07
-
-- Use metautil instead of metarhia/common
-- Use writable factory instead of constructor
-- Use fs.createWriteStream instead of metastreams
-
-## [3.0.0][] - 2020-12-16
-
-- Change Logger interface, use async/await
-- Console interface implementation
-- Create log folder if not exists
-- Support windows
-
-## [2.x][]
-
-- New Logger class extends EventEmitter
-- Refactor module to use new ES2020 syntax and features
-- Rewrite code using async/await
-- Truncate paths in stack traces to minimize log files
-- Use metarhia eslint config
-- Fix multiple bugs and optimize performance
-
-## [1.x][]
-
-First generation of Metarhia Logger
-
-[unreleased]: https://github.com/metarhia/metalog/compare/v3.1.9...HEAD
-[3.1.9]: https://github.com/metarhia/metalog/compare/v3.1.8...v3.1.9
-[3.1.8]: https://github.com/metarhia/metalog/compare/v3.1.7...v3.1.8
-[3.1.7]: https://github.com/metarhia/metalog/compare/v3.1.6...v3.1.7
-[3.1.6]: https://github.com/metarhia/metalog/compare/v3.1.5...v3.1.6
-[3.1.5]: https://github.com/metarhia/metalog/compare/v3.1.4...v3.1.5
-[3.1.4]: https://github.com/metarhia/metalog/compare/v3.1.3...v3.1.4
-[3.1.3]: https://github.com/metarhia/metalog/compare/v3.1.2...v3.1.3
-[3.1.2]: https://github.com/metarhia/metalog/compare/v3.1.1...v3.1.2
-[3.1.1]: https://github.com/metarhia/metalog/compare/v3.1.0...v3.1.1
-[3.1.0]: https://github.com/metarhia/metalog/compare/v3.0.0...v3.1.0
-[3.0.0]: https://github.com/metarhia/metalog/compare/v2.x...v3.0.0
-[2.x]: https://github.com/metarhia/metalog/compare/v1.x...v2.x
-[1.x]: https://github.com/metarhia/metalog/tree/v1.x