refactor: move key utils related to cli.config

src/commands/status.ts

@@ -15,11 +15,8 @@ import {
 import {checkVersion, getSatelliteVersion} from '../services/version.services';
 import type {AssetKey} from '../types/asset-key';
 import {toAssetKeys} from '../utils/asset-key.utils';
-import {
-  assertConfigAndLoadSatelliteContext,
-  orbiterKey,
-  satelliteKey
-} from '../utils/satellite.utils';
+import {orbiterKey, satelliteKey} from '../utils/cli.config.utils';
+import {assertConfigAndLoadSatelliteContext} from '../utils/satellite.utils';
 import {lastRelease} from '../utils/upgrade.utils';
 
 export const status = async () => {

src/services/modules/upgrade/upgrade.orbiter.services.ts

@@ -7,8 +7,8 @@ import {actorParameters} from '../../../api/actor.api';
 import {getCliOrbiters} from '../../../configs/cli.config';
 import {ORBITER_WASM_NAME} from '../../../constants/constants';
 import type {UpgradeWasmModule} from '../../../types/upgrade';
+import {orbiterKey} from '../../../utils/cli.config.utils';
 import {NEW_CMD_LINE} from '../../../utils/prompt.utils';
-import {orbiterKey} from '../../../utils/satellite.utils';
 import {logUpgradeResult, readUpgradeOptions} from '../../../utils/upgrade.utils';
 import {
   confirmReset,

src/services/modules/upgrade/upgrade.satellite.services.ts

@@ -15,8 +15,9 @@ import {
   type UpgradeWasmModule,
   type UpgradeWasmParams
 } from '../../../types/upgrade';
+import {satelliteKey} from '../../../utils/cli.config.utils';
 import {NEW_CMD_LINE} from '../../../utils/prompt.utils';
-import {assertConfigAndLoadSatelliteContext, satelliteKey} from '../../../utils/satellite.utils';
+import {assertConfigAndLoadSatelliteContext} from '../../../utils/satellite.utils';
 import {logUpgradeResult, readUpgradeOptions} from '../../../utils/upgrade.utils';
 import {assertSatelliteBuildType} from './upgrade-assert.services';
 import {

src/utils/cli.config.utils.ts

@@ -3,6 +3,7 @@ import Conf from 'conf';
 import envPaths from 'env-paths';
 import {existsSync} from 'node:fs';
 import {resolve} from 'node:path';
+import {getCliOrbiters, getCliSatellites} from '../configs/cli.config';
 import {CONFIG_OPTIONS} from '../constants/config.constants';
 import type {CliConfig} from '../types/cli.config';
 
@@ -31,3 +32,19 @@ const configPath = (): string => {
 export const configFileExists = (): boolean => existsSync(configPath());
 
 export const noConfigFile = (): boolean => !configFileExists();
+
+/**
+ * For display purpose, use either the name or id. Most probably we should find a name but for simplicity reason we fallback to Id.
+ * @param satelliteId name or id
+ */
+export const satelliteKey = async (satelliteId: string): Promise<string> => {
+  const satellites = await getCliSatellites();
+  const satellite = satellites.find(({p}) => p === satelliteId);
+  return satellite?.n ?? satelliteId;
+};
+
+export const orbiterKey = async (orbiterId: string): Promise<string> => {
+  const orbiters = await getCliOrbiters();
+  const orbiter = orbiters?.find(({p}) => p === orbiterId);
+  return orbiter?.n !== undefined && orbiter.n !== '' ? orbiter.n : orbiterId;
+};

src/utils/satellite.utils.ts

@@ -3,7 +3,6 @@ import type {PrincipalText} from '@dfinity/zod-schemas';
 import type {JunoConfig, SatelliteConfig} from '@junobuild/config';
 import {red} from 'kleur';
 import {actorParameters} from '../api/actor.api';
-import {getCliOrbiters, getCliSatellites} from '../configs/cli.config';
 import {noJunoConfig, readJunoConfig} from '../configs/juno.config';
 import {ENV} from '../env';
 import type {SatelliteConfigEnv} from '../types/config';
@@ -80,19 +79,3 @@ const satelliteParameters = async (
     ...(await actorParameters())
   };
 };
-
-/**
- * For display purpose, use either the name or id. Most probably we should find a name but for simplicity reason we fallback to Id.
- * @param satelliteId name or id
- */
-export const satelliteKey = async (satelliteId: string): Promise<string> => {
-  const satellites = await getCliSatellites();
-  const satellite = satellites.find(({p}) => p === satelliteId);
-  return satellite?.n ?? satelliteId;
-};
-
-export const orbiterKey = async (orbiterId: string): Promise<string> => {
-  const orbiters = await getCliOrbiters();
-  const orbiter = orbiters?.find(({p}) => p === orbiterId);
-  return orbiter?.n !== undefined && orbiter.n !== '' ? orbiter.n : orbiterId;
-};