@corva/create-app 0.50.0-3 → 0.50.0-rc.0

package/README.md

@@ -41,7 +41,7 @@ Usage: create-corva-app create <project-directory> [options]
 Create a new app
 
 Arguments:
-  project-directory               project directory to work with (default: "Current working dir")
+  project-directory               Project directory to work with (default: "Current working dir")
 
 Options:
   --developerName [string]        Enter the Developer Name (default: "O&G Company")

package/lib/commands/attach.js

@@ -1,4 +1,6 @@
+import chalk from 'chalk';
 import { Command } from 'commander';
+import { ERROR_ICON } from '../constants/messages.js';
 import { runFlow } from '../flow.js';
 import { ATTACH_FLOW } from '../flows/attach.js';
 import { getRealWorkingDir } from '../helpers/commands.js';
@@ -18,4 +20,9 @@ export const attachCommand = new Command('attach')
   .addOption(originalCwdOption)
   .action(async (dirName, options) => {
     await runFlow(ATTACH_FLOW, { dirName: getRealWorkingDir(dirName, options), options });
+  })
+  .showHelpAfterError()
+  .showSuggestionAfterError(true)
+  .configureOutput({
+    outputError: (str, write) => write(chalk.red(`${ERROR_ICON} ${str}`)),
   });

package/lib/commands/create.js

@@ -23,6 +23,7 @@ import { getRealWorkingDir } from '../helpers/commands.js';
 import { Manifest } from '../flows/lib/manifest.js';
 import { fillManifest } from '../helpers/manifest.js';
 import { getManifestMandatoryKeys, manifestOptions } from '../constants/manifest.js';
+import { ERROR_ICON } from '../constants/messages.js';
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
@@ -36,7 +37,11 @@ export const createCommand = new Command('create')
   .description('Create a new app')
   .argument('[project-directory]', 'project directory to work with', process.argv[process.argv.length - 1])
   .addOption(originalCwdOption)
-  .usage(`${chalk.green('<project-directory>')} [options]`);
+  .showHelpAfterError()
+  .showSuggestionAfterError(true)
+  .configureOutput({
+    outputError: (str, write) => write(chalk.red(`${ERROR_ICON} ${str}`)),
+  });
 
 manifestOptions().forEach((value) => {
   const type = typeof value.default;

package/lib/commands/release.js

@@ -1,3 +1,4 @@
+import chalk from 'chalk';
 import { Command, Option } from 'commander';
 import { runFlow } from '../flow.js';
 import { RELEASE_FLOW } from '../flows/release.js';
@@ -8,6 +9,7 @@ import { envOption } from '../options/env.js';
 import { originalCwdOption } from '../options/original-cwd.js';
 import { silentOption } from '../options/silent.js';
 import { ensureBumpVersion } from '../helpers/cli-version.js';
+import { ERROR_ICON } from '../constants/messages.js';
 
 export const releaseCommand = new Command('release')
   .description('Release app')
@@ -40,4 +42,9 @@ export const releaseCommand = new Command('release')
       patterns,
       options,
     });
+  })
+  .showHelpAfterError()
+  .showSuggestionAfterError(true)
+  .configureOutput({
+    outputError: (str, write) => write(chalk.red(`${ERROR_ICON} ${str}`)),
   });

package/lib/commands/rerun.js

@@ -1,5 +1,6 @@
+import chalk from 'chalk';
 import { Command, Option } from 'commander';
-
+import { ERROR_ICON } from '../constants/messages.js';
 import { runFlow } from '../flow.js';
 import { RERUN_FLOW } from '../flows/rerun.js';
 import { getRealWorkingDir } from '../helpers/commands.js';
@@ -22,4 +23,9 @@ export const rerunCommand = new Command('rerun')
   .addOption(originalCwdOption)
   .action(async (dirName, options) => {
     await runFlow(RERUN_FLOW, { dirName: getRealWorkingDir(dirName, options), options });
+  })
+  .showHelpAfterError()
+  .showSuggestionAfterError(true)
+  .configureOutput({
+    outputError: (str, write) => write(chalk.red(`${ERROR_ICON} ${str}`)),
   });

package/lib/commands/zip.js

@@ -1,3 +1,4 @@
+import chalk from 'chalk';
 import { Command, Option } from 'commander';
 import _ from 'lodash/fp.js';
 
@@ -8,6 +9,7 @@ import { bumpVersionOption } from '../options/bump-version.js';
 import { originalCwdOption } from '../options/original-cwd.js';
 import { silentOption } from '../options/silent.js';
 import { ensureBumpVersion } from '../helpers/cli-version.js';
+import { ERROR_ICON } from '../constants/messages.js';
 
 export const zipCommand = new Command('zip')
   .description('Bundle app')
@@ -29,4 +31,9 @@ export const zipCommand = new Command('zip')
         options,
       }).then(_.get('zipFileName'));
     }),
-  );
+  )
+  .showHelpAfterError()
+  .showSuggestionAfterError(true)
+  .configureOutput({
+    outputError: (str, write) => write(chalk.red(`${ERROR_ICON} ${str}`)),
+  });

package/lib/constants/messages.js

@@ -1,12 +1,12 @@
 import chalk from 'chalk';
 
-export const SUCCESS_ICON = '  ✅  \n';
-export const ERROR_ICON = '  ❌  \n';
+export const SUCCESS_ICON = '✅';
+export const ERROR_ICON = '❌';
 
 export const RELEASE = {
   createZip: 'Creating zip archive...\n',
   createZipError: 'Could not create zip archive.',
-  createZipSuccess: `Zip archive has been created ${SUCCESS_ICON}`,
+  createZipSuccess: `Zip archive has been created ${SUCCESS_ICON}\n`,
   getAuthToken: 'Reading auth token...',
   getAuthTokenError: `Could not find auth token or API_KEY in .env file.\nFor UI app please run ${chalk.cyan`yarn start`} and login to Corva to fetch it or set API_KEY in your .env file`,
   getAppKey: 'Reading app key...',

package/lib/flow.js

@@ -16,7 +16,7 @@ export const runFlow = async (flow, context, indent = '') => {
 
   const result = await runSteps(flow.steps, context, indent + '  ');
 
-  logger.write(`${indent}Done!` + SUCCESS_ICON);
+  logger.write(`${indent}Done!` + SUCCESS_ICON + '\n');
 
   return result;
 };
@@ -40,7 +40,7 @@ const runSteps = async (steps = [], context = {}, indent = '') => {
 
     Object.assign(context, result);
 
-    logger.write(SUCCESS_ICON);
+    logger.write(SUCCESS_ICON + '\n');
   }
 
   return context;

package/lib/main.js

@@ -1,10 +1,8 @@
 import chalk from 'chalk';
-import { Command, CommanderError } from 'commander';
+import { Command } from 'commander';
 import semver from 'semver';
 
 import { warnIfOutdated } from './helpers/cli-version.js';
-import { ERROR_ICON } from './constants/messages.js';
-import { StepError } from './flows/lib/step-error.js';
 import { logger } from './helpers/logger.js';
 
 import { zipCommand } from './commands/zip.js';
@@ -13,6 +11,8 @@ import { rerunCommand } from './commands/rerun.js';
 import { attachCommand } from './commands/attach.js';
 import { createCommand } from './commands/create.js';
 
+import { ERROR_ICON } from './constants/messages.js';
+
 function checkNodeVersion() {
   logger.write('Checking node version...');
 
@@ -40,70 +40,20 @@ export async function run() {
 
       await warnIfOutdated();
     })
-    .configureOutput({ writeErr: () => undefined })
-    .exitOverride()
     .addCommand(createCommand, { isDefault: true })
     .addCommand(zipCommand)
     .addCommand(releaseCommand)
     .addCommand(rerunCommand)
-    .addCommand(attachCommand);
+    .addCommand(attachCommand)
+    .showHelpAfterError()
+    .showSuggestionAfterError(true)
+    .configureOutput({
+      outputError: (str, write) => write(chalk.red(`${ERROR_ICON} ${str}`)),
+    });
 
   try {
     await program.parseAsync(process.argv);
   } catch (e) {
-    handleError(program, e);
-
     process.exit(1);
   }
 }
-
-const handleError = (program, e) => {
-  if (e instanceof CommanderError) {
-    handleCommanderError(program, e);
-
-    return;
-  }
-
-  logger.write(ERROR_ICON);
-
-  if (!(e instanceof StepError)) {
-    console.error(chalk.red(e));
-
-    return;
-  }
-
-  console.log(chalk.red(e.message));
-  e.cause && console.error(chalk.red(e.cause));
-};
-
-const handleCommanderError = (program, e) => {
-  switch (e.code) {
-    case 'commander.missingArgument': {
-      const match = /error:.*'(.*)'/.exec(e.message);
-
-      if (match && match[1] === 'project-directory') {
-        const commandName = program.args[0] || program._defaultCommandName;
-
-        console.error('Please specify the project directory:');
-        logger.log(`  ${chalk.cyan(program.name())} ${commandName} ${chalk.green('<project-directory>')}`);
-        logger.log();
-        logger.log('For example:');
-        logger.log(`  ${chalk.cyan(program.name())} ${commandName} ${chalk.green('my-react-app')}`);
-        logger.log();
-        logger.log(`Run ${chalk.cyan(`${program.name()} help ${commandName}`)} to see all options.`);
-      } else {
-        console.error('❌', e.message);
-      }
-
-      break;
-    }
-    case 'commander.help':
-    case 'commander.helpDisplayed': {
-      // ignore
-      break;
-    }
-    default: {
-      console.error('❌', e.message);
-    }
-  }
-};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@corva/create-app",
-  "version": "0.50.0-3",
+  "version": "0.50.0-rc.0",
   "private": false,
   "description": "Create an app to use it in CORVA.AI",
   "keywords": [
@@ -35,7 +35,7 @@
     "release-rc": "npm run release -- --prerelease"
   },
   "lint-staged": {
-    "*.{js,json}": "npm run lint:fix"
+    "*.js": "npm run lint:fix"
   },
   "dependencies": {
     "archiver": "^5.3.0",