@nocobase/logger 0.12.0-alpha.5 → 0.13.0-alpha.10

package/lib/create-app-logger.js

@@ -1,95 +1,93 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var create_app_logger_exports = {};
+__export(create_app_logger_exports, {
+  createAppLogger: () => createAppLogger,
+  default: () => create_app_logger_default
 });
-exports.createAppLogger = createAppLogger;
-exports.default = void 0;
-function _crypto() {
-  const data = require("crypto");
-  _crypto = function _crypto() {
-    return data;
-  };
-  return data;
-}
-function _lodash() {
-  const data = require("lodash");
-  _lodash = function _lodash() {
-    return data;
-  };
-  return data;
-}
-var _createLogger = require("./create-logger");
-const _excluded = ["skip", "requestWhitelist", "responseWhitelist"];
-function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
-function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
-function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
-function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
-const defaultRequestWhitelist = ['action', 'header.x-role', 'header.x-hostname', 'header.x-timezone', 'header.x-locale', 'referer'];
-const defaultResponseWhitelist = ['status'];
+module.exports = __toCommonJS(create_app_logger_exports);
+var import_crypto = require("crypto");
+var import_lodash = require("lodash");
+var import_create_logger = require("./create-logger");
+const defaultRequestWhitelist = [
+  "action",
+  "header.x-role",
+  "header.x-hostname",
+  "header.x-timezone",
+  "header.x-locale",
+  "referer"
+];
+const defaultResponseWhitelist = ["status"];
 function createAppLogger(options = {}) {
-  const skip = options.skip,
-    _options$requestWhite = options.requestWhitelist,
-    requestWhitelist = _options$requestWhite === void 0 ? defaultRequestWhitelist : _options$requestWhite,
-    _options$responseWhit = options.responseWhitelist,
-    responseWhitelist = _options$responseWhit === void 0 ? defaultResponseWhitelist : _options$responseWhit,
-    others = _objectWithoutProperties(options, _excluded);
-  const instance = (0, _createLogger.createLogger)(others);
-  const middleware = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator(function* (ctx, next) {
-      if (skip && (yield skip(ctx))) {
-        return next();
-      }
-      const logger = ctx.app['logger'];
-      const startTime = Date.now();
-      const info = {
-        level: 'info',
-        message: `END: ${ctx.method} ${ctx.url}`,
-        req: ctx.request.toJSON()
-      };
-      ctx.reqId = ctx.req['id'] = (0, _crypto().randomUUID)();
-      ctx.logger = ctx.log = logger.child({
-        reqId: ctx.reqId
-      });
-      ctx.logger.info(`BEGIN: ${ctx.method} ${ctx.url}`);
-      let error;
-      try {
-        yield next();
-      } catch (e) {
-        error = e;
-      } finally {
-        info['res'] = ctx.response.toJSON();
-        // info['status'] = ctx.status;
-        if (Math.floor(ctx.status / 100) == 5) {
-          var _ctx$body;
-          info.level = 'error';
-          info['errors'] = ((_ctx$body = ctx.body) === null || _ctx$body === void 0 ? void 0 : _ctx$body['errors']) || ctx.body;
-        } else if (Math.floor(ctx.status / 100) == 4) {
-          var _ctx$body2;
-          info.level = 'warn';
-          info['errors'] = ((_ctx$body2 = ctx.body) === null || _ctx$body2 === void 0 ? void 0 : _ctx$body2['errors']) || ctx.body;
-        }
-        info['responseTime'] = Date.now() - startTime;
-        if (ctx.action) {
-          var _ctx$action, _ctx$action$toJSON;
-          info['req']['action'] = (_ctx$action = ctx.action) === null || _ctx$action === void 0 ? void 0 : (_ctx$action$toJSON = _ctx$action.toJSON) === null || _ctx$action$toJSON === void 0 ? void 0 : _ctx$action$toJSON.call(_ctx$action);
-        }
-        info['req'] = (0, _lodash().pick)(info['req'], requestWhitelist);
-        info['res'] = (0, _lodash().pick)(info['res'], responseWhitelist);
-        ctx.logger.log(info);
+  const {
+    skip,
+    requestWhitelist = defaultRequestWhitelist,
+    responseWhitelist = defaultResponseWhitelist,
+    ...others
+  } = options;
+  const instance = (0, import_create_logger.createLogger)(others);
+  const middleware = /* @__PURE__ */ __name(async (ctx, next) => {
+    var _a, _b, _c, _d;
+    if (skip && await skip(ctx)) {
+      return next();
+    }
+    const logger = ctx.app["logger"];
+    const startTime = Date.now();
+    const info = {
+      level: "info",
+      message: `END: ${ctx.method} ${ctx.url}`,
+      req: ctx.request.toJSON()
+    };
+    ctx.reqId = ctx.req["id"] = (0, import_crypto.randomUUID)();
+    ctx.logger = ctx.log = logger.child({ reqId: ctx.reqId });
+    ctx.logger.info(`BEGIN: ${ctx.method} ${ctx.url}`);
+    let error;
+    try {
+      await next();
+    } catch (e) {
+      error = e;
+    } finally {
+      info["res"] = ctx.response.toJSON();
+      if (Math.floor(ctx.status / 100) == 5) {
+        info.level = "error";
+        info["errors"] = ((_a = ctx.body) == null ? void 0 : _a["errors"]) || ctx.body;
+      } else if (Math.floor(ctx.status / 100) == 4) {
+        info.level = "warn";
+        info["errors"] = ((_b = ctx.body) == null ? void 0 : _b["errors"]) || ctx.body;
       }
-      if (error) {
-        throw error;
+      info["responseTime"] = Date.now() - startTime;
+      if (ctx.action) {
+        info["req"]["action"] = (_d = (_c = ctx.action) == null ? void 0 : _c.toJSON) == null ? void 0 : _d.call(_c);
       }
-    });
-    return function middleware(_x, _x2) {
-      return _ref.apply(this, arguments);
-    };
-  }();
-  return {
-    instance,
-    middleware
-  };
+      info["req"] = (0, import_lodash.pick)(info["req"], requestWhitelist);
+      info["res"] = (0, import_lodash.pick)(info["res"], responseWhitelist);
+      ctx.logger.log(info);
+    }
+    if (error) {
+      throw error;
+    }
+  }, "middleware");
+  return { instance, middleware };
 }
-var _default = createAppLogger;
-exports.default = _default;
+__name(createAppLogger, "createAppLogger");
+var create_app_logger_default = createAppLogger;
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  createAppLogger
+});

package/lib/create-logger.js

@@ -1,94 +1,104 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-Object.defineProperty(exports, "Logger", {
-  enumerable: true,
-  get: function get() {
-    return _winston().Logger;
+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 __name = (target, value) => __defProp(target, "name", { value, configurable: true });
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
   }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var create_logger_exports = {};
+__export(create_logger_exports, {
+  Logger: () => import_winston.Logger,
+  Transports: () => Transports,
+  createLogger: () => createLogger,
+  getLoggerFilePath: () => getLoggerFilePath,
+  getLoggerLevel: () => getLoggerLevel
 });
-exports.Transports = void 0;
-exports.createLogger = createLogger;
-exports.getLoggerFilePath = getLoggerFilePath;
-exports.getLoggerLevel = getLoggerLevel;
-function _path() {
-  const data = _interopRequireDefault(require("path"));
-  _path = function _path() {
-    return data;
-  };
-  return data;
-}
-function _winston() {
-  const data = _interopRequireWildcard(require("winston"));
-  _winston = function _winston() {
-    return data;
-  };
-  return data;
-}
-require("winston-daily-rotate-file");
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
-function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
-const combine = _winston().format.combine,
-  timestamp = _winston().format.timestamp,
-  colorize = _winston().format.colorize,
-  simple = _winston().format.simple;
+module.exports = __toCommonJS(create_logger_exports);
+var import_path = __toESM(require("path"));
+var import_winston = __toESM(require("winston"));
+var import_winston_daily_rotate_file = require("winston-daily-rotate-file");
+const { combine, timestamp, colorize, simple } = import_winston.format;
 function getLoggerLevel() {
-  return process.env.LOGGER_LEVEL || 'info';
+  return process.env.LOGGER_LEVEL || "info";
 }
+__name(getLoggerLevel, "getLoggerLevel");
 function getLoggerFilePath(...paths) {
-  return _path().default.resolve(process.env.LOGGER_BASE_PATH || _path().default.resolve(process.cwd(), 'storage', 'logs'), ...paths);
+  return import_path.default.resolve(process.env.LOGGER_BASE_PATH || import_path.default.resolve(process.cwd(), "storage", "logs"), ...paths);
 }
+__name(getLoggerFilePath, "getLoggerFilePath");
 const Transports = {
   console(options) {
-    return new (_winston().default.transports.Console)(_objectSpread({
-      format: combine(simple(), colorize())
-    }, options));
+    return new import_winston.default.transports.Console({
+      format: combine(simple(), colorize()),
+      ...options
+    });
   },
   dailyRotateFile(options) {
     let dirname = getLoggerFilePath();
-    if (!_path().default.isAbsolute(dirname)) {
-      dirname = _path().default.resolve(process.cwd(), dirname);
+    if (!import_path.default.isAbsolute(dirname)) {
+      dirname = import_path.default.resolve(process.cwd(), dirname);
     }
-    return new (_winston().default.transports.DailyRotateFile)(_objectSpread({
+    return new import_winston.default.transports.DailyRotateFile({
       dirname,
       level: getLoggerLevel(),
-      filename: 'nocobase-%DATE%.log',
-      datePattern: 'YYYY-MM-DD-HH',
-      maxFiles: '14d'
-    }, options));
+      filename: "nocobase-%DATE%.log",
+      datePattern: "YYYY-MM-DD-HH",
+      maxFiles: "14d",
+      ...options
+    });
   }
 };
-exports.Transports = Transports;
 function toArr(value) {
   if (Array.isArray(value)) {
     return value;
   }
-  return value ? value.split(',') : [];
+  return value ? value.split(",") : [];
 }
+__name(toArr, "toArr");
 function createLogger(options = {}) {
-  const transports = toArr((options === null || options === void 0 ? void 0 : options.transports) || ['console', 'dailyRotateFile']).map(t => {
-    if (typeof t === 'string') {
+  const transports = toArr((options == null ? void 0 : options.transports) || ["console", "dailyRotateFile"]).map((t) => {
+    if (typeof t === "string") {
       return Transports[t]();
     }
     return t;
-  }).filter(t => t);
-  const logger = _winston().default.createLogger(_objectSpread(_objectSpread({
+  }).filter((t) => t);
+  const logger = import_winston.default.createLogger({
     level: getLoggerLevel(),
-    levels: _winston().default.config.cli.levels,
-    format: combine(timestamp(), _winston().format.errors({
-      stack: true
-    }), _winston().format.json(), colorize())
-  }, options), {}, {
+    levels: import_winston.default.config.cli.levels,
+    format: combine(timestamp(), import_winston.format.errors({ stack: true }), import_winston.format.json(), colorize()),
+    ...options,
     transports
-  }));
-  _winston().default.addColors(_winston().default.config.cli.colors);
+  });
+  import_winston.default.addColors(import_winston.default.config.cli.colors);
   return logger;
-}
+}
+__name(createLogger, "createLogger");
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  Logger,
+  Transports,
+  createLogger,
+  getLoggerFilePath,
+  getLoggerLevel
+});

package/lib/index.js

@@ -1,27 +1,23 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var src_exports = {};
+module.exports = __toCommonJS(src_exports);
+__reExport(src_exports, require("./create-app-logger"), module.exports);
+__reExport(src_exports, require("./create-logger"), module.exports);
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  ...require("./create-app-logger"),
+  ...require("./create-logger")
 });
-var _createAppLogger = require("./create-app-logger");
-Object.keys(_createAppLogger).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _createAppLogger[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function get() {
-      return _createAppLogger[key];
-    }
-  });
-});
-var _createLogger = require("./create-logger");
-Object.keys(_createLogger).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _createLogger[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function get() {
-      return _createLogger[key];
-    }
-  });
-});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/logger",
-  "version": "0.12.0-alpha.5",
+  "version": "0.13.0-alpha.10",
   "description": "nocobase logging library",
   "license": "Apache-2.0",
   "main": "./lib/index.js",
@@ -15,5 +15,5 @@
     "winston": "^3.8.2",
     "winston-daily-rotate-file": "^4.7.1"
   },
-  "gitHead": "689cc16e83361c4d0b91907e0deac30bdb907692"
+  "gitHead": "5360ed81650f6895f3ed39aede2706467d55862c"
 }