@audiofool/moondog 0.1.0 → 0.2.0-beta.2

package/src/surfaces/cli/brand-theme.mjs

@@ -2,28 +2,40 @@ import { stripVTControlCharacters } from "node:util";
 
 const escape = "\u001b[";
 const modes = new Set(["auto", "paper", "charcoal", "terminal"]);
+// Moondog is black and white, like the moon. The six prism colors from The Dark Side of the Moon
+// are the only hues, and they mark meaning rather than decoration: red fails, orange cautions,
+// green confirms, and the whole spectrum turns while Moondog works.
+// Charcoal uses the cover's colors exactly; paper darkens each hue until it reads on white.
+const prismOrder = ["red", "orange", "yellow", "green", "blue", "violet"];
 const palettes = {
   paper: {
-    background: "#eee7d5",
-    foreground: "#242722",
-    muted: "#606359",
-    faint: "#65685d",
-    accent: "#746044",
-    success: "#50644b",
-    warning: "#7c5d25",
-    error: "#a04136",
+    background: "#f4f4f4",
+    foreground: "#141414",
+    muted: "#585858",
+    faint: "#8a8a8a",
+    accent: "#000000",
+    red: "#d33028",
+    orange: "#b25119",
+    yellow: "#787102",
+    green: "#3c7c3d",
+    blue: "#33768d",
+    violet: "#6e5c8c",
   },
   charcoal: {
-    background: "#222521",
-    foreground: "#eee7d5",
-    muted: "#a9ab9c",
-    faint: "#96988d",
-    accent: "#ccb995",
-    success: "#a8b497",
-    warning: "#d0ad73",
-    error: "#d39b8c",
+    background: "#0c0c0c",
+    foreground: "#e4e4e4",
+    muted: "#9e9e9e",
+    faint: "#666666",
+    accent: "#ffffff",
+    red: "#d93e37",
+    orange: "#e27231",
+    yellow: "#fcf040",
+    green: "#52a953",
+    blue: "#4ea2bf",
+    violet: "#6e5c8c",
   },
 };
+const semantic = { success: "green", warning: "orange", error: "red" };
 const ansi16 = [
   [0, 0, 0], [128, 0, 0], [0, 128, 0], [128, 128, 0],
   [0, 0, 128], [128, 0, 128], [0, 128, 128], [192, 192, 192],
@@ -148,19 +160,22 @@ export function createMoondogTheme({ mode = "auto", environment = process.env }
   const fallback = {
     foreground: light ? 30 : 37,
     muted: light ? 30 : 37,
-    faint: light ? 30 : 90,
-    accent: light ? 30 : 33,
-    success: light ? 32 : 92,
-    warning: light ? 30 : 33,
-    error: light ? 31 : 91,
+    faint: 90,
+    accent: light ? 30 : 97,
+    red: 31,
+    orange: 33,
+    yellow: 33,
+    green: 32,
+    blue: 36,
+    violet: 35,
   };
-  const foreground = (name) => {
+  const foreground = (requested) => {
+    const name = semantic[requested] ?? requested;
     if (depth === 0) return unstyled;
     if (terminal) {
+      // The terminal keeps its own palette, including its own reading of each prism color.
       if (name === "accent") return bold;
-      if (name === "success") return style(32, 39);
-      if (name === "warning") return style(33, 39);
-      if (name === "error") return style(31, 39);
+      if (Object.hasOwn(fallback, name) && prismOrder.includes(name)) return style(fallback[name], 39);
       return plain;
     }
     if (depth === 24) return style(`38;2;${rgb(palette[name]).join(";")}`, 39);
@@ -174,6 +189,7 @@ export function createMoondogTheme({ mode = "auto", environment = process.env }
   const success = foreground("success");
   const warning = foreground("warning");
   const error = foreground("error");
+  const prism = Object.freeze(prismOrder.map(foreground));
   let background = plain;
   if (depth === 0) background = unstyled;
   else if (!terminal) {
@@ -182,10 +198,15 @@ export function createMoondogTheme({ mode = "auto", environment = process.env }
       : depth === 8 ? `48;5;${nearestXterm(palette.background)}` : light ? 107 : 40;
     background = style(code, 49);
   }
-  const selected = (value) => inverse(bold(text(value)));
+  // One selection language everywhere: a moon mark and full-strength ink, never an inverse bar.
+  const selected = (value) => bold(accent(value));
+  const selectedRow = (value) => {
+    const row = String(value ?? "");
+    return row.startsWith("→ ") ? accent("◉ ") + selected(row.slice(2)) : selected(row);
+  };
   const selectListTheme = {
-    selectedPrefix: selected,
-    selectedText: selected,
+    selectedPrefix: selectedRow,
+    selectedText: selectedRow,
     description: muted,
     scrollInfo: muted,
     noMatch: muted,
@@ -218,10 +239,12 @@ export function createMoondogTheme({ mode = "auto", environment = process.env }
     success,
     warning,
     error,
+    prism,
     bold,
     italic,
     underline,
     inverse,
+    selected,
     background,
     editorTheme,
     selectListTheme,

package/src/surfaces/cli/command-completions.mjs

@@ -1,54 +1,59 @@
+import { N_, screenTranslator } from "../../i18n/index.mjs";
+
+// Descriptions are marked English and translated when shown, so /language applies at once.
+let translate = screenTranslator("en");
 function choices(entries) {
-  return entries.map(([value, description]) => ({ value, label: value, description }));
+  return entries.map(([value, description]) => ({ value, label: value, get description() { return translate.marked(description); } }));
 }
 
 const themeChoices = choices([
-  ["paper", "Warm ivory and charcoal ink"],
-  ["charcoal", "A quiet room, warm light"],
-  ["terminal", "Keep your terminal's colors"],
-  ["auto", "Follow MOONDOG_THEME, or guess from your terminal"],
+  ["paper", N_("Black ink on white paper")],
+  ["charcoal", N_("Moonlight on a black sky")],
+  ["terminal", N_("Keep your terminal's colors")],
+  ["auto", N_("Follow MOONDOG_THEME, or guess from your terminal")],
 ]);
 const artChoices = choices([
-  ["braille", "Character artwork with fine detail"],
-  ["ascii", "Simple terminal characters"],
-  ["off", "A quiet opening, no artwork"],
-  ["auto", "Choose artwork for this terminal"],
+  ["braille", N_("Character artwork with fine detail")],
+  ["ascii", N_("Simple terminal characters")],
+  ["off", N_("A quiet opening, no artwork")],
+  ["auto", N_("Choose artwork for this terminal")],
 ]);
-const motionChoices = choices([["on", "Animate the character artwork"], ["off", "Keep the artwork still"]]);
+const motionChoices = choices([["on", N_("Animate the character artwork")], ["off", N_("Keep the artwork still")]]);
 const webChoices = choices([
-  ["search", "Search public music sites"],
-  ["read", "Read a public page"],
-  ["status", "Check whether web lookups work"],
-  ["help", "Web lookup commands"],
+  ["search", N_("Search public music sites")],
+  ["read", N_("Read a public page")],
+  ["status", N_("Check whether web lookups work")],
+  ["help", N_("Web lookup commands")],
 ]);
 const spotifyChoices = choices([
-  ["status", "Check your Spotify connection"],
-  ["now", "What's playing now"],
-  ["devices", "Your Spotify devices"],
-  ["queue", "What's queued up"],
-  ["recent", "What you played lately"],
-  ["account", "Which account is connected"],
-  ["play", "Resume playback or play a Spotify URI"],
-  ["pause", "Pause playback"],
-  ["next", "Play the next track"],
-  ["previous", "Play the previous track"],
-  ["volume", "Set volume from 0 to 100"],
-  ["seek", "Seek to a position in milliseconds"],
-  ["shuffle", "Set shuffle on or off"],
-  ["repeat", "Repeat off, one track, or the context"],
-  ["transfer", "Move playback to another device"],
-  ["queue-add", "Add a track or episode URI to the queue"],
-  ["resolve", "Find a track by title and artist"],
-  ["sync-recent", "Add your latest plays to your profile"],
-  ["import-history", "Add a Spotify history ZIP to your profile"],
-  ["configure", "Save your Spotify app's Client ID"],
-  ["login", "Connect your Spotify account"],
-  ["logout", "Disconnect your Spotify account"],
-  ["help", "Spotify commands"],
+  ["status", N_("Check your Spotify connection")],
+  ["now", N_("What's playing now")],
+  ["devices", N_("Your Spotify devices")],
+  ["queue", N_("What's queued up")],
+  ["recent", N_("What you played lately")],
+  ["account", N_("Which account is connected")],
+  ["play", N_("Resume playback or play a Spotify URI")],
+  ["pause", N_("Pause playback")],
+  ["next", N_("Play the next track")],
+  ["previous", N_("Play the previous track")],
+  ["volume", N_("Set volume from 0 to 100")],
+  ["seek", N_("Seek to a position in milliseconds")],
+  ["shuffle", N_("Set shuffle on or off")],
+  ["repeat", N_("Repeat off, one track, or the context")],
+  ["transfer", N_("Move playback to another device")],
+  ["queue-add", N_("Add a track or episode URI to the queue")],
+  ["resolve", N_("Find a track by title and artist")],
+  ["sync-recent", N_("Add your latest plays to your profile")],
+  ["sync-library", N_("Add your Spotify library and top artists to your profile")],
+  ["import-history", N_("Add a Spotify history ZIP to your profile")],
+  ["configure", N_("Save your Spotify app's Client ID")],
+  ["login", N_("Connect your Spotify account")],
+  ["logout", N_("Disconnect your Spotify account")],
+  ["help", N_("Spotify commands")],
 ]);
 const spotifyArguments = new Map([
-  ["shuffle", choices([["on", "Enable shuffle"], ["off", "Disable shuffle"]])],
-  ["repeat", choices([["off", "Disable repeat"], ["track", "Repeat this track"], ["context", "Repeat the album or playlist"]])],
+  ["shuffle", choices([["on", N_("Enable shuffle")], ["off", N_("Disable shuffle")]])],
+  ["repeat", choices([["off", N_("Disable repeat")], ["track", N_("Repeat this track")], ["context", N_("Repeat the album or playlist")]])],
 ]);
 
 function completeArgument(prefix, getChoices) {
@@ -68,13 +73,21 @@ export function withCommandCompletions(commands, {
   providers = () => [],
   models = () => [],
   authProviderIds = [],
+  tr,
 } = {}) {
+  if (tr) translate = tr;
   const firstArgument = (items) => (previous) => previous.length === 0 ? items : [];
   const specifications = {
+    update: {
+      argumentHint: "[--check] [--channel latest|beta]",
+      choices: previous => previous.at(-1) === "--channel"
+        ? choices([["latest", N_("Stable releases")], ["beta", N_("Preview releases")]])
+        : choices([["--check", N_("Check without installing")], ["--channel", N_("Choose the release channel")]]).filter(item => !previous.includes(item.value)),
+    },
     theme: { argumentHint: "[paper|charcoal|terminal|auto]", choices: firstArgument(themeChoices) },
     art: { argumentHint: "[braille|ascii|off|auto]", choices: firstArgument(artChoices) },
     motion: { argumentHint: "[on|off]", choices: firstArgument(motionChoices) },
-    lyrics: { argumentHint: "[sync]", choices: firstArgument(choices([["sync", "Check profile songs for lyrics"]])) },
+    lyrics: { argumentHint: "[sync]", choices: firstArgument(choices([["sync", N_("Check profile songs for lyrics")]])) },
     web: { argumentHint: "search <query> | read <url> | status", choices: firstArgument(webChoices) },
     spotify: {
       argumentHint: "<command> [arguments]",
@@ -88,14 +101,17 @@ export function withCommandCompletions(commands, {
         .map((provider) => ({ value: provider.id, label: provider.id, description: provider.name })) : [],
     },
     model: {
-      argumentHint: "[provider] [model]",
+      argumentHint: "[provider] [model] | refresh [provider]",
       choices: (previous) => {
         if (previous.length > 1) return [];
         const available = providers().filter((provider) => provider.modelCount > 0);
         if (previous.length === 0) {
-          return available.map((provider) => ({ value: provider.id, label: provider.id, description: provider.name }));
+          return [{ value: "refresh", label: "refresh", description: translate("Refresh public model metadata; keep selection") },
+            ...available.map((provider) => ({ value: provider.id, label: provider.id, description: provider.name }))];
         }
         const providerId = previous[0].toLowerCase();
+        if (providerId === "refresh") return available.filter(provider => authProviderIds.includes(provider.id))
+          .map(provider => ({ value: provider.id, label: provider.id, description: provider.name }));
         if (!available.some((provider) => provider.id === providerId)) return [];
         return models(providerId).map((model) => ({ value: model.id, label: model.id, description: model.name }));
       },