zeddemore-logger 2.1.2 → 2.2.2

package/lib/enums.js

@@ -22,28 +22,6 @@ const ansiColors = {
     LOG_LEVEL_WARNING: 33, // yellow
 };
 
-const apiLogLevelCaptions = {
-    DEFAULT: 'Default',
-    ERROR: 'Error',
-    WARNING: 'Warning',
-    INFO: 'Info',
-    HTTP: 'HTTP',
-    VERBOSE: 'Verbose',
-    DEBUG: 'Debug',
-    SILLY: 'Silly',
-};
-
-const apiLogLevels = {
-    DEFAULT: -1,
-    ERROR: 0,
-    WARNING: 1,
-    INFO: 2,
-    HTTP: 3,
-    VERBOSE: 4,
-    DEBUG: 5,
-    SILLY: 6,
-};
-
 const chalkFormats = {
     ANSI: 'ansi',
     HEX: 'hex',
@@ -55,14 +33,6 @@ const chalkLayers = {
     FOREGROUND: 'fg',
 };
 
-const databaseOperations = {
-    DELETE: 'DELETE',
-    INSERT: 'INSERT',
-    SELECT: 'SELECT',
-    TRUNCATE: 'TRUNCATE',
-    UPDATE: 'UPDATE',
-};
-
 const hexColors = {
     BEARDON_RED: '#951A1D',
     BLACK: '#000000',
@@ -81,11 +51,18 @@ const hexColors = {
     HTTP_POST: '#F4DA7A',
     HTTP_PUT: '#74AEF6',
     HTTP_TRACE: '#FFFFFF',
+    PACKAGE_ANGULARJS: '#C04737',
+    PACKAGE_AXIOS: '#6200e1',
     PACKAGE_EXPRESS: '#F7DF1E',
+    PACKAGE_HANDLEBARS: '#F0772B',
+    PACKAGE_JIMP: '#FF0000',
     PACKAGE_MYSQL: '#00618A',
     PACKAGE_NODE_JS: '#689F63',
+    PACKAGE_PASSPORT: '#51E492',
     PACKAGE_POSTGRESQL: '#336791',
+    PACKAGE_REDIS: '#C23936',
     PACKAGE_SEQUELIZE: '#00AFEF',
+    PACKAGE_ZEDDEMORE: '#E2B68F',
 };
 
 const httpStatusCodeGroups = {
@@ -122,6 +99,11 @@ const httpResponseHeaders = {
     CONTENT_LENGTH: 'Content-Length',
 };
 
+const logLevelTypes = {
+    CONSOLE: 'console',
+    EMAIL: 'email',
+};
+
 const morganFormats = {
     COMBINED: 'combined',
     COMMON: 'common',
@@ -151,10 +133,18 @@ const morganFormatTokens = {
     USER_AGENT: 'user-agent',
 };
 
-const progressBarAlignments = {
-    CENTER: 'center',
-    LEFT: 'left',
-    RIGHT: 'right',
+const winstonFormats = {
+    COLORIZE: 'colorize',
+    JSON: 'json',
+    METADATA: 'metadata',
+    PRETTY_PRINT: 'pretty_print',
+    SIMPLE: 'simple',
+    SPLAT: 'splat',
+    TIMESTAMP: 'timestamp',
+    ZEDDEMORE_INFO_MUTATION: 'zeddemore_info_mutation',
+    ZEDDEMORE_LABEL: 'zeddemore_label',
+    ZEDDEMORE_PRINTF: 'zeddemore_printf',
+    ZEDDEMORE_TIMESTAMP: 'zeddemore_timestamp',
 };
 
 const winstonLogLevelNames = {
@@ -178,28 +168,38 @@ const winstonLogLevels = {
     SILLY: 6,
 };
 
-const winstonTransportIds = {
+const winstonTransports = {
     CONSOLE: 'console',
     EMAIL: 'email',
 };
 
+const zeddemoreLogLevelCaptions = {
+    DEFAULT: 'Default',
+    ERROR: 'Error',
+    WARNING: 'Warning',
+    INFO: 'Info',
+    HTTP: 'HTTP',
+    VERBOSE: 'Verbose',
+    DEBUG: 'Debug',
+    SILLY: 'Silly',
+};
+
 module.exports = {
     doesEnumInclude,
     ansiColors,
-    apiLogLevelCaptions,
-    apiLogLevels,
     chalkFormats,
     chalkLayers,
-    databaseOperations,
     hexColors,
     httpStatusCodeGroups,
     httpMethods,
     httpRequestHeaders,
     httpResponseHeaders,
+    logLevelTypes,
     morganFormats,
     morganFormatTokens,
-    progressBarAlignments,
+    winstonFormats,
     winstonLogLevelNames,
     winstonLogLevels,
-    winstonTransportIds,
+    winstonTransports,
+    zeddemoreLogLevelCaptions,
 };

package/lib/logging.js

@@ -4,7 +4,7 @@ const _ = require('lodash');
 
 const defaults = require('./defaults');
 const enums = require('./enums');
-const { logLevelMap } = require('./mappings/log_mappings');
+const { logLevelMap, transportMap } = require('./mappings/log_mappings');
 
 const { doesEnumInclude } = enums;
 
@@ -12,47 +12,57 @@ function isMorganFormat(format) {
     return doesEnumInclude(enums.morganFormats, format);
 }
 
-function isValidLogLevel(logLevel) {
-    if (!_.isInteger(logLevel) && (!_.isString(logLevel) || !logLevel.length)) return false;
-    if (_.isInteger(logLevel)) return isValidLogLevelId(logLevel);
-    if (_.isString(logLevel)) return isValidLogLevelName(logLevel);
+function isWinstonFormat(format) {
+    return doesEnumInclude(enums.winstonFormats, format);
+}
+
+function isWinstonLogLevel(level) {
+    if (!_.isInteger(level) && (!_.isString(level) || !level.length)) return false;
+    if (_.isInteger(level)) return isWinstonLogLevelId(level);
+    if (_.isString(level)) return isWinstonLogLevelName(level);
     return false;
 }
 
-function isValidLogLevelId(logLevelId) {
-    if (!_.isInteger(logLevelId)) return false;
-    return !!(_.find(logLevelMap, { winstonLevel: logLevelId }))
+function isWinstonLogLevelId(id) {
+    if (!_.isInteger(id)) return false;
+    return !!(_.find(logLevelMap, { winstonLevel: id }))
+}
+
+function isWinstonLogLevelName(name) {
+    if (!_.isString(name)) return false;
+    return !!(_.find(logLevelMap, { winstonName: name }))
 }
 
-function isValidLogLevelName(logLevelName) {
-    if (!_.isString(logLevelName)) return false;
-    return !!(_.find(logLevelMap, { winstonName: logLevelName }))
+function isWinstonTransport(winstonTransport) {
+    return doesEnumInclude(enums.winstonTransports, winstonTransport);
 }
 
-function isWinstonTransportId(winstonTransportId) {
-    return doesEnumInclude(enums.winstonTransportIds, winstonTransportId);
+function transportLogLevelType(transport) {
+    if (!isWinstonTransport(transport)) return defaults.logLevelType;
+    const transportEntry =  _.find(transportMap, { transport });
+    return (transportEntry ? transportEntry.type : null) || defaults.logLevelType;
 }
 
 /**
- * Convert a log level ID to a Winston log level name
+ * Convert a Winston log level ID to a name
  * @param levelId {number}
  * @returns {string}
  */
-function logLevelIdToWinstonLogLevelName(levelId) {
-    if (!isValidLogLevelId(levelId)) return defaults.winstonLogLevelName;
+function winstonLogLevelIdName(levelId) {
+    if (!isWinstonLogLevelId(levelId)) return defaults.winstonLogLevelName;
     const logLevelEntry =  _.find(logLevelMap, { winstonLevel: levelId });
     return (logLevelEntry ? logLevelEntry.winstonName : null) || defaults.winstonLogLevelName;
 }
 
 /**
- * Convert a log level to a Winston log level name
+ * Convert a Winston log level to a name
  * @param logLevel {number|string}
  * @returns {string}
  */
-function logLevelToWinstonLogLevelName(logLevel) {
-    if (!isValidLogLevel(logLevel)) return defaults.winstonLogLevelName;
+function winstonLogLevelName(logLevel) {
+    if (!isWinstonLogLevel(logLevel)) return defaults.winstonLogLevelName;
     if (_.isString(logLevel)) return logLevel;
-    return logLevelIdToWinstonLogLevelName(logLevel);
+    return winstonLogLevelIdName(logLevel);
 }
 
 /**
@@ -73,10 +83,12 @@ function monkeyPatchConsole(methodNames = [ defaults.consoleDirExtensionMethodNa
 
 module.exports = {
     isMorganFormat,
-    isValidLogLevel,
-    isValidLogLevelId,
-    isWinstonTransportId,
-    logLevelIdToWinstonLogLevelName,
-    logLevelToWinstonLogLevelName,
+    isWinstonFormat,
+    isWinstonLogLevel,
+    isWinstonLogLevelId,
+    isWinstonTransport,
     monkeyPatchConsole,
+    transportLogLevelType,
+    winstonLogLevelIdName,
+    winstonLogLevelName,
 };

package/lib/mappings/color_mappings.js

@@ -3,15 +3,7 @@
 const _ = require('lodash');
 const enums = require('../enums');
 
-const { ansiColors: ac, databaseOperations: dbo, chalkFormats: cf, hexColors: hc, httpMethods: http, winstonLogLevelNames: wlln } = enums;
-
-const databaseOperationColors = [
-    { match: dbo.DELETE, style: { format: cf.HEX, fore: hc.DB_DELETE, back: null } },
-    { match: dbo.INSERT, style: { format: cf.HEX, fore: hc.DB_INSERT, back: null } },
-    { match: dbo.SELECT, style: { format: cf.HEX, fore: hc.DB_SELECT, back: null } },
-    { match: dbo.TRUNCATE, style: { format: cf.HEX, fore: hc.DB_TRUNCATE, back: null } },
-    { match: dbo.UPDATE, style: { format: cf.HEX, fore: hc.DB_UPDATE, back: null } },
-];
+const { ansiColors: ac, chalkFormats: cf, hexColors: hc, httpMethods: http, winstonLogLevelNames: wlln } = enums;
 
 const httpStatusColors = [
     { range: _.range(500, 600), style: { format: cf.ANSI, fore: ac.HTTP_SERVER_ERROR, back: null } },
@@ -44,15 +36,21 @@ const logLevelColors = [
 ];
 
 const packageColors = [
+    { match: 'AngularJS', style: { format: cf.HEX, fore: hc.PACKAGE_ANGULARJS, back: null } },
+    { match: 'Axios', style: { format: cf.HEX, fore: hc.PACKAGE_AXIOS, back: null } },
     { match: 'express', style: { format: cf.HEX, fore: hc.PACKAGE_EXPRESS, back: null } },
+    { match: 'Handlebars', style: { format: cf.HEX, fore: hc.PACKAGE_HANDLEBARS, back: null } },
+    { match: 'Jimp', style: { format: cf.HEX, fore: hc.PACKAGE_JIMP, back: null } },
     { match: 'MySQL', style: { format: cf.HEX, fore: hc.PACKAGE_MYSQL, back: null } },
     { match: 'Node.js', style: { format: cf.HEX, fore: hc.PACKAGE_NODE_JS, back: null } },
+    { match: 'passport', style: { format: cf.HEX, fore: hc.PACKAGE_PASSPORT, back: null } },
     { match: 'PostgreSQL', style: { format: cf.HEX, fore: hc.PACKAGE_POSTGRESQL, back: null } },
+    { match: 'Redis', style: { format: cf.HEX, fore: hc.PACKAGE_REDIS, back: null } },
     { match: 'sequelize', style: { format: cf.HEX, fore: hc.PACKAGE_SEQUELIZE, back: null } },
+    { match: 'Zeddemore', style: { format: cf.HEX, fore: hc.PACKAGE_ZEDDEMORE, back: null } },
 ];
 
 module.exports = {
-    databaseOperationColors,
     httpStatusColors,
     httpVerbColors,
     logLevelColors,

package/lib/mappings/log_mappings.js

@@ -2,19 +2,26 @@
 
 const enums = require('../enums');
 
-const { apiLogLevels: all, apiLogLevelCaptions: allc, winstonLogLevelNames: wlln, winstonLogLevels: wll } = enums;
+const { logLevelTypes: llt, winstonLogLevelNames: wlln, winstonLogLevels: wll, winstonTransports: wt,
+    zeddemoreLogLevelCaptions: zllc } = enums;
 
 const logLevelMap = [
-    { apiLevel: all.DEFAULT, winstonLevel: null, winstonName: null, caption: allc.DEFAULT },
-    { apiLevel: all.ERROR, winstonLevel: wll.ERROR, winstonName: wlln.ERROR, caption: allc.ERROR },
-    { apiLevel: all.WARNING, winstonLevel: wll.WARNING, winstonName: wlln.WARNING, caption: allc.WARNING },
-    { apiLevel: all.INFO, winstonLevel: wll.INFO, winstonName: wlln.INFO, caption: allc.INFO },
-    { apiLevel: all.HTTP, winstonLevel: wll.HTTP, winstonName: wlln.HTTP, caption: allc.HTTP },
-    { apiLevel: all.VERBOSE, winstonLevel: wll.VERBOSE, winstonName: wlln.VERBOSE, caption: allc.VERBOSE },
-    { apiLevel: all.DEBUG, winstonLevel: wll.DEBUG, winstonName: wlln.DEBUG, caption: allc.DEBUG },
-    { apiLevel: all.SILLY, winstonLevel: wll.SILLY, winstonName: wlln.SILLY, caption: allc.SILLY },
+    { winstonLevel: null, winstonName: null, caption: zllc.DEFAULT },
+    { winstonLevel: wll.ERROR, winstonName: wlln.ERROR, caption: zllc.ERROR },
+    { winstonLevel: wll.WARNING, winstonName: wlln.WARNING, caption: zllc.WARNING },
+    { winstonLevel: wll.INFO, winstonName: wlln.INFO, caption: zllc.INFO },
+    { winstonLevel: wll.HTTP, winstonName: wlln.HTTP, caption: zllc.HTTP },
+    { winstonLevel: wll.VERBOSE, winstonName: wlln.VERBOSE, caption: zllc.VERBOSE },
+    { winstonLevel: wll.DEBUG, winstonName: wlln.DEBUG, caption: zllc.DEBUG },
+    { winstonLevel: wll.SILLY, winstonName: wlln.SILLY, caption: zllc.SILLY },
+];
+
+const transportMap = [
+    { transport: wt.CONSOLE, type: llt.CONSOLE },
+    { transport: wt.EMAIL, type: llt.EMAIL },
 ];
 
 module.exports = {
     logLevelMap,
+    transportMap,
 };

package/lib/zeddemore-logger.js

@@ -1,13 +1,14 @@
-// Copyright (c) 2025 by Beardon Services, Inc.
+// Copyright (c) 2025-2026 by Beardon Services, Inc.
 
-const { logLevelIdToWinstonLogLevelName } = require('./logging');
+const { winstonLogLevelIdName } = require('./logging');
 const ZeddemoreLogger = require('./ZeddemoreLogger');
 
 module.exports = {
     enums: require('./enums'),
     log: ZeddemoreLogger.getLogger,
-    logLevelIdToWinstonLogLevelName,
-    winstonLogLevelIdToName: logLevelIdToWinstonLogLevelName, // deprecated naming
+    logLevelIdToWinstonLogLevelName: winstonLogLevelIdName, // deprecated naming
+    winstonLogLevelIdName,
+    winstonLogLevelIdToName: winstonLogLevelIdName, // deprecated naming
     writeAxiosErrorLog: ZeddemoreLogger.writeAxiosErrorLog,
     writeAxiosLog: ZeddemoreLogger.writeAxiosResponseLog, // deprecated
     writeAxiosResponseLog: ZeddemoreLogger.writeAxiosResponseLog,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zeddemore-logger",
-  "version": "2.1.2",
+  "version": "2.2.2",
   "description": "Node.js Express logger using Morgan and Winston for thread and caller info tracking",
   "repository": {
     "type": "git",
@@ -22,7 +22,6 @@
   "dependencies": {
     "ansi-html": "^0.0.9",
     "chalk": "^4.1.2",
-    "cli-progress": "^3.12.0",
     "lodash": "^4.18.1",
     "luxon": "^3.7.1",
     "morgan": "^1.10.1",