@corva/create-app 0.43.0-2 → 0.43.0-4

package/bin/create-corva-app.cjs

@@ -1,17 +1,29 @@
 #!/usr/bin/env node
 
-const { spawnSync } = require('child_process');
+const { sync: spawnSync } = require('cross-spawn');
 const { resolve } = require('path');
 
-const cmd = [
-  'node',
+const cmd = 'node';
+const originalCwd = process.cwd()
+
+process.chdir(__dirname)
+
+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',
-  resolve(__dirname, 'cca.js'),
-  ...process.argv.slice(2),
-];
+  'cca.js',
+].concat(preparedOriginalArgs);
 
-const { signal, status, error } = spawnSync(cmd.map((a) => `"${a}"`).join(' '), { stdio: 'inherit', shell: true });
+const { signal, status, error } = spawnSync(cmd, args, {
+  stdio: 'inherit',
+  shell: true,
+});
 
 if (signal) {
   process.exit(signal);

package/lib/bump-version.option.js

@@ -37,6 +37,8 @@ export const silentOption = new Option(
   'Only log result of the operation'
 ).default(false);
 
+export const originalCwdOption = (new Option('--original-cwd <string>')).hideHelp();
+
 export const bumpVersionOptionDeprecated = new Option(
   flags,
   chalk.bgYellow`DEPRECATED` +

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

@@ -2,7 +2,7 @@ import { APP_TYPES } from '../constants/cli.js';
 import Debug from 'debug';
 
 const debug = Debug('cca:resolve-app-runtime');
-import { spawn } from 'child_process';
+import spawn from 'cross-spawn';
 import { promises as fs } from 'fs';
 import semver from 'semver';
 import os from 'os';
@@ -11,22 +11,22 @@ const checkCliVersion = async (command, version, stdErr = false) =>
   new Promise((resolve, reject) => {
     const child = spawn(command, ['--version']);
 
-    let data;
+    let data = '';
 
-    child.stderr.once('data', (buffer) => {
-      data = buffer;
+    child.stderr.on('data', (buffer) => {
+      data += buffer;
     });
 
-    child.stdout.once('data', (buffer) => {
-      data = buffer;
+    child.stdout.on('data', (buffer) => {
+      data += buffer;
     });
 
     child.once('close', (code) => {
       if (code !== 0) {
         debug(`Command ${command} exited with code ${code}`);
-        debug(data.toString());
+        debug('Output:', data.toString());
 
-        return reject(false);
+        return resolve(false);
       }
 
       debug(`%s version output: %s`, command, data.toString());
@@ -50,6 +50,8 @@ const checkNodeVersion = (version) => async () => {
   }
 };
 
+export const IS_WINDOWS = process.platform === 'win32';
+
 export const resolveAppRuntime = (opts) => {
   if (opts.appType === APP_TYPES.UI) {
     const version = '16';
@@ -78,7 +80,7 @@ export const resolveAppRuntime = (opts) => {
   return {
     language: 'python',
     isRuntimeAvailable: async () =>
-      (await checkCliVersion('python3', version)) || (await checkCliVersion('python', version)),
+      IS_WINDOWS ? await checkCliVersion('python', version) || await checkCliVersion('python3', version) : checkCliVersion('python3', version),
     packageManager: 'pip',
     version,
   };

package/lib/helpers/versioning.js

@@ -1,5 +1,8 @@
 import { execSync } from 'node:child_process';
 import { logger } from './logger.js';
+import Debug from 'debug';
+
+const debug = Debug('cca:versioning');
 
 export function isInGitRepository(appPath) {
   try {
@@ -9,6 +12,7 @@ export function isInGitRepository(appPath) {
     });
     return true;
   } catch (e) {
+    debug(e);
     return false;
   }
 }
@@ -16,6 +20,8 @@ export function isInGitRepository(appPath) {
 export function tryGitInit(appPath) {
   try {
     if (isInGitRepository()) {
+      debug('is in git repository');
+
       return false;
     }
     execSync('git --version', { stdio: 'ignore', cwd: appPath });
@@ -24,7 +30,8 @@ export function tryGitInit(appPath) {
     logger.log('Initialized git repo in app');
     return true;
   } catch (e) {
-    console.warn('Git repo not initialized', e);
+    debug(e);
+    console.warn('Git repo not initialized');
     return false;
   }
 }
@@ -44,12 +51,14 @@ export function tryGitCommit(appPath) {
     // In the future, we might supply our own committer
     // like Ember CLI does, but for now, let's just
     // remove the Git files to avoid a half-done state.
-    console.warn('Git commit not created', e);
+    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'));
     } catch (removeErr) {
+      debug(removeErr);
       // Ignore.
     }
     return false;
@@ -61,6 +70,7 @@ export function shouldUseYarn(appPath) {
     execSync('yarnpkg --version', { stdio: 'ignore', cwd: appPath });
     return true;
   } catch (e) {
+    debug(e);
     return false;
   }
 }

package/lib/main.js

@@ -4,7 +4,7 @@ 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 path, { resolve } from 'node:path';
 import semver from 'semver';
 
 import { ensureLatestVersion, warnIfOutdated, ensureBumpVersion } from './scripts/utils/version.js';
@@ -31,9 +31,10 @@ import {
   envOption,
   silentOption,
   appVersion,
+  originalCwdOption,
 } from './bump-version.option.js';
 import { Manifest } from './flows/lib/manifest.js';
-import { resolveAppRuntime } from './helpers/resolve-app-runtime.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';
@@ -57,6 +58,8 @@ const silencer =
     }
   };
 
+  const getRealWorkingDir = (relativePath, options) => resolve(options.originalCwd, relativePath)
+
 function startingMessage() {
   clear();
   console.log(chalk.green('   Welcome to apps generator for:'));
@@ -105,7 +108,7 @@ const printDeprecationNotice = (param) =>
   );
 
 export async function run() {
-  const program = new Command()
+  const program = new Command('create-corva-app')
     .hook('preAction', async () => {
       checkNodeVersion();
 
@@ -117,7 +120,8 @@ export async function run() {
   const createCommand = program
     .command('create', { isDefault: true })
     .description('Create a new app')
-    .argument('[project-directory]', 'project directory to work with', process.cwd())
+    .argument('[project-directory]', 'project directory to work with', process.argv[process.argv.length - 1])
+    .addOption(originalCwdOption)
     .usage(`${chalk.green('<project-directory>')} [options]`);
 
   manifestConstants.manifestOptions().forEach((value) => {
@@ -170,12 +174,15 @@ export async function run() {
     .argument('[patterns...]', 'Additional patterns to zip', [])
     .addOption(bumpVersionOption)
     .addOption(new Option('--ignored-files [ignoredFiles...]', 'Patterns to skip zip', []))
+    .addOption(originalCwdOption)
     .addOption(silentOption)
     .action(
       silencer(async (dirName, patterns, options) => {
         options.bumpVersion = await ensureBumpVersion(options.bumpVersion);
 
-        return runFlow(ZIP_FLOW, { dirName, patterns, options }).then(_.get('zipFileName'));
+        console.log(getRealWorkingDir(dirName, options), options)
+
+        return runFlow(ZIP_FLOW, { dirName: getRealWorkingDir(dirName, options), patterns, options }).then(_.get('zipFileName'));
       })
     );
 
@@ -189,6 +196,7 @@ export async function run() {
     .addOption(silentOption)
     .addOption(envOption)
     .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'])
@@ -209,7 +217,7 @@ export async function run() {
     .action(async (dirName, patterns, options) => {
       options.bumpVersion = await ensureBumpVersion(options.bumpVersion);
 
-      await runFlow(RELEASE_FLOW, { dirName, patterns, options });
+      await runFlow(RELEASE_FLOW, { dirName: getRealWorkingDir(dirName, options), patterns, options });
     });
 
   program
@@ -222,8 +230,9 @@ export async function run() {
     .addOption(appVersion)
     .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) => {
-      await runFlow(RERUN_FLOW, { dirName, options });
+      await runFlow(RERUN_FLOW, { dirName: getRealWorkingDir(dirName, options), options });
     });
 
   program
@@ -234,8 +243,9 @@ export async function run() {
     .addOption(envOption)
     .addOption(silentOption)
     .addOption(appVersion)
+    .addOption(originalCwdOption)
     .action(async (dirName, options) => {
-      await runFlow(ATTACH_FLOW, { dirName, options });
+      await runFlow(ATTACH_FLOW, { dirName: getRealWorkingDir(dirName, options), options });
     });
 
   try {
@@ -302,19 +312,43 @@ const handleCommanderError = (e) => {
   }
 };
 
+/**
+ *
+ * @param {import('./flows/lib/manifest').Manifest} manifest
+ */
+const getEnvManagementLink = (manifest) => {
+  if (manifest.isJs()) {
+    if (IS_WINDOWS) {
+      return 'https://github.com/coreybutler/nvm-windows';
+    }
+
+    return 'https://github.com/nvm-sh/nvm';
+  }
+
+  if (IS_WINDOWS) {
+    return 'https://github.com/pyenv-win/pyenv-win';
+  }
+
+  return 'https://github.com/pyenv/pyenv';
+};
+
 async function initPackage(projectName, opts) {
   const manifest = new Manifest(manifestHelpers.fillManifest(opts));
   const runtime = resolveAppRuntime(opts);
 
   if (!(await runtime.isRuntimeAvailable())) {
-    throw new Error(`Runtime "${opts.runtime}" is not available locally`);
+    throw new Error(
+      `Runtime "${opts.runtime}" is not available locally. Please proceed to ${chalk.green(
+        getEnvManagementLink(manifest)
+      )} to install it locally.`
+    );
   }
 
   if (manifest.isUi()) {
     await ensureLatestVersion();
   }
 
-  const root = path.resolve(projectName);
+  const root = getRealWorkingDir(projectName, opts);
 
   logger.log(`Creating a new Corva app in ${chalk.green(root)}.`);
 
@@ -500,38 +534,44 @@ 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 };
 
-  if (process.env.CI && command === 'yarn') {
-    args.push('--cache-folder=".yarn-cache"');
-  }
+  if (!IS_WINDOWS || manifest.isJs()) {
+    const args = ['install'];
+    const opts = { stdio: ['inherit', 'inherit', 'pipe'], cwd: root };
 
-  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);
-
-  if (proc.stderr) {
-    const error = proc.stderr
-      .toString('utf8')
-      .split('\n')
-      // NOTE: filter out warnings caused by @corva/ui peer dependencies
-      .filter((line) => !line.includes('@corva/ui'))
-      .join('\n');
-    console.log(error);
-  }
+    if (process.env.CI && command === 'yarn') {
+      args.push('--cache-folder=".yarn-cache"');
+    }
 
-  if (proc.status !== 0) {
-    console.error(`\`${command} ${args.join(' ')}\` failed`);
-    return;
-  }
+    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);
+
+    if (proc.stderr) {
+      const error = proc.stderr
+        .toString('utf8')
+        .split('\n')
+        // 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;
+    }
 
-  logger.log(chalk.green('Successfull project install'));
+    logger.log(chalk.green('Successfull project install'));
+  } else {
+    logger.log();
+    logger.log(`⚠️ ${chalk.yellow('Please install project dependencies manually')}`);
+  }
 
   if (versioning.tryGitInit(root)) {
     logger.log();
@@ -544,7 +584,7 @@ async function installApp(root, manifest, runtime) {
   }
 
   logger.log();
-  logger.log(`Success! Created ${manifest.name} at ${root}`);
+  logger.log(`Success! Created ${chalk.green(manifest.name)} at ${chalk.yellow(root)}`);
 
   helpCommands(manifest, runtime);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@corva/create-app",
-    "version": "0.43.0-2",
+    "version": "0.43.0-4",
     "private": false,
     "description": "Create an app to use it in CORVA.AI",
     "keywords": [
@@ -37,7 +37,7 @@
         "archiver": "^5.3.0",
         "chalk": "4.1.0",
         "commander": "^9.1.0",
-        "cross-spawn": "7.0.3",
+        "cross-spawn": "^7.0.3",
         "debug": "^4.3.4",
         "dotenv": "^16.0.0",
         "figlet": "^1.5.0",
@@ -55,6 +55,7 @@
     "devDependencies": {
         "@corva/eslint-config-browser": "^0.0.4",
         "@corva/eslint-config-node": "^4.2.0",
+        "@types/cross-spawn": "^6.0.2",
         "conventional-changelog-cli": "^2.1.0",
         "prettier": "^2.4.1",
         "standard-version": "^9.0.0"