Skip to content

Commit cfe0581

Browse files
committed
Refactor ConfigSource API for better encapsulation
- Change loadDwJson() to return {config, path} for proper path tracking - Make internal utilities internal (remove mapDwJsonToNormalizedConfig, mergeConfigsWithProtection, getPopulatedFields from exports) - Remove deprecated 'sources' option from ResolveConfigOptions - CLI commands now use ResolvedB2CConfig directly with .values.* access - SDK command classes use factory methods (createB2CInstance(), createMrtAuth(), etc.) instead of manual construction - Fix replaceDefaultSources option to work without sourcesAfter BREAKING CHANGE: loadConfig() now returns ResolvedB2CConfig instead of NormalizedConfig. Access config values via .values.* property.
1 parent 64aa557 commit cfe0581

File tree

40 files changed

+173
-550
lines changed

40 files changed

+173
-550
lines changed

packages/b2c-cli/src/commands/code/activate.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,10 @@ export default class CodeActivate extends InstanceCommand<typeof CodeActivate> {
3838
this.requireOAuthCredentials();
3939

4040
const codeVersionArg = this.args.codeVersion;
41-
const hostname = this.resolvedConfig.hostname!;
41+
const hostname = this.resolvedConfig.values.hostname!;
4242

4343
// Get code version from arg, flag, or config
44-
const codeVersion = codeVersionArg ?? this.resolvedConfig.codeVersion;
44+
const codeVersion = codeVersionArg ?? this.resolvedConfig.values.codeVersion;
4545

4646
if (this.flags.reload) {
4747
// Reload mode - re-activate the code version

packages/b2c-cli/src/commands/code/delete.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ export default class CodeDelete extends InstanceCommand<typeof CodeDelete> {
5555
this.requireOAuthCredentials();
5656

5757
const codeVersion = this.args.codeVersion;
58-
const hostname = this.resolvedConfig.hostname!;
58+
const hostname = this.resolvedConfig.values.hostname!;
5959

6060
// Confirm deletion unless --force is used
6161
if (!this.flags.force) {

packages/b2c-cli/src/commands/code/deploy.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ export default class CodeDeploy extends CartridgeCommand<typeof CodeDeploy> {
5151
this.requireWebDavCredentials();
5252
this.requireOAuthCredentials();
5353

54-
const hostname = this.resolvedConfig.hostname!;
55-
let version = this.resolvedConfig.codeVersion;
54+
const hostname = this.resolvedConfig.values.hostname!;
55+
let version = this.resolvedConfig.values.codeVersion;
5656

5757
// If no code version specified, discover the active one
5858
if (!version) {

packages/b2c-cli/src/commands/code/list.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ export default class CodeList extends InstanceCommand<typeof CodeList> {
4747
async run(): Promise<CodeVersionResult> {
4848
this.requireOAuthCredentials();
4949

50-
const hostname = this.resolvedConfig.hostname!;
50+
const hostname = this.resolvedConfig.values.hostname!;
5151

5252
this.log(t('commands.code.list.fetching', 'Fetching code versions from {{hostname}}...', {hostname}));
5353

packages/b2c-cli/src/commands/code/watch.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ export default class CodeWatch extends CartridgeCommand<typeof CodeWatch> {
3131
this.requireWebDavCredentials();
3232
this.requireOAuthCredentials();
3333

34-
const hostname = this.resolvedConfig.hostname!;
35-
const version = this.resolvedConfig.codeVersion;
34+
const hostname = this.resolvedConfig.values.hostname!;
35+
const version = this.resolvedConfig.values.codeVersion;
3636

3737
this.log(t('commands.code.watch.starting', 'Starting watcher for {{path}}', {path: this.cartridgePath}));
3838
this.log(t('commands.code.watch.target', 'Target: {{hostname}}', {hostname}));

packages/b2c-cli/src/commands/docs/download.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ export default class DocsDownload extends InstanceCommand<typeof DocsDownload> {
4646

4747
this.log(
4848
t('commands.docs.download.downloading', 'Downloading documentation from {{hostname}}...', {
49-
hostname: this.resolvedConfig.hostname,
49+
hostname: this.resolvedConfig.values.hostname,
5050
}),
5151
);
5252

packages/b2c-cli/src/commands/job/export.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ export default class JobExport extends JobCommand<typeof JobExport> {
117117
'show-log': showLog,
118118
} = this.flags;
119119

120-
const hostname = this.resolvedConfig.hostname!;
120+
const hostname = this.resolvedConfig.values.hostname!;
121121

122122
// Build data units configuration
123123
const dataUnits = this.buildDataUnits({

packages/b2c-cli/src/commands/job/import.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ export default class JobImport extends JobCommand<typeof JobImport> {
6363
const {target} = this.args;
6464
const {'keep-archive': keepArchive, remote, timeout, 'show-log': showLog} = this.flags;
6565

66-
const hostname = this.resolvedConfig.hostname!;
66+
const hostname = this.resolvedConfig.values.hostname!;
6767

6868
// Create lifecycle context
6969
const context = this.createContext('job:import', {

packages/b2c-cli/src/commands/job/run.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ export default class JobRun extends JobCommand<typeof JobRun> {
8282
parameters: rawBody ? undefined : parameters,
8383
body: rawBody,
8484
wait,
85-
hostname: this.resolvedConfig.hostname,
85+
hostname: this.resolvedConfig.values.hostname,
8686
});
8787

8888
// Run beforeOperation hooks - check for skip
@@ -100,7 +100,7 @@ export default class JobRun extends JobCommand<typeof JobRun> {
100100
this.log(
101101
t('commands.job.run.executing', 'Executing job {{jobId}} on {{hostname}}...', {
102102
jobId,
103-
hostname: this.resolvedConfig.hostname!,
103+
hostname: this.resolvedConfig.values.hostname!,
104104
}),
105105
);
106106

packages/b2c-cli/src/commands/job/search.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ export default class JobSearch extends InstanceCommand<typeof JobSearch> {
8686

8787
this.log(
8888
t('commands.job.search.searching', 'Searching job executions on {{hostname}}...', {
89-
hostname: this.resolvedConfig.hostname!,
89+
hostname: this.resolvedConfig.values.hostname!,
9090
}),
9191
);
9292

0 commit comments

Comments
 (0)