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

package/lib/flows/steps/rerun/ensure-that-app-in-stream.js

@@ -1,6 +1,4 @@
-import _ from 'lodash';
 import chalk from 'chalk';
-import inquirer from 'inquirer';
 
 import { logger } from '../../../helpers/logger.js';
 
@@ -16,7 +14,7 @@ export const ENSURE_APP_IN_STREAM_TASK_STEP = {
     await Promise.all(
       [...mappedAssetsToStreams].map(([assetId, stream]) => {
         return ensureAppIsInTheStream(assetId, stream, app.id, api, manifest);
-      })
+      }),
     );
 
     return context;
@@ -35,15 +33,15 @@ export const ENSURE_APP_IN_STREAM_TASK_STEP = {
  * @returns {void}
  */
 const ensureAppIsInTheStream = async (assetId, stream, appId, api, manifest) => {
-  const connectedApp = stream.app_connections.find(
-    (connection) => connection.app_id === parseInt(appId)
-  );
+  const connectedApp = stream.app_connections.find((connection) => connection.app_id === parseInt(appId));
+
   if (connectedApp) {
     logger.write(
       `\n\n${chalk.black.underline.bold(
-        `App has been already connected to the stream ID: ${stream.id}, for asset ID: ${assetId}`
-      )}`
+        `App has been already connected to the stream ID: ${stream.id}, for asset ID: ${assetId}`,
+      )}`,
     );
+
     return;
   }
 
@@ -51,9 +49,7 @@ const ensureAppIsInTheStream = async (assetId, stream, appId, api, manifest) =>
 
   logger.write(
     `\n\n${chalk.black.underline.bold(
-      `Added app to the stream, connect ID - ${chalk.green(
-        newConnection.id
-      )}, for asset ID: ${assetId}`
-    )}`
+      `Added app to the stream, connect ID - ${chalk.green(newConnection.id)}, for asset ID: ${assetId}`,
+    )}`,
   );
 };

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

@@ -1,4 +1,3 @@
-import _ from 'lodash';
 import chalk from 'chalk';
 import inquirer from 'inquirer';
 
@@ -34,6 +33,7 @@ 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) {
@@ -47,25 +47,26 @@ const getAppVersion = async (appId, optionAppVersion, api) => {
   // try to get version from CLI option
   if (optionAppVersion) {
     const currentAppPackageByOption = appPackages.find(
-      (appPackage) => appPackage.attributes.version == optionAppVersion
+      (appPackage) => appPackage.attributes.version === optionAppVersion,
     );
+
     if (currentAppPackageByOption) {
       const version = currentAppPackageByOption.attributes.version;
+
       confirmUseVersionMessage(version);
+
       return version;
     }
 
-    logger.write(
-      `\n\n${chalk.black.underline.bold(
-        `Could not find app version - ${chalk.green(optionAppVersion)}`
-      )}`
-    );
+    logger.write(`\n\n${chalk.black.underline.bold(`Could not find app version - ${chalk.green(optionAppVersion)}`)}`);
   }
 
   // if there is only on version, use it.
   if (appPackages.length === 1) {
     const version = appPackages[0].attributes.version;
+
     confirmUseVersionMessage(version);
+
     return version;
   }
 

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

@@ -1,8 +1,8 @@
-import _ from 'lodash';
 import chalk from 'chalk';
 import inquirer from 'inquirer';
-import { StepError } from '../../lib/step-error.js';
+import _ from 'lodash';
 import { logger } from '../../../helpers/logger.js';
+import { StepError } from '../../lib/step-error.js';
 
 const MAX_ASSET_IDS_COUNT = 10;
 
@@ -31,17 +31,18 @@ export const PREPARE_DATA_TASK_STEP = {
     const appDatasetsNames = appDatasets.map((dataset) => dataset.attributes.dataset_name);
 
     const existingAppRuns = await getExistAppRuns(app.id, assets, appDatasetsNames, api);
+
     if (existingAppRuns.size) {
-      for (let appRunAssetId of existingAppRuns.keys()) {
+      for (const appRunAssetId of existingAppRuns.keys()) {
         // remove asset ID if similar rerun already exists
-        assets = assets.filter((assetId) => appRunAssetId != assetId);
+        assets = assets.filter((assetId) => appRunAssetId !== assetId);
 
         const run = existingAppRuns.get(appRunAssetId);
 
         logger.write(
           `\n\n${chalk.yellow.bold(
-            `A similar rerun with ID ${run.id}, for asset ID ${appRunAssetId} - already exists. Will be skipped!`
-          )}`
+            `A similar rerun with ID ${run.id}, for asset ID ${appRunAssetId} - already exists. Will be skipped!`,
+          )}`,
         );
       }
     }
@@ -64,6 +65,7 @@ export const PREPARE_DATA_TASK_STEP = {
  */
 const promptAreYouSure = async () => {
   logger.log('\n');
+
   const answers = await inquirer.prompt([
     {
       message:
@@ -77,6 +79,7 @@ const promptAreYouSure = async () => {
       default: false,
     },
   ]);
+
   return answers.option;
 };
 
@@ -96,14 +99,12 @@ 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);

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

@@ -1,4 +1,3 @@
-import _ from 'lodash';
 import chalk from 'chalk';
 import inquirer from 'inquirer';
 
@@ -14,8 +13,11 @@ export const PREPARE_WELL_AND_STREAM_TASK_STEP = {
     let { assets } = context;
     const { api, manifest } = context;
 
-    const { mappedAssetsToWells, mappedAssetsToStreams, assetsToDelete } =
-      await prepareWellAndStreamData(assets, api, manifest);
+    const { mappedAssetsToWells, mappedAssetsToStreams, assetsToDelete } = await prepareWellAndStreamData(
+      assets,
+      api,
+      manifest,
+    );
 
     if (assetsToDelete.length) {
       // remove asset ID if could not found stream or well
@@ -53,9 +55,8 @@ const getStreamWithPrompt = async (streams) => {
   if (choices.length === 1) {
     const [stream] = choices;
 
-    logger.write(
-      `\n\n${chalk.black.underline.bold(`Process stream - ${chalk.green(stream.name)}`)}`
-    );
+    logger.write(`\n\n${chalk.black.underline.bold(`Process stream - ${chalk.green(stream.name)}`)}`);
+
     return stream.value;
   }
 
@@ -85,12 +86,14 @@ const getWellWithPrompt = async (wells, api) => {
   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,
       };
-    })
+    }),
   );
 
   if (!choices.length) {
@@ -101,6 +104,7 @@ 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;
   }
 
@@ -134,42 +138,42 @@ const prepareWellAndStreamData = async (assets, api, manifest) => {
 
   for (const assetId of assets) {
     try {
-      logger.write(
-        `\n\n${chalk.black.underline.bold(`Process asset ID - ${chalk.green(assetId)}`)}`
-      );
+      logger.write(`\n\n${chalk.black.underline.bold(`Process asset ID - ${chalk.green(assetId)}`)}`);
 
       logger.write('\n    Loading wells...');
 
       const wells = await api.getWellByAssetId(assetId);
       const well = await getWellWithPrompt(wells, api);
+
       mappedAssetsToWells.set(well.attributes.asset_id, well);
 
       logger.write('\n    Loading streams...');
 
-      const streams = await api.getStreamsByAssetIds(
-        [assetId],
-        manifest.manifest.application.segments
-      );
+      const streams = await api.getStreamsByAssetIds([assetId], manifest.manifest.application.segments);
 
       if (!streams.length) {
         throw new Error(`Could not found streams for asset ID - ${assetId}`);
       }
 
       const stream = await getStreamWithPrompt(streams);
+
       mappedAssetsToStreams.set(stream.asset_id, stream);
     } catch (e) {
       logger.write(
-        `\n\n${chalk.red.underline.bold(
-          `Skipped the asset ID - ${assetId}, an error occurred: ${e.message}`
-        )}`
+        `\n\n${chalk.red.underline.bold(`Skipped the asset ID - ${assetId}, an error occurred: ${e.message}`)}`,
       );
 
       assetsToDelete.push(assetId);
 
       if (mappedAssetsToWells.has(assetId)) mappedAssetsToWells.delete(assetId);
+
       if (mappedAssetsToStreams.has(assetId)) mappedAssetsToStreams.delete(assetId);
     }
   }
 
-  return { mappedAssetsToWells, mappedAssetsToStreams, assetsToDelete };
+  return {
+    mappedAssetsToWells,
+    mappedAssetsToStreams,
+    assetsToDelete,
+  };
 };

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

@@ -1,9 +1,9 @@
 import { promises as fs } from 'node:fs';
 import { resolve } from 'node:path';
 
-import Debug from 'debug';
+import debugFn from 'debug';
 
-const debug = Debug('cca:flow:zip:cleanup');
+const debug = debugFn('cca:flow:zip:cleanup');
 
 export const CLEANUP_STEP = {
   message: 'Removing temporary files...',

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

@@ -1,7 +1,7 @@
+import debugFn from 'debug';
 import { createZipArchive } from '../lib/create-zip-archive.js';
-import Debug from 'debug';
 
-const debug = Debug('cca:flow:zip:archive');
+const debug = debugFn('cca:flow:zip:archive');
 
 export const CREATE_ARCHIVE_STEP = {
   message: 'Creating archive...',

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

@@ -1,18 +1,19 @@
-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 Glob from 'glob';
 import isGlob from 'is-glob';
+import _ from 'lodash/fp.js';
+import { promises as fs } from 'node:fs';
+import { resolve } from 'node:path';
 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);
-import Debug from 'debug';
 
-const debug = Debug('cca:flow:zip:resolve');
+import debugFn from 'debug';
+
+const debug = debugFn('cca:flow:zip:resolve');
 
 const uniqueValues = (array) => Array.from(new Set(array));
 
@@ -86,7 +87,7 @@ const resolveDataToZipUiApp = async (itemsToZip = [], { options, pkg, dirName, m
       name: 'package.json',
       content: pkg,
       message: chalk(
-        `\n${chalk.yellow`NOTE`}: Version of your app was updated to ${version} (package.json), please don't lower it.`
+        `\n${chalk.yellow`NOTE`}: Version of your app was updated to ${version} (package.json), please don't lower it.`,
       ),
     });
   }
@@ -98,7 +99,7 @@ const resolveDataToZipUiApp = async (itemsToZip = [], { options, pkg, dirName, m
       {
         build: 'webpack --config=./config-overrides.js --mode production',
       },
-      pkg
+      pkg,
     ),
   });
 
@@ -111,8 +112,11 @@ const resolveDataToZipUiApp = async (itemsToZip = [], { options, pkg, dirName, m
     '.npmrc',
     '.nvmrc',
     'yarn.lock',
-    { path: resolve(dirName, 'packageForSource.json'), name: 'package.json' },
-    ...(await transformPatternsIntoFileNames(dirName, ['src/**/*'], options.ignoredFiles))
+    {
+      path: resolve(dirName, 'packageForSource.json'),
+      name: 'package.json',
+    },
+    ...(await transformPatternsIntoFileNames(dirName, ['src/**/*'], options.ignoredFiles)),
   );
 
   return {
@@ -143,7 +147,7 @@ const resolveDataForZipNodeJsApp = async (itemsToZip = [], { options, pkg, dirNa
       name: 'package.json',
       content: pkg,
       message: chalk(
-        `\n${chalk.yellow`NOTE`}: Version of your app was updated to ${version} (package.json), please don't lower it.`
+        `\n${chalk.yellow`NOTE`}: Version of your app was updated to ${version} (package.json), please don't lower it.`,
       ),
     });
   }
@@ -174,13 +178,19 @@ const resolveDataForZipNodeJsApp = async (itemsToZip = [], { options, pkg, dirNa
     if (shouldPushDefaultSrc) {
       itemsToZip.push(
         'index.ts',
-        ...(await glob('+(src|lib)/**/*.ts', { cwd: dirName, ignore: options.ignoredFiles }))
+        ...(await glob('+(src|lib)/**/*.ts', {
+          cwd: dirName,
+          ignore: options.ignoredFiles,
+        })),
       );
     }
   } else if (shouldPushDefaultSrc) {
     itemsToZip.push(
       'index.js',
-      ...(await glob('+(src|lib)/**/*.js', { cwd: dirName, ignore: options.ignoredFiles }))
+      ...(await glob('+(src|lib)/**/*.js', {
+        cwd: dirName,
+        ignore: options.ignoredFiles,
+      })),
     );
   }
 
@@ -207,7 +217,7 @@ const resolveDataForZipPythonApp = async (itemsToZip = [], { manifest, dirName,
       ...(await glob('**/*.py', {
         cwd: dirName,
         ignore: [...(options.ignoredFiles || []), 'venv/**/*'],
-      }))
+      })),
     );
   }
 

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

@@ -1,9 +1,9 @@
-import { saveJson } from '../lib/json.js';
 import { logger } from '../../helpers/logger.js';
+import { saveJson } from '../lib/json.js';
 
-import Debug from 'debug';
+import debugFn from 'debug';
 
-const debug = Debug('cca:flow:zip:prepare');
+const debug = debugFn('cca:flow:zip:prepare');
 
 export const PREPARE_FILES_BEFORE_ZIP_STEP = {
   message: 'Preparing...',

package/lib/flows/steps/zip.js

@@ -3,9 +3,4 @@ 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';
 
-export const ZIP_STEPS = [
-  FILE_LIST_RESOLVE_STEP,
-  PREPARE_FILES_BEFORE_ZIP_STEP,
-  CREATE_ARCHIVE_STEP,
-  CLEANUP_STEP,
-];
+export const ZIP_STEPS = [FILE_LIST_RESOLVE_STEP, PREPARE_FILES_BEFORE_ZIP_STEP, CREATE_ARCHIVE_STEP, CLEANUP_STEP];

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

@@ -1,14 +1,15 @@
+import debugFn from 'debug';
 import { APP_TYPES } from '../constants/cli.js';
-import Debug from 'debug';
 
-const debug = Debug('cca:resolve-app-runtime');
+const debug = debugFn('cca:resolve-app-runtime');
+
 import spawn from 'cross-spawn';
 import { promises as fs } from 'fs';
-import semver from 'semver';
 import os from 'os';
+import semver from 'semver';
 
 const checkCliVersion = async (command, version, stdErr = false) =>
-  new Promise((resolve, reject) => {
+  new Promise((resolve) => {
     const child = spawn(command, ['--version']);
 
     let data = '';
@@ -80,7 +81,9 @@ export const resolveAppRuntime = (opts) => {
   return {
     language: 'python',
     isRuntimeAvailable: async () =>
-      IS_WINDOWS ? await checkCliVersion('python', version) || await checkCliVersion('python3', version) : checkCliVersion('python3', version),
+      IS_WINDOWS
+        ? (await checkCliVersion('python', version)) || (await checkCliVersion('python3', version))
+        : checkCliVersion('python3', version),
     packageManager: 'pip',
     version,
   };

package/lib/helpers/utils.js

@@ -3,7 +3,8 @@ import fs from 'fs-extra';
 
 export function copyFileSync(source, target) {
   let targetFile = target;
-  //if target is a directory a new file with the same name will be created
+
+  // if target is a directory a new file with the same name will be created
   if (fs.existsSync(target)) {
     if (fs.lstatSync(target).isDirectory()) {
       targetFile = path.join(target, path.basename(source));
@@ -14,7 +15,7 @@ export function copyFileSync(source, target) {
 }
 
 export function copyFolderRecursiveSync(sourceFolder, targetFolder) {
-  //check if folder needs to be created or integrated
+  // check if folder needs to be created or integrated
   if (!fs.existsSync(targetFolder)) {
     fs.mkdirSync(targetFolder);
   }
@@ -23,7 +24,7 @@ export function copyFolderRecursiveSync(sourceFolder, targetFolder) {
     return;
   }
 
-  //copy
+  // copy
   const items = fs.readdirSync(sourceFolder);
 
   for (const item of items) {
@@ -53,6 +54,6 @@ export const putVariablesInEnvFile = async (root, manifest) => {
     envFileContent
       .replace(new RegExp('\\${APP_KEY}', 'g'), manifest.manifest.application.key)
       .replace(new RegExp('\\${PROVIDER}', 'g'), manifest.manifest.application.key.split('.')[0])
-      .replace(new RegExp('\\${APP_NAME}', 'g'), manifest.manifest.application.name)
+      .replace(new RegExp('\\${APP_NAME}', 'g'), manifest.manifest.application.name),
   );
 };

package/lib/helpers/versioning.js

@@ -1,8 +1,10 @@
+import debugFn from 'debug';
 import { execSync } from 'node:child_process';
+import fs from 'node:fs';
+import path from 'node:path';
 import { logger } from './logger.js';
-import Debug from 'debug';
 
-const debug = Debug('cca:versioning');
+const debug = debugFn('cca:versioning');
 
 export function isInGitRepository(appPath) {
   try {
@@ -10,9 +12,11 @@ export function isInGitRepository(appPath) {
       stdio: 'ignore',
       cwd: appPath,
     });
+
     return true;
   } catch (e) {
     debug(e);
+
     return false;
   }
 }
@@ -24,14 +28,17 @@ export function tryGitInit(appPath) {
 
       return false;
     }
+
     execSync('git --version', { stdio: 'ignore', cwd: 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;
   }
 }
@@ -44,6 +51,7 @@ 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,
@@ -54,6 +62,7 @@ export function tryGitCommit(appPath) {
     debug(e);
     console.warn('Git commit not created');
     console.warn('Removing .git directory...');
+
     try {
       // unlinkSync() doesn't work on directories.
       fs.removeSync(path.join(appPath, '.git'));
@@ -61,6 +70,7 @@ export function tryGitCommit(appPath) {
       debug(removeErr);
       // Ignore.
     }
+
     return false;
   }
 }
@@ -68,9 +78,11 @@ export function tryGitCommit(appPath) {
 export function shouldUseYarn(appPath) {
   try {
     execSync('yarnpkg --version', { stdio: 'ignore', cwd: appPath });
+
     return true;
   } catch (e) {
     debug(e);
+
     return false;
   }
 }