Compare commits

...

12 Commits
0.1.0 ... 0.3.4

Author SHA1 Message Date
d4bd054953 Made pad function a little easier to use
All checks were successful
Build / Build NPM Project (push) Successful in 31s
Build / Tag Version (push) Successful in 7s
Build / Publish (push) Successful in 14s
2024-02-29 10:30:48 -05:00
cf9bdca2ba Made pad function a little easier to use
All checks were successful
Build / Build NPM Project (push) Successful in 32s
Build / Tag Version (push) Successful in 8s
Build / Publish (push) Successful in 18s
2024-02-29 10:26:56 -05:00
0e2d720fdf Made pad function a little easier to use
Some checks failed
Build / Tag Version (push) Blocked by required conditions
Build / Publish (push) Blocked by required conditions
Build / Build NPM Project (push) Has been cancelled
2024-02-29 10:26:49 -05:00
061e27d92a Fixed build
All checks were successful
Build / Build NPM Project (push) Successful in 32s
Build / Tag Version (push) Successful in 7s
Build / Publish (push) Successful in 17s
2024-02-28 23:57:20 -05:00
63a5c5f6b7 Reverted that revert because I should be using npx anyways
All checks were successful
Build / Tag Version (push) Successful in 9s
Build / Publish (push) Successful in 18s
Build / Build NPM Project (push) Successful in 39s
2024-02-28 23:52:03 -05:00
64a0eac6df Reverted that revert because I should be using npx anyways
Some checks failed
Build / Build NPM Project (push) Failing after 7s
Build / Publish (push) Has been skipped
Build / Tag Version (push) Has been skipped
2024-02-28 23:51:56 -05:00
3e1341d876 Reverted that revert because I should be using npx anyways
Some checks failed
Build / Tag Version (push) Blocked by required conditions
Build / Publish (push) Blocked by required conditions
Build / Build NPM Project (push) Has been cancelled
2024-02-28 23:51:22 -05:00
b3457ed588 Reverted build changes
All checks were successful
Build / Build NPM Project (push) Successful in 33s
Build / Tag Version (push) Successful in 7s
Build / Publish (push) Successful in 13s
2024-02-28 23:50:16 -05:00
210f007e07 Added padding utility and updated logger object
All checks were successful
Build / Build NPM Project (push) Successful in 31s
Build / Tag Version (push) Successful in 7s
Build / Publish (push) Successful in 14s
2024-02-28 23:43:07 -05:00
24edc4a12d Changed logger events
All checks were successful
Build / Build NPM Project (push) Successful in 30s
Build / Tag Version (push) Successful in 12s
Build / Publish (push) Successful in 21s
2024-02-28 19:23:58 -05:00
d4996201cf Added static events to the emitter & added it to the logger
All checks were successful
Build / Build NPM Project (push) Successful in 33s
Build / Tag Version (push) Successful in 10s
Build / Publish (push) Successful in 16s
2024-02-28 19:19:24 -05:00
74c89c3ed4 Updated logger to use log levels 2024-02-28 19:08:51 -05:00
6 changed files with 120 additions and 30 deletions

4
package-lock.json generated
View File

@ -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",

View File

@ -1,6 +1,6 @@
{
"name": "@ztimson/js-utilities",
"version": "0.1.0",
"version": "0.3.4",
"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",

View File

@ -2,17 +2,44 @@ export type Listener = (...args: any[]) => any;
export type TypedEvents = {[k in string | symbol]: Listener} & {'*': (event: string, ...args: any[]) => any};
export class TypedEmitter<T extends TypedEvents = TypedEvents> {
private listeners: { [key in keyof T]?: Function[] } = {};
private static listeners: {[key: string]: Listener[]} = {};
private listeners: { [key in keyof T]?: Listener[] } = {};
static emit(event: any, ...args: any[]) {
(this.listeners['*'] || []).forEach(l => l(event, ...args));
(this.listeners[event.toString()] || []).forEach(l => l(...args));
};
static off(event: any, listener: Listener) {
const e = event.toString();
this.listeners[e] = (this.listeners[e] || []).filter(l => l === listener);
}
static on(event: any, listener: Listener) {
const e = event.toString();
if(!this.listeners[e]) this.listeners[e] = [];
this.listeners[e]?.push(listener);
return () => this.off(event, listener);
}
static once(event: any, listener?: Listener): Promise<any> {
return new Promise(res => {
const unsubscribe = this.on(event, <any>((...args: any) => {
res(args.length == 1 ? args[0] : args);
if(listener) listener(...args);
unsubscribe();
}));
});
}
emit<K extends keyof T>(event: K, ...args: Parameters<T[K]>) {
(this.listeners['*'] || []).forEach(l => l(event, ...args));
(this.listeners[event] || []).forEach(l => l(...args));
};
off<K extends keyof T = string>(event: K, listener: T[K]): this {
console.log('cleared');
off<K extends keyof T = string>(event: K, listener: T[K]) {
this.listeners[event] = (this.listeners[event] || []).filter(l => l === listener);
return this;
}
on<K extends keyof T = string>(event: K, listener: T[K]) {

View File

@ -1,3 +1,5 @@
import {TypedEmitter, TypedEvents} from './emitter';
export const CliEffects = {
CLEAR: "\x1b[0m",
BRIGHT: "\x1b[1m",
@ -9,15 +11,22 @@ export const CliEffects = {
}
export const CliForeground = {
BLACK: "\x1b[30m",
RED: "\x1b[31m",
GREEN: "\x1b[32m",
YELLOW: "\x1b[33m",
BLUE: "\x1b[34m",
MAGENTA: "\x1b[35m",
CYAN: "\x1b[36m",
WHITE: "\x1b[37m",
GREY: "\x1b[90m",
BLACK: '\x1b[30m',
RED: '\x1b[31m',
GREEN: '\x1b[32m',
YELLOW: '\x1b[33m',
BLUE: '\x1b[34m',
MAGENTA: '\x1b[35m',
CYAN: '\x1b[36m',
LIGHT_GREY: '\x1b[37m',
GREY: '\x1b[90m',
LIGHT_RED: '\x1b[91m',
LIGHT_GREEN: '\x1b[92m',
LIGHT_YELLOW: '\x1b[93m',
LIGHT_BLUE: '\x1b[94m',
LIGHT_MAGENTA: '\x1b[95m',
LIGHT_CYAN: '\x1b[96m',
WHITE: '\x1b[97m',
}
export const CliBackground = {
@ -32,34 +41,79 @@ export const CliBackground = {
GREY: "\x1b[100m",
}
export class Logger {
constructor(public readonly namespace: string) { }
export enum LOG_LEVEL {
VERBOSE,
INFO,
WARN,
ERROR
}
export type LoggerEvents = TypedEvents & {
'VERBOSE': (...args: any[]) => any;
'INFO': (...args: any[]) => any;
'WARN': (...args: any[]) => any;
'ERROR': (...args: any[]) => any;
};
export class Logger extends TypedEmitter<LoggerEvents> {
static LOG_LEVEL: LOG_LEVEL = LOG_LEVEL.INFO;
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[]) {
console.log(CliForeground.MAGENTA + this.format(...args) + CliEffects.CLEAR);
if(LOG_LEVEL.VERBOSE >= Logger.LOG_LEVEL) {
const str = this.format(...args);
Logger.emit(LOG_LEVEL.VERBOSE, str);
console.debug(CliForeground.LIGHT_GREY + str + CliEffects.CLEAR);
}
}
error(...args: string[]) {
console.log(CliForeground.RED + this.format(...args) + CliEffects.CLEAR);
if(LOG_LEVEL.ERROR >= Logger.LOG_LEVEL) {
const str = this.format(...args);
Logger.emit(LOG_LEVEL.ERROR, str);
console.error(CliForeground.RED + str + CliEffects.CLEAR);
}
}
info(...args: string[]) {
console.log(CliForeground.CYAN + this.format(...args) + CliEffects.CLEAR);
if(LOG_LEVEL.INFO >= Logger.LOG_LEVEL) {
const str = this.format(...args);
Logger.emit(LOG_LEVEL.INFO, str);
console.info(CliForeground.BLUE + str + CliEffects.CLEAR);
}
}
log(...args: string[]) {
console.log(CliEffects.CLEAR + this.format(...args));
if(LOG_LEVEL.INFO >= Logger.LOG_LEVEL) {
const str = this.format(...args);
Logger.emit(LOG_LEVEL.INFO, str);
console.log(CliEffects.CLEAR + str);
}
}
warn(...args: string[]) {
console.log(CliForeground.YELLOW + this.format(...args) + CliEffects.CLEAR);
}
verbose(...args: string[]) {
console.log(CliForeground.WHITE + this.format(...args) + CliEffects.CLEAR);
if(LOG_LEVEL.WARN >= Logger.LOG_LEVEL) {
const str = this.format(...args);
Logger.emit(LOG_LEVEL.WARN, str);
console.warn(CliForeground.YELLOW + str + CliEffects.CLEAR);
}
}
}

View File

@ -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.
*

View File

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