refactor(cmdline): inline commands used for getList (@fehmer)

Author: fehmer

frontend/src/ts/commandline/lists.ts

@@ -32,6 +32,7 @@ import { Command, CommandsSubgroup } from "./types";
 import { buildCommandForConfigKey } from "./util";
 import { CommandlineConfigMetadataObject } from "./commandline-metadata";
 import { isAuthAvailable, isAuthenticated, signOut } from "../firebase";
+import { ConfigKey } from "@monkeytype/schemas/configs";
 
 const challengesPromise = JSONData.getChallengeList();
 challengesPromise
@@ -44,37 +45,22 @@ challengesPromise
     );
   });
 
-const languageCommand = buildCommandForConfigKey("language");
-const difficultyCommand = buildCommandForConfigKey("difficulty");
-const blindModeCommand = buildCommandForConfigKey("blindMode");
-const oppositeShiftModeCommand = buildCommandForConfigKey("oppositeShiftMode");
-const stopOnErrorCommand = buildCommandForConfigKey("stopOnError");
-const confidenceModeCommand = buildCommandForConfigKey("confidenceMode");
-const lazyModeCommand = buildCommandForConfigKey("lazyMode");
-const layoutCommand = buildCommandForConfigKey("layout");
-const showAverageCommand = buildCommandForConfigKey("showAverage");
-const showPbCommand = buildCommandForConfigKey("showPb");
-const keymapLayoutCommand = buildCommandForConfigKey("keymapLayout");
-const customThemeCommand = buildCommandForConfigKey("customTheme");
-const adsCommand = buildCommandForConfigKey("ads");
-const minSpeedCommand = buildCommandForConfigKey("minWpm");
-const minAccCommand = buildCommandForConfigKey("minAcc");
-const paceCaretCommand = buildCommandForConfigKey("paceCaret");
-
 export const commands: CommandsSubgroup = {
   title: "",
   list: [
     //result
     ...ResultScreenCommands,
 
     //test screen
-    buildCommandForConfigKey("punctuation"),
-    buildCommandForConfigKey("numbers"),
-    buildCommandForConfigKey("mode"),
-    buildCommandForConfigKey("time"),
-    buildCommandForConfigKey("words"),
-    buildCommandForConfigKey("quoteLength"),
-    languageCommand,
+    ...buildCommands(
+      "punctuation",
+      "numbers",
+      "mode",
+      "time",
+      "words",
+      "quoteLength",
+      "language",
+    ),
     {
       id: "changeCustomModeText",
       display: "Change custom text",
@@ -111,14 +97,14 @@ export const commands: CommandsSubgroup = {
 
     //behavior
     ...buildCommands(
-      difficultyCommand,
+      "difficulty",
       "quickRestart",
       "repeatQuotes",
-      blindModeCommand,
+      "blindMode",
       "alwaysShowWordsHistory",
       "singleListCommandLine",
-      minSpeedCommand,
-      minAccCommand,
+      "minWpm",
+      "minAcc",
       ...MinBurstCommands,
       "britishEnglish",
       ...FunboxCommands,
@@ -130,15 +116,15 @@ export const commands: CommandsSubgroup = {
     ...buildCommands(
       "freedomMode",
       "strictSpace",
-      oppositeShiftModeCommand,
-      stopOnErrorCommand,
-      confidenceModeCommand,
+      "oppositeShiftMode",
+      "stopOnError",
+      "confidenceMode",
       "quickEnd",
       "indicateTypos",
       "compositionDisplay",
       "hideExtraLetters",
-      lazyModeCommand,
-      layoutCommand,
+      "lazyMode",
+      "layout",
       "codeUnindentOnBackspace",
     ),
 
@@ -154,7 +140,7 @@ export const commands: CommandsSubgroup = {
     ...buildCommands(
       "smoothCaret",
       "caretStyle",
-      paceCaretCommand,
+      "paceCaret",
       "repeatedPace",
       "paceCaretStyle",
     ),
@@ -184,14 +170,14 @@ export const commands: CommandsSubgroup = {
       "keymapStyle",
       "keymapLegendStyle",
       "keymapSize",
-      keymapLayoutCommand,
+      "keymapLayout",
       "keymapShowTopRow",
     ),
 
     //theme
     ...buildCommands(
       ...ThemesCommands,
-      customThemeCommand,
+      "customTheme",
 
       ...CustomThemesListCommands,
       "flipTestColors",
@@ -218,14 +204,14 @@ export const commands: CommandsSubgroup = {
       "showKeyTips",
       "showOutOfFocusWarning",
       "capsLockWarning",
-      showAverageCommand,
-      showPbCommand,
+      "showAverage",
+      "showPb",
       "monkeyPowerLevel",
       "monkey",
     ),
 
     //danger zone
-    adsCommand,
+    ...buildCommands("ads"),
 
     //other
     ...LoadChallengeCommands,
@@ -381,29 +367,36 @@ export const commands: CommandsSubgroup = {
   ],
 };
 
+function findCommandById(key: ConfigKey): Command {
+  const id = "change" + key.charAt(0).toUpperCase() + key.slice(1);
+  const found = commands.list.find((it) => it.id === id);
+  if (!found) throw new Error(`Cannot find command with id ${id}.`);
+  return found;
+}
+
 const lists = {
-  keymapLayouts: keymapLayoutCommand.subgroup,
-  enableAds: adsCommand.subgroup,
-  customThemesList: customThemeCommand.subgroup,
+  keymapLayouts: findCommandById("keymapLayout").subgroup,
+  enableAds: findCommandById("ads").subgroup,
+  customThemesList: findCommandById("customTheme").subgroup,
   themes: ThemesCommands[0]?.subgroup,
   loadChallenge: LoadChallengeCommands[0]?.subgroup,
-  languages: languageCommand.subgroup,
-  difficulty: difficultyCommand.subgroup,
-  lazyMode: lazyModeCommand.subgroup,
-  paceCaretMode: paceCaretCommand.subgroup,
-  showAverage: showAverageCommand.subgroup,
-  showPb: showPbCommand.subgroup,
-  minWpm: minSpeedCommand.subgroup,
-  minAcc: minAccCommand.subgroup,
+  languages: findCommandById("language").subgroup,
+  difficulty: findCommandById("difficulty").subgroup,
+  lazyMode: findCommandById("lazyMode").subgroup,
+  paceCaretMode: findCommandById("paceCaret").subgroup,
+  showAverage: findCommandById("showAverage").subgroup,
+  showPb: findCommandById("showPb").subgroup,
+  minWpm: findCommandById("minWpm").subgroup,
+  minAcc: findCommandById("minAcc").subgroup,
   minBurst: MinBurstCommands[0]?.subgroup,
   funbox: FunboxCommands[0]?.subgroup,
-  confidenceMode: confidenceModeCommand.subgroup,
-  stopOnError: stopOnErrorCommand.subgroup,
-  layouts: layoutCommand.subgroup,
-  oppositeShiftMode: oppositeShiftModeCommand.subgroup,
+  confidenceMode: findCommandById("confidenceMode").subgroup,
+  stopOnError: findCommandById("stopOnError").subgroup,
+  layouts: findCommandById("layout").subgroup,
+  oppositeShiftMode: findCommandById("oppositeShiftMode").subgroup,
   tags: TagsCommands[0]?.subgroup,
   resultSaving: ResultSavingCommands[0]?.subgroup,
-  blindMode: blindModeCommand.subgroup,
+  blindMode: findCommandById("blindMode").subgroup,
 };
 
 export function doesListExist(listName: string): boolean {