@underactive/pi-topping-statusline 0.1.1 → 0.1.2

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@underactive/pi-topping-statusline",
-	"version": "0.1.1",
+	"version": "0.1.2",
 	"description": "oh-my-pi's powerline statusline as a pi extension with some customizations",
 	"keywords": [
 		"pi-package",

package/src/context.ts

@@ -17,6 +17,9 @@ const EXEC_TIMEOUT_MS = 2_000;
 /** getEntries() filters and copies the whole session, so rescans are rate-limited. */
 const FEED_TTL_MS = 2_000;
 
+/** Prototype-less map — feed keys are publisher-supplied customTypes. */
+const emptyFeedData = (): Record<string, unknown> => Object.create(null);
+
 interface GitStatusCounts {
 	staged: number;
 	unstaged: number;
@@ -85,7 +88,7 @@ export class SegmentContextBuilder {
 
 	#worktree: { projectName: string; worktreeName: string } | null = null;
 
-	#feedData: Record<string, unknown> = Object.create(null) as Record<string, unknown>;
+	#feedData: Record<string, unknown> = emptyFeedData();
 	#feedsScannedAt = 0;
 	#feedsScanned = "";
 	#runStartedAt = 0;
@@ -113,7 +116,7 @@ export class SegmentContextBuilder {
 		// session still carries the previous run's entries. Anything predating this
 		// attach belongs to that stale run.
 		this.#runStartedAt = Date.now();
-		this.#feedData = Object.create(null) as Record<string, unknown>;
+		this.#feedData = emptyFeedData();
 		this.#feedsScannedAt = 0;
 		this.#feedsScanned = "";
 		if (this.#repoCwd !== ctx.cwd) {
@@ -265,7 +268,7 @@ export class SegmentContextBuilder {
 	 */
 	#refreshFeeds(customTypes: readonly string[], now: number): void {
 		this.#feedsScannedAt = now;
-		this.#feedData = Object.create(null) as Record<string, unknown>;
+		this.#feedData = emptyFeedData();
 		const entries = this.#ctx?.sessionManager?.getEntries();
 		if (!entries) return;
 		const pending = new Set(customTypes);

package/src/layout.ts

@@ -66,27 +66,24 @@ export function buildStatusLine(
 	const fgAnsi = theme.getFgAnsi("text");
 	const sepAnsi = theme.getFgAnsi("statusLineSep");
 
-	const leftParts: string[] = [];
+	const left: string[] = [];
 	const leftSegIds: StatusLineSegmentId[] = [];
 	for (const segId of segmentGroups.left) {
 		const rendered = renderSegment(segId, ctx);
 		if (rendered.visible && rendered.content) {
-			leftParts.push(rendered.content);
+			left.push(rendered.content);
 			leftSegIds.push(segId);
 		}
 	}
 
-	const rightParts: string[] = [];
+	const right: string[] = [];
 	for (const segId of segmentGroups.right) {
 		const rendered = renderSegment(segId, ctx);
 		if (rendered.visible && rendered.content) {
-			rightParts.push(rendered.content);
+			right.push(rendered.content);
 		}
 	}
 
-	const left = [...leftParts];
-	const right = [...rightParts];
-
 	const leftSepWidth = visibleWidth(separatorDef.left);
 	const rightSepWidth = visibleWidth(separatorDef.right);
 	// Transparent mode drops the round caps (they need a bg fill to bridge);

package/src/menu.ts

@@ -112,6 +112,10 @@ export interface MenuResult<T> {
 const DEFAULT_HINTS = ["\u2191\u2193 move", "\u2423 toggle", "\u23ce apply", "esc cancel"];
 const EDIT_HINTS = ["type to edit", "\u232b delete", "\u23ce commit", "esc discard"];
 const OVERLAY_WIDTH = "90%";
+/** Width of the "  <marker> " prefix shared by rows without a checkbox. */
+const PLAIN_ROW_PREFIX_LEN = 5;
+/** Width of the "  <marker> [■] " prefix shared by checkbox rows. */
+const CHECKBOX_ROW_PREFIX_LEN = 8;
 
 interface FlatItem {
 	id: string;
@@ -607,10 +611,9 @@ export class MenuComponent implements Component {
 		if (item.text) {
 			const editing = this.editing?.id === item.id ? this.editing : undefined;
 			const raw = editing ? editing.buffer : String(value ?? "");
-			const fixedLeftLen = 5;
-			const labelWidth = Math.min(16, Math.max(0, innerWidth - fixedLeftLen - 4));
+			const labelWidth = Math.min(16, Math.max(0, innerWidth - PLAIN_ROW_PREFIX_LEN - 4));
 			const label = truncateToWidth(item.label, labelWidth).padEnd(labelWidth);
-			const fieldWidth = Math.max(0, innerWidth - fixedLeftLen - labelWidth - 3);
+			const fieldWidth = Math.max(0, innerWidth - PLAIN_ROW_PREFIX_LEN - labelWidth - 3);
 			// Keep the caret in view by showing the buffer's tail once it overflows.
 			const shownRaw =
 				editing && raw.length > fieldWidth - 1 ? raw.slice(raw.length - (fieldWidth - 1)) : raw;
@@ -630,8 +633,7 @@ export class MenuComponent implements Component {
 			const stateWord = `‹ ${value} ›`;
 			// Ungated cycle rows carry no checkbox; gated ones keep it for the space toggle.
 			if (!item.cycleEnabledBy) {
-				const fixedLeftLen = 5; // "  " + marker(1) + " " + margin
-				const maxLabelLen = Math.max(0, innerWidth - fixedLeftLen - visibleWidth(stateWord) - 1);
+				const maxLabelLen = Math.max(0, innerWidth - PLAIN_ROW_PREFIX_LEN - visibleWidth(stateWord) - 1);
 				const label = item.label.length > maxLabelLen ? truncateToWidth(item.label, maxLabelLen) : item.label;
 				const leftPlain = `  ${marker} ${label}`;
 				const gap = Math.max(1, innerWidth - visibleWidth(leftPlain) - visibleWidth(stateWord) - 2);
@@ -639,8 +641,7 @@ export class MenuComponent implements Component {
 				return this.wrap("\u2551", content, "\u2551");
 			}
 			const enabled = this.values[item.cycleEnabledBy] as boolean;
-			const fixedLeftLen = 8;
-			const maxLabelLen = Math.max(0, innerWidth - fixedLeftLen - visibleWidth(stateWord) - 1);
+			const maxLabelLen = Math.max(0, innerWidth - CHECKBOX_ROW_PREFIX_LEN - visibleWidth(stateWord) - 1);
 			const label = item.label.length > maxLabelLen ? truncateToWidth(item.label, maxLabelLen) : item.label;
 			const leftPlain = `  ${marker} [${enabled ? "■" : " "}] ${label}`;
 			const gap = Math.max(1, innerWidth - visibleWidth(leftPlain) - visibleWidth(stateWord) - 2);
@@ -652,8 +653,7 @@ export class MenuComponent implements Component {
 		const box = enabled ? "\u25a0" : " ";
 		const stateWord = enabled ? "ON" : "OFF";
 		const rightPlain = `${stateWord}  `;
-		const fixedLeftLen = 8; // "  " + marker(1) + " " + "[" + box(1) + "]" + " "
-		const maxLabelLen = Math.max(0, innerWidth - fixedLeftLen - rightPlain.length - 1);
+		const maxLabelLen = Math.max(0, innerWidth - CHECKBOX_ROW_PREFIX_LEN - rightPlain.length - 1);
 		const label = item.label.length > maxLabelLen ? truncateToWidth(item.label, maxLabelLen) : item.label;
 		const leftPlain = `  ${marker} [${box}] ${label}`;
 		const gap = Math.max(1, innerWidth - visibleWidth(leftPlain) - visibleWidth(rightPlain));

package/src/rainbow.ts

@@ -46,7 +46,7 @@ export function perimeterPosition(row: number, col: number, width: number, botto
 	return 2 * width + 2 * bottomIdx - 2 - row; // col === 0
 }
 
-function hslToRgb(h: number, s: number, l: number): [number, number, number] {
+export function hslToRgb(h: number, s: number, l: number): [number, number, number] {
 	const c = (1 - Math.abs(2 * l - 1)) * s;
 	const x = c * (1 - Math.abs(((h / 60) % 2) - 1));
 	const m = l - c / 2;
@@ -60,7 +60,7 @@ function hslToRgb(h: number, s: number, l: number): [number, number, number] {
 	return [Math.round((rgb[0] + m) * 255), Math.round((rgb[1] + m) * 255), Math.round((rgb[2] + m) * 255)];
 }
 
-function rgbToHex([r, g, b]: [number, number, number]): string {
+export function rgbToHex([r, g, b]: [number, number, number]): string {
 	return `#${((r << 16) | (g << 8) | b).toString(16).padStart(6, "0")}`;
 }
 

package/src/settings.ts

@@ -94,6 +94,7 @@ function loadSettings(): StatusLineSettings {
 		if (typeof raw.rainbowBorder === "boolean") settings.rainbowBorder = raw.rainbowBorder;
 		return settings;
 	} catch {
+		// Missing or corrupt settings.json falls back to defaults.
 		return {};
 	}
 }

package/src/tests/feeds.test.ts

@@ -15,7 +15,6 @@ import type { ExtensionAPI, ExtensionContext, SessionEntry } from "@earendil-wor
 import { SegmentContextBuilder } from "../context.ts";
 import { SEGMENTS } from "../segments.ts";
 import { DEFAULT_FEEDS, DEFAULT_SEGMENTS, resolveEffectiveSettings, sanitizeFeeds } from "../settings.ts";
-import { theme } from "../theme.ts";
 import type { SegmentContext, StatusLineFeed } from "../types.ts";
 
 const SAVINGS = "pi-prompt-cache/savings";
@@ -364,5 +363,4 @@ test("the default subscription matches what pi-prompt-cache publishes", () => {
 	assert.equal(DEFAULT_FEEDS[0]?.customType, SAVINGS);
 	assert.equal(DEFAULT_FEEDS[0]?.field, "savedUsd");
 	assert.equal(DEFAULT_FEEDS[0]?.format, "currency");
-	void theme;
 });

package/src/theme.ts

@@ -30,8 +30,6 @@ export interface StatusSymbols {
 		powerlineThinRight: string;
 		halfCircleLeft: string;
 		halfCircleRight: string;
-		block: string;
-		space: string;
 		asciiLeft: string;
 		asciiRight: string;
 		dot: string;
@@ -65,8 +63,6 @@ const UNICODE_SYMBOLS: StatusSymbols = {
 		powerlineThinRight: "<",
 		halfCircleLeft: "",
 		halfCircleRight: "",
-		block: "▌",
-		space: " ",
 		asciiLeft: ">",
 		asciiRight: "<",
 		dot: " · ",
@@ -100,8 +96,6 @@ const NERD_SYMBOLS: StatusSymbols = {
 		powerlineThinRight: "\ue0b3",
 		halfCircleLeft: "\ue0b6",
 		halfCircleRight: "\ue0b4",
-		block: "█",
-		space: " ",
 		asciiLeft: ">",
 		asciiRight: "<",
 		dot: " · ",
@@ -135,8 +129,6 @@ const ASCII_SYMBOLS: StatusSymbols = {
 		powerlineThinRight: "<",
 		halfCircleLeft: "",
 		halfCircleRight: "",
-		block: "#",
-		space: " ",
 		asciiLeft: ">",
 		asciiRight: "<",
 		dot: " - ",

package/src/utils.ts

@@ -7,13 +7,20 @@
 import { stripVTControlCharacters } from "node:util";
 import { sliceByColumn, visibleWidth } from "@earendil-works/pi-tui";
 import { parseHex } from "./theme.js";
+import { hslToRgb, rgbToHex } from "./rainbow.js";
 
 export function formatNumber(n: number): string {
 	if (n < 1_000) return n.toString();
 	if (n < 10_000) return `${(n / 1_000).toFixed(1)}K`;
-	if (n < 1_000_000) return `${Math.round(n / 1_000)}K`;
+	if (n < 1_000_000) {
+		const k = Math.round(n / 1_000);
+		return k < 1000 ? `${k}K` : `${(n / 1_000_000).toFixed(1)}M`;
+	}
 	if (n < 10_000_000) return `${(n / 1_000_000).toFixed(1)}M`;
-	if (n < 1_000_000_000) return `${Math.round(n / 1_000_000)}M`;
+	if (n < 1_000_000_000) {
+		const m = Math.round(n / 1_000_000);
+		return m < 1000 ? `${m}M` : `${(n / 1_000_000_000).toFixed(1)}B`;
+	}
 	if (n < 10_000_000_000) return `${(n / 1_000_000_000).toFixed(1)}B`;
 	return `${Math.round(n / 1_000_000_000)}B`;
 }
@@ -122,26 +129,6 @@ function hexToHue(hex: string): number | undefined {
 	return (h + 360) % 360;
 }
 
-function hslToHex(h: number, s: number, l: number): string {
-	const c = (1 - Math.abs(2 * l - 1)) * s;
-	const x = c * (1 - Math.abs(((h / 60) % 2) - 1));
-	const m = l - c / 2;
-	let r = 0;
-	let g = 0;
-	let b = 0;
-	if (h < 60) [r, g, b] = [c, x, 0];
-	else if (h < 120) [r, g, b] = [x, c, 0];
-	else if (h < 180) [r, g, b] = [0, c, x];
-	else if (h < 240) [r, g, b] = [0, x, c];
-	else if (h < 300) [r, g, b] = [x, 0, c];
-	else [r, g, b] = [c, 0, x];
-	const toHex = (v: number) =>
-		Math.round((v + m) * 255)
-			.toString(16)
-			.padStart(2, "0");
-	return `#${toHex(r)}${toHex(g)}${toHex(b)}`;
-}
-
 function findSafeHue(target: number, occupied: number[], lo: number, hi: number): number {
 	if (occupied.length === 0) return target;
 	if (occupied.every(h => hueDistance(target, h) >= MIN_HUE_DISTANCE)) return target;
@@ -160,5 +147,5 @@ export function getSessionAccentHex(name: string, themeColorHexes: string[]): st
 	let targetHue = DARK_HUE_START + (nameToHue(name) % range);
 	const themeHues = themeColorHexes.map(hexToHue).filter((h): h is number => h !== undefined);
 	targetHue = findSafeHue(targetHue, themeHues, DARK_HUE_START, DARK_HUE_END);
-	return hslToHex(targetHue, ACCENT_SATURATION, ACCENT_DARK_LIGHTNESS);
+	return rgbToHex(hslToRgb(targetHue, ACCENT_SATURATION, ACCENT_DARK_LIGHTNESS));
 }