@nocobase/logger 1.6.8 → 1.6.9

package/lib/logger.js

@@ -45,8 +45,8 @@ module.exports = __toCommonJS(logger_exports);
 var import_winston = __toESM(require("winston"));
 var import_winston_daily_rotate_file = require("winston-daily-rotate-file");
 var import_config = require("./config");
-var import_transports = require("./transports");
 var import_format = require("./format");
+var import_transports = require("./transports");
 const levels = {
   trace: 4,
   debug: 3,

package/lib/system-logger.d.ts

@@ -24,3 +24,4 @@ export interface SystemLogger extends Omit<Logger, 'info' | 'warn' | 'error' | '
     trace: logMethod;
 }
 export declare const createSystemLogger: (options: SystemLoggerOptions) => SystemLogger;
+export declare const logger: SystemLogger;

package/lib/system-logger.js

@@ -37,14 +37,16 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var system_logger_exports = {};
 __export(system_logger_exports, {
-  createSystemLogger: () => createSystemLogger
+  createSystemLogger: () => createSystemLogger,
+  logger: () => logger
 });
 module.exports = __toCommonJS(system_logger_exports);
+var import_triple_beam = require("triple-beam");
 var import_winston = __toESM(require("winston"));
-var import_logger = require("./logger");
 var import_winston_transport = __toESM(require("winston-transport"));
-var import_triple_beam = require("triple-beam");
+var import_config = require("./config");
 var import_format = require("./format");
+var import_logger = require("./logger");
 const _SystemLoggerTransport = class _SystemLoggerTransport extends import_winston_transport.default {
   logger;
   errorLogger;
@@ -68,10 +70,10 @@ const _SystemLoggerTransport = class _SystemLoggerTransport extends import_winst
   }
   log(info, callback) {
     const { level, message, reqId, app, dataSourceKey, stack, cause, [import_triple_beam.SPLAT]: args } = info;
-    const logger = level === "error" && this.errorLogger ? this.errorLogger : this.logger;
+    const logger2 = level === "error" && this.errorLogger ? this.errorLogger : this.logger;
     const { module: module2, submodule, method, ...meta } = (args == null ? void 0 : args[0]) || {};
     if (!(cause == null ? void 0 : cause.onlyLogCause)) {
-      logger.log({
+      logger2.log({
         level,
         message,
         stack,
@@ -85,7 +87,7 @@ const _SystemLoggerTransport = class _SystemLoggerTransport extends import_winst
       });
     }
     if (cause) {
-      logger.log({
+      logger2.log({
         level,
         message: cause.message,
         stack: cause.stack,
@@ -105,8 +107,8 @@ const _SystemLoggerTransport = class _SystemLoggerTransport extends import_winst
 __name(_SystemLoggerTransport, "SystemLoggerTransport");
 let SystemLoggerTransport = _SystemLoggerTransport;
 function child(defaultRequestMetadata) {
-  const logger = this;
-  return Object.create(logger, {
+  const logger2 = this;
+  return Object.create(logger2, {
     write: {
       value: /* @__PURE__ */ __name(function(info) {
         const infoClone = Object.assign({}, defaultRequestMetadata, info);
@@ -115,7 +117,7 @@ function child(defaultRequestMetadata) {
           infoClone.message = info.message;
           infoClone.cause = info.cause;
         }
-        logger.write(infoClone);
+        logger2.write(infoClone);
       }, "value")
     }
   });
@@ -126,13 +128,13 @@ const createSystemLogger = /* @__PURE__ */ __name((options) => {
   transport.once("unpipe", () => {
     transport.close();
   });
-  const logger = import_winston.default.createLogger({
+  const logger2 = import_winston.default.createLogger({
     levels: import_logger.levels,
     transports: [transport]
     // Due to the use of custom log levels,
     // we have to use the any type until Winston updates the type definitions.
   });
-  return new Proxy(logger, {
+  return new Proxy(logger2, {
     get(target, prop) {
       if (prop === "child") {
         return child.bind(target);
@@ -141,7 +143,16 @@ const createSystemLogger = /* @__PURE__ */ __name((options) => {
     }
   });
 }, "createSystemLogger");
+const logger = createSystemLogger({
+  dirname: (0, import_config.getLoggerFilePath)("main"),
+  filename: "system",
+  defaultMeta: {
+    app: "main",
+    module: "cli"
+  }
+});
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  createSystemLogger
+  createSystemLogger,
+  logger
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/logger",
-  "version": "1.6.8",
+  "version": "1.6.9",
   "description": "nocobase logging library",
   "license": "AGPL-3.0",
   "main": "./lib/index.js",
@@ -18,5 +18,5 @@
     "winston-daily-rotate-file": "^5.0.0",
     "winston-transport": "^4.7.0"
   },
-  "gitHead": "0261bf929dde4d1feb6479c2ef7105b15754ab53"
+  "gitHead": "0c0b4612f912f8bf343500be37ac9488b6fe86eb"
 }