Skip to content

fix: Omit -configuration when none is provided #460

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hujunfeng wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: Omit -configuration when none is provided #460

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions src/mcp/tools/device/__tests__/build_device.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,8 +161,6 @@ describe('build_device plugin', () => {
'/path/to/MyProject.xcworkspace',
'-scheme',
'MyScheme',
'-configuration',
'Debug',
'-skipMacroValidation',
'-destination',
'generic/platform=iOS',
Expand Down Expand Up @@ -195,8 +193,6 @@ describe('build_device plugin', () => {
'/path/to/MyProject.xcodeproj',
'-scheme',
'MyScheme',
'-configuration',
'Debug',
'-skipMacroValidation',
'-destination',
'generic/platform=iOS',
Expand Down
8 changes: 0 additions & 8 deletions src/mcp/tools/device/__tests__/get_device_app_path.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,8 +129,6 @@ describe('get_device_app_path plugin', () => {
'/path/to/project.xcodeproj',
'-scheme',
'MyScheme',
'-configuration',
'Debug',
'-destination',
'generic/platform=iOS',
'-derivedDataPath',
Expand Down Expand Up @@ -188,8 +186,6 @@ describe('get_device_app_path plugin', () => {
'/path/to/project.xcodeproj',
'-scheme',
'MyScheme',
'-configuration',
'Debug',
'-destination',
'generic/platform=watchOS',
'-derivedDataPath',
Expand Down Expand Up @@ -246,8 +242,6 @@ describe('get_device_app_path plugin', () => {
'/path/to/workspace.xcworkspace',
'-scheme',
'MyScheme',
'-configuration',
'Debug',
'-destination',
'generic/platform=iOS',
'-derivedDataPath',
Expand Down Expand Up @@ -388,8 +382,6 @@ describe('get_device_app_path plugin', () => {
'/path/to/project.xcodeproj',
'-scheme',
'MyScheme',
'-configuration',
'Debug',
'-destination',
'generic/platform=iOS',
'-derivedDataPath',
Expand Down
4 changes: 2 additions & 2 deletions src/mcp/tools/device/build_device.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ function createBuildDeviceRequest(params: BuildDeviceParams): BuildInvocationReq
workspacePath: params.workspacePath,
projectPath: params.projectPath,
derivedDataPath: resolveEffectiveDerivedDataPath(params),
configuration: params.configuration ?? 'Debug',
configuration: params.configuration,
platform: String(mapDevicePlatform(params.platform)),
target: 'device',
};
Expand Down Expand Up @@ -77,7 +77,7 @@ export function createBuildDeviceExecutor(
const platform = mapDevicePlatform(params.platform);
const processedParams = {
...params,
configuration: params.configuration ?? 'Debug',
configuration: params.configuration,
};
const started = createDomainStreamingPipeline('build_device', 'BUILD', ctx, 'build-result');

Expand Down
4 changes: 2 additions & 2 deletions src/mcp/tools/device/build_run_device.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ function createBuildRunDeviceRequest(params: BuildRunDeviceParams): BuildInvocat
workspacePath: params.workspacePath,
projectPath: params.projectPath,
derivedDataPath: resolveEffectiveDerivedDataPath(params),
configuration: params.configuration ?? 'Debug',
configuration: params.configuration,
platform: String(mapDevicePlatform(params.platform)),
deviceId: params.deviceId,
target: 'device',
Expand Down Expand Up @@ -87,7 +87,7 @@ export function createBuildRunDeviceExecutor(
): StreamingExecutor<BuildRunDeviceParams, BuildRunDeviceResult> {
return async (params, ctx) => {
const platform = mapDevicePlatform(params.platform);
const configuration = params.configuration ?? 'Debug';
const configuration = params.configuration;
const request = createBuildRunDeviceRequest(params);
const sharedBuildParams: SharedBuildParams = {
projectPath: params.projectPath,
Expand Down
4 changes: 2 additions & 2 deletions src/mcp/tools/device/get_device_app_path.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ function createRequest(params: GetDeviceAppPathParams) {
scheme: params.scheme,
projectPath: params.projectPath,
workspacePath: params.workspacePath,
configuration: params.configuration ?? 'Debug',
configuration: params.configuration,
platform: String(mapDevicePlatform(params.platform)),
};
}
Expand All @@ -72,7 +72,7 @@ export function createGetDeviceAppPathExecutor(
): NonStreamingExecutor<GetDeviceAppPathParams, AppPathDomainResult> {
return async (params) => {
const platform = mapDevicePlatform(params.platform);
const configuration = params.configuration ?? 'Debug';
const configuration = params.configuration;

log('info', `Getting app path for scheme ${params.scheme} on platform ${platform}`);

Expand Down
4 changes: 2 additions & 2 deletions src/mcp/tools/device/test_device.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ const publicSchemaObject = baseSchemaObject.omit({
} as const);

interface PreparedTestDeviceExecution {
configuration: string;
configuration?: string;
platform: XcodePlatform;
preflight?: TestPreflightResult;
invocationRequest: BuildInvocationRequest;
Expand All @@ -83,7 +83,7 @@ async function prepareTestDeviceExecution(
params: TestDeviceParams,
fileSystemExecutor: FileSystemExecutor,
): Promise<PreparedTestDeviceExecution> {
const configuration = params.configuration ?? 'Debug';
const configuration = params.configuration;
const platform = mapDevicePlatform(params.platform);
const preflight = await resolveTestPreflight(
{
Expand Down
10 changes: 0 additions & 10 deletions src/mcp/tools/macos/__tests__/build_macos.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,8 +207,6 @@ describe('build_macos plugin', () => {
'/path/to/project.xcodeproj',
'-scheme',
'MyScheme',
'-configuration',
'Debug',
'-skipMacroValidation',
'-destination',
'platform=macOS',
Expand Down Expand Up @@ -274,8 +272,6 @@ describe('build_macos plugin', () => {
'/path/to/project.xcodeproj',
'-scheme',
'MyScheme',
'-configuration',
'Debug',
'-skipMacroValidation',
'-destination',
'platform=macOS',
Expand Down Expand Up @@ -305,8 +301,6 @@ describe('build_macos plugin', () => {
'/path/to/project.xcodeproj',
'-scheme',
'MyScheme',
'-configuration',
'Debug',
'-skipMacroValidation',
'-destination',
'platform=macOS,arch=arm64',
Expand Down Expand Up @@ -335,8 +329,6 @@ describe('build_macos plugin', () => {
'/Users/dev/My Project/MyProject.xcodeproj',
'-scheme',
'MyScheme',
'-configuration',
'Debug',
'-skipMacroValidation',
'-destination',
'platform=macOS',
Expand Down Expand Up @@ -365,8 +357,6 @@ describe('build_macos plugin', () => {
'/path/to/workspace.xcworkspace',
'-scheme',
'MyScheme',
'-configuration',
'Debug',
'-skipMacroValidation',
'-destination',
'platform=macOS',
Expand Down
8 changes: 1 addition & 7 deletions src/mcp/tools/macos/__tests__/get_mac_app_path.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,8 +126,6 @@ describe('get_mac_app_path plugin', () => {
'/path/to/MyProject.xcworkspace',
'-scheme',
'MyScheme',
'-configuration',
'Debug',
'-destination',
'generic/platform=macOS',
'-derivedDataPath',
Expand Down Expand Up @@ -168,8 +166,6 @@ describe('get_mac_app_path plugin', () => {
'/path/to/MyProject.xcodeproj',
'-scheme',
'MyScheme',
'-configuration',
'Debug',
'-destination',
'generic/platform=macOS',
'-derivedDataPath',
Expand Down Expand Up @@ -315,7 +311,7 @@ describe('get_mac_app_path plugin', () => {
]);
});

it('should use default configuration when not provided', async () => {
it('should omit configuration when not provided', async () => {
// Manual call tracking for command verification
const calls: any[] = [];
const mockExecutor: CommandExecutor = async (...args) => {
Expand Down Expand Up @@ -345,8 +341,6 @@ describe('get_mac_app_path plugin', () => {
'/path/to/MyProject.xcworkspace',
'-scheme',
'MyScheme',
'-configuration',
'Debug',
'-destination',
'platform=macOS,arch=arm64',
'-derivedDataPath',
Expand Down
4 changes: 2 additions & 2 deletions src/mcp/tools/macos/build_macos.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ function createBuildMacOSRequest(params: BuildMacOSParams): BuildInvocationReque
workspacePath: params.workspacePath,
projectPath: params.projectPath,
derivedDataPath: resolveEffectiveDerivedDataPath(params),
configuration: params.configuration ?? 'Debug',
configuration: params.configuration,
platform: 'macOS',
arch: params.arch,
target: 'macos',
Expand Down Expand Up @@ -74,7 +74,7 @@ export function createBuildMacOSExecutor(
executor: CommandExecutor,
): StreamingExecutor<BuildMacOSParams, BuildMacOSResult> {
return async (params, ctx) => {
const configuration = params.configuration ?? 'Debug';
const configuration = params.configuration;
const started = createDomainStreamingPipeline('build_macos', 'BUILD', ctx, 'build-result');
const buildResult = await executeXcodeBuildCommand(
{ ...params, configuration },
Expand Down
4 changes: 2 additions & 2 deletions src/mcp/tools/macos/build_run_macos.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ function createBuildRunMacOSRequest(params: BuildRunMacOSParams): BuildInvocatio
workspacePath: params.workspacePath,
projectPath: params.projectPath,
derivedDataPath: resolveEffectiveDerivedDataPath(params),
configuration: params.configuration ?? 'Debug',
configuration: params.configuration,
platform: 'macOS',
arch: params.arch,
target: 'macos',
Expand Down Expand Up @@ -82,7 +82,7 @@ export function createBuildRunMacOSExecutor(
executor: CommandExecutor,
): StreamingExecutor<BuildRunMacOSParams, BuildRunMacOSResult> {
return async (params, ctx) => {
const configuration = params.configuration ?? 'Debug';
const configuration = params.configuration;
const request = createBuildRunMacOSRequest(params);
const started = createDomainStreamingPipeline('build_run_macos', 'BUILD', ctx);
try {
Expand Down
4 changes: 2 additions & 2 deletions src/mcp/tools/macos/get_mac_app_path.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ function createRequest(params: GetMacosAppPathParams) {
scheme: params.scheme,
projectPath: params.projectPath,
workspacePath: params.workspacePath,
configuration: params.configuration ?? 'Debug',
configuration: params.configuration,
platform: 'macOS',
};
}
Expand All @@ -67,7 +67,7 @@ export function createGetMacAppPathExecutor(
executor: CommandExecutor,
): NonStreamingExecutor<GetMacosAppPathParams, AppPathDomainResult> {
return async (params) => {
const configuration = params.configuration ?? 'Debug';
const configuration = params.configuration;

log('info', `Getting app path for scheme ${params.scheme} on platform macOS`);

Expand Down
4 changes: 2 additions & 2 deletions src/mcp/tools/macos/test_macos.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ export type TestMacosParams = z.infer<typeof testMacosSchema>;
type TestMacosResult = TestResultDomainResult;

interface PreparedTestMacosExecution {
configuration: string;
configuration?: string;
preflight?: TestPreflightResult;
invocationRequest: BuildInvocationRequest;
}
Expand All @@ -75,7 +75,7 @@ async function prepareTestMacosExecution(
params: TestMacosParams,
fileSystemExecutor: FileSystemExecutor,
): Promise<PreparedTestMacosExecution> {
const configuration = params.configuration ?? 'Debug';
const configuration = params.configuration;
const preflight = await resolveTestPreflight(
{
projectPath: params.projectPath,
Expand Down
8 changes: 0 additions & 8 deletions src/mcp/tools/simulator/__tests__/build_run_sim.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -407,8 +407,6 @@ describe('build_run_sim tool', () => {
'/path/to/MyProject.xcworkspace',
'-scheme',
'MyScheme',
'-configuration',
'Debug',
'-skipMacroValidation',
'-destination',
'platform=iOS Simulator,name=iPhone 17,OS=latest',
Expand Down Expand Up @@ -466,8 +464,6 @@ describe('build_run_sim tool', () => {
'/path/to/MyProject.xcworkspace',
'-scheme',
'MyScheme',
'-configuration',
'Debug',
'-skipMacroValidation',
'-destination',
'platform=iOS Simulator,name=iPhone 17,OS=latest',
Expand Down Expand Up @@ -665,8 +661,6 @@ describe('build_run_sim tool', () => {
'/Users/dev/My Project/MyProject.xcworkspace',
'-scheme',
'My Scheme',
'-configuration',
'Debug',
'-skipMacroValidation',
'-destination',
'platform=iOS Simulator,name=iPhone 17 Pro,OS=latest',
Expand Down Expand Up @@ -699,8 +693,6 @@ describe('build_run_sim tool', () => {
'/path/to/MyProject.xcworkspace',
'-scheme',
'MyTVScheme',
'-configuration',
'Debug',
'-skipMacroValidation',
'-destination',
'platform=tvOS Simulator,name=Apple TV 4K,OS=latest',
Expand Down
10 changes: 0 additions & 10 deletions src/mcp/tools/simulator/__tests__/build_sim.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,8 +208,6 @@ describe('build_sim tool', () => {
'/path/to/MyProject.xcworkspace',
'-scheme',
'MyScheme',
'-configuration',
'Debug',
'-skipMacroValidation',
'-destination',
'platform=iOS Simulator,name=iPhone 17,OS=latest',
Expand Down Expand Up @@ -243,8 +241,6 @@ describe('build_sim tool', () => {
'/path/to/MyProject.xcodeproj',
'-scheme',
'MyScheme',
'-configuration',
'Debug',
'-skipMacroValidation',
'-destination',
'platform=iOS Simulator,name=iPhone 17,OS=latest',
Expand Down Expand Up @@ -318,8 +314,6 @@ describe('build_sim tool', () => {
'/Users/dev/My Project/MyProject.xcworkspace',
'-scheme',
'My Scheme',
'-configuration',
'Debug',
'-skipMacroValidation',
'-destination',
'platform=iOS Simulator,name=iPhone 17 Pro,OS=latest',
Expand Down Expand Up @@ -354,8 +348,6 @@ describe('build_sim tool', () => {
'/path/to/MyProject.xcworkspace',
'-scheme',
'MyScheme',
'-configuration',
'Debug',
'-skipMacroValidation',
'-destination',
'platform=iOS Simulator,name=iPhone 17,OS=latest',
Expand Down Expand Up @@ -389,8 +381,6 @@ describe('build_sim tool', () => {
'/path/to/MyProject.xcworkspace',
'-scheme',
'MyWatchScheme',
'-configuration',
'Debug',
'-skipMacroValidation',
'-destination',
'platform=watchOS Simulator,name=Apple Watch Ultra 2,OS=latest',
Expand Down
4 changes: 0 additions & 4 deletions src/mcp/tools/simulator/__tests__/get_sim_app_path.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,8 +156,6 @@ describe('get_sim_app_path tool', () => {
'/path/to/workspace.xcworkspace',
'-scheme',
'MyScheme',
'-configuration',
'Debug',
'-destination',
'platform=iOS Simulator,name=iPhone 17,OS=latest',
'-derivedDataPath',
Expand Down Expand Up @@ -219,8 +217,6 @@ describe('get_sim_app_path tool', () => {
'/path/to/workspace.xcworkspace',
'-scheme',
'MyScheme',
'-configuration',
'Debug',
'-destination',
'platform=iOS Simulator,name=iPhone 17,OS=latest',
'-derivedDataPath',
Expand Down
Loading
Loading