@tomjs/logger 1.4.0 → 3.0.0

package/dist/index.cjs

@@ -0,0 +1,176 @@
+Object.defineProperty(exports, '__esModule', { value: true });
+//#region rolldown:runtime
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __copyProps = (to, from, except, desc) => {
+	if (from && typeof from === "object" || typeof from === "function") for (var keys = __getOwnPropNames(from), i = 0, n = keys.length, key; i < n; i++) {
+		key = keys[i];
+		if (!__hasOwnProp.call(to, key) && key !== except) __defProp(to, key, {
+			get: ((k) => from[k]).bind(null, key),
+			enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
+		});
+	}
+	return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", {
+	value: mod,
+	enumerable: true
+}) : target, mod));
+
+//#endregion
+let node_fs = require("node:fs");
+node_fs = __toESM(node_fs);
+let node_os = require("node:os");
+node_os = __toESM(node_os);
+let node_path = require("node:path");
+node_path = __toESM(node_path);
+let dayjs = require("dayjs");
+dayjs = __toESM(dayjs);
+let picocolors = require("picocolors");
+picocolors = __toESM(picocolors);
+let strip_ansi = require("strip-ansi");
+strip_ansi = __toESM(strip_ansi);
+let is_unicode_supported = require("is-unicode-supported");
+is_unicode_supported = __toESM(is_unicode_supported);
+
+//#region src/colors.ts
+const supported = (0, is_unicode_supported.default)();
+const logColors = {
+	info: picocolors.default.cyan,
+	success: picocolors.default.green,
+	warn: picocolors.default.yellow,
+	warning: picocolors.default.yellow,
+	error: picocolors.default.red,
+	debug: picocolors.default.gray,
+	log: picocolors.default.gray
+};
+const logSymbols = {
+	info: picocolors.default.cyan(supported ? "ℹ" : "i"),
+	success: picocolors.default.green(supported ? "✔" : "√"),
+	warn: picocolors.default.yellow(supported ? "⚠" : "!"),
+	warning: picocolors.default.yellow(supported ? "⚠" : "!"),
+	error: picocolors.default.red(supported ? "✖" : "x"),
+	debug: picocolors.default.gray(supported ? "◎" : "#"),
+	log: picocolors.default.gray(supported ? "◎" : "#")
+};
+
+//#endregion
+//#region src/index.ts
+let timeFormatter;
+function getTimeFormatter() {
+	timeFormatter ??= new Intl.DateTimeFormat(void 0, {
+		hour: "numeric",
+		minute: "numeric",
+		second: "numeric"
+	});
+	return timeFormatter;
+}
+/**
+* log tool
+*/
+var Logger = class {
+	constructor(options) {
+		this._opts = {};
+		this.setOptions(Object.assign({}, options));
+	}
+	initLogDir() {
+		const { directory, cleanup } = this._opts;
+		if (!directory) return;
+		const root = this._opts.root || node_path.default.join(node_os.default.homedir(), ".tomjs");
+		const logDir = node_path.default.join(root, directory);
+		this._logDir = logDir;
+		if (!node_fs.default.existsSync(logDir)) node_fs.default.mkdirSync(logDir, { recursive: true });
+		node_fs.default.readdirSync(logDir).forEach((s) => {
+			if ((0, dayjs.default)(s.substring(0, 8)).isBefore((0, dayjs.default)().endOf("day").subtract(Math.max(1, cleanup ?? 30), "day"))) node_fs.default.rmSync(node_path.default.join(logDir, s), { force: true });
+		});
+	}
+	format(...args) {
+		return args.map((s) => typeof s === "object" ? JSON.stringify(s) : s || "").join(" ");
+	}
+	_writeLog(...args) {
+		if (!this._logDir) return;
+		const logFile = node_path.default.join(this._logDir, `${(0, dayjs.default)().format("YYYYMMDD")}.log`);
+		node_fs.default.appendFileSync(logFile, `${(0, dayjs.default)().format("YYYY-MM-DD HH:mm:ss.SSS")} ${(0, strip_ansi.default)(this.format(...args))}\n`);
+	}
+	_log(type, ...args) {
+		this._writeLog(type, ...args);
+		const flag = this._opts.flag || "symbol";
+		const preList = [];
+		if (flag === "time") preList.push(picocolors.default.dim(getTimeFormatter().format(/* @__PURE__ */ new Date())));
+		else if (flag === "symbol") preList.push(logSymbols[type]);
+		const { prefix } = this._opts;
+		if (prefix) preList.push(logColors[type](picocolors.default.bold(prefix)));
+		const list = preList.concat(args);
+		console.log(preList.concat(args).map((s) => typeof s === "object" ? "%o" : "%s").join(" "), ...list);
+	}
+	/**
+	* set debug mode or not
+	*/
+	enableDebug(debug) {
+		this._opts.debug = !!debug;
+	}
+	/**
+	* set debug mode or not
+	*/
+	setOptions(options) {
+		this._opts = Object.assign({}, this._opts, options);
+		this.initLogDir();
+	}
+	/**
+	* like console.log
+	*/
+	log(...args) {
+		this._log("log", ...args);
+	}
+	/**
+	* write log to file
+	*/
+	write(...args) {
+		this._writeLog(...args);
+	}
+	/**
+	* only show in debug mode
+	*/
+	debug(...args) {
+		if (this._opts.debug) this._log("log", ...args);
+	}
+	/**
+	* add the specified red prefix or error symbol before the log content
+	*/
+	error(...args) {
+		this._log(`error`, ...args);
+	}
+	/**
+	* add the specified blue prefix or info symbol before the log content
+	*/
+	info(...args) {
+		this._log("info", ...args);
+	}
+	/**
+	* add the specified green prefix or success symbol before the log content
+	*/
+	success(...args) {
+		this._log("success", ...args);
+	}
+	/**
+	* add the specified yellow prefix or warning symbol before the log content
+	*/
+	warning(...args) {
+		this._log("warn", ...args);
+	}
+	/**
+	* add the specified yellow prefix or warning symbol before the log content
+	*/
+	warn(...args) {
+		this.warning(...args);
+	}
+};
+var src_default = Logger;
+
+//#endregion
+exports.Logger = Logger;
+exports.default = src_default;

package/dist/{index.d.ts → index.d.cts}

@@ -1,3 +1,4 @@
+//#region src/index.d.ts
 interface LoggerOptions {
   /**
    * log prefix
@@ -9,10 +10,16 @@ interface LoggerOptions {
    */
   debug?: boolean;
   /**
-   * show time in log
+   * show time in log. use `flag:"time"` replace time
    * @default false
+   * @deprecated
    */
   time?: boolean;
+  /**
+   * show log symbols
+   * @default 'symbol'
+   */
+  flag?: 'time' | 'symbol' | 'none';
   /**
    * specify the log directory name
    */
@@ -79,5 +86,5 @@ declare class Logger {
    */
   warn(...args: any[]): void;
 }
-
-export { Logger, type LoggerOptions, Logger as default };
+//#endregion
+export { Logger, Logger as default, LoggerOptions };

package/dist/index.d.mts

@@ -1,3 +1,4 @@
+//#region src/index.d.ts
 interface LoggerOptions {
   /**
    * log prefix
@@ -9,10 +10,16 @@ interface LoggerOptions {
    */
   debug?: boolean;
   /**
-   * show time in log
+   * show time in log. use `flag:"time"` replace time
    * @default false
+   * @deprecated
    */
   time?: boolean;
+  /**
+   * show log symbols
+   * @default 'symbol'
+   */
+  flag?: 'time' | 'symbol' | 'none';
   /**
    * specify the log directory name
    */
@@ -79,5 +86,5 @@ declare class Logger {
    */
   warn(...args: any[]): void;
 }
-
-export { Logger, type LoggerOptions, Logger as default };
+//#endregion
+export { Logger, Logger as default, LoggerOptions };

package/dist/index.mjs

@@ -1,104 +1,144 @@
-import fs from 'node:fs';
-import os from 'node:os';
-import path from 'node:path';
-import chalk from 'chalk';
-import dayjs from 'dayjs';
-import logSymbols from 'log-symbols';
-import stripAnsi from 'strip-ansi';
+import fs from "node:fs";
+import os from "node:os";
+import path from "node:path";
+import dayjs from "dayjs";
+import colors from "picocolors";
+import stripAnsi from "strip-ansi";
+import isUnicodeSupported from "is-unicode-supported";
+
+//#region src/colors.ts
+const supported = isUnicodeSupported();
+const logColors = {
+	info: colors.cyan,
+	success: colors.green,
+	warn: colors.yellow,
+	warning: colors.yellow,
+	error: colors.red,
+	debug: colors.gray,
+	log: colors.gray
+};
+const logSymbols = {
+	info: colors.cyan(supported ? "ℹ" : "i"),
+	success: colors.green(supported ? "✔" : "√"),
+	warn: colors.yellow(supported ? "⚠" : "!"),
+	warning: colors.yellow(supported ? "⚠" : "!"),
+	error: colors.red(supported ? "✖" : "x"),
+	debug: colors.gray(supported ? "◎" : "#"),
+	log: colors.gray(supported ? "◎" : "#")
+};
+
+//#endregion
+//#region src/index.ts
+let timeFormatter;
+function getTimeFormatter() {
+	timeFormatter ??= new Intl.DateTimeFormat(void 0, {
+		hour: "numeric",
+		minute: "numeric",
+		second: "numeric"
+	});
+	return timeFormatter;
+}
+/**
+* log tool
+*/
 var Logger = class {
-  constructor(options) {
-    this._opts = {};
-    this.setOptions(Object.assign({}, options));
-  }
-  initLogDir() {
-    const { directory, cleanup } = this._opts;
-    if (!directory) {
-      return;
-    }
-    const root = this._opts.root || path.join(os.homedir(), '.tomjs');
-    const logDir = path.join(root, directory);
-    this._logDir = logDir;
-    if (!fs.existsSync(logDir)) {
-      fs.mkdirSync(logDir, { recursive: true });
-    }
-    fs.readdirSync(logDir).forEach(s => {
-      if (
-        dayjs(s.substring(0, 8)).isBefore(
-          dayjs()
-            .endOf('day')
-            .subtract(Math.max(1, cleanup ?? 30), 'day'),
-        )
-      ) {
-        fs.rmSync(path.join(logDir, s), { force: true });
-      }
-    });
-  }
-  format(...args) {
-    return args.map(s => (typeof s === 'object' ? JSON.stringify(s) : s || '')).join(' ');
-  }
-  _writeLog(...args) {
-    if (!this._logDir) {
-      return;
-    }
-    const logFile = path.join(this._logDir, `${dayjs().format('YYYYMMDD')}.log`);
-    fs.appendFileSync(
-      logFile,
-      `${dayjs().format('YYYY-MM-DD HH:mm:ss.SSS')} ${stripAnsi(this.format(...args))}
-`,
-    );
-  }
-  _log(...args) {
-    this._writeLog(...args);
-    let list = [...args];
-    if (this._opts.time) {
-      list = [chalk.gray(dayjs().format('HH:mm:ss')), ...list];
-    }
-    console.log(list.map(s => (typeof s === 'object' ? '%o' : '%s')).join(' '), ...list);
-  }
-  enableDebug(debug) {
-    this._opts.debug = !!debug;
-  }
-  setOptions(options) {
-    this._opts = Object.assign({}, options);
-    this.initLogDir();
-  }
-  log(...args) {
-    this._log(...args);
-  }
-  write(...args) {
-    this._writeLog(...args);
-  }
-  debug(...args) {
-    if (this._opts.debug) {
-      this._log(
-        ...args.map(s => {
-          if (typeof s !== 'object') {
-            return chalk.gray(s);
-          }
-          return s;
-        }),
-      );
-    }
-  }
-  error(...args) {
-    const { prefix } = this._opts;
-    this._log(prefix ? chalk.red(prefix) : logSymbols.error, ...args);
-  }
-  info(...args) {
-    const { prefix } = this._opts;
-    this._log(prefix ? chalk.blue(prefix) : logSymbols.info, ...args);
-  }
-  success(...args) {
-    const { prefix } = this._opts;
-    this._log(prefix ? chalk.green(prefix) : logSymbols.success, ...args);
-  }
-  warning(...args) {
-    const { prefix } = this._opts;
-    this._log(prefix ? chalk.yellow(prefix) : logSymbols.warning, ...args);
-  }
-  warn(...args) {
-    this.warning(...args);
-  }
+	constructor(options) {
+		this._opts = {};
+		this.setOptions(Object.assign({}, options));
+	}
+	initLogDir() {
+		const { directory, cleanup } = this._opts;
+		if (!directory) return;
+		const root = this._opts.root || path.join(os.homedir(), ".tomjs");
+		const logDir = path.join(root, directory);
+		this._logDir = logDir;
+		if (!fs.existsSync(logDir)) fs.mkdirSync(logDir, { recursive: true });
+		fs.readdirSync(logDir).forEach((s) => {
+			if (dayjs(s.substring(0, 8)).isBefore(dayjs().endOf("day").subtract(Math.max(1, cleanup ?? 30), "day"))) fs.rmSync(path.join(logDir, s), { force: true });
+		});
+	}
+	format(...args) {
+		return args.map((s) => typeof s === "object" ? JSON.stringify(s) : s || "").join(" ");
+	}
+	_writeLog(...args) {
+		if (!this._logDir) return;
+		const logFile = path.join(this._logDir, `${dayjs().format("YYYYMMDD")}.log`);
+		fs.appendFileSync(logFile, `${dayjs().format("YYYY-MM-DD HH:mm:ss.SSS")} ${stripAnsi(this.format(...args))}\n`);
+	}
+	_log(type, ...args) {
+		this._writeLog(type, ...args);
+		const flag = this._opts.flag || "symbol";
+		const preList = [];
+		if (flag === "time") preList.push(colors.dim(getTimeFormatter().format(/* @__PURE__ */ new Date())));
+		else if (flag === "symbol") preList.push(logSymbols[type]);
+		const { prefix } = this._opts;
+		if (prefix) preList.push(logColors[type](colors.bold(prefix)));
+		const list = preList.concat(args);
+		console.log(preList.concat(args).map((s) => typeof s === "object" ? "%o" : "%s").join(" "), ...list);
+	}
+	/**
+	* set debug mode or not
+	*/
+	enableDebug(debug) {
+		this._opts.debug = !!debug;
+	}
+	/**
+	* set debug mode or not
+	*/
+	setOptions(options) {
+		this._opts = Object.assign({}, this._opts, options);
+		this.initLogDir();
+	}
+	/**
+	* like console.log
+	*/
+	log(...args) {
+		this._log("log", ...args);
+	}
+	/**
+	* write log to file
+	*/
+	write(...args) {
+		this._writeLog(...args);
+	}
+	/**
+	* only show in debug mode
+	*/
+	debug(...args) {
+		if (this._opts.debug) this._log("log", ...args);
+	}
+	/**
+	* add the specified red prefix or error symbol before the log content
+	*/
+	error(...args) {
+		this._log(`error`, ...args);
+	}
+	/**
+	* add the specified blue prefix or info symbol before the log content
+	*/
+	info(...args) {
+		this._log("info", ...args);
+	}
+	/**
+	* add the specified green prefix or success symbol before the log content
+	*/
+	success(...args) {
+		this._log("success", ...args);
+	}
+	/**
+	* add the specified yellow prefix or warning symbol before the log content
+	*/
+	warning(...args) {
+		this._log("warn", ...args);
+	}
+	/**
+	* add the specified yellow prefix or warning symbol before the log content
+	*/
+	warn(...args) {
+		this.warning(...args);
+	}
 };
 var src_default = Logger;
-export { Logger, src_default as default };
+
+//#endregion
+export { Logger, src_default as default };

package/package.json

@@ -1,31 +1,36 @@
 {
   "name": "@tomjs/logger",
-  "version": "1.4.0",
+  "version": "3.0.0",
   "description": "logger for `node.js`",
-  "keywords": [
-    "node",
-    "utils"
-  ],
   "author": {
     "name": "Tom Gao",
     "email": "tom@tomgao.cc"
   },
   "license": "MIT",
-  "main": "./dist/index.js",
-  "module": "./dist/index.mjs",
-  "types": "./dist/index.d.ts",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/tomjs/utils.git",
+    "directory": "packages/logger"
+  },
+  "keywords": [
+    "node",
+    "utils"
+  ],
   "exports": {
     ".": {
-      "require": {
-        "default": "./dist/index.js",
-        "types": "./dist/index.d.ts"
-      },
       "import": {
-        "default": "./dist/index.mjs",
-        "types": "./dist/index.d.mts"
+        "types": "./dist/index.d.mts",
+        "default": "./dist/index.mjs"
+      },
+      "require": {
+        "types": "./dist/index.d.ts",
+        "default": "./dist/index.js"
       }
     }
   },
+  "main": "./dist/index.js",
+  "module": "./dist/index.mjs",
+  "types": "./dist/index.d.ts",
   "files": [
     "dist"
   ],
@@ -36,19 +41,14 @@
     "access": "public",
     "registry": "https://registry.npmjs.org/"
   },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/tomjs/utils.git",
-    "directory": "packages/logger"
-  },
   "dependencies": {
-    "chalk": "^4.1.2",
     "dayjs": "^1.11.13",
-    "log-symbols": "^4.1.0",
+    "is-unicode-supported": "^2.1.0",
+    "picocolors": "^1.1.1",
     "strip-ansi": "^6.0.1"
   },
   "scripts": {
-    "build": "tsup && prettier --write ./dist",
-    "test": "vitest"
+    "build": "tsdown",
+    "print": "tsx ./scripts/print.ts"
   }
 }

package/dist/index.js

@@ -1,134 +0,0 @@
-'use strict';
-Object.defineProperty(exports, '__esModule', { value: true });
-function _interopRequireDefault(obj) {
-  return obj && obj.__esModule ? obj : { default: obj };
-}
-function _nullishCoalesce(lhs, rhsFn) {
-  if (lhs != null) {
-    return lhs;
-  } else {
-    return rhsFn();
-  }
-}
-var _fs = require('fs');
-var _fs2 = _interopRequireDefault(_fs);
-var _os = require('os');
-var _os2 = _interopRequireDefault(_os);
-var _path = require('path');
-var _path2 = _interopRequireDefault(_path);
-var _chalk = require('chalk');
-var _chalk2 = _interopRequireDefault(_chalk);
-var _dayjs = require('dayjs');
-var _dayjs2 = _interopRequireDefault(_dayjs);
-var _logsymbols = require('log-symbols');
-var _logsymbols2 = _interopRequireDefault(_logsymbols);
-var _stripansi = require('strip-ansi');
-var _stripansi2 = _interopRequireDefault(_stripansi);
-var Logger = class {
-  constructor(options) {
-    this._opts = {};
-    this.setOptions(Object.assign({}, options));
-  }
-  initLogDir() {
-    const { directory, cleanup } = this._opts;
-    if (!directory) {
-      return;
-    }
-    const root = this._opts.root || _path2.default.join(_os2.default.homedir(), '.tomjs');
-    const logDir = _path2.default.join(root, directory);
-    this._logDir = logDir;
-    if (!_fs2.default.existsSync(logDir)) {
-      _fs2.default.mkdirSync(logDir, { recursive: true });
-    }
-    _fs2.default.readdirSync(logDir).forEach(s => {
-      if (
-        _dayjs2.default.call(void 0, s.substring(0, 8)).isBefore(
-          _dayjs2.default
-            .call(void 0)
-            .endOf('day')
-            .subtract(
-              Math.max(
-                1,
-                _nullishCoalesce(cleanup, () => 30),
-              ),
-              'day',
-            ),
-        )
-      ) {
-        _fs2.default.rmSync(_path2.default.join(logDir, s), { force: true });
-      }
-    });
-  }
-  format(...args) {
-    return args.map(s => (typeof s === 'object' ? JSON.stringify(s) : s || '')).join(' ');
-  }
-  _writeLog(...args) {
-    if (!this._logDir) {
-      return;
-    }
-    const logFile = _path2.default.join(
-      this._logDir,
-      `${_dayjs2.default.call(void 0).format('YYYYMMDD')}.log`,
-    );
-    _fs2.default.appendFileSync(
-      logFile,
-      `${_dayjs2.default.call(void 0).format('YYYY-MM-DD HH:mm:ss.SSS')} ${_stripansi2.default.call(void 0, this.format(...args))}
-`,
-    );
-  }
-  _log(...args) {
-    this._writeLog(...args);
-    let list = [...args];
-    if (this._opts.time) {
-      list = [_chalk2.default.gray(_dayjs2.default.call(void 0).format('HH:mm:ss')), ...list];
-    }
-    console.log(list.map(s => (typeof s === 'object' ? '%o' : '%s')).join(' '), ...list);
-  }
-  enableDebug(debug) {
-    this._opts.debug = !!debug;
-  }
-  setOptions(options) {
-    this._opts = Object.assign({}, options);
-    this.initLogDir();
-  }
-  log(...args) {
-    this._log(...args);
-  }
-  write(...args) {
-    this._writeLog(...args);
-  }
-  debug(...args) {
-    if (this._opts.debug) {
-      this._log(
-        ...args.map(s => {
-          if (typeof s !== 'object') {
-            return _chalk2.default.gray(s);
-          }
-          return s;
-        }),
-      );
-    }
-  }
-  error(...args) {
-    const { prefix } = this._opts;
-    this._log(prefix ? _chalk2.default.red(prefix) : _logsymbols2.default.error, ...args);
-  }
-  info(...args) {
-    const { prefix } = this._opts;
-    this._log(prefix ? _chalk2.default.blue(prefix) : _logsymbols2.default.info, ...args);
-  }
-  success(...args) {
-    const { prefix } = this._opts;
-    this._log(prefix ? _chalk2.default.green(prefix) : _logsymbols2.default.success, ...args);
-  }
-  warning(...args) {
-    const { prefix } = this._opts;
-    this._log(prefix ? _chalk2.default.yellow(prefix) : _logsymbols2.default.warning, ...args);
-  }
-  warn(...args) {
-    this.warning(...args);
-  }
-};
-var src_default = Logger;
-exports.Logger = Logger;
-exports.default = src_default;