Fixed logger

package-lock.json

@@ -1,12 +1,12 @@
 {
 	"name": "@ztimson/js-utilities",
-	"version": "0.0.0",
+	"version": "0.2.1",
 	"lockfileVersion": 3,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "@ztimson/js-utilities",
-			"version": "0.0.0",
+			"version": "0.2.1",
 			"license": "MIT",
 			"devDependencies": {
 				"@types/jest": "^29.5.12",

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@ztimson/js-utilities",
-	"version": "0.2.0",
+	"version": "0.3.6",
 	"description": "JavaScript Utility library",
 	"author": "Zak Timson",
 	"license": "MIT",
@@ -13,10 +13,10 @@
 	"module": "./dist/js-utilities.mjs",
 	"types": "./dist/src/index.d.ts",
 	"scripts": {
-		"build": "vite build",
+		"build": "npx vite build",
 		"test": "npx jest",
 		"test:coverage": "npx jest --coverage",
-		"watch": "vite build --watch"
+		"watch": "npx vite build --watch"
 	},
 	"devDependencies": {
 		"@types/jest": "^29.5.12",

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';

src/logger.ts

@@ -43,9 +43,11 @@ export const CliBackground = {
 
 export enum LOG_LEVEL {
 	VERBOSE,
-	INFO,
+	DEBUG = 0,
-	WARN,
+	LOG = 1,
-	ERROR
+	INFO = 2,
+	WARN = 3,
+	ERROR = 4,
 }
 
 export type LoggerEvents = TypedEvents & {
@@ -56,48 +58,58 @@ export type LoggerEvents = TypedEvents & {
 };
 
 export class Logger extends TypedEmitter<LoggerEvents> {
-	static LOG_LEVEL: LOG_LEVEL = LOG_LEVEL.INFO;
+	static LOG_LEVEL: LOG_LEVEL = LOG_LEVEL.VERBOSE;
 
-	constructor(public readonly namespace: string) {
+	constructor(public readonly namespace?: string) {
 		super();
 	}
 
+	private pad(text: any, length: number, char: string, end = false) {
+		const t = text.toString();
+		const l = length - t.length;
+		if(l <= 0) return t;
+		const padding = Array(~~(l / char.length)).fill(char).join('');
+		return !end ? padding + t : t + padding;
+	}
+
 	private format(...text: string[]): string {
-		return `${new Date().toISOString()} [${this.namespace}] ${text.join(' ')}`;
+		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)}`;
+		return `${timestamp}${this.namespace ? ` [${this.namespace}]` : ''} ${text.join(' ')}`;
 	}
 
 	debug(...args: string[]) {
-		if(LOG_LEVEL.VERBOSE >= Logger.LOG_LEVEL) {
+		if(Logger.LOG_LEVEL > LOG_LEVEL.VERBOSE) return;
-			Logger.emit(LOG_LEVEL.VERBOSE, ...args);
+		const str = this.format(...args);
-			console.debug(CliForeground.LIGHT_GREY + this.format(...args) + CliEffects.CLEAR);
+		Logger.emit(LOG_LEVEL.VERBOSE, str);
-		}
+		console.debug(CliForeground.LIGHT_GREY + str + CliEffects.CLEAR);
-	}
-
-	error(...args: string[]) {
-		if(LOG_LEVEL.ERROR >= Logger.LOG_LEVEL) {
-			Logger.emit(LOG_LEVEL.ERROR, ...args);
-			console.error(CliForeground.RED + this.format(...args) + CliEffects.CLEAR);
-		}
-	}
-
-	info(...args: string[]) {
-		if(LOG_LEVEL.INFO >= Logger.LOG_LEVEL) {
-			Logger.emit(LOG_LEVEL.INFO, ...args);
-			console.info(CliForeground.CYAN + this.format(...args) + CliEffects.CLEAR);
-		}
 	}
 
 	log(...args: string[]) {
-		if(LOG_LEVEL.INFO >= Logger.LOG_LEVEL) {
+		if(Logger.LOG_LEVEL > LOG_LEVEL.INFO) return;
-			Logger.emit(LOG_LEVEL.INFO, ...args);
+		const str = this.format(...args);
-			console.log(CliEffects.CLEAR + 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(LOG_LEVEL.WARN >= Logger.LOG_LEVEL) {
+		if(Logger.LOG_LEVEL > LOG_LEVEL.WARN) return;
-			Logger.emit(LOG_LEVEL.WARN, ...args);
+		const str = this.format(...args);
-			console.warn(CliForeground.YELLOW + this.format(...args) + CliEffects.CLEAR);
+		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);
 	}
 }

src/redis.ts

@@ -1,72 +0,0 @@
-// import {createClient, RedisClientType} from 'redis';
-// import {environment} from '../environments/environment';
-//
-// export type RedisKey = string | string[];
-//
-// export let Redis!: RedisClientType & {
-// 	// get/set shimmed for JSON
-// 	jGet: (redisKey: string) => Promise<any>,
-// 	jSet: (redisKey: string, obj: any, opts?: any) => Promise<void>,
-// 	// hGet/hSet shimmed for objects
-// 	oGet: (redisKey: string) => Promise<any>;
-// 	oSet: (redisKey: string, obj: any) => Promise<void>,
-// 	// Helpers
-// 	findKeys: (filter: RedisKey) => Promise<string[]>,
-// 	forEach: (filter: RedisKey, cb: (key: string) => any) => Promise<void>,
-// };
-//
-// export async function connectRedis(retry = 3) {
-// 	Redis = <any>createClient({
-// 		url: `redis://host:port`
-// 	});
-// 	if(!Redis && retry > 0) {
-// 		await connectRedis(retry - 1);
-// 	} else if(!!Redis) {
-// 		Redis.jGet = async (redisKey: string) => {
-// 			const val = await Redis.get(redisKey);
-// 			return val ? JSON.parse(val) || val : null;
-// 		};
-// 		Redis.jSet = (redisKey: string, obj: any, opts?: any) => {
-// 			return Redis.set(redisKey, JSON.stringify(obj), opts).then(() => {});
-// 		};
-// 		Redis.oGet = async (redisKey: string) => {
-// 			if(!(await Redis.hLen(redisKey))) return null;
-// 			const val = await Redis.hGetAll(redisKey);
-// 			Object.entries(val).forEach(([key, v]) => val[key] = JSON.parse(v));
-// 			return val;
-// 		};
-// 		Redis.oSet = (redisKey: string, obj: any) => {
-// 			const r = Redis.multi();
-// 			Object.entries(obj).forEach(([key, val]) => {
-// 				r.hSet(redisKey, key, JSON.stringify(val));
-// 			});
-// 			return r.exec().then(() => {});
-// 		};
-// 		Redis.findKeys = async (filter: RedisKey): Promise<string[]> => {
-// 			const found: string[] = [];
-// 			await Redis.forEach(filter, (key: string) => found.push(key));
-// 			return found;
-// 		}
-// 		Redis.forEach = async (filter: RedisKey, cb: (key: string) => any): Promise<void> => {
-// 			for await (const k of Redis.scanIterator({MATCH: createKey(filter)})) {
-// 				const rtn = cb(k);
-// 				if(rtn instanceof Promise) await rtn;
-// 			}
-// 		}
-// 		await Redis.connect();
-// 	}
-// }
-//
-// export function createKey(...keys: (string | string[])[]) {
-// 	return keys.flat().map(k => k == null ? '*' : k).join(':');
-// }
-//
-// export function namespacedKey(namespace: string, key: RedisKey): string {
-// 	return createKey(namespace, ...(Array.isArray(key) ? key : [key]));
-// }
-//
-// export function nameSpacer(namespace: string) {
-// 	return (key: RedisKey) => {
-// 		return namespacedKey(namespace, key);
-// 	};
-// }

src/string.ts

@@ -52,6 +52,14 @@ export function insertAt(target: string, str: string, index: number): String {
 	return `${target.slice(0, index)}${str}${target.slice(index + 1)}`;
 }
 
+export function pad(text: any, length: number, char: string, start = true) {
+	const t = text.toString();
+	const l = length - t.length;
+	if(l <= 0) return t;
+	const padding = Array(~~(l / char.length)).fill(char).join('');
+	return start ? padding + t : t + padding;
+}
+
 /**
  * Generate a string of random characters.
  *

tsconfig.json

@@ -8,6 +8,7 @@
 		"declarationMap": true,
 		"experimentalDecorators": true,
 		"esModuleInterop": true,
+		"inlineSourceMap": true,
 		"lib": ["ESNext", "DOM"],
 		"module": "ES6",
 		"moduleResolution": "Node",