feat: nx run in command palette and context menu (#1065)

nrwl · Apr 23, 2021 · 9b5fd5c · 9b5fd5c
1 parent c3f2b92
commit 9b5fd5c
Show file tree

Hide file tree

Showing 2 changed files with 73 additions and 11 deletions.
diff --git a/apps/vscode/src/package.json b/apps/vscode/src/package.json
@@ -50,6 +50,11 @@
           "when": "isAngularWorkspace && config.nxConsole.enableGenerateFromContextMenu || isNxWorkspace && config.nxConsole.enableGenerateFromContextMenu",
           "command": "nx.generate.ui.fileexplorer",
           "group": "explorerContext"
+        },
+        {
+          "when": "isNxWorkspace && config.nxConsole.enableGenerateFromContextMenu",
+          "command": "nx.run.fileexplorer",
+          "group": "explorerContext"
         }
       ],
       "view/title": [
@@ -81,6 +86,10 @@
           "command": "nx.generate.ui.fileexplorer",
           "when": "false"
         },
+        {
+          "command": "nx.run.fileexplorer",
+          "when": "false"
+        },
         {
           "command": "ng.lint",
           "when": "isAngularWorkspace"
@@ -165,6 +174,10 @@
           "command": "nx.run-many",
           "when": "isNxWorkspace"
         },
+        {
+          "command": "nx.run",
+          "when": "isNxWorkspace"
+        },
         {
           "command": "nx.affected",
           "when": "isNxWorkspace"
@@ -362,6 +375,11 @@
         "title": "run-many",
         "command": "nx.run-many"
       },
+      {
+        "category": "Nx",
+        "title": "run",
+        "command": "nx.run"
+      },
       {
         "category": "Nx",
         "title": "affected",
@@ -451,6 +469,11 @@
         "category": "Nx",
         "title": "Nx generate (ui)",
         "command": "nx.generate.ui.fileexplorer"
+      },
+      {
+        "category": "Nx",
+        "title": "Nx run",
+        "command": "nx.run.fileexplorer"
       }
     ],
     "configuration": {

diff --git a/libs/vscode/tasks/src/lib/cli-task-commands.ts b/libs/vscode/tasks/src/lib/cli-task-commands.ts
@@ -49,6 +49,13 @@ export function registerCliTaskCommands(
     );
   });
 
+  commands.registerCommand('nx.run', () =>
+    selectCliCommandAndPromptForFlags('run')
+  );
+  commands.registerCommand(`nx.run.fileexplorer`, (uri: Uri) =>
+    selectCliCommandAndPromptForFlags('run', getCliProjectFromUri(uri))
+  );
+
   commands.registerCommand(`ng.generate`, () =>
     selectSchematicAndPromptForFlags()
   );
@@ -98,19 +105,31 @@ function selectCliCommandAndShowUi(
   );
 }
 
-async function selectCliCommandAndPromptForFlags(command: string) {
+async function selectCliCommandAndPromptForFlags(command: string, projectName?: string) {
   const { validWorkspaceJson, json, workspaceType } = verifyWorkspace();
 
-  const selection = validWorkspaceJson
-    ? await selectCliProject(command, json)
-    : undefined;
-  if (!selection) {
-    return; // Do not execute a command if user clicks out of VSCode UI.
+  if (!projectName) {
+    const selection = validWorkspaceJson
+      ? await selectCliProject(command, json)
+      : undefined;
+    if (!selection) {
+      return; // Do not execute a command if user clicks out of VSCode UI.
+    }
+    projectName = selection.projectName;
+  }
+
+  let target = command;
+  const isRunCommand = command === 'run';
+  if (isRunCommand) {
+    target = (await selectCliTarget(Object.keys(json.projects[projectName].architect || {}))) as string;
+    if (!target) {
+      return;
+    }
   }
 
   const builderDefinition = await verifyBuilderDefinition(
-    selection.projectName,
-    command,
+    projectName,
+    target,
     json
   );
   const {
@@ -136,14 +155,18 @@ async function selectCliCommandAndPromptForFlags(command: string) {
   }
 
   const flags = await selectFlags(
-    `${command} ${selection.projectName}`,
+    isRunCommand
+      ? `${command} ${projectName}:${target}`
+      : `${command} ${projectName}`,
     options,
     workspaceType
   );
 
   if (flags !== undefined) {
     cliTaskProvider.executeTask({
-      positional: selection.projectName,
+      positional: isRunCommand
+        ? `${projectName}:${target}`
+        : projectName,
       command,
       flags,
     });
@@ -181,12 +204,20 @@ async function selectSchematicAndPromptForFlags() {
   }
 }
 
+export function getCliProjectFromUri(uri: Uri): string | undefined {
+  const project = cliTaskProvider.projectForPath(uri.fsPath);
+  return project?.name;
+}
+
 export function selectCliProject(command: string, json: any) {
   const items = cliTaskProvider
     .getProjectEntries(json)
     .filter(([_, { architect }]) => Boolean(architect))
     .flatMap(([project, { architect }]) => ({ project, architect }))
-    .filter(({ architect }) => Boolean(architect && architect[command]))
+    .filter(
+      ({ architect }) =>
+        Boolean(architect && architect[command]) || command === 'run'
+    )
     .map(
       ({ project, architect }) =>
         new CliTaskQuickPickItem(
@@ -209,3 +240,11 @@ export function selectCliProject(command: string, json: any) {
     placeHolder: `Project to ${command}`,
   });
 }
+
+async function selectCliTarget(
+  targets: string[]
+): Promise<string | undefined> {
+  return window.showQuickPick(targets, {
+    placeHolder: 'Target to run',
+  });
+}