diff --git a/package.json b/package.json index 5067304..2bc1642 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@ztimson/js-utilities", - "version": "0.3.5", + "version": "0.3.6", "description": "JavaScript Utility library", "author": "Zak Timson", "license": "MIT", diff --git a/src/index.ts b/src/index.ts index f131c41..c162c4f 100644 --- a/src/index.ts +++ b/src/index.ts @@ -4,7 +4,6 @@ export * from './errors'; export * from './logger'; export * from './misc'; export * from './objects'; -// export * from './redis'; export * from './string'; export * from './time'; export * from './xhr'; diff --git a/src/logger.ts b/src/logger.ts index 405949f..a2658a1 100644 --- a/src/logger.ts +++ b/src/logger.ts @@ -43,9 +43,11 @@ export const CliBackground = { export enum LOG_LEVEL { VERBOSE, - INFO, - WARN, - ERROR + DEBUG = 0, + LOG = 1, + INFO = 2, + WARN = 3, + ERROR = 4, } export type LoggerEvents = TypedEvents & { @@ -70,7 +72,6 @@ export class Logger extends TypedEmitter { return !end ? padding + t : t + padding; } - private format(...text: string[]): string { const now = new Date(); const timestamp = `${now.getFullYear()}-${now.getMonth() + 1}-${now.getDate()} ${this.pad(now.getHours().toString(), 2, '0')}:${this.pad(now.getMinutes().toString(), 2, '0')}:${this.pad(now.getSeconds().toString(), 2, '0')}.${this.pad(now.getMilliseconds().toString(), 3, '0', true)}`; @@ -78,42 +79,37 @@ export class Logger extends TypedEmitter { } debug(...args: string[]) { - if(Logger.LOG_LEVEL >= LOG_LEVEL.VERBOSE) { - const str = this.format(...args); - Logger.emit(LOG_LEVEL.VERBOSE, str); - console.debug(CliForeground.LIGHT_GREY + str + CliEffects.CLEAR); - } - } - - error(...args: string[]) { - if(Logger.LOG_LEVEL >= LOG_LEVEL.ERROR) { - const str = this.format(...args); - Logger.emit(LOG_LEVEL.ERROR, str); - console.error(CliForeground.RED + str + CliEffects.CLEAR); - } - } - - info(...args: string[]) { - if(Logger.LOG_LEVEL >= LOG_LEVEL.INFO) { - const str = this.format(...args); - Logger.emit(LOG_LEVEL.INFO, str); - console.info(CliForeground.BLUE + str + CliEffects.CLEAR); - } + if(Logger.LOG_LEVEL > LOG_LEVEL.VERBOSE) return; + const str = this.format(...args); + Logger.emit(LOG_LEVEL.VERBOSE, str); + console.debug(CliForeground.LIGHT_GREY + str + CliEffects.CLEAR); } log(...args: string[]) { - if(Logger.LOG_LEVEL >= LOG_LEVEL.INFO) { - const str = this.format(...args); - Logger.emit(LOG_LEVEL.INFO, str); - console.log(CliEffects.CLEAR + str); - } + if(Logger.LOG_LEVEL > LOG_LEVEL.INFO) return; + const str = this.format(...args); + Logger.emit(LOG_LEVEL.INFO, str); + console.log(CliEffects.CLEAR + str); + } + + info(...args: string[]) { + if(Logger.LOG_LEVEL > LOG_LEVEL.INFO) return; + const str = this.format(...args); + Logger.emit(LOG_LEVEL.INFO, str); + console.info(CliForeground.BLUE + str + CliEffects.CLEAR); } warn(...args: string[]) { - if(Logger.LOG_LEVEL >= LOG_LEVEL.WARN) { - const str = this.format(...args); - Logger.emit(LOG_LEVEL.WARN, str); - console.warn(CliForeground.YELLOW + str + CliEffects.CLEAR); - } + if(Logger.LOG_LEVEL > LOG_LEVEL.WARN) return; + const str = this.format(...args); + Logger.emit(LOG_LEVEL.WARN, str); + console.warn(CliForeground.YELLOW + str + CliEffects.CLEAR); + } + + error(...args: string[]) { + if(Logger.LOG_LEVEL > LOG_LEVEL.ERROR) return; + const str = this.format(...args); + Logger.emit(LOG_LEVEL.ERROR, str); + console.error(CliForeground.RED + str + CliEffects.CLEAR); } }