@rse/ase 2.0.2 → 2.0.4

package/dst/ase-util-diagram.js

@@ -4,7 +4,7 @@
 **  Licensed under Apache 2.0 <https://spdx.org/licenses/Apache-2.0>
 */
 import fs from "node:fs";
-import { InvalidArgumentError } from "commander";
+import { InvalidArgumentError, Option } from "commander";
 import { z } from "zod";
 import { readStdin, writeStdout } from "./ase-lib-stdio.js";
 /*  custom argument parser for Commander: non-negative integer  */
@@ -14,24 +14,6 @@ const parseInteger = (name) => (value) => {
         throw new InvalidArgumentError(`${name} must be a non-negative integer`);
     return n;
 };
-/*  custom argument parser for Commander: color mode  */
-const parseColorMode = (name) => (value) => {
-    if (value !== "none" && value !== "ansi16" && value !== "ansi256")
-        throw new InvalidArgumentError(`${name} must be "none", "ansi16", or "ansi256"`);
-    return value;
-};
-/*  custom argument parser for Commander: diagram language  */
-const parseLang = (name) => (value) => {
-    if (value !== "mermaid" && value !== "d2")
-        throw new InvalidArgumentError(`${name} must be "mermaid" or "d2"`);
-    return value;
-};
-/*  custom argument parser for Commander: output format  */
-const parseFormat = (name) => (value) => {
-    if (value !== "ascii" && value !== "svg")
-        throw new InvalidArgumentError(`${name} must be "ascii" or "svg"`);
-    return value;
-};
 /*  the D2 compiler, created on first use only (as it spins up the
     WebAssembly build of D2 in a worker thread, which keeps the process
     alive until the compiler is disposed)  */
@@ -117,6 +99,7 @@ const visibleWidth = (line) => {
 };
 /*  reusable functionality: Mermaid and D2 diagram rendering as Unicode/ASCII art or SVG  */
 export class Diagram {
+    /*  detect a terminal dimension from an environment variable, else from stdout (0 if unknown)  */
     static detectTermDimension(envVar, stdoutProp) {
         let value = 0;
         /*  attempt 1: query environment variable  */
@@ -144,23 +127,13 @@ export class Diagram {
     }
     /*  detect terminal color capability  */
     static detectColorMode() {
-        let mode = "none";
-        let explicit = false;
         /*  attempt 1: query environment variable (explicitly)  */
-        if (process.env.ASE_TERM_COLORS !== undefined)
-            if (/^(?:none|ansi16|ansi256)$/.test(process.env.ASE_TERM_COLORS)) {
-                mode = process.env.ASE_TERM_COLORS;
-                explicit = true;
-            }
+        const env = process.env.ASE_TERM_COLORS;
+        if (env === "none" || env === "ansi16" || env === "ansi256")
+            return env;
         /*  attempt 2: query stdout  */
-        if (!explicit && process.stdout.isTTY) {
-            const depth = process.stdout.getColorDepth();
-            if (depth >= 8)
-                mode = "ansi256";
-            else if (depth >= 4)
-                mode = "ansi16";
-        }
-        return mode;
+        const depth = process.stdout.isTTY ? process.stdout.getColorDepth() : 0;
+        return depth >= 8 ? "ansi256" : depth >= 4 ? "ansi16" : "none";
     }
     /*  dispose the D2 compiler (if any), so its worker thread no longer
         keeps the process alive (used by the short-lived CLI only)  */
@@ -287,10 +260,13 @@ export default class DiagramCommand {
             .command("diagram")
             .description("Render Mermaid or D2 diagram specification as Unicode/ASCII art or SVG")
             .option("-i, --input <file>", "read diagram source from file instead of stdin")
-            .option("-l, --lang <lang>", "diagram language (\"mermaid\" or \"d2\")", parseLang("--lang"), "mermaid")
-            .option("-f, --format <format>", "output format (\"ascii\" or \"svg\")", parseFormat("--format"), "ascii")
+            .addOption(new Option("-l, --lang <lang>", "diagram language")
+            .choices(["mermaid", "d2"]).default("mermaid"))
+            .addOption(new Option("-f, --format <format>", "output format")
+            .choices(["ascii", "svg"]).default("ascii"))
             .option("-a, --ascii", "emit plain ASCII (+-|) instead of Unicode box-drawing", false)
-            .option("-c, --color-mode <mode>", "force color mode (\"none\", \"ansi16\", or \"ansi256\") (Mermaid only)", parseColorMode("--color-mode"), Diagram.detectColorMode())
+            .addOption(new Option("-c, --color-mode <mode>", "force color mode (Mermaid only)")
+            .choices(["none", "ansi16", "ansi256"]).default(Diagram.detectColorMode()))
             .option("--node-margin-x <n>", "horizontal margin between nodes of <n> characters (Mermaid only)", parseInteger("--node-margin-x"), 3)
             .option("--node-margin-y <n>", "vertical margin between nodes of <n> lines (Mermaid only)", parseInteger("--node-margin-y"), 3)
             .option("--node-padding <n>", "horizontal and vertical inner node padding with <n> characters (Mermaid only)", parseInteger("--node-padding"), 1)

package/dst/ase.js

@@ -112,9 +112,9 @@ const main = async () => {
         the command line actually addresses; when no sub-command matches
         at all, all of them are registered, as only then Commander can
         render the complete sub-command overview of a help or a typo  */
-    const register = async (name, rest) => {
-        const parent = await commands[name](program);
-        const subs = subCommands[name];
+    const register = async (top) => {
+        const parent = await commands[top](program);
+        const subs = subCommands[top];
         if (subs === undefined || !(parent instanceof Command))
             return;
         const wanted = Object.keys(subs).filter((sub) => rest.includes(sub));
@@ -133,10 +133,10 @@ const main = async () => {
         answered by the program itself and hence needs no command module,
         while an unknown command and any help request need all of them  */
     if (Object.hasOwn(commands, name))
-        await register(name, rest);
+        await register(name);
     else if (!(name === "" && version))
         for (const command of Object.keys(commands))
-            await register(command, rest);
+            await register(command);
     /*  parse program arguments  */
     await program.parseAsync(process.argv);
     /*  gracefully terminate  */