Skip to content

Commit 6b0f928

Browse files
refactor: group cli types (#489)
Signed-off-by: David Dal Busco <david.dalbusco@outlook.com>
1 parent 1233f53 commit 6b0f928

14 files changed

Lines changed: 10 additions & 10 deletions

src/cli/env.loader.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import {notEmptyString} from '@dfinity/utils';
22
import {nextArg} from '@junobuild/cli-tools';
3-
import {type JunoCliConfig, type JunoCliEnv, type JunoConsole} from '../types/cli.env';
3+
import {type JunoCliConfig, type JunoCliEnv, type JunoConsole} from '../types/cli/cli.env';
44

55
export const loadEnv = (): JunoCliEnv => {
66
const [_, ...args] = process.argv.slice(2);

src/configs/cli.config.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import type Conf from 'conf';
44
import {red, yellow} from 'kleur';
55
import {askForPassword} from '../services/cli.settings.services';
66
import {getSettingsStore} from '../stores/settings.store';
7-
import type {CliConfig, CliOrbiterConfig, CliSatelliteConfig} from '../types/cli.config';
7+
import type {CliConfig, CliOrbiterConfig, CliSatelliteConfig} from '../types/cli/cli.config';
88
import {loadConfig} from '../utils/cli.config.utils';
99

1010
// Save in https://github.com/sindresorhus/env-paths#pathsconfig

src/configs/cli.settings.config.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import Conf, {type Schema} from 'conf';
22
import {ENV} from '../env';
3-
import {type CliSettings} from '../types/cli.settings';
3+
import {type CliSettings} from '../types/cli/cli.settings';
44

55
const schema: Schema<CliSettings> = {
66
encryption: {

src/configs/cli.state.config.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import {
55
type CliState,
66
type CliStateSatellite,
77
type CliStateSatelliteAppliedConfigHashes
8-
} from '../types/cli.state';
8+
} from '../types/cli/cli.state';
99

1010
export const getStateConfig = (): Conf<CliState> =>
1111
new Conf<CliState>({projectName: ENV.config.projectStateName});

src/constants/config.constants.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import type {Schema} from 'conf';
22
import {ENV} from '../env';
3-
import {type CliConfig} from '../types/cli.config';
4-
import {type CliDefaultOptions, type CliOptions} from '../types/cli.options';
3+
import {type CliConfig} from '../types/cli/cli.config';
4+
import {type CliDefaultOptions, type CliOptions} from '../types/cli/cli.options';
55

66
const schema: Schema<CliConfig> = {
77
token: {

src/services/config/apply.services.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ import {
4242
type ConfigHash,
4343
type RuleHash,
4444
type SettingsHash
45-
} from '../../types/cli.state';
45+
} from '../../types/cli/cli.state';
4646
import type {SatelliteParametersWithId} from '../../types/satellite';
4747
import {assertConfigAndLoadSatelliteContext} from '../../utils/juno.config.utils';
4848
import {objHash} from '../../utils/obj.utils';

src/services/config/init.services.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import {
1414
writeJunoConfig,
1515
writeJunoConfigPlaceholder
1616
} from '../../configs/juno.config';
17-
import type {CliOrbiterConfig, CliSatelliteConfig} from '../../types/cli.config';
17+
import type {CliOrbiterConfig, CliSatelliteConfig} from '../../types/cli/cli.config';
1818
import {type EmulatorConfigWithoutConsole} from '../../types/emulator';
1919
import type {PackageManager} from '../../types/pm';
2020
import {detectPackageManager} from '../../utils/pm.utils';

src/stores/settings.store.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import type Conf from 'conf';
33
import {yellow} from 'kleur';
44
import {getSettingsConfig, saveEncryption} from '../configs/cli.settings.config';
55
import {askForPassword} from '../services/cli.settings.services';
6-
import type {CliSettings} from '../types/cli.settings';
6+
import type {CliSettings} from '../types/cli/cli.settings';
77
import {configFileExists, loadConfig} from '../utils/cli.config.utils';
88
import {isHeadless} from '../utils/process.utils';
99
import {confirm} from '../utils/prompt.utils';

0 commit comments

Comments
 (0)