Merge remote-tracking branch 'origin/sm/unify-create-apex-class' into sm/trigger-templates

Author: mshanemc

.cursor/rules/wireit.mdc

@@ -0,0 +1,6 @@
+---
+description: Wireit build system usage and authoring
+alwaysApply: true
+---
+
+When working with wireit — answering questions, authoring scripts, or editing `package.json` — read `.claude/skills/wireit/SKILL.md` first.

packages/salesforcedx-vscode-apex-testing/src/commands/apexGenerateUnitTestClass.ts

@@ -46,11 +46,18 @@ const getApiVersion = Effect.fn('getApiVersion')(function* (project: SfProject)
   );
 });
 
-const getDefaultOutputDir = Effect.fn('getDefaultOutputDir')(function* (project: SfProject) {
+const promptForOutputDir = Effect.fn('promptForOutputDir')(function* (project: SfProject) {
   const api = yield* (yield* ExtensionProviderService).getServicesApi;
+  const promptService = yield* api.services.PromptService;
   const workspaceInfo = yield* api.services.WorkspaceService.getWorkspaceInfoOrThrow();
+
   const defaultPkg = project.getDefaultPackage();
-  return Utils.joinPath(workspaceInfo.uri, defaultPkg.path, 'main', 'default', 'classes');
+  const defaultUri = Utils.joinPath(workspaceInfo.uri, defaultPkg.path, 'main', 'default', 'classes');
+
+  return yield* promptService.promptForOutputDir({
+    defaultUri,
+    pickerPlaceHolder: nls.localize('apex_test_class_output_dir_prompt')
+  });
 });
 
 const promptForClassName = Effect.fn('promptForClassName')(function* () {
@@ -104,22 +111,22 @@ export const apexGenerateUnitTestClassCommand = Effect.fn('apexGenerateUnitTestC
 ) {
   const api = yield* (yield* ExtensionProviderService).getServicesApi;
   const promptService = yield* api.services.PromptService;
+  const fsService = yield* api.services.FsService;
   const project = yield* api.services.ProjectService.getSfProject();
-  const workspaceInfo = yield* api.services.WorkspaceService.getWorkspaceInfoOrThrow();
 
   const className = params?.name ?? (yield* promptForClassName());
 
-  const outputDirUri = params?.outputDir ?? outputDirectory ?? (yield* getDefaultOutputDir(project));
+  const outputDirUri = params?.outputDir ?? outputDirectory ?? (yield* promptForOutputDir(project));
 
   const template = params?.template ?? (yield* promptForTemplate());
 
+  const workspaceInfo = yield* api.services.WorkspaceService.getWorkspaceInfoOrThrow();
   const apiVersion = yield* getApiVersion(project);
-  const cwd = workspaceInfo.uri.fsPath;
   const uris = [`${className}.cls`, `${className}.cls-meta.xml`].map(uri => Utils.joinPath(outputDirUri, uri));
   yield* promptService.ensureMetadataOverwriteOrThrow({ uris });
 
   const result = yield* api.services.TemplateService.create({
-    cwd,
+    cwd: yield* fsService.uriToPath(workspaceInfo.uri),
     templateType: api.services.TemplateType.ApexClass,
     outputdir: outputDirUri,
     options: { template, classname: className, apiversion: apiVersion }

packages/salesforcedx-vscode-apex-testing/test/playwright/specs/apexTestClassCreate.headless.spec.ts

@@ -59,6 +59,13 @@ test('Create Apex Unit Test Class via command palette', async ({ page }) => {
     await saveScreenshot(page, 'step.class-name-entered.png');
   });
 
+  await test.step('select output directory in QuickPick', async () => {
+    await page.locator(QUICK_INPUT_LIST_ROW).first().waitFor({ state: 'visible', timeout: 5000 });
+    await saveScreenshot(page, 'step.directory-prompt-visible.png');
+    await page.keyboard.press('Enter');
+    await saveScreenshot(page, 'step.after-accept-directory.png');
+  });
+
   await test.step('select template in QuickPick', async () => {
     await page.locator(QUICK_INPUT_LIST_ROW).first().waitFor({ state: 'visible', timeout: 5000 });
     await page.keyboard.press('Enter');

packages/salesforcedx-vscode-metadata/src/commands/createApexClass.ts

@@ -88,7 +88,7 @@ export const createApexClassCommand = Effect.fn('createApexClassCommand')(functi
   yield* promptService.ensureMetadataOverwriteOrThrow({ uris });
 
   yield* api.services.TemplateService.create({
-    cwd: workspaceInfo.uri.fsPath,
+    cwd: yield* fsService.uriToPath(workspaceInfo.uri),
     templateType: api.services.TemplateType.ApexClass,
     outputdir: outputDirUri,
     options: { template, classname: className, apiversion: apiVersion }