fix(cli): Smol CLI improvements

cli/commands/codegen-app.ts

@@ -1,4 +1,7 @@
+/* eslint no-console: 0 */
+
 import { Command } from '@oclif/core';
+import chalk from 'chalk';
 import dedent from 'dedent';
 import { ESLint } from 'eslint';
 import fse from 'fs-extra';
@@ -14,47 +17,58 @@ export default class CodegenApp extends Command {
   static flags = {};
   static args = [{ name: 'appId', description: 'The application id ', required: true }];
 
+  private loadDefinition(appId: string) {
+    try {
+      return require(`../src/apps/${appId}/${appId}.definition`);
+    } catch (e) {
+      throw new Error(`Cannot find app with id "${appId}", please verify you're targeting the right app!`);
+    }
+  }
   async run(): Promise<void> {
     const { args } = await this.parse(CodegenApp);
 
     const appId = args.appId;
     const appDefinitionName = `${strings.upperCase(appId)}_DEFINITION`;
 
-    const definitionModule = require(`../src/apps/${appId}/${appId}.definition`);
-    const definition = definitionModule[appDefinitionName];
-    const networksRaw = definition.supportedNetworks;
-
-    const networks = Object.keys(networksRaw);
-    const groups = definition.groups;
-    let moduleImports = '';
-    let moduleProviders = '';
-
-    for (const network of networks) {
-      moduleImports += generateImportStatementForModule(appId, 'balance', network);
-      moduleProviders += generateClassNamesForModule(appId, 'balance', network);
-
-      for (const [key, appGroup] of Object.entries<AppGroup>(groups)) {
-        switch (appGroup.type) {
-          case GroupType.TOKEN:
-            generateTokenFetcher(appId, key, appGroup.id, network);
-            moduleImports += generateImportStatementForModule(appId, appGroup.type, network, appGroup.id);
-            moduleProviders += generateClassNamesForModule(appId, appGroup.type, network, appGroup.id);
-            break;
-
-          case GroupType.POSITION:
-            generateContractPosition(appId, key, appGroup.id, network);
-            moduleImports += generateImportStatementForModule(appId, appGroup.type, network, appGroup.id);
-            moduleProviders += generateClassNamesForModule(appId, appGroup.type, network, appGroup.id);
-            break;
-
-          default:
-            break;
+    try {
+      const definitionModule = this.loadDefinition(appId);
+      const definition = definitionModule[appDefinitionName];
+      const networksRaw = definition.supportedNetworks;
+
+      const networks = Object.keys(networksRaw);
+      const groups = definition.groups;
+      let moduleImports = '';
+      let moduleProviders = '';
+
+      for (const network of networks) {
+        moduleImports += generateImportStatementForModule(appId, 'balance', network);
+        moduleProviders += generateClassNamesForModule(appId, 'balance', network);
+
+        for (const [key, appGroup] of Object.entries<AppGroup>(groups)) {
+          switch (appGroup.type) {
+            case GroupType.TOKEN:
+              generateTokenFetcher(appId, key, appGroup.id, network);
+              moduleImports += generateImportStatementForModule(appId, appGroup.type, network, appGroup.id);
+              moduleProviders += generateClassNamesForModule(appId, appGroup.type, network, appGroup.id);
+              break;
+
+            case GroupType.POSITION:
+              generateContractPosition(appId, key, appGroup.id, network);
+              moduleImports += generateImportStatementForModule(appId, appGroup.type, network, appGroup.id);
+              moduleProviders += generateClassNamesForModule(appId, appGroup.type, network, appGroup.id);
+              break;
+
+            default:
+              break;
+          }
         }
+        generateBalanceFetcher(appId, network);
       }
-      generateBalanceFetcher(appId, network);
+      await generateModule(appId, moduleImports, moduleProviders);
+      this.log(`Files for ${appId} were generated !`);
+    } catch (e) {
+      console.log(chalk.red(e.message));
     }
-    await generateModule(appId, moduleImports, moduleProviders);
-    this.log(`Files for ${appId} were generated !`);
   }
 }
 

cli/commands/create-app.ts

@@ -5,6 +5,7 @@ import * as inquirer from 'inquirer';
 import { zipObject } from 'lodash';
 import prettier from 'prettier';
 
+import { AppTag } from '../../src/app/app.interface';
 import { Network } from '../../src/types/network.interface';
 import { strings } from '../strings';
 
@@ -14,6 +15,42 @@ export default class CreateApp extends Command {
   static flags = {};
   static args = [];
 
+  private async promptNetworks() {
+    let networks: Network[] = [];
+    do {
+      const prompt = await inquirer.prompt([
+        {
+          name: 'networks',
+          message: 'Select (at least one) network supported by the app',
+          type: 'checkbox',
+          choices: Object.values(Network)
+            .filter(v => v !== Network.BITCOIN_MAINNET)
+            .map(name => ({ name })),
+        },
+      ]);
+      if (prompt.networks) networks = prompt.networks;
+    } while (!networks.length);
+
+    return networks;
+  }
+
+  private async promptTags() {
+    let tags: AppTag[] = [];
+    do {
+      const prompt = await inquirer.prompt([
+        {
+          name: 'tags',
+          message: 'Select (at least one) tag representing your app',
+          type: 'checkbox',
+          choices: Object.values(AppTag).map(name => ({ name })),
+        },
+      ]);
+      if (prompt.tags) tags = prompt.tags;
+    } while (!tags.length);
+
+    return tags;
+  }
+
   async run(): Promise<void> {
     const appName = await CliUx.ux.prompt('What is the name of the app ', { required: true });
     const appId = await CliUx.ux.prompt('What is the ID of the app ', {
@@ -23,16 +60,8 @@ export default class CreateApp extends Command {
     const appDescription = await CliUx.ux.prompt('What is the description of your app ', { required: true });
     const appUrl = await CliUx.ux.prompt('What is the URL of your app ', { required: true });
 
-    const { networks } = await inquirer.prompt([
-      {
-        name: 'networks',
-        message: 'Select networks supported by the app',
-        type: 'checkbox',
-        choices: Object.values(Network)
-          .filter(v => v !== Network.BITCOIN_MAINNET)
-          .map(name => ({ name })),
-      },
-    ]);
+    const networks = await this.promptNetworks();
+    const tags = await this.promptTags();
 
     createFolder(`./src/apps/${appId}`);
     createFolder(`./src/apps/${appId}/assets`);
@@ -42,7 +71,7 @@ export default class CreateApp extends Command {
       createFolder(`./src/apps/${appId}/${network}`);
     }
 
-    const generatedCode = generateDefinitionFile(appId, appName, appDescription, appUrl, networks);
+    const generatedCode = generateDefinitionFile({ appId, appName, appDescription, appUrl, networks, tags });
     const config = await prettier.resolveConfig(process.cwd());
     fse.writeFileSync(
       `./src/apps/${appId}/${appId}.definition.ts`,
@@ -52,21 +81,31 @@ export default class CreateApp extends Command {
   }
 }
 
-function generateDefinitionFile(
-  appId: string,
-  appName: string,
-  appDescription: string,
-  appUrl: string,
-  networks: string[],
-) {
+function generateDefinitionFile({
+  appId,
+  appName,
+  appDescription,
+  appUrl,
+  networks,
+  tags,
+}: {
+  appId: string;
+  appName: string;
+  appDescription: string;
+  appUrl: string;
+  networks: Network[];
+  tags: AppTag[];
+}) {
   const appDefinitionName = `${strings.upperCase(appId)}_DEFINITION`;
   const appClassName = strings.titleCase(appId);
+
   const networkToKey = zipObject(Object.values(Network), Object.keys(Network));
+  const tagToKey = zipObject(Object.values(AppTag), Object.keys(AppTag));
 
   return dedent`
   import { Register } from '~app-toolkit/decorators';
   import { AppDefinition } from '~app/app.definition';
-  import { AppAction, AppDefinitionObject } from '~app/app.interface';
+  import { AppAction, AppTag, AppDefinitionObject } from '~app/app.interface';
   import { Network } from '~types/network.interface';
 
   export const ${appDefinitionName}: AppDefinitionObject = {
@@ -75,7 +114,8 @@ function generateDefinitionFile(
     description: '${appDescription}',
     url: '${appUrl}',
     groups: {},
-    tags: [],
+    tags: [${tags.map(n => `AppTag.${tagToKey[n]}`).join(',')}],
+    keywords: [],
     links: {
       learn: '',
       github: '',