fix(vscode): adapt cli task logic to handle affected & other commands correctly (#2127)

Author: MaxKless

libs/vscode/nx-cli-quickpicks/src/lib/select-affected-flags.ts

@@ -17,11 +17,11 @@ export async function selectAffectedFlags(target: string): Promise<{
       };
     }
     default: {
-      const positional = `--target=${target}`;
       return {
         command: 'affected',
-        positional,
-        flags: await selectFlags(`affected ${positional}`, AFFECTED_OPTIONS),
+        flags: await selectFlags(`affected`, AFFECTED_OPTIONS, {
+          target,
+        }),
       };
     }
   }

libs/vscode/nx-commands-view/src/lib/nx-commands-provider.ts

@@ -1,17 +1,12 @@
-import {
-  getNxWorkspacePath,
-  GlobalConfigurationStore,
-} from '@nx-console/vscode/configuration';
-import { getNxWorkspace } from '@nx-console/vscode/nx-workspace';
+import { GlobalConfigurationStore } from '@nx-console/vscode/configuration';
+import { onWorkspaceRefreshed } from '@nx-console/vscode/lsp-client';
+import { CliTaskProvider } from '@nx-console/vscode/tasks';
 import {
   AbstractTreeProvider,
-  getShellExecutionForConfig,
   logAndShowTaskCreationError,
 } from '@nx-console/vscode/utils';
-import { commands, ExtensionContext, Task, tasks, TaskScope } from 'vscode';
+import { commands, ExtensionContext } from 'vscode';
 import { NxCommandConfig, NxCommandsTreeItem } from './nx-commands-tree-item';
-import { onWorkspaceRefreshed } from '@nx-console/vscode/lsp-client';
-import { importNxPackagePath } from '@nx-console/shared/npm';
 
 export const EXECUTE_ARBITRARY_COMMAND = 'nxConsole.executeArbitraryCommand';
 
@@ -77,31 +72,29 @@ export class NxCommandsTreeProvider extends AbstractTreeProvider<NxCommandsTreeI
   }
 
   async executeArbitraryCommand(command: string) {
-    const prefixedCommand = command.startsWith('nx ')
-      ? command
-      : `nx ${command}`;
-    const workspacePath = getNxWorkspacePath();
-    const isEncapsulatedNx =
-      (await getNxWorkspace())?.isEncapsulatedNx ?? false;
-    const { detectPackageManager } = await importNxPackagePath<
-      typeof import('nx/src/devkit-exports')
-    >(workspacePath, 'src/devkit-exports');
-    const pkgManager = detectPackageManager(workspacePath);
+    let _command: string;
+    let positional: string | undefined;
+
+    const commandBeforeFlags = command.split(' -')[0];
+    if (commandBeforeFlags.includes(' ')) {
+      _command = commandBeforeFlags.split(' ')[0];
+      positional = commandBeforeFlags.replace(_command, '').trim();
+    } else {
+      _command = commandBeforeFlags;
+      positional = undefined;
+    }
+
+    const flags = command
+      .replace(commandBeforeFlags, '')
+      .split(' ')
+      .filter(Boolean);
 
     try {
-      const task = new Task(
-        { type: 'nx' },
-        TaskScope.Workspace,
-        prefixedCommand,
-        pkgManager,
-        await getShellExecutionForConfig({
-          cwd: workspacePath,
-          displayCommand: prefixedCommand,
-          encapsulatedNx: isEncapsulatedNx,
-          workspacePath,
-        })
-      );
-      tasks.executeTask(task);
+      CliTaskProvider.instance.executeTask({
+        command: _command,
+        positional,
+        flags,
+      });
     } catch (e) {
       logAndShowTaskCreationError(e);
       return;

libs/vscode/tasks/src/lib/cli-task-definition.ts

@@ -1,5 +1,5 @@
 export interface CliTaskDefinition {
-  positional: string;
+  positional?: string;
   command: string;
   flags: Array<string>;
   cwd?: string;

libs/vscode/tasks/src/lib/cli-task-provider.ts

@@ -82,7 +82,7 @@ export class CliTaskProvider implements TaskProvider {
     }
 
     let task;
-    const positionals = definition.positional.match(
+    const positionals = definition.positional?.match(
       WORKSPACE_GENERATOR_NAME_REGEX
     );
     try {

libs/vscode/tasks/src/lib/cli-task.ts

@@ -81,16 +81,6 @@ export class CliTask extends Task {
 
 function getArgs(definition: CliTaskDefinition) {
   const { positional, command, flags } = definition;
-  switch (command) {
-    case 'add':
-    case 'build':
-    case 'lint':
-    case 'generate':
-    case 'run':
-    case 'serve':
-    case 'test':
-      return [command, positional, ...flags];
-    default:
-      return ['run', `${positional}:${command}`, ...flags];
-  }
+  const args = [command, positional, ...flags];
+  return args.filter((v) => v !== undefined && v !== null);
 }