diff --git a/metalog.js b/metalog.js index 5a77e45..dee7799 100644 --- a/metalog.js +++ b/metalog.js @@ -77,9 +77,6 @@ const getNextReopen = () => { return nextDate - curTime + DAY_MILLISECONDS; }; -const isError = (val) => - Object.prototype.toString.call(val) === '[object Error]'; - class Console { constructor(write) { this._write = write; @@ -345,13 +342,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); diff --git a/package-lock.json b/package-lock.json index 1c1aa15..0907254 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,10 +10,10 @@ "license": "MIT", "dependencies": { "concolor": "^1.0.6", - "metautil": "^3.7.2" + "metautil": "^3.10.0" }, "devDependencies": { - "@types/node": "^18.16.1", + "@types/node": "^20.4.1", "eslint": "^8.44.0", "eslint-config-metarhia": "^8.2.0", "eslint-config-prettier": "^8.7.0", @@ -21,7 +21,7 @@ "eslint-plugin-prettier": "^5.0.0-alpha.2", "metatests": "^0.8.2", "prettier": "^3.0.0", - "typescript": "^5.0.4" + "typescript": "^5.1.6" }, "engines": { "node": "16 || 18 || 19 || 20" @@ -200,9 +200,9 @@ "dev": true }, "node_modules/@types/node": { - "version": "18.16.3", - "resolved": "https://registry.npmjs.org/@types/node/-/node-18.16.3.tgz", - "integrity": "sha512-OPs5WnnT1xkCBiuQrZA4+YAV4HEJejmHneyraIaxsbev5yCEr6KMwINNFP9wQeFIw8FWcoTqF3vQsa5CDaI+8Q==", + "version": "20.4.1", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.4.1.tgz", + "integrity": "sha512-JIzsAvJeA/5iY6Y/OxZbv1lUcc8dNSE77lb2gnBH+/PJ3lFR1Ccvgwl5JWnHAkNHcRsT0TbpVOsiMKZ1F/yyJg==", "dev": true }, "node_modules/acorn": { @@ -1957,9 +1957,9 @@ } }, "node_modules/metautil": { - "version": "3.7.2", - "resolved": "https://registry.npmjs.org/metautil/-/metautil-3.7.2.tgz", - "integrity": "sha512-s9ZjFwGT7hyaGIifnDYUr7HrrjqjpgjEqUnglAJ+qt3f1ZgnVo2/9yYvzlWQo5pPz8UDYqyoEVkc8hhS9VIVnw==", + "version": "3.10.0", + "resolved": "https://registry.npmjs.org/metautil/-/metautil-3.10.0.tgz", + "integrity": "sha512-9V9VbZjpc9IXQpVuCLTNQzMXrD7g2JWfG0ZEpXeExIxSgLRsSifMKrw2lU8DvAsm52brVYBhO5ELOhx6kq0GYg==", "engines": { "node": "16 || 18 || 19 || 20" }, @@ -2569,9 +2569,9 @@ } }, "node_modules/semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "dev": true, "bin": { "semver": "bin/semver.js" @@ -2912,16 +2912,16 @@ } }, "node_modules/typescript": { - "version": "5.0.4", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.0.4.tgz", - "integrity": "sha512-cW9T5W9xY37cc+jfEnaUvX91foxtHkza3Nw3wkoF4sSlKn0MONdkdEndig/qPBWXNkmplh3NzayQzCiHM4/hqw==", + "version": "5.1.6", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.1.6.tgz", + "integrity": "sha512-zaWCozRZ6DLEWAWFrVDz1H6FVXzUSfTy5FUMWsQlU8Ym5JP9eO4xkTIROFCQvhQf61z6O/G6ugw3SgAnvvm+HA==", "dev": true, "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" }, "engines": { - "node": ">=12.20" + "node": ">=14.17" } }, "node_modules/unbox-primitive": { @@ -3285,9 +3285,9 @@ "dev": true }, "@types/node": { - "version": "18.16.3", - "resolved": "https://registry.npmjs.org/@types/node/-/node-18.16.3.tgz", - "integrity": "sha512-OPs5WnnT1xkCBiuQrZA4+YAV4HEJejmHneyraIaxsbev5yCEr6KMwINNFP9wQeFIw8FWcoTqF3vQsa5CDaI+8Q==", + "version": "20.4.1", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.4.1.tgz", + "integrity": "sha512-JIzsAvJeA/5iY6Y/OxZbv1lUcc8dNSE77lb2gnBH+/PJ3lFR1Ccvgwl5JWnHAkNHcRsT0TbpVOsiMKZ1F/yyJg==", "dev": true }, "acorn": { @@ -4540,9 +4540,9 @@ } }, "metautil": { - "version": "3.7.2", - "resolved": "https://registry.npmjs.org/metautil/-/metautil-3.7.2.tgz", - "integrity": "sha512-s9ZjFwGT7hyaGIifnDYUr7HrrjqjpgjEqUnglAJ+qt3f1ZgnVo2/9yYvzlWQo5pPz8UDYqyoEVkc8hhS9VIVnw==" + "version": "3.10.0", + "resolved": "https://registry.npmjs.org/metautil/-/metautil-3.10.0.tgz", + "integrity": "sha512-9V9VbZjpc9IXQpVuCLTNQzMXrD7g2JWfG0ZEpXeExIxSgLRsSifMKrw2lU8DvAsm52brVYBhO5ELOhx6kq0GYg==" }, "micromatch": { "version": "4.0.5", @@ -4940,9 +4940,9 @@ } }, "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "dev": true }, "set-blocking": { @@ -5189,9 +5189,9 @@ } }, "typescript": { - "version": "5.0.4", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.0.4.tgz", - "integrity": "sha512-cW9T5W9xY37cc+jfEnaUvX91foxtHkza3Nw3wkoF4sSlKn0MONdkdEndig/qPBWXNkmplh3NzayQzCiHM4/hqw==", + "version": "5.1.6", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.1.6.tgz", + "integrity": "sha512-zaWCozRZ6DLEWAWFrVDz1H6FVXzUSfTy5FUMWsQlU8Ym5JP9eO4xkTIROFCQvhQf61z6O/G6ugw3SgAnvvm+HA==", "dev": true }, "unbox-primitive": { diff --git a/package.json b/package.json index e938c7c..a924fb3 100644 --- a/package.json +++ b/package.json @@ -50,10 +50,10 @@ }, "dependencies": { "concolor": "^1.0.6", - "metautil": "^3.7.2" + "metautil": "^3.10.0" }, "devDependencies": { - "@types/node": "^18.16.1", + "@types/node": "^20.4.1", "eslint": "^8.44.0", "eslint-config-metarhia": "^8.2.0", "eslint-config-prettier": "^8.7.0", @@ -61,6 +61,6 @@ "eslint-plugin-prettier": "^5.0.0-alpha.2", "metatests": "^0.8.2", "prettier": "^3.0.0", - "typescript": "^5.0.4" + "typescript": "^5.1.6" } }