@corva/create-app 0.40.0-1 → 0.41.0-2

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

@@ -1,16 +1,16 @@
-const _ = require('lodash');
-const chalk = require('chalk');
-const inquirer = require('inquirer');
-const { Api } = require('../lib/api');
-const { StepError } = require('../lib/step-error');
+import _ from 'lodash';
+import chalk from 'chalk';
+import inquirer from 'inquirer';
+import { StepError } from '../lib/step-error.js';
+import { logger } from '../../helpers/logger.js';
 
 const MAX_ASSET_IDS_COUNT = 10;
 
-const PREPARE_DATA_STEP = {
+export const PREPARE_DATA_STEP = {
   message: 'Preparing data for tasks...',
   fn: async (context) => {
-    const { manifest, patterns, API_KEY, CORVA_API_ENV, pkg } = context;
-    let { assets } = patterns;
+    const { manifest, options, api, pkg } = context;
+    let { assets } = options;
 
     assets = _.uniq(assets);
 
@@ -22,12 +22,10 @@ const PREPARE_DATA_STEP = {
       throw new StepError('Rerun command supports only "scheduler" or "stream" apps');
     }
 
-    if (!await promptAreYouSure()) {
+    if (!(await promptAreYouSure())) {
       throw new StepError('Command stopped');
     }
 
-    const api = new Api(CORVA_API_ENV, API_KEY);
-
     const app = await api.getAppByKey(manifest.manifest.application.key.toLowerCase());
     const appDatasets = await api.getAppDatasetsOperationWrite(app.id);
     const appDatasetsNames = appDatasets.map((dataset) => dataset.attributes.dataset_name);
@@ -40,13 +38,16 @@ const PREPARE_DATA_STEP = {
 
         const run = existingAppRuns.get(appRunAssetId);
 
-        process.stdout.write( 
-          `\n\n${chalk.yellow.bold(`Similar rerun with ID ${run.id}, for asset ID ${appRunAssetId} - already exist. Will be skipped!`)}`
+        logger.write(
+          `\n\n${chalk.yellow.bold(
+            `Similar rerun with ID ${run.id}, for asset ID ${appRunAssetId} - already exist. Will be skipped!`
+          )}`
         );
       }
     }
 
-    const {mappedAssetsToWells, mappedAssetsToStreams, assetsToDelete} = await prepareWellAndStreamData(assets, api);
+    const { mappedAssetsToWells, mappedAssetsToStreams, assetsToDelete } =
+      await prepareWellAndStreamData(assets, api);
 
     if (assetsToDelete.length) {
       // remove asset ID if could not found stream or well
@@ -59,8 +60,6 @@ const PREPARE_DATA_STEP = {
       appDatasetsNames,
       mappedAssetsToStreams,
       mappedAssetsToWells,
-      api,
-      CORVA_API_ENV,
       version: pkg.version,
     };
   },
@@ -71,145 +70,167 @@ const PREPARE_DATA_STEP = {
  *
  * @returns
  */
- const promptAreYouSure = async () => {
-    const answers = await inquirer
-      .prompt([
-        {
-          message:
-            '\n This command will create additional load on the server, which may take a long time. \n Are you sure you want to do this?',
-          name: 'option',
-          type: 'list',
-          choices: [
-            { value: true, name: 'Yes' },
-            { value: false, name: 'No' },
-          ],
-          default: false,
-        },
-      ]);
-    return answers.option;
- }
-
- /**
+const promptAreYouSure = async () => {
+  const answers = await inquirer.prompt([
+    {
+      message:
+        '\n This command will create additional load on the server, which may take a long time. \n Are you sure you want to do this?',
+      name: 'option',
+      type: 'list',
+      choices: [
+        { value: true, name: 'Yes' },
+        { value: false, name: 'No' },
+      ],
+      default: false,
+    },
+  ]);
+  return answers.option;
+};
+
+/**
  *  CLI prompt question - Please choose the stream
- * 
-   * @param {object[]} streams
+ *
+ * @param {object[]} streams
  *
  * @returns
  */
-  const getStreamWithPrompt = async (streams) => {
-    let stream = {};
+const getStreamWithPrompt = async (streams) => {
+  let stream = {};
 
-    const choices = streams.map((stream) => {
-      return {
-        value: stream,
-        name: stream.name
-      };
+  const choices = streams.map((stream) => {
+    return {
+      value: stream,
+      name: stream.name,
+    };
+  });
+
+  if (!choices.length) {
+    throw new Error('No completed streams')
+  }
+
+  if (choices.length === 1) {
+    const [stream] = choices;
+
+    logger.write(
+      `\n\n${chalk.black.underline.bold(`Process stream - ${chalk.green(stream.name)}`)}`
+    );
+    return stream.value
+  }
+
+  await inquirer
+    .prompt([
+      {
+        message: '\n Please choose stream?',
+        name: 'option',
+        type: 'list',
+        choices,
+      },
+    ])
+    .then((answers) => {
+      stream = answers.option;
     });
 
-    await inquirer
-      .prompt([
-        {
-          message:
-            '\n Please choose stream?',
-          name: 'option',
-          type: 'list',
-          choices,
-        },
-      ])
-      .then((answers) => {
-        stream = answers.option;
-      });
-
-      return stream;
- }
-
- /**
+  return stream;
+};
+
+/**
  *  CLI prompt question - Please choose the well
- * 
+ *
  * @param {object[]} wells
- * @param {object} api
+ * @param {import('../lib/api').Api} api
  *
  * @returns
  */
-  const getWellWithPrompt = async (wells, api) => {
-    let well = {};
+const getWellWithPrompt = async (wells, api) => {
+  let well = {};
 
-    const choices = await Promise.all(wells.map( async (well) => {
+  const choices = await Promise.all(
+    wells.map(async (well) => {
       const assetDetails = await api.getAssetById(well.data.attributes.asset_id);
       well.data.name = assetDetails.attributes.name;
       return {
         value: well.data,
         name: well.data.name,
       };
-    }));
-
-    await inquirer
-      .prompt([
-        {
-          message:
-            '\n Please choose the well?',
-          name: 'option',
-          type: 'list',
-          choices,
-        },
-      ])
-      .then((answers) => {
-        well = answers.option;
-      });
-
-      return well;
- }
-
-
- /**
+    })
+  );
+
+  if (!choices.length) {
+    throw new Error('No wells found');
+  }
+
+  if (choices.length === 1) {
+    const [well] = choices;
+
+    logger.write(
+      `\n\n${chalk.black.underline.bold(`Process well - ${chalk.green(well.name)}`)}`
+    );
+    return well.value
+  }
+
+  await inquirer
+    .prompt([
+      {
+        message: '\n Please choose the well?',
+        name: 'option',
+        type: 'list',
+        choices,
+      },
+    ])
+    .then((answers) => {
+      well = answers.option;
+    });
+
+  return well;
+};
+
+/**
  *  Get stream and well data for assets
- * 
+ *
  * @param {string[]} assets
- * @param {object} api
+ * @param {import('../lib/api').Api} api
  *
  * @returns {object}
  */
-  const prepareWellAndStreamData = async (assets, api) => {
-    const mappedAssetsToWells = new Map();
-    const mappedAssetsToStreams = new Map();
-    const assetsToDelete = [];
-
-    for (const assetId of assets) {
-      try {
-        process.stdout.write(
-          `\n\n${chalk.black.underline.bold(`Process asset ID - ${chalk.green(assetId)}`)}`
-        );
+const prepareWellAndStreamData = async (assets, api) => {
+  const mappedAssetsToWells = new Map();
+  const mappedAssetsToStreams = new Map();
+  const assetsToDelete = [];
 
-        process.stdout.write(
-          '\n    Loading wells...'
-        );
+  for (const assetId of assets) {
+    try {
+      logger.write(
+        `\n\n${chalk.black.underline.bold(`Process asset ID - ${chalk.green(assetId)}`)}`
+      );
 
-        const wells = await api.getWellByAssetId(assetId);
-        const well = await getWellWithPrompt(wells, api);
-        mappedAssetsToWells.set(well.attributes.asset_id, well.id);
-  
-        process.stdout.write(
-          '\n    Loading streams...'
-        );
+      logger.write('\n    Loading wells...');
 
-        const streams = await api.getStreamByAssetId(assetId);
-        const stream = await getStreamWithPrompt(streams);
-        mappedAssetsToStreams.set(stream.asset_id, stream.id);
-      } catch (e) {
-        process.stdout.write( 
-          `\n\n${chalk.red.underline.bold(`Skipped the asset ID - ${assetId}, an error occured: ${e.message}`)}`
-        );
+      const wells = await api.getWellByAssetId(assetId);
+      const well = await getWellWithPrompt(wells, api);
+      mappedAssetsToWells.set(well.attributes.asset_id, well.id);
 
-        assetsToDelete.push(assetId);
+      logger.write('\n    Loading streams...');
 
-        if (mappedAssetsToWells.has(assetId)) mappedAssetsToWells.delete(assetId);
-        if (mappedAssetsToStreams.has(assetId)) mappedAssetsToStreams.delete(assetId);
-      }
-    }
+      const streams = await api.getStreamByAssetId(assetId);
+      const stream = await getStreamWithPrompt(streams);
+      mappedAssetsToStreams.set(stream.asset_id, stream.id);
+    } catch (e) {
+      logger.write(
+        `\n\n${chalk.red.underline.bold(
+          `Skipped the asset ID - ${assetId}, an error occured: ${e.message}`
+        )}`
+      );
 
-    return {mappedAssetsToWells, mappedAssetsToStreams, assetsToDelete};
+      assetsToDelete.push(assetId);
+
+      if (mappedAssetsToWells.has(assetId)) mappedAssetsToWells.delete(assetId);
+      if (mappedAssetsToStreams.has(assetId)) mappedAssetsToStreams.delete(assetId);
+    }
   }
 
+  return { mappedAssetsToWells, mappedAssetsToStreams, assetsToDelete };
+};
+
 /**
  *  Check if current runs already exist
  *
@@ -226,10 +247,14 @@ const getExistAppRuns = async (appId, assets, appDatasetsNames, api) => {
 
   // go through all assets ids
   for (const assetId of assets) {
-    const runsForCurrentAsset = existingAppRuns.filter((run) => run.attributes.well_asset_id == assetId);
+    const runsForCurrentAsset = existingAppRuns.filter(
+      (run) => run.attributes.well_asset_id == assetId
+    );
     // go through all existing runs for current asset ID
     for (const run of runsForCurrentAsset) {
-      const currentAppDatasetsNames = run.attributes.app_run_datasets.map((dataset) => dataset.name);
+      const currentAppDatasetsNames = run.attributes.app_run_datasets.map(
+        (dataset) => dataset.name
+      );
       // if datasets names matched for the same asset ID - then run already exist
       if (appDatasetsNames.sort().toString() === currentAppDatasetsNames.sort().toString()) {
         appRuns.set(assetId, run);
@@ -239,5 +264,3 @@ const getExistAppRuns = async (appId, assets, appDatasetsNames, api) => {
 
   return appRuns;
 };
-
-module.exports = { PREPARE_DATA_STEP };

package/lib/flows/steps/rerun.js

@@ -1,8 +1,4 @@
-const { PREPARE_DATA_STEP } = require('./rerun-prepare-data');
-const { CREATE_TASK_STEP } = require('./rerun-create-task');
+import { PREPARE_DATA_STEP } from './rerun-prepare-data.js';
+import { CREATE_TASK_STEP } from './rerun-create-task.js';
 
-const RERUN_STEPS = [PREPARE_DATA_STEP, CREATE_TASK_STEP];
-
-module.exports = {
-  RERUN_STEPS,
-};
+export const RERUN_STEPS = [PREPARE_DATA_STEP, CREATE_TASK_STEP];

package/lib/flows/steps/zip-cleanup.js

@@ -1,9 +1,11 @@
-const { promises: fs } = require('fs');
-const { resolve } = require('path');
+import { promises as fs } from 'node:fs';
+import { resolve } from 'node:path';
 
-const debug = require('debug')('cca:flow:zip:cleanup');
+import Debug from 'debug';
 
-const CLEANUP_STEP = {
+const debug = Debug('cca:flow:zip:cleanup');
+
+export const CLEANUP_STEP = {
   message: 'Removing temporary files...',
   fn: async ({ itemsToRemove, dirName }) => {
     for (const item of itemsToRemove) {
@@ -13,5 +15,3 @@ const CLEANUP_STEP = {
     }
   },
 };
-
-module.exports = { CLEANUP_STEP };

package/lib/flows/steps/zip-create-archive.js

@@ -1,7 +1,9 @@
-const { createZipArchive } = require('../lib/create-zip-archive');
-const debug = require('debug')('cca:flow:zip:archive');
+import { createZipArchive } from '../lib/create-zip-archive.js';
+import Debug from 'debug';
 
-const CREATE_ARCHIVE_STEP = {
+const debug = Debug('cca:flow:zip:archive');
+
+export const CREATE_ARCHIVE_STEP = {
   message: 'Creating archive...',
   fn: async ({ itemsToZip, zipFileName, dirName }) => {
     debug(`Zipping %d items to %s`, itemsToZip.length, zipFileName);
@@ -11,5 +13,3 @@ const CREATE_ARCHIVE_STEP = {
     debug(`Created %s with %d items (%d bytes)`, zipFileName, itemsToZip.length, bytes);
   },
 };
-
-module.exports = { CREATE_ARCHIVE_STEP };

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

@@ -1,20 +1,22 @@
-const { set } = require('lodash/fp');
-const { resolve } = require('path');
-const { promises: fs } = require('fs');
-const Glob = require('glob');
-const chalk = require('chalk');
-const isGlob = require('is-glob');
-const { promisify } = require('util');
-const { getIncreasedVersion } = require('../../scripts/utils/version');
-const { loadJson } = require('../lib/json');
-const { StepError } = require('../lib/step-error');
+import _ from 'lodash/fp.js';
+import { resolve } from 'node:path';
+import { promises as fs } from 'node:fs';
+import Glob from 'glob';
+import chalk from 'chalk';
+import isGlob from 'is-glob';
+import { promisify } from 'node:util';
+import { getIncreasedVersion } from '../../scripts/utils/version.js';
+import { loadJson } from '../lib/json.js';
+import { StepError } from '../lib/step-error.js';
 
 const glob = promisify(Glob);
-const debug = require('debug')('cca:flow:zip:resolve');
+import Debug from 'debug';
+
+const debug = Debug('cca:flow:zip:resolve');
 
 const uniqueValues = (array) => Array.from(new Set(array));
 
-const FILE_LIST_RESOLVE_STEP = {
+export const FILE_LIST_RESOLVE_STEP = {
   message: 'Resolving files list...',
   fn: async (context) => {
     const { patterns, manifest, dirName, options } = context;
@@ -65,11 +67,11 @@ const transformPatternsIntoFileNames = async (dirName, patterns, ignoredFiles =
 };
 
 /**
- * 
- * @param {string[]} itemsToZip 
- * @param {object} param1 
+ *
+ * @param {string[]} itemsToZip
+ * @param {object} param1
  * @param {import('../lib/manifest').Manifest} param1.manifest
- * @returns 
+ * @returns
  */
 const resolveDataToZipUiApp = async (itemsToZip = [], { options, pkg, dirName, manifest }) => {
   const version = await getIncreasedVersion(pkg.version, options);
@@ -91,7 +93,7 @@ const resolveDataToZipUiApp = async (itemsToZip = [], { options, pkg, dirName, m
 
   itemsToSave.push({
     name: 'packageForSource.json',
-    content: set(
+    content: _.set(
       'scripts',
       {
         build: 'webpack --config=./config-overrides.js --mode production',
@@ -122,11 +124,11 @@ const resolveDataToZipUiApp = async (itemsToZip = [], { options, pkg, dirName, m
 };
 
 /**
- * 
- * @param {string[]} itemsToZip 
- * @param {object} param1 
+ *
+ * @param {string[]} itemsToZip
+ * @param {object} param1
  * @param {import('../lib/manifest').Manifest} param1.manifest
- * @returns 
+ * @returns
  */
 const resolveDataForZipNodeJsApp = async (itemsToZip = [], { options, pkg, dirName, manifest }) => {
   const version = await getIncreasedVersion(pkg.version, options);
@@ -157,7 +159,7 @@ const resolveDataForZipNodeJsApp = async (itemsToZip = [], { options, pkg, dirNa
     if (shouldUpdateVersion) {
       itemsToSave.push({
         name: 'package-lock.json',
-        content: set('version', version, await loadJson(dirName, 'package-lock.json')),
+        content: _.set('version', version, await loadJson(dirName, 'package-lock.json')),
       });
     }
   } else if (packageDirContent.includes('yarn.lock')) {
@@ -191,17 +193,22 @@ const resolveDataForZipNodeJsApp = async (itemsToZip = [], { options, pkg, dirNa
 };
 
 /**
- * 
- * @param {string[]} itemsToZip 
- * @param {object} param1 
+ *
+ * @param {string[]} itemsToZip
+ * @param {object} param1
  * @param {import('../lib/manifest').Manifest} param1.manifest
- * @returns 
+ * @returns
  */
 const resolveDataForZipPythonApp = async (itemsToZip = [], { manifest, dirName, options }) => {
   const zipFileName = `${manifest.unix_name}.zip`;
 
   if (!itemsToZip.length) {
-    itemsToZip.push(...(await glob('**/*.py', { cwd: dirName, ignore: [...(options.ignoredFiles || []), 'venv/**/*'] })));
+    itemsToZip.push(
+      ...(await glob('**/*.py', {
+        cwd: dirName,
+        ignore: [...(options.ignoredFiles || []), 'venv/**/*'],
+      }))
+    );
   }
 
   itemsToZip.push('manifest.json', 'requirements.txt');
@@ -213,5 +220,3 @@ const resolveDataForZipPythonApp = async (itemsToZip = [], { manifest, dirName,
     itemsToRemove: [],
   };
 };
-
-module.exports = { FILE_LIST_RESOLVE_STEP };

package/lib/flows/steps/zip-prepare.js

@@ -1,9 +1,11 @@
-const { saveJson } = require('../lib/json');
-const logger = require('../../helpers/logger');
+import { saveJson } from '../lib/json.js';
+import { logger } from '../../helpers/logger.js';
 
-const debug = require('debug')('cca:flow:zip:prepare');
+import Debug from 'debug';
 
-const PREPARE_FILES_BEFORE_ZIP_STEP = {
+const debug = Debug('cca:flow:zip:prepare');
+
+export const PREPARE_FILES_BEFORE_ZIP_STEP = {
   message: 'Preparing...',
   fn: async ({ itemsToSave, dirName }) => {
     for (const item of itemsToSave) {
@@ -16,7 +18,3 @@ const PREPARE_FILES_BEFORE_ZIP_STEP = {
     }
   },
 };
-
-module.exports = {
-  PREPARE_FILES_BEFORE_ZIP_STEP,
-};

package/lib/flows/steps/zip.js

@@ -1,15 +1,11 @@
-const { CLEANUP_STEP } = require('./zip-cleanup');
-const { CREATE_ARCHIVE_STEP } = require('./zip-create-archive');
-const { FILE_LIST_RESOLVE_STEP } = require('./zip-file-list-resolve');
-const { PREPARE_FILES_BEFORE_ZIP_STEP } = require('./zip-prepare');
+import { CLEANUP_STEP } from './zip-cleanup.js';
+import { CREATE_ARCHIVE_STEP } from './zip-create-archive.js';
+import { FILE_LIST_RESOLVE_STEP } from './zip-file-list-resolve.js';
+import { PREPARE_FILES_BEFORE_ZIP_STEP } from './zip-prepare.js';
 
-const ZIP_STEPS = [
+export const ZIP_STEPS = [
   FILE_LIST_RESOLVE_STEP,
   PREPARE_FILES_BEFORE_ZIP_STEP,
   CREATE_ARCHIVE_STEP,
   CLEANUP_STEP,
 ];
-
-module.exports = {
-  ZIP_STEPS,
-};

package/lib/flows/zip-simple.js

@@ -1,8 +1,6 @@
-const { ZIP_STEPS } = require('./steps/zip');
+import { ZIP_STEPS } from './steps/zip.js';
 
-const ZIP_SIMPLE_FLOW = {
+export const ZIP_SIMPLE_FLOW = {
   name: 'zip (simple)',
   steps: ZIP_STEPS,
 };
-
-module.exports = { ZIP_SIMPLE_FLOW };

package/lib/flows/zip.js

@@ -1,9 +1,7 @@
-const { PREPARE_FLOW } = require('./prepare');
-const { ZIP_STEPS } = require('./steps/zip');
+import { PREPARE_FLOW } from './prepare.js';
+import { ZIP_STEPS } from './steps/zip.js';
 
-const ZIP_FLOW = {
+export const ZIP_FLOW = {
   name: 'zip',
   steps: [PREPARE_FLOW, ...ZIP_STEPS],
 };
-
-module.exports = { ZIP_FLOW };

package/lib/helpers/logger.js

@@ -1,4 +1,4 @@
-class Logger {
+export class Logger {
     constructor() {
         this.isSilent = process.argv.includes('--silent');
     }
@@ -8,10 +8,12 @@ class Logger {
             return;
         }
 
-        process.stdout.write(str);
-    }
+        if (str === undefined) {
+          process.stdout.write();
+
+          return;
+        }
 
-    writeDirectlyToConsole(str) {
         process.stdout.write(str);
     }
 
@@ -20,8 +22,14 @@ class Logger {
             return;
         }
 
+        if (str === undefined) {
+          console.log();
+
+          return;
+        }
+
         console.log(str);
     }
 }
 
-module.exports = new Logger();
+export const logger = new Logger();