@corva/create-app 0.59.0-rc.0 → 0.59.0-rc.1

package/lib/commands/create.js

@@ -23,7 +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';
+import { StepError } from '../flows/lib/step-error.js';
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
@@ -36,12 +36,7 @@ const WRITE_TO_JSON_OPTS = {
 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)
-  .showHelpAfterError()
-  .showSuggestionAfterError(true)
-  .configureOutput({
-    outputError: (str, write) => write(chalk.red(`${ERROR_ICON} ${str}`)),
-  });
+  .addOption(originalCwdOption);
 
 manifestOptions().forEach((value) => {
   const type = value.commaSeparated ? 'string' : typeof value.default;
@@ -99,7 +94,7 @@ const getEnvManagementLink = (manifest) => {
   }
 
   if (IS_WINDOWS) {
-    return 'https://github.com/pyenv-win/pyenv-win';
+    return 'https://docs.python.org/3/using/windows.html#using-python-on-windows';
   }
 
   return 'https://github.com/pyenv/pyenv';
@@ -110,7 +105,7 @@ async function initPackage(projectName, opts) {
   const runtime = resolveAppRuntime(opts);
 
   if (!(await runtime.isRuntimeAvailable())) {
-    throw new Error(
+    throw new StepError(
       `Runtime "${opts.runtime}" is not available locally. Please proceed to ${chalk.green(
         getEnvManagementLink(manifest),
       )} to install it locally.`,
@@ -141,7 +136,7 @@ async function initPackage(projectName, opts) {
     if (shouldCleanup) {
       await fs.emptyDir(root);
     } else {
-      throw new Error(`Directory is not empty: ${root}`);
+      throw new StepError(`Directory is not empty: ${root}`);
     }
   }
 

package/lib/flow.js

@@ -21,7 +21,7 @@ export const runFlow = async (flow, context, indent = '') => {
 
     return result;
   } catch (error) {
-    logger.write(`\n${indent}${chalk.red('Error:')} ${error.message}\n`);
+    logger.write(`\n`);
 
     throw error;
   }

package/lib/flows/lib/api.js

@@ -50,7 +50,7 @@ export class Api {
     const app = data.find((app) => app.attributes.app_key === appKey);
 
     if (!app) {
-      throw new Error(
+      throw new StepError(
         `App with key - ${appKey}, does not exist.\nThe key search is case-sensitive. You might need to update the app key in your app to exactly match the key.`,
       );
     }
@@ -155,7 +155,7 @@ export class Api {
       .json();
 
     if (!wells || !wells.length) {
-      throw new Error(`Could not found wells by asset ID - ${assetId}`);
+      throw new StepError(`Could not found wells by asset ID - ${assetId}`);
     }
 
     return wells;

package/lib/flows/lib/json.js

@@ -3,6 +3,7 @@ import os from 'node:os';
 import { resolve } from 'node:path';
 
 import debugFn from 'debug';
+import { StepError } from './step-error.js';
 
 const debug = debugFn('cca:json');
 
@@ -17,7 +18,7 @@ export const loadJson = async (dirName, fileName) => {
     return JSON.parse(manifest);
   } catch (e) {
     if (e.code === 'ENOENT') {
-      throw new Error(`${fileName} was not found in ${resolve(dirName)}`);
+      throw new StepError(`${fileName} was not found in ${resolve(dirName)}`, { cause: e });
     }
 
     throw e;

package/lib/flows/steps/release/remove-failed-upload.js

@@ -1,5 +1,6 @@
 import { resolve } from 'node:path';
 import { unlink } from 'node:fs/promises';
+import { StepError } from '../../lib/step-error.js';
 
 export const REMOVE_FAILED_UPLOAD_STEP = {
   message: 'Cleaning up...',
@@ -15,6 +16,6 @@ export const REMOVE_FAILED_UPLOAD_STEP = {
       await api.deleteAppUpload(appId, packageId);
     }
 
-    throw new Error(`Got unexpected status '${uploadStatus}' while processing package ${packageId}.`);
+    throw new StepError(`Got unexpected status '${uploadStatus}' while processing package ${packageId}.`);
   },
 };

package/lib/flows/steps/rerun/get-app-version.js

@@ -2,6 +2,7 @@ import chalk from 'chalk';
 import inquirer from 'inquirer';
 
 import { logger } from '../../../helpers/logger.js';
+import { StepError } from '../../lib/step-error.js';
 
 export const GET_APP_VERSION_TASK_STEP = {
   message: 'Get app version...',
@@ -37,7 +38,7 @@ const getAppVersion = async (appId, optionAppVersion, api) => {
   const appPackages = await api.getAppPackages(appId);
 
   if (!appPackages.length) {
-    throw new Error('No app versions found');
+    throw new StepError('No app versions found');
   }
 
   const confirmUseVersionMessage = (version) => {

package/lib/flows/steps/zip-file-list-resolve.js

@@ -35,7 +35,7 @@ export const FILE_LIST_RESOLVE_STEP = {
       return resolveDataForZipPythonApp(files, context);
     }
 
-    throw new Error(`Unsupported runtime: ${manifest.runtime}`);
+    throw new StepError(`Unsupported runtime: ${manifest.runtime}`);
   },
 };
 

package/lib/helpers/resolve-app-runtime.js

@@ -8,7 +8,13 @@ import { promises as fs } from 'fs';
 import os from 'os';
 import semver from 'semver';
 
-const checkCliVersion = async (command, version, stdErr = false) =>
+/**
+ *
+ * @param {string} command
+ * @param {string} version
+ * @returns {Promise<boolean>}
+ */
+const checkCliVersion = async (command, version) =>
   new Promise((resolve) => {
     const child = spawn(command, ['--version']);
 
@@ -103,10 +109,18 @@ export const resolveAppRuntime = (opts) => {
 
   return {
     language: 'python',
-    isRuntimeAvailable: async () =>
-      IS_WINDOWS
-        ? (await checkCliVersion('python', version)) || (await checkCliVersion('python3', version))
-        : checkCliVersion('python3', version),
+    isRuntimeAvailable: async () => {
+      if (!IS_WINDOWS) {
+        return checkCliVersion(`python${version}`, version);
+      }
+
+      return (
+        (await checkCliVersion(`py -${version}`, version)) ||
+        (await checkCliVersion('python', version)) ||
+        (await checkCliVersion('python3', version))
+      );
+    },
+
     packageManager: 'pip',
     version,
     semver: semverVersionsMapping.python[version],

package/lib/main.js

@@ -12,6 +12,10 @@ import { attachCommand } from './commands/attach.js';
 import { createCommand } from './commands/create.js';
 
 import { ERROR_ICON } from './constants/messages.js';
+import { StepError } from './flows/lib/step-error.js';
+import debugFn from 'debug';
+
+const debug = debugFn('cca:main');
 
 function checkNodeVersion() {
   logger.write('Checking node version...');
@@ -46,14 +50,19 @@ export async function run() {
     .addCommand(rerunCommand)
     .addCommand(attachCommand)
     .showHelpAfterError()
-    .showSuggestionAfterError(true)
-    .configureOutput({
-      outputError: (str, write) => write(chalk.red(`${ERROR_ICON} ${str}`)),
-    });
+    .showSuggestionAfterError(true);
 
   try {
     await program.parseAsync(process.argv);
   } catch (e) {
+    if (e instanceof StepError) {
+      console.error(chalk.red(`${ERROR_ICON} ${e.message}`));
+    } else {
+      debug(e);
+
+      console.error(chalk.red(`${ERROR_ICON} Unknown error occured, please contact support`));
+    }
+
     process.exit(1);
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@corva/create-app",
-  "version": "0.59.0-rc.0",
+  "version": "0.59.0-rc.1",
   "private": false,
   "description": "Create an app to use it in CORVA.AI",
   "keywords": [