@corva/create-app 0.44.0-1 → 0.44.0-2

package/bin/create-corva-app.cjs

@@ -4,21 +4,18 @@ const { sync: spawnSync } = require('cross-spawn');
 const { resolve } = require('path');
 
 const cmd = 'node';
-const originalCwd = process.cwd()
+const originalCwd = process.cwd();
 
-process.chdir(__dirname)
+process.chdir(__dirname);
 
-const preparedOriginalArgs = process.argv.slice(2)
+const preparedOriginalArgs = process.argv
+  .slice(2)
   // after changing the cwd need to pass the original path
   .concat(['--original-cwd', originalCwd])
-  // leave spaces in place for arguments 
-  .map(a => a.includes(" ") ? `"${a}"` : a);
-
-const args = [
-  '--no-warnings',
-  '--experimental-json-modules',
-  'cca.js',
-].concat(preparedOriginalArgs);
+  // leave spaces in place for arguments
+  .map(a => (a.includes(' ') ? `"${a}"` : a));
+
+const args = ['--no-warnings', '--experimental-json-modules', 'cca.js'].concat(preparedOriginalArgs);
 
 const { signal, status, error } = spawnSync(cmd, args, {
   stdio: 'inherit',

package/lib/bump-version.option.js

@@ -1,5 +1,5 @@
-import { Option, InvalidArgumentError } from 'commander';
 import chalk from 'chalk';
+import { InvalidArgumentError, Option } from 'commander';
 import semver from 'semver';
 
 const flags = '--bump-version <string>';
@@ -7,41 +7,34 @@ const description = 'Bump version';
 const choices = ['major', 'minor', 'patch', 'skip'];
 
 function argParser(value, previous) {
+  // eslint-disable-next-line no-invalid-this
   if (this.argChoices.includes(value) || semver.valid(value)) {
     return value;
   }
 
   throw new InvalidArgumentError(
-    `Allowed choices are ${this.argChoices
-      .map((choice) => `"${choice}"`)
-      .join(', ')} or a valid semver version.`
+    // eslint-disable-next-line no-invalid-this
+    `Allowed choices are ${this.argChoices.map((choice) => `"${choice}"`).join(', ')} or a valid semver version.`,
   );
 }
-export const bumpVersionOption = new Option(flags, description)
-  .choices(choices)
-  .argParser(argParser);
+export const bumpVersionOption = new Option(flags, description).choices(choices).argParser(argParser);
 
 export const apiKeyOption = new Option(
   '--api-key [string]',
-  'Pre generated API key for authorization during app upload'
+  'Pre generated API key for authorization during app upload',
 );
 
 export const appVersion = new Option('--app-version [number]', 'App version (exp. 1, 2, 3)');
 
-export const envOption = new Option('--env [string]', 'Environment to use')
-  .choices(['qa', 'staging', 'production']);
+export const envOption = new Option('--env [string]', 'Environment to use').choices(['qa', 'staging', 'production']);
 
-export const silentOption = new Option(
-  '--silent [boolean]',
-  'Only log result of the operation'
-).default(false);
+export const silentOption = new Option('--silent [boolean]', 'Only log result of the operation').default(false);
 
-export const originalCwdOption = (new Option('--original-cwd <string>')).hideHelp();
+export const originalCwdOption = new Option('--original-cwd <string>').hideHelp();
 
 export const bumpVersionOptionDeprecated = new Option(
   flags,
-  chalk.bgYellow`DEPRECATED` +
-    ` Use with ${chalk.cyan`zip`} or ${chalk.cyan`release`} command instead`
+  chalk.bgYellow`DEPRECATED` + ` Use with ${chalk.cyan`zip`} or ${chalk.cyan`release`} command instead`,
 )
   .choices(choices)
   .argParser(argParser);

package/lib/constants/manifest.js

@@ -99,13 +99,30 @@ export const getManifestMandatoryKeys = (opts) => {
   return keys;
 };
 
-export const SCHEDULER_TYPE_NATURAL_TIME = { name: 'Natural Time', value: 1 };
-export const SCHEDULER_TYPE_DATA_TIME = { name: 'Data Time', value: 2 };
-export const SCHEDULER_TYPE_DEPTH = { name: 'Date Depth', value: 4 };
+export const SCHEDULER_TYPE_NATURAL_TIME = {
+  name: 'Natural Time',
+  value: 1,
+};
+export const SCHEDULER_TYPE_DATA_TIME = {
+  name: 'Data Time',
+  value: 2,
+};
+export const SCHEDULER_TYPE_DEPTH = {
+  name: 'Date Depth',
+  value: 4,
+};
 
 export const manifestOptions = (projectName = 'Corva Dev Center App') => [
-  { name: 'developerName', message: 'Enter the Developer Name', default: 'O&G Company' },
-  { name: 'developerIdentifier', message: 'Enter the Developer Identifier', default: 'oandgc' },
+  {
+    name: 'developerName',
+    message: 'Enter the Developer Name',
+    default: 'O&G Company',
+  },
+  {
+    name: 'developerIdentifier',
+    message: 'Enter the Developer Identifier',
+    default: 'oandgc',
+  },
   {
     type: 'rawlist',
     name: 'appType',
@@ -126,8 +143,7 @@ export const manifestOptions = (projectName = 'Corva Dev Center App') => [
     name: 'cronString',
     message: 'Provide CRON string for the scheduler',
     default: '*/5 * * * *',
-    when: (answers) =>
-      answers.schedulerType && answers.schedulerType !== SCHEDULER_TYPE_DEPTH.value,
+    when: (answers) => answers.schedulerType && answers.schedulerType !== SCHEDULER_TYPE_DEPTH.value,
   },
   {
     name: 'depthMilestone',
@@ -164,7 +180,11 @@ export const manifestOptions = (projectName = 'Corva Dev Center App') => [
     default: '',
     required: true,
   },
-  { name: 'website', message: 'Enter website', default: 'https://www.oandgexample.com/my-app/' },
+  {
+    name: 'website',
+    message: 'Enter website',
+    default: 'https://www.oandgexample.com/my-app/',
+  },
   {
     type: 'rawlist',
     name: 'segments',
@@ -201,8 +221,7 @@ export const manifestOptions = (projectName = 'Corva Dev Center App') => [
     message: 'Would you like to use TypesScript?',
     default: false,
     when: (answers) =>
-      (answers.runtime && answers.runtime.startsWith(TEMPLATE_TYPES.NODE)) ||
-      answers.appType === APP_TYPES.UI,
+      (answers.runtime && answers.runtime.startsWith(TEMPLATE_TYPES.NODE)) || answers.appType === APP_TYPES.UI,
   },
   {
     name: 'silent',

package/lib/constants/package.js

@@ -69,9 +69,11 @@ const tsUiPackage = {
 };
 
 const nodeNpmScripts = {
-  bundle: 'create-corva-app zip .',
-  test: 'npm audit --production && npm run unit',
-  unit: 'jest --passWithNoTests',
+  'bundle': 'create-corva-app zip .',
+  'test': 'npm audit --production && npm run unit',
+  'unit': 'jest --passWithNoTests',
+  'lint': 'eslint .',
+  'lint:fix': 'eslint . --fix',
 };
 
 const nodeDependencies = {
@@ -79,10 +81,12 @@ const nodeDependencies = {
 };
 
 const nodeDevDependencies = {
-  jest: '^27.5.1',
+  '@corva/eslint-config-node': '^5.0.0',
+  'jest': '^27.5.1',
 };
 
 const nodeTsDevDependencies = {
+  '@corva/eslint-config-node': '^5.0.0',
   '@types/jest': '^27.4.1',
   'jest': '^27.5.1',
   'ts-jest': '^27.1.4',

package/lib/flow.js

@@ -1,17 +1,15 @@
 import chalk from 'chalk';
-import { SUCCESS_ICON } from './constants/messages.js';
 import { resolve, sep } from 'node:path';
+import { SUCCESS_ICON } from './constants/messages.js';
 import { logger } from './helpers/logger.js';
 
-import Debug from 'debug';
+import debugFn from 'debug';
 
-const debug = Debug('cca:flow');
+const debug = debugFn('cca:flow');
 
 export const runFlow = async (flow, context, indent = '') => {
   logger.write(
-    `${indent}Running ${chalk.cyan(flow.name)} in ${chalk.cyan(
-      resolve(context.dirName).split(sep).pop()
-    )}\n`
+    `${indent}Running ${chalk.cyan(flow.name)} in ${chalk.cyan(resolve(context.dirName).split(sep).pop())}\n`,
   );
 
   context.progress = () => logger.write('.');

package/lib/flows/lib/api.js

@@ -1,8 +1,8 @@
+import debugFn from 'debug';
 import got from 'got';
-import Debug from 'debug';
 import { StepError } from './step-error.js';
 
-const debug = Debug('cca:api');
+const debug = debugFn('cca:api');
 
 /**
  * Connect to Corva API
@@ -48,6 +48,7 @@ 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`);
     }
@@ -66,10 +67,9 @@ export class Api {
    */
   async getAppDatasetsOperationWrite(appId) {
     const { data } = await this.#api
-      .get(
-        `v2/apps/${appId}/app_datasets?dataset_operation=write&fields[]=app_dataset.dataset_name`
-      )
+      .get(`v2/apps/${appId}/app_datasets?dataset_operation=write&fields[]=app_dataset.dataset_name`)
       .json();
+
     return data;
   }
 
@@ -125,6 +125,7 @@ export class Api {
         searchParams: { status, per_page: perPage },
       })
       .json();
+
     return data;
   }
 
@@ -139,7 +140,9 @@ export class Api {
    */
   async getWellByAssetId(assetId) {
     const { wells } = await this.#api
-      .post('v2/assets/resolve', { json: { assets: [assetId] } })
+      .post('v2/assets/resolve', {
+        json: { assets: [assetId] },
+      })
       .json();
 
     if (!wells.length) {
@@ -199,9 +202,7 @@ export class Api {
    */
   async getAppRuns(appId) {
     const { data } = await this.#api
-      .get(
-        `v2/apps/${appId}/app_runs?page=1&per_page=500&status[]=pending&status[]=in_progress&status[]=running`
-      )
+      .get(`v2/apps/${appId}/app_runs?page=1&per_page=500&status[]=pending&status[]=in_progress&status[]=running`)
       .json();
 
     return data;
@@ -233,10 +234,7 @@ export class Api {
         status: data.attributes.status,
       };
     } catch (e) {
-      throw new StepError(
-        `${JSON.parse(e.response.body).message || ''} \nPOST: ${uploadURL} failed.`,
-        { cause: e }
-      );
+      throw new StepError(`${JSON.parse(e.response.body).message || ''} \nPOST: ${uploadURL} failed.`, { cause: e });
     }
   }
 
@@ -295,6 +293,7 @@ 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' } },
@@ -318,6 +317,7 @@ export class Api {
    */
   async getAppPackages(appId) {
     const { data } = await this.#api.get(`v2/apps/${appId}/packages`).json();
+
     return data;
   }
 
@@ -338,7 +338,7 @@ export class Api {
       app_stream_id: streamId,
       app_id: appId,
       status,
-      settings: settings,
+      settings,
       scheduler_type: settings.scheduler_type,
     };
 

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

@@ -1,17 +1,20 @@
 import archiver from 'archiver';
-import Debug from 'debug';
+import debugFn from 'debug';
 
-const debug = Debug('cca:zip');
-import { promises as fs, createWriteStream } from 'node:fs';
+const debug = debugFn('cca:zip');
+
+import { createWriteStream, promises as fs } from 'node:fs';
 import path from 'node:path';
 
 export const createZipArchive = async (dirName, zipName, itemsToZip = []) => {
   const filePath = path.resolve(dirName, zipName);
   const archive = archiver.create('zip', {});
   const output = createWriteStream(filePath);
+
   // pipe archive data to the file
   archive.pipe(output);
 
+  // eslint-disable-next-line no-async-promise-executor
   await new Promise(async (resolve, reject) => {
     output.once('close', resolve).once('end', function () {
       debug('Data has been drained');
@@ -57,7 +60,10 @@ const getDataToZip = async (itemsToZip, dirName) => {
 
     const { exists, isDir } = await fs
       .lstat(filePath)
-      .then((stat) => ({ exists: true, isDir: stat.isDirectory() }))
+      .then((stat) => ({
+        exists: true,
+        isDir: stat.isDirectory(),
+      }))
       .catch(() => {
         debug(`%s location not exist, filtering it out`, filePath);
 

package/lib/flows/lib/json.js

@@ -1,16 +1,17 @@
-import { resolve } from 'node:path';
 import { promises as fs } from 'node:fs';
 import os from 'node:os';
+import { resolve } from 'node:path';
 
-import Debug from 'debug';
+import debugFn from 'debug';
 
-const debug = Debug('cca:json');
+const debug = debugFn('cca:json');
 
 export const loadJson = async (dirName, fileName) => {
   const fullPath = resolve(dirName, fileName);
 
   try {
     debug('Loading file %s', fullPath);
+
     const manifest = await fs.readFile(fullPath, 'utf8');
 
     return JSON.parse(manifest);

package/lib/flows/lib/notification.js

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

package/lib/flows/steps/attach/add-app-to-stream.js

@@ -1,24 +1,23 @@
-import _ from 'lodash';
-
 export const ADD_APP_TO_STREAM_TASK_STEP = {
   message: 'Add app to streams...',
   fn: async (context) => {
     const { assetsStreamsDataToProcess, api, app, manifest, notification } = context;
 
     let counter = 0;
+
     for (const assetStreamsData of assetsStreamsDataToProcess) {
       for (const stream of assetStreamsData.selectedStreams) {
         notification.printStreamLink(stream.name, stream.id);
+
         try {
           await api.connectAppToStream(app.id, stream.id, manifest.manifest.settings.app);
           ++counter;
         } catch (e) {
-          notification.printError(
-            `Could not add app to the stream, an error occurred: ${e.message}`
-          );
+          notification.printError(`Could not add app to the stream, an error occurred: ${e.message}`);
         }
       }
     }
+
     notification.print(`The app has been added to ${counter} - stream(s)`);
   },
 };

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

@@ -1,4 +1,3 @@
-import _ from 'lodash';
 import inquirer from 'inquirer';
 
 export const GET_ALL_LIVE_ASSETS_TASK_STEP = {
@@ -13,18 +12,11 @@ export const GET_ALL_LIVE_ASSETS_TASK_STEP = {
     const selectedAssets = await getAssetsListWithPrompt(assets, notification);
 
     const assetsIds = selectedAssets.map((asset) => asset.id);
-    const streams = await api.getStreamsByAssetIds(
-      assetsIds,
-      manifest.manifest.application.segments
-    );
+    const streams = await api.getStreamsByAssetIds(assetsIds, manifest.manifest.application.segments);
 
     const mappedAssetStreamsData = mapAssetsStreamsData(selectedAssets, streams);
 
-    const assetsStreamsDataToProcess = await getAssetsStreamsWithPrompt(
-      mappedAssetStreamsData,
-      app.id,
-      notification
-    );
+    const assetsStreamsDataToProcess = await getAssetsStreamsWithPrompt(mappedAssetStreamsData, app.id, notification);
 
     return {
       ...context,
@@ -73,6 +65,7 @@ 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,
@@ -93,7 +86,8 @@ const mapAssetsStreamsData = (assets, streamsData) => {
  */
 const getAssetsStreamsWithPrompt = async (mappedAssetsStreamsData, appId, notification) => {
   notification.printLineBreak();
-  for (let mappedData of mappedAssetsStreamsData) {
+
+  for (const mappedData of mappedAssetsStreamsData) {
     const currentStreamsCount = mappedData.streams.length;
 
     if (!currentStreamsCount) {
@@ -101,9 +95,7 @@ const getAssetsStreamsWithPrompt = async (mappedAssetsStreamsData, appId, notifi
     }
 
     const streamsWithoutCurrentApp = mappedData.streams.filter((stream) => {
-      return !stream.app_connections.find(
-        (appConnection) => appConnection.app_id === parseInt(appId)
-      );
+      return !stream.app_connections.find((appConnection) => appConnection.app_id === parseInt(appId));
     });
 
     if (!streamsWithoutCurrentApp.length) {
@@ -112,6 +104,7 @@ const getAssetsStreamsWithPrompt = async (mappedAssetsStreamsData, appId, notifi
 
     if (streamsWithoutCurrentApp.length === 1) {
       mappedData.selectedStreams = streamsWithoutCurrentApp;
+
       continue;
     }
 

package/lib/flows/steps/attach/index.js

@@ -2,8 +2,4 @@ import { PREPARE_DATA_TASK_STEP } from './prepare-data.js';
 import { GET_ALL_LIVE_ASSETS_TASK_STEP } from './get-all-live-assets.js';
 import { ADD_APP_TO_STREAM_TASK_STEP } from './add-app-to-stream.js';
 
-export const ATTACH_STEPS = [
-  PREPARE_DATA_TASK_STEP,
-  GET_ALL_LIVE_ASSETS_TASK_STEP,
-  ADD_APP_TO_STREAM_TASK_STEP,
-];
+export const ATTACH_STEPS = [PREPARE_DATA_TASK_STEP, GET_ALL_LIVE_ASSETS_TASK_STEP, ADD_APP_TO_STREAM_TASK_STEP];

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

@@ -1,4 +1,3 @@
-import _ from 'lodash';
 import { StepError } from '../../lib/step-error.js';
 
 export const PREPARE_DATA_TASK_STEP = {

package/lib/flows/steps/prepare-load-app-files.js

@@ -4,10 +4,8 @@ import { Manifest } from '../lib/manifest.js';
 export const LOAD_APP_FILES_STEP = {
   message: "Loading Corva app's files...",
   async fn(context) {
-    const manifest =
-      context.manifest || new Manifest(await loadJson(context.dirName, 'manifest.json'));
-    const pkg =
-      context.package || (manifest.isJs() && (await loadJson(context.dirName, 'package.json')));
+    const manifest = context.manifest || new Manifest(await loadJson(context.dirName, 'manifest.json'));
+    const pkg = context.package || (manifest.isJs() && (await loadJson(context.dirName, 'package.json')));
 
     return { pkg, manifest };
   },

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

@@ -9,6 +9,7 @@ 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/release/remove-failed-upload.js

@@ -3,16 +3,7 @@ import { unlink } from 'node:fs/promises';
 
 export const REMOVE_FAILED_UPLOAD_STEP = {
   message: 'Cleaning up...',
-  async fn({
-    api,
-    appId,
-    packageId,
-    removeOnFail,
-    uploadStatus,
-    dirName,
-    zipFileName,
-    removeOnSuccess,
-  }) {
+  async fn({ api, appId, packageId, removeOnFail, uploadStatus, dirName, zipFileName, removeOnSuccess }) {
     if (uploadStatus === 'draft') {
       removeOnSuccess && (await unlink(resolve(dirName, zipFileName)));
 
@@ -24,8 +15,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 Error(`Got unexpected status '${uploadStatus}' while processing package ${packageId}.`);
   },
 };

package/lib/flows/steps/release/upload-zip-to-corva.js

@@ -1,9 +1,7 @@
-import { RELEASE } from '../../../constants/messages.js';
 import FormData from 'form-data';
-import { resolve } from 'node:path';
 import { createReadStream } from 'node:fs';
-import { StepError } from '../../lib/step-error.js';
-import _ from 'lodash/fp.js';
+import { resolve } from 'node:path';
+import { RELEASE } from '../../../constants/messages.js';
 
 export const UPLOAD_ZIP_TO_CORVA_STEP = {
   message: RELEASE.uploadApp,
@@ -18,10 +16,7 @@ export const UPLOAD_ZIP_TO_CORVA_STEP = {
 
     form.append('package', createReadStream(resolve(dirName, zipFileName)), 'package.zip');
 
-    const { id: packageId, status: uploadStatus } = await api.uploadPackages(
-      manifest.manifest.application.key,
-      form
-    );
+    const { id: packageId } = await api.uploadPackages(manifest.manifest.application.key, form);
 
     return { packageId };
   },

package/lib/flows/steps/release/wait-for-build.js

@@ -1,7 +1,7 @@
-import Debug from 'debug';
+import debugFn from 'debug';
 import { waitForMs } from '../../lib/waitForMs.js';
 
-const debug = Debug('cca:flow:release:step:wait-for-build');
+const debug = debugFn('cca:flow:release:step:wait-for-build');
 
 const PROCESSING_STATUSES = ['pending', 'processing', 'queued', 'deploying'];
 
@@ -24,6 +24,7 @@ export const WAIT_FOR_BUILD_FINISH_STEP = {
       }
 
       await waitForMs(5000);
+      // eslint-disable-next-line no-constant-condition
     } while (true);
   },
 };

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

@@ -1,4 +1,3 @@
-import _ from 'lodash';
 import chalk from 'chalk';
 
 import { logger } from '../../../helpers/logger.js';
@@ -32,9 +31,10 @@ export const CREATE_TASK_STEP = {
       if (!wellId || !streamId) {
         logger.write(
           `\n\n${chalk.red.underline.bold(
-            `Skipped creating a task for asset ID - ${assetId}, well ID or stream ID is missing`
-          )}\n\n`
+            `Skipped creating a task for asset ID - ${assetId}, well ID or stream ID is missing`,
+          )}\n\n`,
         );
+
         continue;
       }
 
@@ -43,25 +43,24 @@ export const CREATE_TASK_STEP = {
           .queueAppRun(app.id, version, interval, wellId, appDatasetsNames, streamId)
           .catch((e) => {
             console.log(e.response.body);
+
             throw e;
           });
 
         logger.write(
-          `\n    Created a new task with ID ${chalk.yellow(result.id)} for asset ID - ${chalk.green(
-            assetId
-          )}`
+          `\n    Created a new task with ID ${chalk.yellow(result.id)} for asset ID - ${chalk.green(assetId)}`,
         );
 
         logger.write(
           `\n    Task link - https://app${
             CORVA_API_ENV === 'production' ? '.' : `.${CORVA_API_ENV}.`
-          }corva.ai/dev-center/apps/${app.id}/runner`
+          }corva.ai/dev-center/apps/${app.id}/runner`,
         );
       } catch (e) {
         logger.write(
           `\n\n${chalk.red.underline.bold(
-            `Could not rerun app for asset ID - ${assetId}, an error occurred: ${e.message}`
-          )}\n\n`
+            `Could not rerun app for asset ID - ${assetId}, an error occurred: ${e.message}`,
+          )}\n\n`,
         );
       }
     }