@zenera/cli 1.1.18 → 1.1.19

package/dist/banner.js

@@ -1,4 +1,4 @@
-import { dim, note, styled } from "./term.js";
+import { appearance, dim, note, styled } from "./term.js";
 // ---------------------------------------------------------------------------
 // The banner
 //
@@ -65,7 +65,10 @@ function big(word) {
 /** A wordmark rather than a sentence, so the letters are set apart. */
 const spaced = (s) => [...s.toUpperCase()].join(' ');
 const RESET = '\u001b[0m';
-const HEAD = { face: '\u001b[1;38;5;231m', shade: '\u001b[0;38;5;244m' };
+const HEADS = {
+    dark: { face: '\u001b[1;38;5;231m', shade: '\u001b[0;38;5;244m' },
+    light: { face: '\u001b[1;38;5;235m', shade: '\u001b[0;38;5;245m' },
+};
 /** One per sub-brand, so two of them are told apart before the word is read. */
 const ACCENTS = {
     orange: { face: '\u001b[1;38;5;208m', shade: '\u001b[0;38;5;130m' },
@@ -95,17 +98,18 @@ export function bannerLines(text, columns = process.stderr.columns || 80) {
     // inside a styled string cannot be trimmed away later.
     const accent = big(text.accent).map((row) => row.trimEnd());
     const tone = ACCENTS[text.hue ?? 'orange'];
+    const ink = HEADS[appearance()];
     const margin = ' '.repeat(INDENT);
     const width = INDENT + head[0].length + GAP + Math.max(...accent.map((row) => row.length));
     if (width > columns) {
         return [
-            `${margin}${flat(text.head.toUpperCase(), HEAD)} ${flat(text.accent.toUpperCase(), tone)}`,
+            `${margin}${flat(text.head.toUpperCase(), ink)} ${flat(text.accent.toUpperCase(), tone)}`,
             `${margin}${dim(spaced(text.subtitle))}`,
         ];
     }
     const lines = [];
     for (let r = 0; r < HEIGHT; r++) {
-        lines.push(`${margin}${paint(head[r], HEAD)}${' '.repeat(GAP)}${paint(accent[r], tone)}`);
+        lines.push(`${margin}${paint(head[r], ink)}${' '.repeat(GAP)}${paint(accent[r], tone)}`);
     }
     // Rules on both sides, centred under the art: the subtitle is a caption,
     // and without them a short line of spaced capitals floats.

package/dist/term.d.ts

@@ -20,7 +20,21 @@ export declare class CliError extends Error {
 export declare const usageError: (m: string, hint?: string) => CliError;
 export declare const invalidError: (m: string, hint?: string) => CliError;
 export declare const credentialError: (m: string, hint?: string) => CliError;
+export type Appearance = 'dark' | 'light';
+/** One grey per background. The only 256-colour indices in the CLI. */
+export declare const CHROME: Record<Appearance, number>;
+/** What the terminal looks like, as far as can be known without asking it. */
+export declare function appearance(): Appearance;
 export declare const bold: (s: string) => string;
+/**
+ * One step quieter, which is half of everything this tool prints: paths,
+ * counts, hints, the second column of every table.
+ *
+ * A stated grey rather than SGR 2. `dim` is not a colour, it is a request, and
+ * how far it is honoured is the terminal's own business — iTerm2 takes a step,
+ * Apple Terminal goes most of the way to the background and takes the quiet
+ * half of the output with it.
+ */
 export declare const dim: (s: string) => string;
 export declare const red: (s: string) => string;
 export declare const green: (s: string) => string;

package/dist/term.js

@@ -1,3 +1,4 @@
+import { execFileSync } from 'node:child_process';
 import { createInterface } from 'node:readline/promises';
 import { styleText } from 'node:util';
 // ---------------------------------------------------------------------------
@@ -36,11 +37,75 @@ export class CliError extends Error {
 export const usageError = (m, hint) => new CliError(m, EXIT.usage, hint);
 export const invalidError = (m, hint) => new CliError(m, EXIT.invalid, hint);
 export const credentialError = (m, hint) => new CliError(m, EXIT.credentials, hint);
+/** One grey per background. The only 256-colour indices in the CLI. */
+export const CHROME = { dark: 245, light: 242 };
+let sniffed;
+/** What the terminal looks like, as far as can be known without asking it. */
+export function appearance() {
+    sniffed ??= fromEnv() ?? fromColorFgBg() ?? fromAppleTerminal() ?? 'dark';
+    return sniffed;
+}
+function fromEnv() {
+    const v = process.env['ZENERA_THEME']?.trim().toLowerCase();
+    return v === 'dark' || v === 'light' ? v : undefined;
+}
+/**
+ * `COLORFGBG` is `fg;bg` or `fg;<something>;bg`; the background is the last
+ * field. Anything non-numeric (notably `default`) tells us nothing.
+ */
+function fromColorFgBg() {
+    const parts = process.env['COLORFGBG']?.split(';');
+    const bg = parts?.[parts.length - 1];
+    if (bg === undefined || !/^\d+$/.test(bg)) {
+        return undefined;
+    }
+    const n = Number(bg);
+    return n === 7 || n >= 9 ? 'light' : 'dark';
+}
+/** The shipped Apple Terminal profiles that are paper rather than ink. */
+const APPLE_LIGHT = new Set(['basic', 'man page', 'novel', 'silver aerogel']);
+/**
+ * Ask `defaults` which profile Terminal.app opens with. A subprocess during
+ * startup is a real cost, so it is paid last, once per process, and only on
+ * the one terminal that leaves us nothing else to go on. A custom profile is
+ * not in the table and falls through to the guess.
+ */
+function fromAppleTerminal() {
+    if (process.env['TERM_PROGRAM'] !== 'Apple_Terminal') {
+        return undefined;
+    }
+    try {
+        const name = execFileSync('defaults', ['read', 'com.apple.Terminal', 'Default Window Settings'], { encoding: 'utf8', timeout: 300, stdio: ['ignore', 'pipe', 'ignore'] })
+            .trim()
+            .toLowerCase();
+        return APPLE_LIGHT.has(name) ? 'light' : undefined;
+    }
+    catch {
+        return undefined;
+    }
+}
 // ---------------------------------------------------------------------------
 // Styling
 // ---------------------------------------------------------------------------
 export const bold = (s) => styleText('bold', s);
-export const dim = (s) => styleText('dim', s);
+/**
+ * One step quieter, which is half of everything this tool prints: paths,
+ * counts, hints, the second column of every table.
+ *
+ * A stated grey rather than SGR 2. `dim` is not a colour, it is a request, and
+ * how far it is honoured is the terminal's own business — iTerm2 takes a step,
+ * Apple Terminal goes most of the way to the background and takes the quiet
+ * half of the output with it.
+ */
+export const dim = (s) => {
+    if (!styled()) {
+        return s;
+    }
+    const open = `\u001b[38;5;${CHROME[appearance()]}m`;
+    // A colour nested inside closes with `39m`, which would drop the grey for
+    // whatever follows it.
+    return `${open}${s.replaceAll('\u001b[39m', `\u001b[39m${open}`)}\u001b[39m`;
+};
 export const red = (s) => styleText('red', s);
 export const green = (s) => styleText('green', s);
 export const yellow = (s) => styleText('yellow', s);