Fix circular dependencies

Signed-off-by: paulober <[email protected]>

Author: paulober

src/commands/clearGithubApiCache.mts

@@ -2,14 +2,13 @@ import { Command } from "./command.mjs";
 import Logger from "../logger.mjs";
 import GithubApiCache from "../utils/githubApiCache.mjs";
 import { window } from "vscode";
+import { CLEAR_GITHUB_API_CACHE } from "./cmdIds.mjs";
 
 export default class ClearGithubApiCacheCommand extends Command {
   private _logger: Logger = new Logger("ClearGithubApiCacheCommand");
 
-  public static readonly id = "clearGithubApiCache";
-
   constructor() {
-    super(ClearGithubApiCacheCommand.id);
+    super(CLEAR_GITHUB_API_CACHE);
   }
 
   async execute(): Promise<void> {

src/commands/cmdIds.mts

@@ -0,0 +1,45 @@
+// Command IDs
+export const CLEAR_GITHUB_API_CACHE = "clearGithubApiCache";
+export const COMPILE_PROJECT = "compileProject";
+export const CONDITIONAL_DEBUGGING = "conditionalDebugging";
+export const CONFIGURE_CMAKE = "configureCmake";
+export const CLEAN_CMAKE = "cleanCmake";
+export const SWITCH_BUILD_TYPE = "switchBuildType";
+export const DEBUG_LAYOUT = "debugLayout";
+export const FLASH_PROJECT_SWD = "flashProject";
+export const GET_PYTHON_PATH = "getPythonPath";
+export const GET_ENV_PATH = "getEnvPath";
+export const GET_GDB_PATH = "getGDBPath";
+export const GET_COMPILER_PATH = "getCompilerPath";
+export const GET_CXX_COMPILER_PATH = "getCxxCompilerPath";
+export const GET_CHIP = "getChip";
+export const GET_CHIP_UPPERCASE = "getChipUppercase";
+export const GET_TARGET = "getTarget";
+export const GET_PICOTOOL_PATH = "getPicotoolPath";
+export const GET_OPENOCD_ROOT = "getOpenOCDRoot";
+export const GET_SVD_PATH = "getSVDPath";
+export const GET_WEST_PATH = "getWestPath";
+export const GET_ZEPHYR_WORKSPACE_PATH = "getZephyrWorkspacePath";
+
+export const IMPORT_PROJECT = "importProject";
+
+export const LAUNCH_TARGET_PATH = "launchTargetPath";
+export const LAUNCH_TARGET_PATH_RELEASE = "launchTargetPathRelease";
+export const SBOM_TARGET_PATH_DEBUG = "sbomTargetPathDebug";
+export const SBOM_TARGET_PATH_RELEASE = "sbomTargetPathRelease";
+
+export const NEW_EXAMPLE_PROJECT = "newExampleProject";
+
+export const NEW_PROJECT = "newProject";
+
+export const OPEN_SDK_DOCUMENTATION = "openSdkDocumentation";
+
+export const RUN_PROJECT = "runProject";
+
+export const SWITCH_BOARD = "switchBoard";
+
+export const SWITCH_SDK = "switchSDK";
+
+export const UNINSTALL_PICO_SDK = "uninstallPicoSDK";
+
+export const UPDATE_OPENOCD = "updateOpenOCD";

src/commands/compileProject.mts

@@ -5,14 +5,13 @@ import Logger from "../logger.mjs";
 import Settings, { SettingsKey } from "../settings.mjs";
 import State from "../state.mjs";
 import { cmakeToolsForcePicoKit } from "../utils/cmakeToolsUtil.mjs";
+import { COMPILE_PROJECT } from "./cmdIds.mjs";
 
 export default class CompileProjectCommand extends CommandWithResult<boolean> {
   private _logger: Logger = new Logger("CompileProjectCommand");
 
-  public static readonly id = "compileProject";
-
   constructor() {
-    super(CompileProjectCommand.id);
+    super(COMPILE_PROJECT);
   }
 
   async execute(): Promise<boolean> {

src/commands/conditionalDebugging.mts

@@ -2,7 +2,7 @@ import { Command, extensionName } from "./command.mjs";
 import Logger from "../logger.mjs";
 import { commands, window, workspace, debug } from "vscode";
 import State from "../state.mjs";
-import DebugLayoutCommand from "./debugLayout.mjs";
+import { CONDITIONAL_DEBUGGING, DEBUG_LAYOUT } from "./cmdIds.mjs";
 
 /**
  * Relay command for the default buildin debug select and start command.
@@ -11,10 +11,8 @@ import DebugLayoutCommand from "./debugLayout.mjs";
 export default class ConditionalDebuggingCommand extends Command {
   private _logger: Logger = new Logger("ConditionalDebuggingCommand");
 
-  public static readonly id = "conditionalDebugging";
-
   constructor() {
-    super(ConditionalDebuggingCommand.id);
+    super(CONDITIONAL_DEBUGGING);
   }
 
   async execute(): Promise<void> {
@@ -29,7 +27,7 @@ export default class ConditionalDebuggingCommand extends Command {
         return;
       }
 
-      void commands.executeCommand(`${extensionName}.${DebugLayoutCommand.id}`);
+      void commands.executeCommand(`${extensionName}.${DEBUG_LAYOUT}`);
       void debug.startDebugging(wsFolder, "Pico Debug (probe-rs)");
 
       return;

src/commands/configureCmake.mts

@@ -7,14 +7,13 @@ import { join } from "path";
 import { rimraf } from "rimraf";
 import { unknownErrorToString } from "../utils/errorHelper.mjs";
 import type UI from "../ui.mjs";
+import { CLEAN_CMAKE, CONFIGURE_CMAKE, SWITCH_BUILD_TYPE } from "./cmdIds.mjs";
 
 export default class ConfigureCmakeCommand extends Command {
   private _logger: Logger = new Logger("ConfigureCmakeCommand");
 
-  public static readonly id = "configureCmake";
-
   constructor() {
-    super(ConfigureCmakeCommand.id);
+    super(CONFIGURE_CMAKE);
   }
 
   async execute(): Promise<void> {
@@ -59,10 +58,8 @@ export default class ConfigureCmakeCommand extends Command {
 export class CleanCMakeCommand extends Command {
   private _logger: Logger = new Logger("CleanCMakeCommand");
 
-  public static readonly id = "cleanCmake";
-
   constructor(private readonly _ui: UI) {
-    super(CleanCMakeCommand.id);
+    super(CLEAN_CMAKE);
   }
 
   async execute(): Promise<void> {
@@ -127,10 +124,8 @@ export class CleanCMakeCommand extends Command {
 export class SwitchBuildTypeCommand extends Command {
   private _logger: Logger = new Logger("SwitchBuildTypeCommand");
 
-  public static readonly id = "switchBuildType";
-
   constructor(private readonly _ui: UI) {
-    super(SwitchBuildTypeCommand.id);
+    super(SWITCH_BUILD_TYPE);
   }
 
   async execute(): Promise<void> {

src/commands/debugLayout.mts

@@ -1,17 +1,16 @@
 import { Command } from "./command.mjs";
 import Logger from "../logger.mjs";
 import { commands, workspace } from "vscode";
+import { DEBUG_LAYOUT } from "./cmdIds.mjs";
 
 /**
  * Relay command for toggling the debug layout (debug activity bar and debug repl).
  */
 export default class DebugLayoutCommand extends Command {
   private _logger: Logger = new Logger("DebugLayoutCommand");
 
-  public static readonly id = "debugLayout";
-
   constructor() {
-    super(DebugLayoutCommand.id);
+    super(DEBUG_LAYOUT);
   }
 
   async execute(): Promise<void> {

src/commands/flashProjectSwd.mts

@@ -2,14 +2,13 @@ import { CommandWithResult } from "./command.mjs";
 import Logger from "../logger.mjs";
 import { tasks, window } from "vscode";
 import { EventEmitter } from "stream";
+import { FLASH_PROJECT_SWD } from "./cmdIds.mjs";
 
 export default class FlashProjectSWDCommand extends CommandWithResult<boolean> {
   private _logger: Logger = new Logger("FlashProjectSWDCommand");
 
-  public static readonly id = "flashProject";
-
   constructor() {
-    super(FlashProjectSWDCommand.id);
+    super(FLASH_PROJECT_SWD);
   }
 
   async execute(): Promise<boolean> {

src/commands/getPaths.mts

@@ -29,18 +29,31 @@ import Logger from "../logger.mjs";
 import { rustProjectGetSelectedChip } from "../utils/rustUtil.mjs";
 import { OPENOCD_VERSION } from "../utils/sharedConstants.mjs";
 import {
-  getBoardFromZephyrProject,
+  GET_CHIP,
+  GET_CHIP_UPPERCASE,
+  GET_COMPILER_PATH,
+  GET_CXX_COMPILER_PATH,
+  GET_ENV_PATH,
+  GET_GDB_PATH,
+  GET_OPENOCD_ROOT,
+  GET_PICOTOOL_PATH,
+  GET_PYTHON_PATH,
+  GET_SVD_PATH,
+  GET_TARGET,
+  GET_WEST_PATH,
+  GET_ZEPHYR_WORKSPACE_PATH,
+} from "./cmdIds.mjs";
+import { getBoardFromZephyrProject } from "../utils/setupZephyr.mjs";
+import {
   ZEPHYR_PICO,
   ZEPHYR_PICO2,
   ZEPHYR_PICO2_W,
   ZEPHYR_PICO_W,
-} from "./switchBoard.mjs";
+} from "../models/zephyrBoards.mjs";
 
 export class GetPythonPathCommand extends CommandWithResult<string> {
-  public static readonly id = "getPythonPath";
-
   constructor() {
-    super(GetPythonPathCommand.id);
+    super(GET_PYTHON_PATH);
   }
 
   async execute(): Promise<string> {
@@ -58,10 +71,8 @@ export class GetPythonPathCommand extends CommandWithResult<string> {
 }
 
 export class GetEnvPathCommand extends CommandWithResult<string> {
-  public static readonly id = "getEnvPath";
-
   constructor() {
-    super(GetEnvPathCommand.id);
+    super(GET_ENV_PATH);
   }
 
   async execute(): Promise<string> {
@@ -79,10 +90,8 @@ export class GetEnvPathCommand extends CommandWithResult<string> {
 }
 
 export class GetGDBPathCommand extends CommandWithResult<string> {
-  public static readonly id = "getGDBPath";
-
   constructor(private readonly _extensionUri: Uri) {
-    super(GetGDBPathCommand.id);
+    super(GET_GDB_PATH);
   }
 
   async execute(): Promise<string> {
@@ -172,10 +181,8 @@ export class GetGDBPathCommand extends CommandWithResult<string> {
 }
 
 export class GetCompilerPathCommand extends CommandWithResult<string> {
-  public static readonly id = "getCompilerPath";
-
   constructor() {
-    super(GetCompilerPathCommand.id);
+    super(GET_COMPILER_PATH);
   }
 
   async execute(): Promise<string> {
@@ -213,10 +220,8 @@ export class GetCompilerPathCommand extends CommandWithResult<string> {
 }
 
 export class GetCxxCompilerPathCommand extends CommandWithResult<string> {
-  public static readonly id = "getCxxCompilerPath";
-
   constructor() {
-    super(GetCxxCompilerPathCommand.id);
+    super(GET_CXX_COMPILER_PATH);
   }
 
   async execute(): Promise<string> {
@@ -256,10 +261,8 @@ export class GetCxxCompilerPathCommand extends CommandWithResult<string> {
 export class GetChipCommand extends CommandWithResult<string> {
   private readonly _logger = new Logger("GetChipCommand");
 
-  public static readonly id = "getChip";
-
   constructor() {
-    super(GetChipCommand.id);
+    super(GET_CHIP);
   }
 
   async execute(): Promise<string> {
@@ -357,10 +360,8 @@ export class GetChipCommand extends CommandWithResult<string> {
 }
 
 export class GetChipUppercaseCommand extends CommandWithResult<string> {
-  public static readonly id = "getChipUppercase";
-
   constructor() {
-    super(GetChipUppercaseCommand.id);
+    super(GET_CHIP_UPPERCASE);
   }
 
   async execute(): Promise<string> {
@@ -372,10 +373,8 @@ export class GetChipUppercaseCommand extends CommandWithResult<string> {
 }
 
 export class GetTargetCommand extends CommandWithResult<string> {
-  public static readonly id = "getTarget";
-
   constructor() {
-    super(GetTargetCommand.id);
+    super(GET_TARGET);
   }
 
   async execute(): Promise<string> {
@@ -455,12 +454,11 @@ export class GetPicotoolPathCommand extends CommandWithResult<
 > {
   private running: boolean = false;
 
-  public static readonly id = "getPicotoolPath";
-
   constructor() {
-    super(GetPicotoolPathCommand.id);
+    super(GET_PICOTOOL_PATH);
   }
 
+  // TODO: add rate limiting and caching
   async execute(): Promise<string | undefined> {
     if (this.running) {
       return undefined;
@@ -505,10 +503,8 @@ export class GetOpenOCDRootCommand extends CommandWithResult<
 > {
   private running: boolean = false;
 
-  public static readonly id = "getOpenOCDRoot";
-
   constructor() {
-    super(GetOpenOCDRootCommand.id);
+    super(GET_OPENOCD_ROOT);
   }
 
   async execute(): Promise<string | undefined> {
@@ -536,10 +532,8 @@ export class GetOpenOCDRootCommand extends CommandWithResult<
  * Currently rust only!
  */
 export class GetSVDPathCommand extends CommandWithResult<string | undefined> {
-  public static readonly id = "getSVDPath";
-
   constructor(private readonly _extensionUri: Uri) {
-    super(GetSVDPathCommand.id);
+    super(GET_SVD_PATH);
   }
 
   async execute(): Promise<string | undefined> {
@@ -582,10 +576,8 @@ export class GetSVDPathCommand extends CommandWithResult<string | undefined> {
 }
 
 export class GetWestPathCommand extends CommandWithResult<string | undefined> {
-  public static readonly id = "getWestPath";
-
   constructor() {
-    super(GetWestPathCommand.id);
+    super(GET_WEST_PATH);
   }
 
   execute(): string | undefined {
@@ -602,10 +594,8 @@ export class GetWestPathCommand extends CommandWithResult<string | undefined> {
 export class GetZephyrWorkspacePathCommand extends CommandWithResult<
   string | undefined
 > {
-  public static readonly id = "getZephyrWorkspacePath";
-
   constructor() {
-    super(GetZephyrWorkspacePathCommand.id);
+    super(GET_ZEPHYR_WORKSPACE_PATH);
   }
 
   execute(): string | undefined {

src/commands/importProject.mts

@@ -1,15 +1,11 @@
 import { CommandWithArgs } from "./command.mjs";
-import Logger from "../logger.mjs";
 import { type Uri } from "vscode";
 import { NewProjectPanel } from "../webview/newProjectPanel.mjs";
+import { IMPORT_PROJECT } from "./cmdIds.mjs";
 
 export default class ImportProjectCommand extends CommandWithArgs {
-  private _logger: Logger = new Logger("ImportProjectCommand");
-
-  public static readonly id = "importProject";
-
   constructor(private readonly _extensionUri: Uri) {
-    super(ImportProjectCommand.id);
+    super(IMPORT_PROJECT);
   }
 
   execute(projectUri?: Uri): void {