@orkestrel/console 0.0.3 → 0.0.5

package/dist/src/core/index.d.cts

@@ -1002,10 +1002,10 @@ export declare const LEVELS: readonly LogLevel[];
  */
 export declare class Logger implements LoggerInterface {
     #private;
+    readonly name?: string;
     constructor(options?: LoggerOptions);
     get emitter(): EmitterInterface<LoggerEventMap>;
     get level(): LogLevel;
-    get name(): string | undefined;
     debug(message: string, data?: Record<string, unknown>): void;
     info(message: string, data?: Record<string, unknown>): void;
     warn(message: string, data?: Record<string, unknown>): void;

package/dist/src/core/index.d.ts

@@ -1002,10 +1002,10 @@ export declare const LEVELS: readonly LogLevel[];
  */
 export declare class Logger implements LoggerInterface {
     #private;
+    readonly name?: string;
     constructor(options?: LoggerOptions);
     get emitter(): EmitterInterface<LoggerEventMap>;
     get level(): LogLevel;
-    get name(): string | undefined;
     debug(message: string, data?: Record<string, unknown>): void;
     info(message: string, data?: Record<string, unknown>): void;
     warn(message: string, data?: Record<string, unknown>): void;

package/dist/src/core/index.js

@@ -430,7 +430,7 @@ var ConsoleError = class extends Error {
 		super(message);
 		this.name = "ConsoleError";
 		this.code = code;
-		this.context = context;
+		if (context !== void 0) this.context = context;
 	}
 };
 /**
@@ -754,20 +754,21 @@ function renderBox(options) {
 	const inner = lines.reduce((max, line) => Math.max(max, width(line)), Math.max(0, titleRoom, budget));
 	const gutter = " ".repeat(padding);
 	const bar = paint(styler, chars.vertical);
-	const boxTop = () => {
-		const span = inner + padding * 2;
-		if (options.title === void 0) return paint(styler, `${chars.topLeft}${repeatTo(chars.horizontal, span)}${chars.topRight}`);
+	const span = inner + padding * 2;
+	let top;
+	if (options.title === void 0) top = paint(styler, `${chars.topLeft}${repeatTo(chars.horizontal, span)}${chars.topRight}`);
+	else {
 		const caption = ` ${options.title} `;
 		const room = span - width(caption);
 		const lead = paint(styler, repeatTo(chars.horizontal, 1));
 		const rest = room - 1 <= 0 ? "" : paint(styler, repeatTo(chars.horizontal, room - 1));
-		return `${paint(styler, chars.topLeft)}${lead}${paint(styler, caption)}${rest}${paint(styler, chars.topRight)}`;
-	};
-	const top = boxTop();
+		top = `${paint(styler, chars.topLeft)}${lead}${paint(styler, caption)}${rest}${paint(styler, chars.topRight)}`;
+	}
 	const bottom = paint(styler, `${chars.bottomLeft}${repeatTo(chars.horizontal, inner + padding * 2)}${chars.bottomRight}`);
+	const body = lines.map((line) => `${bar}${gutter}${align(line, inner)}${gutter}${bar}`);
 	return [
 		top,
-		...lines.map((line) => `${bar}${gutter}${align(line, inner)}${gutter}${bar}`),
+		...body,
 		bottom
 	].join("\n");
 }
@@ -798,22 +799,20 @@ function renderTable(options) {
 	const columns = options.columns;
 	const widths = columns.map((column, index) => options.rows.reduce((max, row) => Math.max(max, width(cellAt(row, index))), width(column.label)));
 	const aligns = columns.map((column) => column.align ?? "left");
-	const tableRow = (cells) => {
+	const renderedRows = [columns.map((column) => paint(styler, column.label)), ...options.rows.map((row) => columns.map((_column, index) => cellAt(row, index)))].map((cells) => {
 		const bar = paint(styler, chars.vertical);
 		return `${bar}${cells.map((cell, index) => ` ${align(cell, widths[index] ?? width(cell), aligns[index] ?? "left")} `).join(bar)}${bar}`;
-	};
-	const tableEdge = (left, mid, right) => {
-		const segments = widths.map((columnWidth) => repeatTo(chars.horizontal, columnWidth + 2));
-		return paint(styler, `${left}${segments.join(mid)}${right}`);
-	};
-	const header = tableRow(columns.map((column) => paint(styler, column.label)));
-	const body = options.rows.map((row) => tableRow(columns.map((_column, index) => cellAt(row, index))));
+	});
+	const segments = widths.map((columnWidth) => repeatTo(chars.horizontal, columnWidth + 2));
+	const top = paint(styler, `${chars.topLeft}${segments.join(chars.teeDown)}${chars.topRight}`);
+	const rule = paint(styler, `${chars.teeRight}${segments.join(chars.cross)}${chars.teeLeft}`);
+	const bottom = paint(styler, `${chars.bottomLeft}${segments.join(chars.teeUp)}${chars.bottomRight}`);
 	return [
-		tableEdge(chars.topLeft, chars.teeDown, chars.topRight),
-		header,
-		tableEdge(chars.teeRight, chars.cross, chars.teeLeft),
-		...body,
-		tableEdge(chars.bottomLeft, chars.teeUp, chars.bottomRight)
+		top,
+		...renderedRows.slice(0, 1),
+		rule,
+		...renderedRows.slice(1),
+		bottom
 	].join("\n");
 }
 /**
@@ -1075,7 +1074,7 @@ var Styler = class Styler {
 	* type assertion is used (AGENTS §1 / §14 — narrow, never assert).
 	*/
 	get surface() {
-		const render = (text) => this.#enabled ? this.#renderer.render(this.#style, text) : text;
+		const render = this.#render.bind(this);
 		const descriptors = {
 			style: {
 				value: this.#style,
@@ -1087,17 +1086,26 @@ var Styler = class Styler {
 			}
 		};
 		for (const color of COLORS) descriptors[color] = {
-			get: () => this.#foreground(color).surface,
+			get: this.#foregroundSurface.bind(this, color),
 			enumerable: true
 		};
 		for (const attribute of ATTRIBUTES) descriptors[attribute] = {
-			get: () => this.#attribute(attribute).surface,
+			get: this.#attributeSurface.bind(this, attribute),
 			enumerable: true
 		};
 		const surface = Object.defineProperties(render, descriptors);
 		if (this.#isSurface(surface)) return surface;
 		throw new ConsoleError("INVARIANT", "console: styler surface construction is incomplete");
 	}
+	#render(text) {
+		return this.#enabled ? this.#renderer.render(this.#style, text) : text;
+	}
+	#foregroundSurface(color) {
+		return this.#foreground(color).surface;
+	}
+	#attributeSurface(attribute) {
+		return this.#attribute(attribute).surface;
+	}
 	#isSurface(value) {
 		return typeof value === "function" && "style" in value && "enabled" in value && "red" in value && "bold" in value;
 	}
@@ -1160,8 +1168,8 @@ var Capture = class {
 	#active = false;
 	constructor(options) {
 		this.#emitter = new Emitter({
-			on: options?.on,
-			error: options?.error
+			...options?.on !== void 0 ? { on: options.on } : {},
+			...options?.error !== void 0 ? { error: options.error } : {}
 		});
 		this.#levels = options?.levels ?? DEFAULT_CAPTURE_LEVELS;
 		this.#mirror = options?.mirror ?? false;
@@ -1183,7 +1191,7 @@ var Capture = class {
 			const original = target[level];
 			this.#originals.set(level, original);
 			const mirror = original.bind(console);
-			target[level] = (...args) => this.#intercept(level, args, mirror);
+			target[level] = this.#captureCall.bind(this, level, mirror);
 		}
 		this.#emitter.emit("start");
 	}
@@ -1207,6 +1215,9 @@ var Capture = class {
 		this.stop();
 		this.#emitter.destroy();
 	}
+	#captureCall(level, mirror, ...args) {
+		this.#intercept(level, args, mirror);
+	}
 	#intercept(level, args, mirror) {
 		const message = this.#capture(level, args);
 		this.#retain(message);
@@ -1285,11 +1296,11 @@ var LoggerManager = class {
 	}
 	register(name, options) {
 		const logger = new Logger({
-			level: this.#level,
-			sink: this.#sink,
-			styler: this.#styler,
-			limit: this.#limit,
-			silent: this.#silent,
+			...this.#level !== void 0 ? { level: this.#level } : {},
+			...this.#sink !== void 0 ? { sink: this.#sink } : {},
+			...this.#styler !== void 0 ? { styler: this.#styler } : {},
+			...this.#limit !== void 0 ? { limit: this.#limit } : {},
+			...this.#silent !== void 0 ? { silent: this.#silent } : {},
 			...options,
 			name
 		});
@@ -1372,8 +1383,8 @@ var Progress = class {
 	#completed = false;
 	constructor(options) {
 		this.#emitter = new Emitter({
-			on: options.on,
-			error: options.error
+			...options.on !== void 0 ? { on: options.on } : {},
+			...options.error !== void 0 ? { error: options.error } : {}
 		});
 		this.#total = options.total;
 		this.#width = options.width ?? 30;
@@ -1571,8 +1582,8 @@ var Spinner = class {
 	#index = 0;
 	constructor(options) {
 		this.#emitter = new Emitter({
-			on: options?.on,
-			error: options?.error
+			...options?.on !== void 0 ? { on: options.on } : {},
+			...options?.error !== void 0 ? { error: options.error } : {}
 		});
 		const frames = options?.frames ?? SPINNER_FRAMES;
 		this.#frames = frames.length === 0 ? SPINNER_FRAMES : frames;
@@ -1909,21 +1920,25 @@ function createCapture(options) {
 function withCapture(fn, options) {
 	const capture = new Capture(options);
 	capture.start();
-	const settle = (value) => {
-		const messages = capture.messages();
-		capture.destroy();
-		return {
-			value,
-			messages
-		};
-	};
 	try {
 		const result = fn();
-		if (result instanceof Promise) return result.then((value) => settle(value), (error) => {
+		if (result instanceof Promise) return result.then((value) => {
+			const messages = capture.messages();
+			capture.destroy();
+			return {
+				value,
+				messages
+			};
+		}, (error) => {
 			capture.destroy();
 			throw error;
 		});
-		return settle(result);
+		const messages = capture.messages();
+		capture.destroy();
+		return {
+			value: result,
+			messages
+		};
 	} catch (error) {
 		capture.destroy();
 		throw error;
@@ -2028,19 +2043,19 @@ function createProgress(options) {
 var Logger = class {
 	#emitter;
 	#level;
-	#name;
 	#sink;
 	#styler;
 	#limit;
 	#silent;
 	#entries = [];
+	name;
 	constructor(options) {
 		this.#emitter = new Emitter({
-			on: options?.on,
-			error: options?.error
+			...options?.on !== void 0 ? { on: options.on } : {},
+			...options?.error !== void 0 ? { error: options.error } : {}
 		});
 		this.#level = options?.level ?? "info";
-		this.#name = options?.name;
+		if (options?.name !== void 0) this.name = options.name;
 		this.#sink = options?.sink ?? createConsoleSink();
 		this.#styler = options?.styler ?? createStyler();
 		this.#limit = options?.limit ?? 1e3;
@@ -2052,9 +2067,6 @@ var Logger = class {
 	get level() {
 		return this.#level;
 	}
-	get name() {
-		return this.#name;
-	}
 	debug(message, data) {
 		this.#log("debug", message, data);
 	}
@@ -2090,7 +2102,7 @@ var Logger = class {
 			level,
 			message,
 			time: Date.now(),
-			...this.#name === void 0 ? {} : { name: this.#name },
+			...this.name === void 0 ? {} : { name: this.name },
 			...data === void 0 ? {} : { data: Object.freeze({ ...data }) }
 		});
 	}