Skip to content

Commit 53da7f8

Browse files
Hannia Valerahanniavalera
authored andcommitted
refactor(presets): simplify TestPreset interface and update jobs handling
1 parent 24a2bd2 commit 53da7f8

2 files changed

Lines changed: 6 additions & 14 deletions

File tree

src/api.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,9 +98,7 @@ class CMakeProjectWrapper implements api.Project {
9898

9999
get testPreset() {
100100
logApiTelemetry('getTestPreset');
101-
// Cast: internal TestPreset widens execution.jobs to number | string (v11+),
102-
// but the external API still exposes the narrower number type.
103-
return this.project.testPreset as api.TestPreset | null ?? undefined;
101+
return this.project.testPreset ?? undefined;
104102
}
105103

106104
get packagePreset() {

src/presets/preset.ts

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -256,15 +256,7 @@ export interface TestPresetPrivate {
256256
__generator?: string; // Getting this from the config preset
257257
}
258258

259-
// v11+: execution.jobs can be an empty string (--parallel with no value).
260-
// Widen the type from the API's number to number | string.
261-
export interface TestExecutionOptions extends Omit<api.ExecutionOptions, 'jobs'> {
262-
jobs?: number | string;
263-
}
264-
265-
export interface TestPreset extends Omit<api.TestPreset, 'execution'>, TestPresetPrivate, PresetPrivate {
266-
execution?: TestExecutionOptions;
267-
}
259+
export interface TestPreset extends api.TestPreset, TestPresetPrivate, PresetPrivate {}
268260

269261
export interface PackagePresetPrivate {
270262
__binaryDir?: string; // Getting this from the config preset
@@ -2307,10 +2299,12 @@ export function testArgs(preset: TestPreset): string[] {
23072299
preset.execution.enableFailover && result.push('-F');
23082300
if (preset.execution.jobs !== undefined) {
23092301
// v11+: jobs can be an empty string meaning --parallel with no value (auto-detect).
2310-
if (preset.execution.jobs === '') {
2302+
// The API type currently declares jobs as number; will be updated to number | string.
2303+
const jobs = preset.execution.jobs as number | string;
2304+
if (jobs === '') {
23112305
result.push('--parallel');
23122306
} else {
2313-
result.push('--parallel', preset.execution.jobs.toString());
2307+
result.push('--parallel', jobs.toString());
23142308
}
23152309
}
23162310
preset.execution.resourceSpecFile && result.push('--resource-spec-file', preset.execution.resourceSpecFile);

0 commit comments

Comments
 (0)