@corva/create-app 0.45.0-4 → 0.45.0

package/lib/flows/lib/api.js

@@ -48,7 +48,6 @@ export class Api {
       .json();
 
     const app = data.find((app) => app.attributes.app_key === appKey);
-
     if (!app) {
       throw new Error(`App with key - ${appKey}, not exist`);
     }
@@ -300,7 +299,6 @@ export class Api {
     console.log(`v2/apps/${appId}/packages/${id}`, {
       json: { package: { status: 'published' } },
     });
-
     const { data } = await this.#api
       .patch(`v2/apps/${appId}/packages/${id}`, {
         json: { package: { status: 'published' } },
@@ -324,7 +322,6 @@ export class Api {
    */
   async getAppPackages(appId) {
     const { data } = await this.#api.get(`v2/apps/${appId}/packages`).json();
-
     return data;
   }
 

package/lib/flows/lib/notification.js

@@ -91,7 +91,6 @@ export class Notification {
    */
   getStreamLink(title, streamId) {
     const streamUrl = `${this.#prefixUrl}/config/streams/${streamId}`;
-
     return this._createLink(title, streamUrl);
   }
 
@@ -107,7 +106,6 @@ export class Notification {
    */
   printStreamLink(title, streamId) {
     const link = this.getStreamLink(title, streamId);
-
     this.print(link);
   }
 
@@ -123,7 +121,6 @@ export class Notification {
    */
   getAssetLink(title, assetId) {
     const assetUrl = `${this.#prefixUrl}/assets/${assetId}`;
-
     return this._createLink(title, assetUrl);
   }
 

package/lib/flows/steps/attach/get-all-live-assets.js

@@ -65,7 +65,6 @@ const getAssetsListWithPrompt = (assets, notification) => {
 const mapAssetsStreamsData = (assets, streamsData) => {
   return assets.map((asset) => {
     const currentStreams = streamsData.filter((stream) => stream.asset_id === parseInt(asset.id));
-
     return {
       assetId: asset.id,
       assetName: asset.attributes.name,
@@ -104,7 +103,6 @@ const getAssetsStreamsWithPrompt = async (mappedAssetsStreamsData, appId, notifi
 
     if (streamsWithoutCurrentApp.length === 1) {
       mappedData.selectedStreams = streamsWithoutCurrentApp;
-
       continue;
     }
 

package/lib/flows/steps/release/get-config.js

@@ -9,7 +9,6 @@ import { Notification } from '../../lib/notification.js';
 async function getVarsFromDotEnv({ dirName }) {
   try {
     const envFile = await fs.readFile(resolve(dirName, '.env'));
-
     return dotenv.parse(envFile);
   } catch (error) {
     return {};

package/lib/flows/steps/rerun/create-task.js

@@ -45,7 +45,6 @@ export const CREATE_TASK_STEP = {
           .queueAppRun(app.id, version, interval, wellId, appDatasetsNames, streamId)
           .catch((e) => {
             console.log(e.response.body);
-
             throw e;
           });
 

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

@@ -33,7 +33,6 @@ export const GET_APP_VERSION_TASK_STEP = {
  */
 const getAppVersion = async (appId, optionAppVersion, api) => {
   logger.write('\n    Checking app versions...');
-
   const appPackages = await api.getAppPackages(appId);
 
   if (!appPackages.length) {

package/lib/flows/steps/rerun/prepare-data.js

@@ -69,7 +69,6 @@ export const PREPARE_DATA_TASK_STEP = {
  */
 const promptAreYouSure = async () => {
   logger.log('\n');
-
   const answers = await inquirer.prompt([
     {
       message:
@@ -83,7 +82,6 @@ const promptAreYouSure = async () => {
       default: false,
     },
   ]);
-
   return answers.option;
 };
 

package/lib/flows/steps/rerun/prepare-well-and-stream-data.js

@@ -104,7 +104,6 @@ const getWellWithPrompt = async (wells, api) => {
     const [well] = choices;
 
     logger.write(`\n\n${chalk.black.underline.bold(`Process well - ${chalk.green(well.name)}`)}`);
-
     return well.value;
   }
 
@@ -144,7 +143,6 @@ const prepareWellAndStreamData = async (assets, api, manifest) => {
 
       const wells = await api.getWellByAssetId(assetId);
       const well = await getWellWithPrompt(wells, api);
-
       mappedAssetsToWells.set(well.attributes.asset_id, well);
 
       logger.write('\n    Loading streams...');
@@ -166,7 +164,6 @@ const prepareWellAndStreamData = async (assets, api, manifest) => {
       assetsToDelete.push(assetId);
 
       if (mappedAssetsToWells.has(assetId)) mappedAssetsToWells.delete(assetId);
-
       if (mappedAssetsToStreams.has(assetId)) mappedAssetsToStreams.delete(assetId);
     }
   }

package/lib/helpers/versioning.js

@@ -16,7 +16,6 @@ export function isInGitRepository(appPath) {
     return true;
   } catch (e) {
     debug(e);
-
     return false;
   }
 }
@@ -33,12 +32,10 @@ export function tryGitInit(appPath) {
 
     execSync('git init', { stdio: 'ignore', cwd: appPath });
     logger.log('Initialized git repo in app');
-
     return true;
   } catch (e) {
     debug(e);
     console.warn('Git repo not initialized');
-
     return false;
   }
 }
@@ -51,7 +48,6 @@ export function tryGitCommit(appPath) {
       cwd: appPath,
     });
     logger.log('Added first git commit');
-
     return true;
   } catch (e) {
     // We couldn't commit in already initialized git repo,
@@ -82,7 +78,6 @@ export function shouldUseYarn(appPath) {
     return true;
   } catch (e) {
     debug(e);
-
     return false;
   }
 }

package/lib/main.js

@@ -1,45 +1,44 @@
-/* eslint-disable no-undef */
 import chalk from 'chalk';
-import { Command, CommanderError, Option } from 'commander';
 import figlet from 'figlet';
+import { Command, CommanderError, Option } from 'commander';
 import fs from 'fs-extra';
 import inquirer from 'inquirer';
 import os from 'node:os';
 import path, { resolve } from 'node:path';
 import semver from 'semver';
 
-import * as manifestHelpers from './helpers/manifest.js';
+import { ensureLatestVersion, warnIfOutdated, ensureBumpVersion } from './scripts/utils/version.js';
 import * as utils from './helpers/utils.js';
+import * as manifestHelpers from './helpers/manifest.js';
 import * as versioning from './helpers/versioning.js';
-import { ensureBumpVersion, ensureLatestVersion, warnIfOutdated } from './scripts/utils/version.js';
 
-import * as manifestConstants from './constants/manifest.js';
 import { getDefaultsForPackageJson } from './constants/package.js';
+import * as manifestConstants from './constants/manifest.js';
 
-import spawn from 'cross-spawn';
-import _ from 'lodash/fp.js';
-import { clear } from 'node:console';
-import { existsSync } from 'node:fs';
-import { fileURLToPath } from 'node:url';
 import packageJson from '../package.json' assert { type: 'json' };
+import { clear } from 'node:console';
+import spawn from 'cross-spawn';
+import { runFlow } from './flow.js';
+import { ERROR_ICON } from './constants/messages.js';
+import { StepError } from './flows/lib/step-error.js';
+import { RELEASE_FLOW } from './flows/release.js';
+import { RERUN_FLOW } from './flows/rerun.js';
+import { ATTACH_FLOW } from './flows/attach.js';
+import { ZIP_FLOW } from './flows/zip.js';
 import {
-  apiKeyOption,
-  appVersion,
   bumpVersionOption,
+  apiKeyOption,
   envOption,
-  originalCwdOption,
   silentOption,
+  appVersion,
+  originalCwdOption,
 } from './bump-version.option.js';
-import { ERROR_ICON } from './constants/messages.js';
-import { runFlow } from './flow.js';
-import { ATTACH_FLOW } from './flows/attach.js';
 import { Manifest } from './flows/lib/manifest.js';
-import { StepError } from './flows/lib/step-error.js';
-import { RELEASE_FLOW } from './flows/release.js';
-import { RERUN_FLOW } from './flows/rerun.js';
-import { ZIP_FLOW } from './flows/zip.js';
-import { logger } from './helpers/logger.js';
 import { IS_WINDOWS, resolveAppRuntime } from './helpers/resolve-app-runtime.js';
+import { existsSync } from 'node:fs';
+import { fileURLToPath } from 'node:url';
+import { logger } from './helpers/logger.js';
+import _ from 'lodash/fp.js';
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
@@ -59,7 +58,7 @@ const silencer =
     }
   };
 
-const getRealWorkingDir = (relativePath, options) => resolve(options.originalCwd, relativePath);
+  const getRealWorkingDir = (relativePath, options) => resolve(options.originalCwd, relativePath)
 
 function startingMessage() {
   clear();
@@ -71,19 +70,16 @@ function checkNodeVersion() {
   logger.write('Checking node version...');
 
   const unsupportedNodeVersion = !semver.satisfies(process.version, '>=16');
-
   if (unsupportedNodeVersion) {
     logger.log(
       chalk.red(
         `\nYou are using Node ${process.version}.\n\n` +
-          `Please update to Node 16 or higher for a better, fully supported experience.\n`,
-      ),
+          `Please update to Node 16 or higher for a better, fully supported experience.\n`
+      )
     );
-
     // Fall back to latest supported react-scripts on Node 4
     return process.exit(1);
   }
-
   logger.write('  ✅  \n');
 }
 
@@ -105,10 +101,10 @@ function checkOptions(opts) {
   };
 }
 
-// eslint-disable-next-line no-unused-vars
 const printDeprecationNotice = (param) =>
   console.warn(
-    chalk.bgYellowBright`DEPRECATED OPTION: ${param}` + ` Use ${chalk.cyan(`create-corva-app ${param} .`)} instead`,
+    chalk.bgYellowBright`DEPRECATED OPTION: ${param}` +
+      ` Use ${chalk.cyan(`create-corva-app ${param} .`)} instead`
   );
 
 export async function run() {
@@ -131,7 +127,9 @@ export async function run() {
   manifestConstants.manifestOptions().forEach((value) => {
     const type = typeof value.default;
     const option = new Option(
-      `${value.alias ? `-${value.alias}, ` : ''}--${value.name} [${(type !== 'undefined' && type) || 'string'}]`,
+      `${value.alias ? `-${value.alias}, ` : ''}--${value.name} [${
+        (type !== 'undefined' && type) || 'string'
+      }]`,
       value.message,
     );
 
@@ -139,7 +137,9 @@ export async function run() {
       if (typeof value.choices === 'function') {
         option.choices(value.choices());
       } else {
-        option.choices(value.choices.map((choice) => `${typeof choice === 'object' ? choice.value : choice}`));
+        option.choices(
+          value.choices.map((choice) => `${typeof choice === 'object' ? choice.value : choice}`)
+        );
       }
     }
 
@@ -180,14 +180,10 @@ export async function run() {
       silencer(async (dirName, patterns, options) => {
         options.bumpVersion = await ensureBumpVersion(options.bumpVersion);
 
-        console.log(getRealWorkingDir(dirName, options), options);
+        console.log(getRealWorkingDir(dirName, options), options)
 
-        return runFlow(ZIP_FLOW, {
-          dirName: getRealWorkingDir(dirName, options),
-          patterns,
-          options,
-        }).then(_.get('zipFileName'));
-      }),
+        return runFlow(ZIP_FLOW, { dirName: getRealWorkingDir(dirName, options), patterns, options }).then(_.get('zipFileName'));
+      })
     );
 
   program
@@ -202,20 +198,26 @@ export async function run() {
     .addOption(apiKeyOption)
     .addOption(originalCwdOption)
     .addOption(new Option('--notes [string]', 'Add custom notes to published app'))
-    .addOption(new Option('--label [string]', 'Put a label on the release').choices(['BETA', 'PROD']))
-    .addOption(new Option('--remove-on-fail [boolean]', 'Remove release if it fails during deployment').default(false))
     .addOption(
-      new Option('--remove-on-success [boolean]', 'App package (.zip) will not be deleted after upload').default(true),
+      new Option('--label [string]', 'Put a label on the release').choices(['BETA', 'PROD'])
+    )
+    .addOption(
+      new Option(
+        '--remove-on-fail [boolean]',
+        'Remove release if it fails during deployment'
+      ).default(false)
+    )
+    .addOption(
+      new Option(
+        '--remove-on-success [boolean]',
+        'App package (.zip) will not be deleted after upload'
+      ).default(true)
     )
     // .addOption(new Option('--zip-file-name [string]', 'Prebuilt zip file name in dir'))
     .action(async (dirName, patterns, options) => {
       options.bumpVersion = await ensureBumpVersion(options.bumpVersion);
 
-      await runFlow(RELEASE_FLOW, {
-        dirName: getRealWorkingDir(dirName, options),
-        patterns,
-        options,
-      });
+      await runFlow(RELEASE_FLOW, { dirName: getRealWorkingDir(dirName, options), patterns, options });
     });
 
   program
@@ -226,8 +228,7 @@ export async function run() {
     .addOption(envOption)
     .addOption(silentOption)
     .addOption(appVersion)
-    .addOption(new Option('--assets [assets...]', 'Assets IDs list', []).conflicts('companyId'))
-    .addOption(new Option('--company-id [number]', 'Company ID', []))
+    .addOption(new Option('--assets [assets...]', 'Assets ids list', []))
     .addOption(new Option('--interval [number]', 'Interval for scheduler apps (exp. 1200)'))
     .addOption(originalCwdOption)
     .action(async (dirName, options) => {
@@ -250,15 +251,15 @@ export async function run() {
   try {
     await program.parseAsync(process.argv);
   } catch (e) {
-    handleError(program, e);
+    handleError(e);
 
     process.exit(1);
   }
 }
 
-const handleError = (program, e) => {
+const handleError = (e) => {
   if (e instanceof CommanderError) {
-    handleCommanderError(program, e);
+    handleCommanderError(e);
 
     return;
   }
@@ -275,7 +276,7 @@ const handleError = (program, e) => {
   e.cause && console.error(chalk.red(e.cause));
 };
 
-const handleCommanderError = (program, e) => {
+const handleCommanderError = (e) => {
   switch (e.code) {
     case 'commander.missingArgument': {
       const match = /error:.*'(.*)'/.exec(e.message);
@@ -284,12 +285,16 @@ const handleCommanderError = (program, e) => {
         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(
+          `  ${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.`);
+        logger.log(
+          `Run ${chalk.cyan(`${program.name()} help ${commandName}`)} to see all options.`
+        );
       } else {
         console.error('❌', e.message);
       }
@@ -334,8 +339,8 @@ async function initPackage(projectName, opts) {
   if (!(await runtime.isRuntimeAvailable())) {
     throw new Error(
       `Runtime "${opts.runtime}" is not available locally. Please proceed to ${chalk.green(
-        getEnvManagementLink(manifest),
-      )} to install it locally.`,
+        getEnvManagementLink(manifest)
+      )} to install it locally.`
     );
   }
 
@@ -347,26 +352,10 @@ async function initPackage(projectName, opts) {
 
   logger.log(`Creating a new Corva app in ${chalk.green(root)}.`);
 
-  await fs.ensureDir(root);
-
-  if ((await fs.readdir(root)).length) {
-    const shouldCleanup = await inquirer
-      .prompt([
-        {
-          message: `Directory "${root}" is not empty. Clean it to proceed?`,
-          name: 'cleanup',
-          type: 'confirm',
-        },
-      ])
-      .then(_.get('cleanup'));
-
-    if (shouldCleanup) {
-      await fs.emptyDir(root);
-    } else {
-      throw new Error(`Directory is not empty: ${root}`);
-    }
+  if (fs.existsSync(root)) {
+    throw new Error(`Directory already exists: ${root}`);
   }
-
+  await fs.mkdir(root);
   await fs.writeJSON(path.join(root, 'manifest.json'), manifest.manifest, writejsonOptions);
 
   await addTemplate(root, manifest, runtime);
@@ -404,7 +393,13 @@ async function addTemplate(root, manifest, runtime) {
   logger.log(chalk.green('Copying app template...'));
   logger.log();
 
-  const templateFolder = path.resolve(__dirname, '..', 'templates', runtime.language, manifest.type);
+  const templateFolder = path.resolve(
+    __dirname,
+    '..',
+    'templates',
+    runtime.language,
+    manifest.type
+  );
 
   utils.copyFolderRecursiveSync(templateFolder, root);
 
@@ -467,7 +462,7 @@ const addTsConfigs = (root, manifest, runtime) => {
           inlineSourceMap: true,
         },
       },
-      writejsonOptions,
+      writejsonOptions
     ),
     fs.writeJson(
       path.resolve(root, 'tsconfig.build.json'),
@@ -476,7 +471,7 @@ const addTsConfigs = (root, manifest, runtime) => {
         include: ['lib/**/*.ts', 'index.ts'],
         exclude: ['node_modules', '**/*.spec.ts'],
       },
-      writejsonOptions,
+      writejsonOptions
     ),
   ]);
 };
@@ -488,7 +483,13 @@ function patchSchedulerForPython(root, manifest, runtime) {
     return;
   }
 
-  const templateFolder = path.resolve(__dirname, '..', 'templates', runtime.language, manifest.type);
+  const templateFolder = path.resolve(
+    __dirname,
+    '..',
+    'templates',
+    runtime.language,
+    manifest.type
+  );
   const originalType = 'ScheduledDataTimeEvent';
   const replacementType =
     schedulerType === manifestConstants.SCHEDULER_TYPE_DEPTH.value
@@ -543,7 +544,6 @@ async function installApp(root, manifest, runtime) {
     }
 
     logger.log(chalk.yellow(`Installing template dependencies using ${runtime.packageManager}...`));
-
     const proc =
       manifest.isJs() && existsSync(`${os.homedir()}/.nvm/nvm.sh`)
         ? spawn.sync(`\\. ${os.homedir()}/.nvm/nvm.sh && nvm i && ${command} ${args.join(' ')}`, {
@@ -559,13 +559,11 @@ async function installApp(root, manifest, runtime) {
         // NOTE: filter out warnings caused by @corva/ui peer dependencies
         .filter((line) => !line.includes('@corva/ui'))
         .join('\n');
-
       console.log(error);
     }
 
     if (proc.status !== 0) {
       console.error(`\`${command} ${args.join(' ')}\` failed`);
-
       return;
     }
 

package/package.json

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

package/templates/javascript/scheduler/.eslintrc.js

@@ -0,0 +1 @@
+module.exports = { extends: '@corva/eslint-config-node' };

package/templates/javascript/scheduler/.prettierrc

@@ -0,0 +1 @@
+"@corva/eslint-config-node/prettier"

package/templates/javascript/stream/.eslintrc.js

@@ -0,0 +1 @@
+module.exports = { extends: '@corva/eslint-config-node' };

package/templates/javascript/stream/.prettierrc

@@ -0,0 +1 @@
+"@corva/eslint-config-node/prettier"

package/templates/javascript/task/.eslintrc.js

@@ -0,0 +1 @@
+module.exports = { extends: '@corva/eslint-config-node' };

package/templates/javascript/task/.prettierrc

@@ -0,0 +1 @@
+"@corva/eslint-config-node/prettier"

package/templates/typescript/scheduler/.prettierrc

@@ -0,0 +1 @@
+"@corva/eslint-config-node/prettier"

package/templates/typescript/stream/.prettierrc

@@ -0,0 +1 @@
+"@corva/eslint-config-node/prettier"

package/templates/typescript/task/.prettierrc

@@ -0,0 +1 @@
+"@corva/eslint-config-node/prettier"