@autofleet/logger 4.0.0-beta-2 → 4.0.0-beta-3

package/dist/index.js

@@ -6,44 +6,53 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.LogLevel = void 0;
 const pino_1 = __importDefault(require("pino"));
 const pino_cloud_logging_1 = require("pino-cloud-logging");
+// eslint-disable-next-line no-shadow
+var LogLevel;
+(function (LogLevel) {
+    LogLevel["trace"] = "trace";
+    LogLevel["debug"] = "debug";
+    LogLevel["info"] = "info";
+    LogLevel["warn"] = "warn";
+    LogLevel["error"] = "error";
+    LogLevel["fatal"] = "fatal";
+})(LogLevel || (exports.LogLevel = LogLevel = {}));
 const getLevel = (logLevel) => {
     if (logLevel)
         return logLevel;
     if (process.env.LOG_LEVEL)
         return process.env.LOG_LEVEL;
     if (process.env.NODE_ENV && ['production', 'staging', 'test'].includes(process.env.NODE_ENV))
-        return 'info';
+        return LogLevel.info;
     if (process.env.NODE_ENV === 'development')
-        return 'debug';
-    return 'debug';
+        return LogLevel.debug;
+    return LogLevel.debug;
 };
 const createLoggerInstance = (level, options) => {
     let loggerInstance;
     if (process.env.NODE_ENV === 'production') {
-        loggerInstance = (0, pino_1.default)((0, pino_cloud_logging_1.gcpLogOptions)(Object.assign({ level: process.env.PINO_LOG_LEVEL || 'info' }, options)));
+        loggerInstance = (0, pino_1.default)((0, pino_cloud_logging_1.gcpLogOptions)({
+            level: process.env.PINO_LOG_LEVEL || 'info',
+            ...options,
+        }));
     }
     else {
-        loggerInstance = (0, pino_1.default)(Object.assign({ level: process.env.PINO_LOG_LEVEL || 'info', transport: {
+        loggerInstance = (0, pino_1.default)({
+            level: process.env.PINO_LOG_LEVEL || 'info',
+            transport: {
                 target: 'pino-pretty',
                 options: {
                     colorize: true,
                 },
-            } }, options));
+            },
+            ...options,
+        });
     }
     loggerInstance.level = level;
     return loggerInstance;
 };
-// eslint-disable-next-line no-shadow
-var LogLevel;
-(function (LogLevel) {
-    LogLevel["trace"] = "trace";
-    LogLevel["debug"] = "debug";
-    LogLevel["info"] = "info";
-    LogLevel["warn"] = "warn";
-    LogLevel["error"] = "error";
-    LogLevel["fatal"] = "fatal";
-})(LogLevel || (exports.LogLevel = LogLevel = {}));
 class LoggerInstanceManager {
+    contextMiddlewares;
+    logger;
     constructor(logLevel) {
         this.contextMiddlewares = [];
         this.logger = createLoggerInstance(getLevel(logLevel), {

package/index.ts

@@ -1,15 +1,27 @@
 import Pino from 'pino';
 import { gcpLogOptions } from 'pino-cloud-logging';
 
-const getLevel = (logLevel: string | undefined) => {
+// eslint-disable-next-line no-shadow
+export enum LogLevel {
+  trace = 'trace',
+  debug = 'debug',
+  info = 'info',
+  warn = 'warn',
+  error = 'error',
+  fatal = 'fatal',
+}
+
+type LogLevels = 'trace' | 'debug' | 'info' | 'warn' | 'error' | 'fatal';
+
+const getLevel = (logLevel?: LogLevel): LogLevel => {
   if (logLevel) return logLevel;
-  if (process.env.LOG_LEVEL) return process.env.LOG_LEVEL;
-  if (process.env.NODE_ENV && ['production', 'staging', 'test'].includes(process.env.NODE_ENV)) return 'info';
-  if (process.env.NODE_ENV === 'development') return 'debug';
-  return 'debug';
+  if (process.env.LOG_LEVEL) return process.env.LOG_LEVEL as LogLevel;
+  if (process.env.NODE_ENV && ['production', 'staging', 'test'].includes(process.env.NODE_ENV)) return LogLevel.info;
+  if (process.env.NODE_ENV === 'development') return LogLevel.debug;
+  return LogLevel.debug;
 };
 
-const createLoggerInstance = (level: string, options: object) => {
+const createLoggerInstance = (level: LogLevel, options: object) => {
   let loggerInstance;
   if (process.env.NODE_ENV === 'production') {
     loggerInstance = Pino(gcpLogOptions({
@@ -32,16 +44,6 @@ const createLoggerInstance = (level: string, options: object) => {
   return loggerInstance;
 };
 
-// eslint-disable-next-line no-shadow
-export enum LogLevel {
-  trace = 'trace',
-  debug = 'debug',
-  info = 'info',
-  warn = 'warn',
-  error = 'error',
-  fatal = 'fatal',
-}
-
 type MiddlewareFunction = () => Record<string, unknown>;
 
 class LoggerInstanceManager {
@@ -49,7 +51,7 @@ class LoggerInstanceManager {
 
   logger: Pino.Logger;
 
-  constructor(logLevel?: string) {
+  constructor(logLevel?: LogLevel) {
     this.contextMiddlewares = [];
     this.logger = createLoggerInstance(getLevel(logLevel), {
       mixin: () => this.addMetadata(),
@@ -110,4 +112,5 @@ class LoggerInstanceManager {
     return this.logger.level;
   }
 }
-export default (loglevel?: string) => new LoggerInstanceManager(loglevel);
+
+export default (loglevel?: LogLevels) => new LoggerInstanceManager(loglevel as LogLevel);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autofleet/logger",
-  "version": "4.0.0-beta-2",
+  "version": "4.0.0-beta-3",
   "description": "",
   "scripts": {
     "coverage": "jest --coverage --forceExit --runInBand",

package/tsconfig.json

@@ -1,6 +1,6 @@
 {
   "compilerOptions": {
-    "target": "es2016",                                  /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */
+    "target": "ES2022",                                  /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */
     "module": "commonjs",                                /* Specify what module code is generated. */       /* Allow 'import x from y' when a module doesn't have a default export. */
     "esModuleInterop": true,                             /* Emit additional JavaScript to ease support for importing CommonJS modules. This enables 'allowSyntheticDefaultImports' for type compatibility. */
     // "preserveSymlinks": true,                         /* Disable resolving symlinks to their realpath. This correlates to the same flag in node. */