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

package/lib/helpers/manifest.js

@@ -1,7 +1,7 @@
-const { APP_RUNTIMES, APP_TYPES, TEMPLATE_TYPES } = require('../constants/cli.js');
-const manifestConstants = require('../constants/manifest.js');
+import { APP_RUNTIMES, APP_TYPES, TEMPLATE_TYPES } from '../constants/cli.js';
+import * as manifestConstants from '../constants/manifest.js';
 
-function fillManifest(answers) {
+export function fillManifest(answers) {
   const runtime = answers.runtime || APP_RUNTIMES.UI;
 
   const defaultManifestProperties = _defaultManifestProperties({
@@ -66,16 +66,12 @@ function defaultAppSettings({ type, schedulerType, cronString, depthMilestone })
   if (schedulerType === manifestConstants.SCHEDULER_TYPE_DEPTH.value) {
     return {
       scheduler_type: schedulerType,
-      depth_milestone: depthMilestone || 1
-    }
+      depth_milestone: depthMilestone || 1,
+    };
   }
 
   return {
     scheduler_type: schedulerType,
     cron_string: cronString || '*/5 * * * *',
-  }
+  };
 }
-
-module.exports = {
-  fillManifest,
-};

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

@@ -1,38 +1,41 @@
-const { APP_TYPES } = require("../constants/cli");
-const debug = require('debug')('cca:resolve-app-runtime');
-const { spawn } = require("child_process");
-const { promises: fs } = require("fs");
-const semver = require("semver");
-const os = require("os");
+import { APP_TYPES } from '../constants/cli.js';
+import Debug from 'debug';
 
-const checkCliVersion = async (command, version, stdErr = false) => new Promise((resolve, reject) => {
-  const child = spawn(command, ['--version']);
+const debug = Debug('cca:resolve-app-runtime');
+import { spawn } from 'child_process';
+import { promises as fs } from 'fs';
+import semver from 'semver';
+import os from 'os';
 
-  let data;
+const checkCliVersion = async (command, version, stdErr = false) =>
+  new Promise((resolve, reject) => {
+    const child = spawn(command, ['--version']);
 
-  child.stderr.once('data', buffer => {
-    data = buffer;
-  });
+    let data;
 
-  child.stdout.once('data', buffer => {
-    data = buffer;
-  });
+    child.stderr.once('data', (buffer) => {
+      data = buffer;
+    });
 
-  child.once('close', code => {
-    if (code !== 0) {
-      debug(`Command ${command} exited with code ${code}`);
-      debug(data.toString());
+    child.stdout.once('data', (buffer) => {
+      data = buffer;
+    });
 
-      return reject(false);
-    }
+    child.once('close', (code) => {
+      if (code !== 0) {
+        debug(`Command ${command} exited with code ${code}`);
+        debug(data.toString());
 
-    debug(`%s version output: %s`, command, data.toString());
+        return reject(false);
+      }
 
-    resolve(semver.satisfies(semver.coerce(data.toString('utf-8')), version))
-  })
-})
+      debug(`%s version output: %s`, command, data.toString());
+
+      resolve(semver.satisfies(semver.coerce(data.toString('utf-8')), version));
+    });
+  });
 
-const checkNodeVersion = version => async () => {
+const checkNodeVersion = (version) => async () => {
   try {
     await fs.access(`${os.homedir()}/.nvm/nvm.sh`);
 
@@ -43,41 +46,40 @@ const checkNodeVersion = version => async () => {
     debug(e);
     debug('nvm is not installed, checking node version');
 
-    return checkCliVersion("node", version)
+    return checkCliVersion('node', version);
   }
-}
+};
 
-const resolveAppRuntime = (opts) => {
+export const resolveAppRuntime = (opts) => {
   if (opts.appType === APP_TYPES.UI) {
-    const version = "16";
+    const version = '16';
 
     return {
-      language: opts.useTypescript ? "typescript" : "javascript",
+      language: opts.useTypescript ? 'typescript' : 'javascript',
       isRuntimeAvailable: checkNodeVersion(version),
       packageManager: opts.packageManager,
-      version
-    }
+      version,
+    };
   }
 
-  if (opts.runtime.startsWith("node")) {
+  if (opts.runtime.startsWith('node')) {
     const version = /nodejs(\d{2})\.x/.exec(opts.runtime)[1];
 
     return {
-      language: opts.useTypescript ? "typescript" : "javascript",
+      language: opts.useTypescript ? 'typescript' : 'javascript',
       isRuntimeAvailable: checkNodeVersion(version),
       packageManager: opts.packageManager,
-      version
-    }
+      version,
+    };
   }
 
-  const version = /python(\d\.\d)/.exec(opts.runtime)[1]
+  const version = /python(\d\.\d)/.exec(opts.runtime)[1];
 
   return {
-    language: "python",
-    isRuntimeAvailable: async () => await checkCliVersion('python3', version) || await checkCliVersion('python', version),
-    packageManager: "pip",
-    version
-  }
+    language: 'python',
+    isRuntimeAvailable: async () =>
+      (await checkCliVersion('python3', version)) || (await checkCliVersion('python', version)),
+    packageManager: 'pip',
+    version,
+  };
 };
-
-module.exports = { resolveAppRuntime };

package/lib/helpers/utils.js

@@ -1,7 +1,7 @@
-const path = require('path');
-const fs = require('fs-extra');
+import path from 'node:path';
+import fs from 'fs-extra';
 
-function copyFileSync(source, target) {
+export function copyFileSync(source, target) {
   let targetFile = target;
   //if target is a directory a new file with the same name will be created
   if (fs.existsSync(target)) {
@@ -13,7 +13,7 @@ function copyFileSync(source, target) {
   fs.writeFileSync(targetFile, fs.readFileSync(source));
 }
 
-function copyFolderRecursiveSync(sourceFolder, targetFolder) {
+export function copyFolderRecursiveSync(sourceFolder, targetFolder) {
   //check if folder needs to be created or integrated
   if (!fs.existsSync(targetFolder)) {
     fs.mkdirSync(targetFolder);
@@ -38,8 +38,3 @@ function copyFolderRecursiveSync(sourceFolder, targetFolder) {
     copyFileSync(curSource, targetFolder);
   }
 }
-
-module.exports = {
-  copyFileSync,
-  copyFolderRecursiveSync,
-};

package/lib/helpers/versioning.js

@@ -1,7 +1,7 @@
-const execSync = require('child_process').execSync;
-const logger = require('./logger');
+import { execSync } from 'node:child_process';
+import { logger } from './logger.js';
 
-function isInGitRepository(appPath) {
+export function isInGitRepository(appPath) {
   try {
     execSync('git rev-parse --is-inside-work-tree', {
       stdio: 'ignore',
@@ -13,7 +13,7 @@ function isInGitRepository(appPath) {
   }
 }
 
-function tryGitInit(appPath) {
+export function tryGitInit(appPath) {
   try {
     if (isInGitRepository()) {
       return false;
@@ -29,7 +29,7 @@ function tryGitInit(appPath) {
   }
 }
 
-function tryGitCommit(appPath) {
+export function tryGitCommit(appPath) {
   try {
     execSync('git add -A', { stdio: 'ignore', cwd: appPath });
     execSync('git commit -m "chore: initialize project using @corva/create-app"', {
@@ -56,7 +56,7 @@ function tryGitCommit(appPath) {
   }
 }
 
-function shouldUseYarn(appPath) {
+export function shouldUseYarn(appPath) {
   try {
     execSync('yarnpkg --version', { stdio: 'ignore', cwd: appPath });
     return true;
@@ -64,9 +64,3 @@ function shouldUseYarn(appPath) {
     return false;
   }
 }
-
-module.exports = {
-  isInGitRepository,
-  tryGitInit,
-  tryGitCommit,
-};

package/lib/{index.js → main.js}

@@ -1,48 +1,57 @@
-#!/usr/bin/env node
-
-'use strict';
-
-const chalk = require('chalk');
-const figlet = require('figlet');
-const { Command, CommanderError, Option } = require('commander');
-const fs = require('fs-extra');
-const inquirer = require('inquirer');
-const os = require('os');
-const path = require('path');
-const semver = require('semver');
-
-const {
+import chalk from 'chalk';
+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 from 'node:path';
+import semver from 'semver';
+
+import {
   ensureLatestVersion,
   warnIfOutdated,
   ensureBumpVersion,
-} = require('./scripts/utils/version');
-const utils = require('./helpers/utils.js');
-const manifestHelpers = require('./helpers/manifest.js');
-const versioning = require('./helpers/versioning.js');
-
-const { getDefaultsForPackageJson } = require('./constants/package.js');
-const manifestConstants = require('./constants/manifest.js');
-
-const packageJson = require('../package.json');
-const { clear } = require('console');
-const spawn = require('cross-spawn');
-const { runFlow } = require('./flow');
-const { ERROR_ICON } = require('./constants/messages');
-const { StepError } = require('./flows/lib/step-error');
-const { RELEASE_FLOW } = require('./flows/release');
-const { RERUN_FLOW } = require('./flows/rerun');
-const { ZIP_FLOW } = require('./flows/zip');
-const { bumpVersionOptionDeprecated, bumpVersionOption } = require('./bump-version.option');
-const { Manifest } = require('./flows/lib/manifest');
-const { resolveAppRuntime } = require('./helpers/resolve-app-runtime');
-const { existsSync } = require('fs');
-const logger = require('./helpers/logger');
+} 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 { getDefaultsForPackageJson } from './constants/package.js';
+import * as manifestConstants from './constants/manifest.js';
+
+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 { ZIP_FLOW } from './flows/zip.js';
+import { bumpVersionOptionDeprecated, bumpVersionOption, apiKeyOption, envOption, silentOption } from './bump-version.option.js';
+import { Manifest } from './flows/lib/manifest.js';
+import { 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);
 
 const writejsonOptions = {
   spaces: 2,
   EOL: os.EOL,
 };
 
+const silencer = handler => async (...args) => {
+  const result = await handler(...args);
+
+  if (args[args.length - 2].silent && result) {
+    console.log(result);
+  }
+}
+
 function startingMessage() {
   clear();
   console.log(chalk.green('   Welcome to apps generator for:'));
@@ -90,7 +99,7 @@ const printDeprecationNotice = (param) =>
     ` Use ${chalk.cyan(`create-corva-app ${param} .`)} instead`
   );
 
-async function initialChecks() {
+export async function run() {
   const program = new Command()
     .hook('preAction', async () => {
       checkNodeVersion();
@@ -111,7 +120,7 @@ async function initialChecks() {
     const option = new Option(
       `${value.alias ? `-${value.alias}, ` : ''}--${value.name} [${(type !== 'undefined' && type) || 'string'
       }]`,
-      value.message
+      value.message,
     );
 
     if (value.choices) {
@@ -137,37 +146,12 @@ async function initialChecks() {
 
   createCommand
     .version(packageJson.version)
-    .addOption(
-      new Option(
-        '-z, --zip [string]',
-        chalk.bgYellow`DEPRECATED` + ` Use ${chalk.cyan`zip`} command instead`
-      )
-    )
-    .addOption(
-      new Option(
-        '--release',
-        chalk.bgYellow`DEPRECATED` + ` Use ${chalk.cyan`release`} command instead`
-      )
-    )
-    .addOption(bumpVersionOptionDeprecated);
 
   createCommand.action(async (dirName, options) => {
     if (options.zip || options.release) {
       options.bumpVersion = await ensureBumpVersion(options.bumpVersion);
     }
 
-    if (options.zip) {
-      printDeprecationNotice('zip');
-
-      return runFlow(ZIP_FLOW, { dirName, patterns: [], options });
-    }
-
-    if (options.release) {
-      printDeprecationNotice('release');
-
-      return runFlow(RELEASE_FLOW, { dirName, patterns: [], options });
-    }
-
     startingMessage();
 
     // NOTE: Default action
@@ -181,16 +165,12 @@ async function initialChecks() {
     .argument('[patterns...]', 'Additional patterns to zip', [])
     .addOption(bumpVersionOption)
     .addOption(new Option('--ignored-files [ignoredFiles...]', 'Patterns to skip zip', []))
-    .addOption(new Option('--silent [boolean]', 'Only log result of the operation', []))
-    .action(async (dirName, patterns, options) => {
+    .addOption(silentOption)
+    .action(silencer(async (dirName, patterns, options) => {
       options.bumpVersion = await ensureBumpVersion(options.bumpVersion);
 
-      if (options.silent) {
-        console.log(dirName);
-      }
-
-      return runFlow(ZIP_FLOW, { dirName, patterns, options });
-    });
+      return runFlow(ZIP_FLOW, { dirName, patterns, options }).then(_.get('zipFileName'))
+    }));
 
   program
     .command('release')
@@ -198,25 +178,30 @@ async function initialChecks() {
     .argument('<project-directory>', 'Project directory to work with')
     .argument('[patterns...]', 'Additional patterns to zip', [])
     .addOption(bumpVersionOption)
-    .addOption(new Option('--ignored-files [ignoredFiles...]', 'Patterns to skip zip', []))
-    .addOption(new Option('--silent [boolean]', 'Only log result of the operation', []))
+    .addOption(new Option('--ignored-files [string...]', 'Patterns to skip zip').default([]))
+    .addOption(silentOption)
+    .addOption(envOption)
+    .addOption(apiKeyOption)
+    .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('--zip-file-name [string]', 'Prebuilt zip file name in dir'))
     .action(async (dirName, patterns, options) => {
       options.bumpVersion = await ensureBumpVersion(options.bumpVersion);
 
-      if (options.silent) {
-        console.log(dirName);
-      }
-
-      return runFlow(RELEASE_FLOW, { dirName, patterns, options });
+      await runFlow(RELEASE_FLOW, { dirName, patterns, options });
     });
 
   program
     .command('rerun')
     .description('Rerun app')
     .argument('<project-directory>', 'Project directory to work with')
+    .addOption(apiKeyOption)
+    .addOption(envOption)
+    .addOption(silentOption)
     .addOption(new Option('--assets [assets...]', 'Assets ids list', []))
-    .action(async (dirName, patterns, options) => {
-      return runFlow(RERUN_FLOW, { dirName, patterns, options });
+    .action(async (dirName, options) => {
+      await runFlow(RERUN_FLOW, { dirName, options });
     });
 
   try {
@@ -289,7 +274,7 @@ async function initPackage(projectName, opts) {
   const manifest = new Manifest(manifestHelpers.fillManifest(opts));
   const runtime = resolveAppRuntime(opts);
 
-  if (!await runtime.isRuntimeAvailable()) {
+  if (!(await runtime.isRuntimeAvailable())) {
     throw new Error(`Runtime "${opts.runtime}" is not available locally`);
   }
 
@@ -391,7 +376,7 @@ async function configureApp(root, manifest, runtime) {
 
 const addNvmRc = async (root, manifest, runtime) => {
   await fs.outputFile(path.join(root, '.nvmrc'), `${runtime.version}\n`);
-}
+};
 
 const addTsConfigs = (root, manifest, runtime) => {
   if (runtime.language !== 'typescript') {
@@ -466,7 +451,7 @@ function addPackageJSON(root, manifest, runtime) {
     scripts: defaults.scripts,
     dependencies: defaults.dependencies,
     devDependencies: defaults.devDependencies,
-    ...(defaults.jest && { jest: defaults.jest })
+    ...(defaults.jest && { jest: defaults.jest }),
   };
 
   return fs.writeJSON(path.join(root, 'package.json'), packageJson, writejsonOptions);
@@ -480,12 +465,20 @@ function addPackageJSON(root, manifest, runtime) {
 async function installApp(root, manifest, runtime) {
   const command = manifest.isJs() ? runtime.packageManager : 'make';
   const args = ['install'];
-  const opts = { stdio: ['inherit', 'inherit', 'pipe'], cwd: root }
+  const opts = { stdio: ['inherit', 'inherit', 'pipe'], cwd: root };
+
+  if (process.env.CI && command === 'yarn') {
+    args.push('--cache-folder=".yarn-cache"');
+  }
 
   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(' ')}`, { shell: true, ...opts }) :
-    spawn.sync(command, args, opts);
+  const proc =
+    manifest.isJs() && existsSync(`${os.homedir()}/.nvm/nvm.sh`)
+      ? spawn.sync(`\\. ${os.homedir()}/.nvm/nvm.sh && nvm i && ${command} ${args.join(' ')}`, {
+        shell: true,
+        ...opts,
+      })
+      : spawn.sync(command, args, opts);
 
   if (proc.stderr) {
     const error = proc.stderr
@@ -542,5 +535,3 @@ async function helpCommands(manifest, { packageManager: displayedCommand }) {
   logger.log('    Uploads the app ZIP to Corva');
   logger.log();
 }
-
-initialChecks();

package/lib/scripts/utils/version.js

@@ -1,10 +1,10 @@
-const NpmApi = require('npm-api');
-const chalk = require('chalk');
-const semver = require('semver');
-const inquirer = require('inquirer');
+import NpmApi from 'npm-api';
+import chalk from 'chalk';
+import semver from 'semver';
+import inquirer from 'inquirer';
 
-const logger = require('../../helpers/logger');
-const packageJson = require('../../../package.json');
+import packageJson from '../../../package.json' assert { type: 'json' };
+import { logger } from '../../helpers/logger.js';
 const npm = new NpmApi();
 
 const error = chalk.bold.red;
@@ -16,7 +16,7 @@ const getCurrentVersion = () => packageJson.version;
 const getLatestVersion = async () => npm.repo('@corva/create-app').prop('version');
 
 // NOTE: Stop process and show error if version is outdated
-async function ensureLatestVersion() {
+export async function ensureLatestVersion() {
   const currentVersion = getCurrentVersion();
   const latestVersion = await getLatestVersion();
 
@@ -37,7 +37,7 @@ async function ensureLatestVersion() {
 }
 
 // NOTE: Show user-friendly warning if version is outdated
-async function warnIfOutdated() {
+export async function warnIfOutdated() {
   logger.write('Checking for updates...\n');
 
   const currentVersion = getCurrentVersion();
@@ -64,7 +64,7 @@ const PROMPT_MESSAGE = `Bumping package version:
 ${chalk.bold` Please select one of the options below:`}
   `;
 
-const ensureBumpVersion = async (bumpVersion) => {
+export const ensureBumpVersion = async (bumpVersion) => {
   if (bumpVersion) {
     return bumpVersion;
   }
@@ -96,7 +96,7 @@ const ensureBumpVersion = async (bumpVersion) => {
   return option === 'custom' ? custom : option;
 };
 
-async function getIncreasedVersion(version, { bumpVersion: releaseTypeOrNewVersion }) {
+export async function getIncreasedVersion(version, { bumpVersion: releaseTypeOrNewVersion }) {
   if (releaseTypeOrNewVersion === 'skip') {
     return version;
   }
@@ -107,5 +107,3 @@ async function getIncreasedVersion(version, { bumpVersion: releaseTypeOrNewVersi
 
   return semver.inc(version, releaseTypeOrNewVersion);
 }
-
-module.exports = { ensureLatestVersion, warnIfOutdated, getIncreasedVersion, ensureBumpVersion };

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@corva/create-app",
-    "version": "0.40.0-1",
+    "version": "0.41.0-2",
     "private": false,
     "description": "Create app to use it in CORVA.AI",
     "keywords": [
@@ -15,10 +15,12 @@
         "directory": "@corva/create-app"
     },
     "license": "MIT",
+    "type": "module",
     "bin": {
-        "create-corva-app": "./bin/create-corva-app.js"
+        "create-corva-app": "./bin/create-corva-app.cjs"
     },
     "files": [
+        "bin/**/*.cjs",
         "bin/**/*.js",
         "lib/**/*.js",
         "templates",
@@ -33,7 +35,6 @@
     },
     "dependencies": {
         "archiver": "^5.3.0",
-        "axios": "^0.25.0",
         "chalk": "4.1.0",
         "commander": "^9.1.0",
         "cross-spawn": "7.0.3",
@@ -43,6 +44,7 @@
         "form-data": "^4.0.0",
         "fs-extra": "9.0.1",
         "glob": "^8.0.1",
+        "got": "^12.5.1",
         "inquirer": "^8.2.3",
         "is-glob": "^4.0.3",
         "lodash": "^4.17.21",

package/bin/create-corva-app.js

@@ -1,5 +0,0 @@
-#!/usr/bin/env node
-
-const { run } = require('../lib/app');
-
-run();

package/lib/app.js

@@ -1,9 +0,0 @@
-'use strict';
-
-const run = () => {
-  require('./');
-};
-
-module.exports = {
-  run,
-};

package/lib/flows/steps/release-get-app-key.js

@@ -1,16 +0,0 @@
-const { RELEASE } = require('../../constants/messages');
-
-const GET_APP_KEY_STEP = {
-  message: RELEASE.getAppKey,
-  fn: ({ manifest }) => {
-    const appKey = manifest.manifest.application.key;
-
-    if (!appKey) {
-      throw new Error(RELEASE.getAppKeyError);
-    }
-
-    return { appKey };
-  },
-};
-
-module.exports = { GET_APP_KEY_STEP };

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

@@ -1,37 +0,0 @@
-const { RELEASE } = require('../../constants/messages');
-const { promises: fs } = require('fs');
-const dotenv = require('dotenv');
-const { resolve } = require('path');
-const { StepError } = require('../lib/step-error');
-
-async function getVarsFromDotEnv({ dirName }) {
-  try {
-    const envFile = await fs.readFile(resolve(dirName, '.env'));
-    return dotenv.parse(envFile);
-  } catch (error) {
-    return {};
-  }
-}
-
-const GET_RELEASE_CONFIG_STEP = {
-  message: RELEASE.getAuthToken,
-  fn: async ({ dirName }) => {
-    const parsedEnv = await getVarsFromDotEnv({ dirName });
-
-    const CORVA_API_ENV = process.env.CORVA_API_ENV || parsedEnv.CORVA_API_ENV;
-    const AUTH_TOKEN = process.env.AUTH_TOKEN || parsedEnv.AUTH_TOKEN;
-    const API_KEY = process.env.API_KEY || parsedEnv.API_KEY;
-
-    if (!AUTH_TOKEN && !API_KEY) {
-      throw new StepError(RELEASE.getAuthTokenError);
-    }
-
-    return {
-      CORVA_API_ENV: CORVA_API_ENV || 'production',
-      AUTH_TOKEN,
-      API_KEY,
-    };
-  },
-};
-
-module.exports = { GET_RELEASE_CONFIG_STEP };