feat: Add commands to add applications and libraries directly

.vscode/launch.json

@@ -17,6 +17,10 @@
         "${workspaceFolder}/node_modules"
       ],
       "request": "launch",
+      "skipFiles": [
+        "<node_internals>/**",
+        "/Applications/Visual Studio Code.app/**"
+      ],
       "type": "pwa-extensionHost"
     },
     {

apps/vscode/src/main.ts

@@ -21,6 +21,7 @@ import {
   getOutputChannel,
   getTelemetry,
   initTelemetry,
+  readAllGeneratorCollections,
   teardownTelemetry,
   watchFile,
 } from '@nx-console/server';
@@ -44,6 +45,7 @@ import {
   NxProjectTreeProvider,
 } from '@nx-console/vscode/nx-project-view';
 import {
+  getNxConfig,
   verifyWorkspace,
   WorkspaceCodeLensProvider,
 } from '@nx-console/vscode/nx-workspace';
@@ -53,6 +55,7 @@ import {
   WorkspaceJsonSchema,
   ProjectJsonSchema,
 } from '@nx-console/vscode/json-schema';
+import { GeneratorType } from '@nx-console/schema';
 
 let runTargetTreeView: TreeView<RunTargetTreeItem>;
 let nxProjectTreeView: TreeView<NxProjectTreeItem>;
@@ -196,10 +199,10 @@ function scanForWorkspace(vscodeWorkspacePath: string) {
 
   while (currentDirectory !== root) {
     if (existsSync(join(currentDirectory, 'angular.json'))) {
-      return setWorkspace(join(currentDirectory, 'angular.json'));
+      setWorkspace(join(currentDirectory, 'angular.json'));
     }
     if (existsSync(join(currentDirectory, 'workspace.json'))) {
-      return setWorkspace(join(currentDirectory, 'workspace.json'));
+      setWorkspace(join(currentDirectory, 'workspace.json'));
     }
     currentDirectory = dirname(currentDirectory);
   }
@@ -244,6 +247,8 @@ async function setWorkspace(workspaceJsonPath: string) {
     );
   }
 
+  await setApplicationAndLibraryContext(workspaceJsonPath);
+
   const isNxWorkspace = existsSync(join(workspaceJsonPath, '..', 'nx.json'));
   const isAngularWorkspace = workspaceJsonPath.endsWith('angular.json');
 
@@ -271,6 +276,50 @@ async function setWorkspace(workspaceJsonPath: string) {
   getTelemetry().record('WorkspaceType', { workspaceType });
 }
 
+async function setApplicationAndLibraryContext(workspaceJsonPath: string) {
+  const nxConfig = getNxConfig(dirname(workspaceJsonPath));
+
+  commands.executeCommand('setContext', 'nxAppsDir', [
+    join(
+      dirname(workspaceJsonPath),
+      nxConfig.workspaceLayout?.appsDir ?? 'apps'
+    ),
+  ]);
+  commands.executeCommand('setContext', 'nxLibsDir', [
+    join(
+      dirname(workspaceJsonPath),
+      nxConfig.workspaceLayout?.libsDir ?? 'libs'
+    ),
+  ]);
+
+  const generatorCollections = await readAllGeneratorCollections(
+    workspaceJsonPath
+  );
+  let hasApplicationGenerators = false;
+  let hasLibraryGenerators = false;
+
+  generatorCollections.forEach((generatorCollection) => {
+    generatorCollection.generators.forEach((generator) => {
+      if (generator.type === 'application') {
+        hasApplicationGenerators = true;
+      } else if (generator.type === 'library') {
+        hasLibraryGenerators = true;
+      }
+    });
+  });
+
+  commands.executeCommand(
+    'setContext',
+    'nx.hasApplicationGenerators',
+    hasApplicationGenerators
+  );
+  commands.executeCommand(
+    'setContext',
+    'nx.hasLibraryGenerators',
+    hasLibraryGenerators
+  );
+}
+
 function registerWorkspaceFileWatcher(
   context: ExtensionContext,
   workspaceJsonPath: string

apps/vscode/src/package.json

@@ -65,6 +65,16 @@
           "when": "isNxWorkspace && config.nxConsole.enableGenerateFromContextMenu",
           "command": "nx.run.fileexplorer",
           "group": "2_workspace"
+        },
+        {
+          "when": "isNxWorkspace && explorerResourceIsFolder && resourcePath in nxAppsDir && config.nxConsole.enableGenerateFromContextMenu && nx.hasApplicationGenerators",
+          "command": "nx.generate.ui.app.fileexplorer",
+          "group": "2_workspace"
+        },
+        {
+          "when": "isNxWorkspace && explorerResourceIsFolder && resourcePath in nxLibsDir && config.nxConsole.enableGenerateFromContextMenu && nx.hasLibraryGenerators",
+          "command": "nx.generate.ui.lib.fileexplorer",
+          "group": "2_workspace"
         }
       ],
       "view/title": [
@@ -108,6 +118,22 @@
           "command": "nx.run.fileexplorer",
           "when": "false"
         },
+        {
+          "command": "nx.generate.ui.app.fileexplorer",
+          "when": "false"
+        },
+        {
+          "command": "nx.generate.ui.lib.fileexplorer",
+          "when": "false"
+        },
+        {
+          "command": "nx.generate.ui.app",
+          "when": "isNxWorkspace && nx.hasApplicationGenerators"
+        },
+        {
+          "command": "nx.generate.ui.lib",
+          "when": "isNxWorkspace && nx.hasLibraryGenerators"
+        },
         {
           "command": "ng.lint",
           "when": "isAngularWorkspace"
@@ -364,7 +390,7 @@
       },
       {
         "category": "ng",
-        "title": "ng generate (ui)",
+        "title": "ng generate...",
         "command": "ng.generate.ui.fileexplorer"
       },
       {
@@ -504,13 +530,33 @@
       },
       {
         "category": "Nx",
-        "title": "Nx generate (ui)",
+        "title": "Nx generate...",
         "command": "nx.generate.ui.fileexplorer"
       },
       {
         "category": "Nx",
         "title": "Nx run",
         "command": "nx.run.fileexplorer"
+      },
+      {
+        "category": "Nx",
+        "title": "generate application",
+        "command": "nx.generate.ui.app"
+      },
+      {
+        "category": "Nx",
+        "title": "generate library",
+        "command": "nx.generate.ui.lib"
+      },
+      {
+        "category": "Nx",
+        "title": "Nx generate application",
+        "command": "nx.generate.ui.app.fileexplorer"
+      },
+      {
+        "category": "Nx",
+        "title": "Nx generate library",
+        "command": "nx.generate.ui.lib.fileexplorer"
       }
     ],
     "configuration": {

libs/schema/src/index.ts

@@ -47,16 +47,23 @@ export interface TaskExecutionSchema {
   contextValues?: Record<string, string | number | boolean | undefined>;
 }
 
-export interface SchematicCollection {
+export interface GeneratorCollection {
   name: string;
-  schematics: Schematic[];
+  generators: Generator[];
 }
 
-export interface Schematic {
+export enum GeneratorType {
+  Application = 'application',
+  Library = 'library',
+  Other = 'other',
+}
+
+export interface Generator {
   collection: string;
   name: string;
   description: string;
   options?: Option[];
+  type: GeneratorType;
 }
 
 export interface DefaultValue {

libs/server/src/index.ts

@@ -1,11 +1,11 @@
 export * from './lib/abstract-tree-provider';
 export * from './lib/extensions';
 export * from './lib/stores';
-export * from './lib/select-schematic';
+export * from './lib/select-generator';
 export * from './lib/telemetry';
 export * from './lib/utils/output-channel';
 export * from './lib/utils/read-projects';
-export * from './lib/utils/read-schematic-collections';
+export * from './lib/utils/read-generator-collections';
 export {
   fileExistsSync,
   findClosestNg,

libs/server/src/lib/select-generator.ts

@@ -0,0 +1,58 @@
+import { Generator, GeneratorType } from '@nx-console/schema';
+import { TaskExecutionSchema } from '@nx-console/schema';
+import { QuickPickItem, window } from 'vscode';
+import {
+  readAllGeneratorCollections,
+  readGeneratorOptions,
+} from './utils/read-generator-collections';
+
+export async function selectGenerator(
+  workspaceJsonPath: string,
+  generatorType?: GeneratorType
+): Promise<TaskExecutionSchema | undefined> {
+  interface GenerateQuickPickItem extends QuickPickItem {
+    collectionName: string;
+    generator: Generator;
+  }
+
+  let generators = (await readAllGeneratorCollections(workspaceJsonPath))
+    .filter((c) => c && c.generators.length)
+    .map((c): GenerateQuickPickItem[] =>
+      c.generators.map(
+        (s: Generator): GenerateQuickPickItem => ({
+          description: s.description,
+          label: `${c.name} - ${s.name}`,
+          collectionName: c.name,
+          generator: s,
+        })
+      )
+    )
+    .flat();
+
+  if (generatorType) {
+    generators = generators.filter((generator) => {
+      return generator.generator.type === generatorType;
+    });
+  }
+
+  if (generators) {
+    const selection = await window.showQuickPick(generators);
+    if (selection) {
+      const options =
+        selection.generator.options ||
+        (await readGeneratorOptions(
+          workspaceJsonPath,
+          selection.collectionName,
+          selection.generator.name
+        ));
+      const positional = `${selection.collectionName}:${selection.generator.name}`;
+      return {
+        ...selection.generator,
+        options,
+        command: 'generate',
+        positional,
+        cliName: 'nx',
+      };
+    }
+  }
+}