From 140c9c4e7df0a48f21ff5e2d4541d564e7a4d2b9 Mon Sep 17 00:00:00 2001 From: Giedrius Grabauskas Date: Tue, 28 Nov 2017 18:40:31 +0200 Subject: [PATCH 1/2] Fixed end color symbol emit in browser. --- src/handlers/console-message-handler.ts | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/handlers/console-message-handler.ts b/src/handlers/console-message-handler.ts index a012349..bf420e8 100644 --- a/src/handlers/console-message-handler.ts +++ b/src/handlers/console-message-handler.ts @@ -21,7 +21,7 @@ export class ConsoleMessageHandler extends MessageHandlerBase { }; } - private resolveLogLevelPrefix(level: LogLevel, colorStart: string): string | undefined { + private resolveLogLevelPrefix(level: LogLevel, colorString: string): string | undefined { if (level === LogLevel.Trace) { return undefined; } @@ -30,9 +30,10 @@ export class ConsoleMessageHandler extends MessageHandlerBase { if (prefix == null) { return undefined; } - const colorPrefix = this.configuration.UseColors ? colorStart : ""; + const colorStart = this.configuration.UseColors ? colorString : ""; + const colorEnd = this.configuration.UseColors ? ANSIColorCodes.Reset : ""; - return `${colorPrefix}${prefix}${ANSIColorCodes.Reset}`; + return `${colorStart}${prefix}${colorEnd}`; } public HandleMessage(level: LogLevel, timestamp: number, messages: any[]): void { From d212c68656d3bc230db6b6df31b5fe31336e576d Mon Sep 17 00:00:00 2001 From: Giedrius Grabauskas Date: Tue, 28 Nov 2017 18:41:41 +0200 Subject: [PATCH 2/2] Rebuilded code. --- @types/handlers/console-message-handler.d.ts | 2 +- dist/simplr-logger.js | 7 ++++--- dist/simplr-logger.min.js | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/@types/handlers/console-message-handler.d.ts b/@types/handlers/console-message-handler.d.ts index a92a976..18993cd 100644 --- a/@types/handlers/console-message-handler.d.ts +++ b/@types/handlers/console-message-handler.d.ts @@ -3,7 +3,7 @@ export declare class ConsoleMessageHandler extends MessageHandlerBase { constructor(configuration?: Partial); private configuration; private readonly defaultConfiguration; - private resolveLogLevelPrefix(level, colorStart); + private resolveLogLevelPrefix(level, colorString); HandleMessage(level: LogLevel, timestamp: number, messages: any[]): void; } export declare namespace ConsoleMessageHandler { diff --git a/dist/simplr-logger.js b/dist/simplr-logger.js index 565644a..19bb0d5 100644 --- a/dist/simplr-logger.js +++ b/dist/simplr-logger.js @@ -524,7 +524,7 @@ var ConsoleMessageHandler = /** @class */ (function (_super) { enumerable: true, configurable: true }); - ConsoleMessageHandler.prototype.resolveLogLevelPrefix = function (level, colorStart) { + ConsoleMessageHandler.prototype.resolveLogLevelPrefix = function (level, colorString) { if (level === simplr_logger_1.LogLevel.Trace) { return undefined; } @@ -532,8 +532,9 @@ var ConsoleMessageHandler = /** @class */ (function (_super) { if (prefix == null) { return undefined; } - var colorPrefix = this.configuration.UseColors ? colorStart : ""; - return "" + colorPrefix + prefix + ansi_color_codes_1.ANSIColorCodes.Reset; + var colorStart = this.configuration.UseColors ? colorString : ""; + var colorEnd = this.configuration.UseColors ? ansi_color_codes_1.ANSIColorCodes.Reset : ""; + return "" + colorStart + prefix + colorEnd; }; ConsoleMessageHandler.prototype.HandleMessage = function (level, timestamp, messages) { var method; diff --git a/dist/simplr-logger.min.js b/dist/simplr-logger.min.js index 36b84f4..630787f 100644 --- a/dist/simplr-logger.min.js +++ b/dist/simplr-logger.min.js @@ -1 +1 @@ -!function(e,r){if("object"==typeof exports&&"object"==typeof module)module.exports=r();else if("function"==typeof define&&define.amd)define([],r);else{var n=r();for(var o in n)("object"==typeof exports?exports:e)[o]=n[o]}}(this,function(){return function(e){function r(o){if(n[o])return n[o].exports;var t=n[o]={i:o,l:!1,exports:{}};return e[o].call(t.exports,t,t.exports,r),t.l=!0,t.exports}var n={};return r.m=e,r.c=n,r.d=function(e,n,o){r.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:o})},r.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return r.d(n,"a",n),n},r.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},r.p="",r(r.s=0)}([function(e,r,n){Object.defineProperty(r,"__esModule",{value:!0});var o=n(2);r.LoggerHelpers=o.Helpers;var t=n(4);r.LogLevel=t.LogLevel;var i=n(5);r.MessageHandlerBase=i.MessageHandlerBase;var l=n(6);r.PrefixType=l.PrefixType;var a=n(7);r.ConsoleMessageHandler=a.ConsoleMessageHandler;var u=n(9);r.LoggerConfigurationBuilder=u.LoggerConfigurationBuilder;var s=n(10);r.LoggerRuntimeConfigurationBuilder=s.LoggerRuntimeConfigurationBuilder;var g=n(11);r.LoggerBuilder=g.LoggerBuilder},function(e,r){e.exports=require("tslib")},function(e,r,n){(function(e){Object.defineProperty(r,"__esModule",{value:!0});var o=n(0);!function(r){function n(e){switch(e){case o.LogLevel.Critical:return"crit";case o.LogLevel.Error:return"erro";case o.LogLevel.Warning:return"warn";case o.LogLevel.Information:return"info";case o.LogLevel.Debug:return"dbug";case o.LogLevel.Trace:return"trce";case o.LogLevel.None:default:return"none"}}function t(e){return o.LogLevel[e].toString()}function i(e){for(var r=o.LogLevel.None,n=0,t=e;n=n},r.ResolveLogLevelPrefix=function(e,r){switch(e){case o.PrefixType.None:return;case o.PrefixType.Short:return n(r);case o.PrefixType.Full:return t(r)}},r.ResolveTimePrefix=function(e,r){switch(e){case o.PrefixType.None:return;case o.PrefixType.Short:return new Date(r).toLocaleTimeString();case o.PrefixType.Full:return new Date(r).toLocaleString()}}}(r.Helpers||(r.Helpers={}))}).call(r,n(3))},function(e,r){function n(){throw new Error("setTimeout has not been defined")}function o(){throw new Error("clearTimeout has not been defined")}function t(e){if(s===setTimeout)return setTimeout(e,0);if((s===n||!s)&&setTimeout)return s=setTimeout,setTimeout(e,0);try{return s(e,0)}catch(r){try{return s.call(null,e,0)}catch(r){return s.call(this,e,0)}}}function i(){v&&f&&(v=!1,f.length?L=f.concat(L):d=-1,L.length&&l())}function l(){if(!v){var e=t(i);v=!0;for(var r=L.length;r;){for(f=L,L=[];++d1)for(var n=1;n0){var g=a.join(" ");o.apply(void 0,[g+":"].concat(n))}else o.apply(void 0,n)},r}(i.MessageHandlerBase);r.ConsoleMessageHandler=l},function(e,r){Object.defineProperty(r,"__esModule",{value:!0});!function(e){e.Reset="",e.Bright="",e.Dim="",e.Underscore="",e.Blink="",e.Reverse="",e.Hidden="",e.FgBlack="",e.FgRed="",e.FgGreen="",e.FgYellow="",e.FgBlue="",e.FgMagenta="",e.FgCyan="",e.FgWhite="",e.BgBlack="",e.BgRed="",e.BgGreen="",e.BgYellow="",e.BgBlue="",e.BgMagenta="",e.BgCyan="",e.BgWhite=""}(r.ANSIColorCodes||(r.ANSIColorCodes={}))},function(e,r,n){Object.defineProperty(r,"__esModule",{value:!0});var o=n(1),t=n(0),i=function(){function e(e){this.configuration=o.__assign({},this.defaultConfiguration(),e)}return e.prototype.defaultConfiguration=function(){return{WriteMessageHandlers:[],DefaultLogLevel:{LogLevel:t.LogLevel.Warning,LogLevelIsBitMask:!1},Prefix:void 0}},e.prototype.Override=function(e){return this.configuration=o.__assign({},this.configuration,e),this},e.prototype.AddWriteMessageHandler=function(e,r){return this.AddWriteMessageHandlers([e],r),this},e.prototype.AddWriteMessageHandlers=function(e,r){if(null!=r){var n=t.LoggerHelpers.ResolveLogLevel(r),o=n.isBitMask,i=n.value;e=e.map(function(e){return null==e.LogLevel&&(e.LogLevel=i,e.LogLevelIsBitMask=o),e})}return this.configuration.WriteMessageHandlers=this.configuration.WriteMessageHandlers.concat(e),this},e.prototype.SetDefaultLogLevel=function(e){var r=t.LoggerHelpers.ResolveLogLevel(e),n=r.isBitMask,o=r.value;return this.configuration.DefaultLogLevel={LogLevel:o,LogLevelIsBitMask:n},this},e.prototype.SetPrefix=function(e){return this.configuration.Prefix=e,this},e.prototype.Build=function(){var e,r=this;return 0===this.configuration.WriteMessageHandlers.length?(this.AddWriteMessageHandler(o.__assign({Handler:new t.ConsoleMessageHandler},this.configuration.DefaultLogLevel)),e=this.configuration.WriteMessageHandlers):e=this.configuration.WriteMessageHandlers.map(function(e){return null==e.LogLevel?e=o.__assign({Handler:e.Handler},r.configuration.DefaultLogLevel):null==e.LogLevelIsBitMask&&(e.LogLevelIsBitMask=!1),e}),{WriteMessageHandlers:e,DefaultLogLevel:this.configuration.DefaultLogLevel,Prefix:this.configuration.Prefix}},e}();r.LoggerConfigurationBuilder=i},function(e,r,n){Object.defineProperty(r,"__esModule",{value:!0});var o=n(0),t=function(){function e(e){void 0===e&&(e=(new o.LoggerConfigurationBuilder).Build()),this.Configuration=e}return e.prototype.UpdateConfiguration=function(e,r){return void 0===r&&(r=!0),this.Configuration=e(new o.LoggerConfigurationBuilder(r?this.Configuration:void 0)),this},e}();r.LoggerRuntimeConfigurationBuilder=t},function(e,r,n){Object.defineProperty(r,"__esModule",{value:!0});var o=n(1),t=n(0),i=function(e){function r(){var r=null!==e&&e.apply(this,arguments)||this;return r.Log=function(e){for(var n=[],o=1;o=n},r.ResolveLogLevelPrefix=function(e,r){switch(e){case o.PrefixType.None:return;case o.PrefixType.Short:return n(r);case o.PrefixType.Full:return t(r)}},r.ResolveTimePrefix=function(e,r){switch(e){case o.PrefixType.None:return;case o.PrefixType.Short:return new Date(r).toLocaleTimeString();case o.PrefixType.Full:return new Date(r).toLocaleString()}}}(r.Helpers||(r.Helpers={}))}).call(r,n(3))},function(e,r){function n(){throw new Error("setTimeout has not been defined")}function o(){throw new Error("clearTimeout has not been defined")}function t(e){if(s===setTimeout)return setTimeout(e,0);if((s===n||!s)&&setTimeout)return s=setTimeout,setTimeout(e,0);try{return s(e,0)}catch(r){try{return s.call(null,e,0)}catch(r){return s.call(this,e,0)}}}function i(){v&&f&&(v=!1,f.length?L=f.concat(L):d=-1,L.length&&l())}function l(){if(!v){var e=t(i);v=!0;for(var r=L.length;r;){for(f=L,L=[];++d1)for(var n=1;n0){var g=a.join(" ");o.apply(void 0,[g+":"].concat(n))}else o.apply(void 0,n)},r}(i.MessageHandlerBase);r.ConsoleMessageHandler=l},function(e,r){Object.defineProperty(r,"__esModule",{value:!0});!function(e){e.Reset="",e.Bright="",e.Dim="",e.Underscore="",e.Blink="",e.Reverse="",e.Hidden="",e.FgBlack="",e.FgRed="",e.FgGreen="",e.FgYellow="",e.FgBlue="",e.FgMagenta="",e.FgCyan="",e.FgWhite="",e.BgBlack="",e.BgRed="",e.BgGreen="",e.BgYellow="",e.BgBlue="",e.BgMagenta="",e.BgCyan="",e.BgWhite=""}(r.ANSIColorCodes||(r.ANSIColorCodes={}))},function(e,r,n){Object.defineProperty(r,"__esModule",{value:!0});var o=n(1),t=n(0),i=function(){function e(e){this.configuration=o.__assign({},this.defaultConfiguration(),e)}return e.prototype.defaultConfiguration=function(){return{WriteMessageHandlers:[],DefaultLogLevel:{LogLevel:t.LogLevel.Warning,LogLevelIsBitMask:!1},Prefix:void 0}},e.prototype.Override=function(e){return this.configuration=o.__assign({},this.configuration,e),this},e.prototype.AddWriteMessageHandler=function(e,r){return this.AddWriteMessageHandlers([e],r),this},e.prototype.AddWriteMessageHandlers=function(e,r){if(null!=r){var n=t.LoggerHelpers.ResolveLogLevel(r),o=n.isBitMask,i=n.value;e=e.map(function(e){return null==e.LogLevel&&(e.LogLevel=i,e.LogLevelIsBitMask=o),e})}return this.configuration.WriteMessageHandlers=this.configuration.WriteMessageHandlers.concat(e),this},e.prototype.SetDefaultLogLevel=function(e){var r=t.LoggerHelpers.ResolveLogLevel(e),n=r.isBitMask,o=r.value;return this.configuration.DefaultLogLevel={LogLevel:o,LogLevelIsBitMask:n},this},e.prototype.SetPrefix=function(e){return this.configuration.Prefix=e,this},e.prototype.Build=function(){var e,r=this;return 0===this.configuration.WriteMessageHandlers.length?(this.AddWriteMessageHandler(o.__assign({Handler:new t.ConsoleMessageHandler},this.configuration.DefaultLogLevel)),e=this.configuration.WriteMessageHandlers):e=this.configuration.WriteMessageHandlers.map(function(e){return null==e.LogLevel?e=o.__assign({Handler:e.Handler},r.configuration.DefaultLogLevel):null==e.LogLevelIsBitMask&&(e.LogLevelIsBitMask=!1),e}),{WriteMessageHandlers:e,DefaultLogLevel:this.configuration.DefaultLogLevel,Prefix:this.configuration.Prefix}},e}();r.LoggerConfigurationBuilder=i},function(e,r,n){Object.defineProperty(r,"__esModule",{value:!0});var o=n(0),t=function(){function e(e){void 0===e&&(e=(new o.LoggerConfigurationBuilder).Build()),this.Configuration=e}return e.prototype.UpdateConfiguration=function(e,r){return void 0===r&&(r=!0),this.Configuration=e(new o.LoggerConfigurationBuilder(r?this.Configuration:void 0)),this},e}();r.LoggerRuntimeConfigurationBuilder=t},function(e,r,n){Object.defineProperty(r,"__esModule",{value:!0});var o=n(1),t=n(0),i=function(e){function r(){var r=null!==e&&e.apply(this,arguments)||this;return r.Log=function(e){for(var n=[],o=1;o