@haventech/supertype - npm Package Compare versions

Comparing version 6.0.0-beta.6 to 6.0.0-beta.7

dist/SupertypeLogger.d.ts

@@ -22,4 +22,5 @@ export declare class SupertypeLogger {
     private log;
-    setContextLog(object: any): void;
-    getContextLog(object: any): any;
+    private setLogsSessionId;
+    private setLogsAmorphicContext;
+    getAmorphicContext(): any;
     startContext(context: any): void;
@@ -31,2 +32,3 @@ setContextProps(context: any): {};
     formatDateTime(date: any): string;
+    private deleteEmptyLogProperties;
     /**
@@ -33,0 +35,0 @@ * this function is designed to be replaced by the consumer of this class.

dist/SupertypeLogger.js

@@ -116,3 +116,7 @@ "use strict";
             }
-            this.setContextLog(logObj.data);
+            if (!logObj.context) {
+                logObj.context = {};
+            }
+            this.setLogsAmorphicContext(logObj.data);
+            this.setLogsSessionId(logObj);
             logObj['level'] = level;
@@ -130,11 +134,17 @@ if (this.isEnabled(levelToStr[logObj['level']], logObj)) {
     };
-    SupertypeLogger.prototype.setContextLog = function (object) {
-        object[this._amorphicContext] = __assign({}, this.context);
+    SupertypeLogger.prototype.setLogsSessionId = function (logObj) {
+        var _a, _b;
+        if ((_b = (_a = logObj.data) === null || _a === void 0 ? void 0 : _a.__amorphicContext) === null || _b === void 0 ? void 0 : _b.session) {
+            logObj.context.sessionId = logObj.data.__amorphicContext.session;
+            delete logObj.data.__amorphicContext.session;
+        }
     };
-    SupertypeLogger.prototype.getContextLog = function (object) {
-        if (!object[this._amorphicContext]) {
-            this.setContextLog(object);
+    SupertypeLogger.prototype.setLogsAmorphicContext = function (object) {
+        if (this.context && Object.keys(this.context).length > 0) {
+            object[this._amorphicContext] = __assign({}, this.context);
         }
-        return object[this._amorphicContext];
     };
+    SupertypeLogger.prototype.getAmorphicContext = function () {
+        return { __amorphicContext: __assign({}, this.context) };
+    };
     SupertypeLogger.prototype.startContext = function (context) {
@@ -191,7 +201,8 @@ this.context = context;
                 childLogger = this._clientLogger.childLogger(rootValues, dataValues);
+                child = childLogger;
             }
             else if (this._clientLogger.child === 'function') {
                 childLogger = this._clientLogger.child(__assign(__assign({}, rootValues), { data: { dataValues: dataValues } }));
+                child = childLogger;
             }
-            child.logger = childLogger;
         }
@@ -211,2 +222,10 @@ return child; // bad practice but should fix
     };
+    SupertypeLogger.prototype.deleteEmptyLogProperties = function (logObject) {
+        var keys = ['context', 'data'];
+        keys.forEach(function (key) {
+            if (logObject[key] && Object.keys(logObject[key]).length < 1) {
+                delete logObject[key];
+            }
+        });
+    };
     /**
@@ -226,2 +245,3 @@ * this function is designed to be replaced by the consumer of this class.
         var functionName = this.sendToLog.name;
+        this.deleteEmptyLogProperties(logObject);
         if (this._clientLogger) {
@@ -312,2 +332,2 @@ var levelForLog = typeof logLevel === 'string' ? strToLevel[logLevel] : logLevel;
 exports.SupertypeLogger = SupertypeLogger;
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"SupertypeLogger.js","sourceRoot":"","sources":["../src/SupertypeLogger.ts"],"names":[],"mappings":"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","sourcesContent":["import { isModuleNamespaceObject } from \"util/types\";\n\nconst levelToStr = { 60: 'fatal', 50: 'error', 40: 'warn', 30: 'info', 20: 'debug', 10: 'trace' };\nconst strToLevel = { 'fatal': 60, 'error': 50, 'warn': 40, 'info': 30, 'debug': 20, 'trace': 10 };\n\nexport class SupertypeLogger {\n    static moduleName: string = SupertypeLogger.name;\n    private _amorphicContext = '__amorphicContext';\n    context: any;\n    granularLevels: any;\n    level: any;\n    private _clientLogger: any;\n\n    // for overriding\n    // sendToLog: Function;\n    // formatDateTime: Function;\n\n    constructor() {\n        this.context = {};\n        this.granularLevels = {};\n        this.level = 'info';\n    }\n\n\n    fatal(...data: any[]): void {\n        this.log(60, ...data);\n    }\n\n    error(...data: any[]): void {\n        this.log(50, ...data);\n    }\n\n    warn(...data: any[]): void {\n        this.log(40, ...data);\n    }\n\n    info(...data: any[]): void {\n        this.log(30, ...data);\n    }\n\n    debug(...data: any[]): void {\n        this.log(20, ...data);\n    }\n\n    trace(...data: any[]): void {\n        this.log(10, ...data);\n    }\n\n    get clientLogger() {\n        return this._clientLogger;\n    }\n\n    /**\n     * assign a custom send to log functionality.\n     * @param logger - logger must fit the format of info/error/debug/warn\n     */\n    setLogger(logger) {\n        if (typeof logger.info !== 'function' ||\n            typeof logger.error !== 'function' ||\n            typeof logger.debug !== 'function' ||\n            typeof logger.warn !== 'function') {\n            throw new Error('Please specify a logger with the info, error, debug, and warn functions');\n        }\n        if (typeof logger.childLogger === 'function') {\n            this._clientLogger = logger.childLogger({error: {isHumanRelated: false}});\n            return;\n        }\n        if (typeof logger.child === 'function') {\n            this._clientLogger = logger.child();\n            return;\n        }\n        this._clientLogger = logger;\n    }\n\n    // Log all arguments assuming the first one is level and the second one might be an object (similar to banyan)\n    private log(level: number, ...args: any[]): void {\n        const properties: any[] = args && Array.isArray(args) ? args.slice() : args;\n\n        if (typeof properties[0] === 'object')  {\n            let logObj = properties[0];\n            if (!logObj.data) {\n                logObj.data = {};\n            }\n            this.setContextLog(logObj.data);\n            logObj['level'] = level;\n            if (this.isEnabled(levelToStr[logObj['level']], logObj)) {\n                this.sendToLog(levelToStr[logObj['level']], logObj, ...properties.slice(1));\n            }\n            return;\n        }\n\n        properties['level'] = level;\n        if (this.isEnabled(levelToStr[properties['level']], properties)) {\n            this.sendToLog(levelToStr[properties['level']], properties);\n        }\n        return;\n    }\n\n    setContextLog(object) {\n        object[this._amorphicContext] = { ...this.context };\n    }\n\n    getContextLog(object) {\n        if (!object[this._amorphicContext]) {\n            this.setContextLog(object);\n        }\n        return object[this._amorphicContext];\n    }\n\n    startContext(context) {\n        this.context = context;\n    }\n\n    // Save the properties in the context and return a new object that has the properties only so they can be cleared\n    setContextProps(context) {\n        const reverse = {};\n\n        for (const prop in context) {\n            reverse[prop] = true;\n            this.context[prop] = context[prop];\n        }\n\n        return reverse;\n    }\n    // Parse log levels such as warn.activity\n    setLevel(level) {\n        var levels = level.split(';');\n\n        for (var ix = 0; ix < levels.length; ++ix) {\n            var levela = levels[ix];\n\n            if (levela.match(/:/)) {\n                if (levels[ix].match(/(.*):(.*)/)) {\n                    this.granularLevels[RegExp.$1] = this.granularLevels[RegExp.$1] || {};\n                    this.granularLevels[RegExp.$1] = RegExp.$2;\n                }\n                else {\n                    this.level = levels[ix];\n                }\n            }\n            else {\n                this.level = levela;\n            }\n        }\n    }\n\n    // Remove any properties recorded by setContext\n    clearContextProps(contextToClear) {\n        for (const prop in contextToClear) {\n            delete this.context[prop];\n        }\n    }\n\n    // Create a new logger and copy over it's context\n    createChildLogger(context, rootValues?, dataValues?): SupertypeLogger {\n        let child: { [key: string]: any } = {};\n\n        for (let prop in this) {\n            child[prop] = this[prop];\n        }\n\n        child.context = context || {};\n\n        for (let proper in this.context) {\n            child.context[proper] = this.context[proper];\n        }\n\n        if (this._clientLogger) {\n            let childLogger;\n            if (this._clientLogger.childLogger === 'function') {\n                childLogger = this._clientLogger.childLogger(rootValues, dataValues);\n            }\n            else if (this._clientLogger.child === 'function') {\n                childLogger = this._clientLogger.child({...rootValues, data: {dataValues}});\n            }\n            child.logger = childLogger;\n        }\n\n        return child as SupertypeLogger; // bad practice but should fix\n    }\n\n    formatDateTime(date): string {\n        return f(2, (date.getMonth() + 1), '/') + f(2, date.getDate(), '/') + f(4, date.getFullYear(), ' ') +\n            f(2, date.getHours(), ':') + f(2, date.getMinutes(), ':') + f(2, date.getSeconds(), ':') +\n            f(3, date.getMilliseconds()) + ' GMT' + (0 - date.getTimezoneOffset() / 60);\n\n        function f(z, d, s?) {\n            while (String(d).length < z) {\n                d = '0' + d;\n            }\n\n            return d + (s || '');\n        }\n    }\n\n    /**\n     * this function is designed to be replaced by the consumer of this class.\n     *\n     * @param logLevel - log level\n     * @param logObject - formatted log object, passed in from consumer\n     * @param rawLogData - unformatted and unprocessed version of \"logObject\" param\n     */\n    protected sendToLog(logLevel, logObject, ...rawLogData) {\n        const functionName = this.sendToLog.name;\n        if (this._clientLogger) {\n            let levelForLog = typeof logLevel === 'string' ? strToLevel[logLevel] : logLevel;\n            switch (levelForLog) {\n                case 10:\n                case 20:\n                    this._clientLogger.debug(logObject, ...rawLogData);\n                    return;\n                case 30:\n                    this._clientLogger.info(logObject, ...rawLogData);\n                    return;\n                case 40:\n                    this._clientLogger.warn(logObject, ...rawLogData);\n                    return;\n                case 60:\n                case 50:\n                    this._clientLogger.error(logObject, ...rawLogData);\n                    return;\n                default: \n                    this._clientLogger.error({\n                        module: SupertypeLogger.moduleName,\n                        function: functionName,\n                        category: 'milestone',\n                        message: 'invalid level used',\n                        data: {\n                            logLevel: logLevel,\n                            logObject: logObject\n                        }\n                    });\n                    return;\n            }\n        }\n        console.log(this.prettyPrint(logLevel, logObject));     // eslint-disable-line no-console\n    }\n\n    prettyPrint(level, json) {\n        let split = this.split(json, {time: 1, msg: 1, level: 1, name: 1});\n\n        return this.formatDateTime(json.time ? new Date(json.time) : new Date()) + ': ' +\n            level.toUpperCase() + ': ' +\n            addColonIfToken(split[1].name, ': ') +\n            addColonIfToken(split[1].msg, ': ') +\n            xy(split[0]);\n\n        function addColonIfToken (token, colonAndSpace) {\n            if (token) {\n                return token + colonAndSpace;\n            }\n\n            return '';\n        }\n\n        function xy(j) {\n            var str = '';\n            var sep = '';\n\n            for (var prop in j) {\n                str += sep + prop + '=' + JSON.stringify(j[prop]);\n                sep = ' ';\n            }\n\n            if (str.length > 0) {\n                return '(' + str + ')';\n            }\n\n            return '';\n        }\n    }\n\n    private split(json, props): any[] {\n        const a = {};\n        const b = {};\n\n        for (const prop in json) {\n            (props[prop] ? b : a)[prop] = json[prop];\n        }\n\n        return [a, b];\n    }\n\n    // Logging is enabled if either the level threshold is met or the granular level matches\n    private isEnabled(level, obj) {\n        level = strToLevel[level];\n\n        if (level >= strToLevel[this.level]) {\n            return true;\n        }\n\n        if (this.granularLevels) {\n            for (let levelr in this.granularLevels) {\n                if (obj[levelr] && obj[levelr] == this.granularLevels[levelr]) {\n                    return true;\n                }\n            }\n        }\n    }\n}"]}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"SupertypeLogger.js","sourceRoot":"","sources":["../src/SupertypeLogger.ts"],"names":[],"mappings":"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","sourcesContent":["const levelToStr = { 60: 'fatal', 50: 'error', 40: 'warn', 30: 'info', 20: 'debug', 10: 'trace' };\nconst strToLevel = { 'fatal': 60, 'error': 50, 'warn': 40, 'info': 30, 'debug': 20, 'trace': 10 };\n\nexport class SupertypeLogger {\n    static moduleName: string = SupertypeLogger.name;\n    private _amorphicContext = '__amorphicContext';\n    context: any;\n    granularLevels: any;\n    level: any;\n    private _clientLogger: any;\n\n    // for overriding\n    // sendToLog: Function;\n    // formatDateTime: Function;\n\n    constructor() {\n        this.context = {};\n        this.granularLevels = {};\n        this.level = 'info';\n    }\n\n\n    fatal(...data: any[]): void {\n        this.log(60, ...data);\n    }\n\n    error(...data: any[]): void {\n        this.log(50, ...data);\n    }\n\n    warn(...data: any[]): void {\n        this.log(40, ...data);\n    }\n\n    info(...data: any[]): void {\n        this.log(30, ...data);\n    }\n\n    debug(...data: any[]): void {\n        this.log(20, ...data);\n    }\n\n    trace(...data: any[]): void {\n        this.log(10, ...data);\n    }\n\n    get clientLogger() {\n        return this._clientLogger;\n    }\n\n    /**\n     * assign a custom send to log functionality.\n     * @param logger - logger must fit the format of info/error/debug/warn\n     */\n    setLogger(logger) {\n        if (typeof logger.info !== 'function' ||\n            typeof logger.error !== 'function' ||\n            typeof logger.debug !== 'function' ||\n            typeof logger.warn !== 'function') {\n            throw new Error('Please specify a logger with the info, error, debug, and warn functions');\n        }\n        if (typeof logger.childLogger === 'function') {\n            this._clientLogger = logger.childLogger({error: {isHumanRelated: false}});\n            return;\n        }\n        if (typeof logger.child === 'function') {\n            this._clientLogger = logger.child();\n            return;\n        }\n        this._clientLogger = logger;\n    }\n\n    // Log all arguments assuming the first one is level and the second one might be an object (similar to banyan)\n    private log(level: number, ...args: any[]): void {\n        const properties: any[] = args && Array.isArray(args) ? args.slice() : args;\n\n        if (typeof properties[0] === 'object')  {\n            let logObj = properties[0];\n            if (!logObj.data) {\n                logObj.data = {};\n            }\n            if (!logObj.context) {\n                logObj.context = {};\n            }\n\n            this.setLogsAmorphicContext(logObj.data);\n            this.setLogsSessionId(logObj);\n\n            logObj['level'] = level;\n            if (this.isEnabled(levelToStr[logObj['level']], logObj)) {\n                this.sendToLog(levelToStr[logObj['level']], logObj, ...properties.slice(1));\n            }\n            return;\n        }\n\n        properties['level'] = level;\n        if (this.isEnabled(levelToStr[properties['level']], properties)) {\n            this.sendToLog(levelToStr[properties['level']], properties);\n        }\n        return;\n    }\n\n    private setLogsSessionId(logObj: any) {\n        if (logObj.data?.__amorphicContext?.session) {\n            logObj.context.sessionId = logObj.data.__amorphicContext.session;\n            delete logObj.data.__amorphicContext.session;\n        }\n    }\n\n    private setLogsAmorphicContext(object) {\n        if (this.context && Object.keys(this.context).length > 0) {\n            object[this._amorphicContext] = { ...this.context };\n        }\n    }\n\n    getAmorphicContext(): any {\n        return { __amorphicContext: { ...this.context } };\n    }\n\n    startContext(context) {\n        this.context = context;\n    }\n\n    // Save the properties in the context and return a new object that has the properties only so they can be cleared\n    setContextProps(context) {\n        const reverse = {};\n\n        for (const prop in context) {\n            reverse[prop] = true;\n            this.context[prop] = context[prop];\n        }\n\n        return reverse;\n    }\n    // Parse log levels such as warn.activity\n    setLevel(level) {\n        var levels = level.split(';');\n\n        for (var ix = 0; ix < levels.length; ++ix) {\n            var levela = levels[ix];\n\n            if (levela.match(/:/)) {\n                if (levels[ix].match(/(.*):(.*)/)) {\n                    this.granularLevels[RegExp.$1] = this.granularLevels[RegExp.$1] || {};\n                    this.granularLevels[RegExp.$1] = RegExp.$2;\n                }\n                else {\n                    this.level = levels[ix];\n                }\n            }\n            else {\n                this.level = levela;\n            }\n        }\n    }\n\n    // Remove any properties recorded by setContext\n    clearContextProps(contextToClear) {\n        for (const prop in contextToClear) {\n            delete this.context[prop];\n        }\n    }\n\n    // Create a new logger and copy over it's context\n    createChildLogger(context, rootValues?, dataValues?): SupertypeLogger {\n        let child: { [key: string]: any } = {};\n\n        for (let prop in this) {\n            child[prop] = this[prop];\n        }\n\n        child.context = context || {};\n\n        for (let proper in this.context) {\n            child.context[proper] = this.context[proper];\n        }\n        if (this._clientLogger) {\n            let childLogger;\n            if (this._clientLogger.childLogger === 'function') {\n                childLogger = this._clientLogger.childLogger(rootValues, dataValues);\n                child = childLogger;\n            }\n            else if (this._clientLogger.child === 'function') {\n                childLogger = this._clientLogger.child({...rootValues, data: {dataValues}});\n                child = childLogger;\n            }\n        }\n\n        return child as SupertypeLogger; // bad practice but should fix\n    }\n\n    formatDateTime(date): string {\n        return f(2, (date.getMonth() + 1), '/') + f(2, date.getDate(), '/') + f(4, date.getFullYear(), ' ') +\n            f(2, date.getHours(), ':') + f(2, date.getMinutes(), ':') + f(2, date.getSeconds(), ':') +\n            f(3, date.getMilliseconds()) + ' GMT' + (0 - date.getTimezoneOffset() / 60);\n\n        function f(z, d, s?) {\n            while (String(d).length < z) {\n                d = '0' + d;\n            }\n\n            return d + (s || '');\n        }\n    }\n\n    private deleteEmptyLogProperties(logObject: any) {\n        const keys = ['context', 'data'];\n        keys.forEach((key) => {\n            if (logObject[key] && Object.keys(logObject[key]).length < 1) {\n                delete logObject[key];\n            }\n        })\n    }\n\n    /**\n     * this function is designed to be replaced by the consumer of this class.\n     *\n     * @param logLevel - log level\n     * @param logObject - formatted log object, passed in from consumer\n     * @param rawLogData - unformatted and unprocessed version of \"logObject\" param\n     */\n    protected sendToLog(logLevel, logObject, ...rawLogData) {\n        const functionName = this.sendToLog.name;\n        this.deleteEmptyLogProperties(logObject);\n        if (this._clientLogger) {\n            let levelForLog = typeof logLevel === 'string' ? strToLevel[logLevel] : logLevel;\n            switch (levelForLog) {\n                case 10:\n                case 20:\n                    this._clientLogger.debug(logObject, ...rawLogData);\n                    return;\n                case 30:\n                    this._clientLogger.info(logObject, ...rawLogData);\n                    return;\n                case 40:\n                    this._clientLogger.warn(logObject, ...rawLogData);\n                    return;\n                case 60:\n                case 50:\n                    this._clientLogger.error(logObject, ...rawLogData);\n                    return;\n                default: \n                    this._clientLogger.error({\n                        module: SupertypeLogger.moduleName,\n                        function: functionName,\n                        category: 'milestone',\n                        message: 'invalid level used',\n                        data: {\n                            logLevel: logLevel,\n                            logObject: logObject\n                        }\n                    });\n                    return;\n            }\n        }\n        console.log(this.prettyPrint(logLevel, logObject));     // eslint-disable-line no-console\n    }\n\n    prettyPrint(level, json) {\n        let split = this.split(json, {time: 1, msg: 1, level: 1, name: 1});\n\n        return this.formatDateTime(json.time ? new Date(json.time) : new Date()) + ': ' +\n            level.toUpperCase() + ': ' +\n            addColonIfToken(split[1].name, ': ') +\n            addColonIfToken(split[1].msg, ': ') +\n            xy(split[0]);\n\n        function addColonIfToken (token, colonAndSpace) {\n            if (token) {\n                return token + colonAndSpace;\n            }\n\n            return '';\n        }\n\n        function xy(j) {\n            var str = '';\n            var sep = '';\n\n            for (var prop in j) {\n                str += sep + prop + '=' + JSON.stringify(j[prop]);\n                sep = ' ';\n            }\n\n            if (str.length > 0) {\n                return '(' + str + ')';\n            }\n\n            return '';\n        }\n    }\n\n    private split(json, props): any[] {\n        const a = {};\n        const b = {};\n\n        for (const prop in json) {\n            (props[prop] ? b : a)[prop] = json[prop];\n        }\n\n        return [a, b];\n    }\n\n    // Logging is enabled if either the level threshold is met or the granular level matches\n    private isEnabled(level, obj) {\n        level = strToLevel[level];\n\n        if (level >= strToLevel[this.level]) {\n            return true;\n        }\n\n        if (this.granularLevels) {\n            for (let levelr in this.granularLevels) {\n                if (obj[levelr] && obj[levelr] == this.granularLevels[levelr]) {\n                    return true;\n                }\n            }\n        }\n    }\n}"]}

package.json

 {
     "name": "@haventech/supertype",
     "description": "A type system for classical inheritence, mix-ins and composition.",
-    "version": "6.0.0-beta.6",
+    "version": "6.0.0-beta.7",
     "main": "dist/index.js",
@@ -6,0 +6,0 @@ "types": "dist/index.d.ts",

src/SupertypeLogger.ts

@@ -1,3 +0,1 @@
-import { isModuleNamespaceObject } from "util/types";
-
 const levelToStr = { 60: 'fatal', 50: 'error', 40: 'warn', 30: 'info', 20: 'debug', 10: 'trace' };
@@ -84,3 +82,9 @@ const strToLevel = { 'fatal': 60, 'error': 50, 'warn': 40, 'info': 30, 'debug': 20, 'trace': 10 };
             }
-            this.setContextLog(logObj.data);
+            if (!logObj.context) {
+                logObj.context = {};
+            }
+
+            this.setLogsAmorphicContext(logObj.data);
+            this.setLogsSessionId(logObj);
+
             logObj['level'] = level;
@@ -100,13 +104,19 @@ if (this.isEnabled(levelToStr[logObj['level']], logObj)) {
 
-    setContextLog(object) {
-        object[this._amorphicContext] = { ...this.context };
+    private setLogsSessionId(logObj: any) {
+        if (logObj.data?.__amorphicContext?.session) {
+            logObj.context.sessionId = logObj.data.__amorphicContext.session;
+            delete logObj.data.__amorphicContext.session;
+        }
     }
 
-    getContextLog(object) {
-        if (!object[this._amorphicContext]) {
-            this.setContextLog(object);
+    private setLogsAmorphicContext(object) {
+        if (this.context && Object.keys(this.context).length > 0) {
+            object[this._amorphicContext] = { ...this.context };
         }
-        return object[this._amorphicContext];
     }
 
+    getAmorphicContext(): any {
+        return { __amorphicContext: { ...this.context } };
+    }
+
     startContext(context) {
@@ -169,3 +179,2 @@ this.context = context;
         }
-
         if (this._clientLogger) {
@@ -175,7 +184,8 @@ let childLogger;
                 childLogger = this._clientLogger.childLogger(rootValues, dataValues);
+                child = childLogger;
             }
             else if (this._clientLogger.child === 'function') {
                 childLogger = this._clientLogger.child({...rootValues, data: {dataValues}});
+                child = childLogger;
             }
-            child.logger = childLogger;
         }
@@ -200,2 +210,11 @@
 
+    private deleteEmptyLogProperties(logObject: any) {
+        const keys = ['context', 'data'];
+        keys.forEach((key) => {
+            if (logObject[key] && Object.keys(logObject[key]).length < 1) {
+                delete logObject[key];
+            }
+        })
+    }
+
     /**
@@ -210,2 +229,3 @@ * this function is designed to be replaced by the consumer of this class.
         const functionName = this.sendToLog.name;
+        this.deleteEmptyLogProperties(logObject);
         if (this._clientLogger) {
@@ -212,0 +232,0 @@ let levelForLog = typeof logLevel === 'string' ? strToLevel[logLevel] : logLevel;

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

387436

increased by0.95%

Lines of code

4706

increased by0.86%

No dependency changes