@corva/create-app 0.0.0-73c49372 → 0.0.0-node-test

package/bin/create-corva-app.cjs

@@ -7,18 +7,13 @@ 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', 'cca.js'].concat(preparedOriginalArgs);
+const args = ['--no-warnings', '--experimental-json-modules', 'cca.js']
+  .concat(process.argv.slice(2))
+  .concat(['--original-cwd', originalCwd]);
 
 const { signal, status, error } = spawnSync(cmd, args, {
   stdio: 'inherit',
-  shell: true,
+  shell: false,
 });
 
 if (signal) {

package/lib/constants/cli.js

@@ -2,10 +2,16 @@ export const APP_RUNTIMES = {
   UI: 'ui',
   // NODE12: 'nodejs12.x',
   // NODE14: 'nodejs14.x',
-  NODE16: 'nodejs16.x',
+  // NODE16: 'nodejs16.x',
   NODE18: 'nodejs18.x',
+  NODE20: 'nodejs20.x',
+  // NODE22: 'nodejs22.x',
   PYTHON3_8: 'python3.8',
   PYTHON3_9: 'python3.9',
+  PYTHON3_10: 'python3.10',
+  PYTHON3_11: 'python3.11',
+  PYTHON3_12: 'python3.12',
+  // PYTHON3_13: 'python3.13',
 };
 
 export const TEMPLATE_TYPES = {
@@ -22,3 +28,7 @@ export const APP_TYPES = {
   STREAM: 'stream',
   TASK: 'task',
 };
+
+export const APP_EXTENSIONS = {
+  CORVA: 'corva',
+};

package/lib/constants/package.js

@@ -1,4 +1,5 @@
 import _ from 'lodash';
+import { APP_EXTENSIONS } from './cli.js';
 
 const uiDependencies = {
   '@corva/ui': 'latest',
@@ -37,8 +38,10 @@ const jsUiDevDependencies = {
 const tsUiDevDependencies = {
   ...jsUiDevDependencies,
   '@tsconfig/create-react-app': '1.0.2',
+  '@types/lodash': '4.17.5',
   '@types/material-ui': '0.21.9',
-  '@types/mime': '3',
+  '@types/mime': '3.0.1',
+  '@types/node': '18.19.47',
   '@types/react': '^17.0.22',
   '@types/react-dom': '^17.0.9',
   '@types/jest': '^27.0.1',
@@ -67,7 +70,7 @@ function applyUiExtension(packageJson, extensionNames) {
 
   const extensions = extensionNames
     .map((extensionName) => {
-      if (extensionName === 'corva') {
+      if (extensionName === APP_EXTENSIONS.CORVA) {
         return corvaUiExtension;
       }
 
@@ -151,17 +154,17 @@ const nodeDependencies = {
 
 const nodeDevDependencies = {
   '@corva/eslint-config-node': '^5.1.1',
-  'jest': '^27.5.1',
+  'jest': '^29.7.0',
   'dotenv': '^16.0.3',
   'eslint': '^8.2.0',
   'prettier': '^2.0.0',
-  'typescript': '^4.9.4',
+  'typescript': '^5.5.4',
 };
 
 const nodeTsDevDependencies = {
   ...nodeDevDependencies,
-  '@types/jest': '^27.4.1',
-  'ts-jest': '^27.1.4',
+  '@types/jest': '^29.5.12',
+  'ts-jest': '^29.2.4',
 };
 
 const nodeYarnScripts = {

package/lib/flows/lib/api.js

@@ -42,21 +42,15 @@ export class Api {
    * @returns  {object}
    */
   async getAppByKey(appKey) {
-    const { data } = await this.#api
-      .get('v2/apps', {
-        searchParams: { per_page: 2, search: appKey },
-      })
-      .json();
+    const { data } = await this.#api.get(`v2/apps/${appKey}`).json();
 
-    const app = data.find((app) => app.attributes.app_key === appKey);
-
-    if (!app) {
+    if (!data) {
       throw new StepError(
         `App with key - ${appKey}, does not exist.\nThe key search is case-sensitive. You might need to update the app key in your app to exactly match the key.`,
       );
     }
 
-    return app;
+    return data;
   }
 
   /**

package/lib/flows/lib/manifest.js

@@ -11,7 +11,7 @@ const SCHEDULER_MAPPING = [SCHEDULER_TYPE_DATA_TIME, SCHEDULER_TYPE_DEPTH, SCHED
   {},
 );
 
-const NODE_RUNTIMES = [APP_RUNTIMES.NODE16, APP_RUNTIMES.NODE18];
+const NODE_RUNTIMES = [APP_RUNTIMES.NODE18, APP_RUNTIMES.NODE20];
 
 export class Manifest {
   constructor(manifest) {

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

@@ -5,6 +5,7 @@ import { resolve } from 'node:path';
 import { RELEASE } from '../../../constants/messages.js';
 import { StepError } from '../../lib/step-error.js';
 import { logger } from '../../../helpers/logger.js';
+import { execSync } from 'node:child_process';
 
 async function deleteAppPackage({ api, appId, appPkgVersion }) {
   const appPackages = await api.getAppPackages(appId);
@@ -23,6 +24,27 @@ async function deleteAppPackage({ api, appId, appPkgVersion }) {
   }
 }
 
+function getGithubUsernameActor() {
+  // It is fetched from CI github.actor variable
+  return process.env.githubUsername || null;
+}
+
+function getGitConfigUsername() {
+  try {
+    let username = execSync('git config user.name').toString().trim();
+
+    if (!username) {
+      username = execSync('git config --global user.name').toString().trim();
+    }
+
+    return username || null;
+  } catch (error) {
+    logger.log('Unable to fetch git config username:', error.message);
+
+    return null;
+  }
+}
+
 export const UPLOAD_ZIP_TO_CORVA_STEP = {
   message: RELEASE.uploadApp,
   /**
@@ -36,6 +58,14 @@ export const UPLOAD_ZIP_TO_CORVA_STEP = {
 
       form.append('package', createReadStream(resolve(dirName, zipFileName)), 'package.zip');
 
+      let githubUsername = getGithubUsernameActor();
+
+      if (!githubUsername) {
+        githubUsername = getGitConfigUsername();
+      }
+
+      form.append('github_username', githubUsername);
+
       const { id: packageId, isDeletedDueToLimit } = await api.uploadPackages(appKey, form);
 
       if (isDeletedDueToLimit) {

package/lib/helpers/manifest.js

@@ -1,4 +1,4 @@
-import { APP_RUNTIMES, APP_TYPES, TEMPLATE_TYPES } from '../constants/cli.js';
+import { APP_EXTENSIONS, APP_RUNTIMES, APP_TYPES, TEMPLATE_TYPES } from '../constants/cli.js';
 import * as manifestConstants from '../constants/manifest.js';
 
 export function fillManifest(answers) {
@@ -10,6 +10,13 @@ export function fillManifest(answers) {
     runtime,
   });
 
+  const enable_isolation =
+    answers.appType === APP_TYPES.UI &&
+    answers.runtime === APP_RUNTIMES.UI &&
+    answers.extensions.includes(APP_EXTENSIONS.CORVA)
+      ? false
+      : undefined;
+
   const manifest = {
     ...manifestConstants.defaultManifest,
     ...defaultManifestProperties,
@@ -35,6 +42,7 @@ export function fillManifest(answers) {
       ...defaultManifestProperties.settings,
       runtime,
       app: defaultAppSettings(answers),
+      enable_isolation,
     },
   };
 

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

@@ -61,8 +61,8 @@ export const IS_WINDOWS = process.platform === 'win32';
 
 const semverVersionsMapping = {
   node: {
-    16: '16.19.0',
     18: '18.13.0',
+    20: '20.16.0',
   },
   python: {
     '3.8': '3.8.16',
@@ -82,7 +82,7 @@ const semverVersionsMapping = {
  */
 export const resolveAppRuntime = (opts) => {
   if (opts.appType === APP_TYPES.UI) {
-    const version = '18';
+    const version = '20';
 
     return {
       language: opts.useTypescript ? 'typescript' : 'javascript',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@corva/create-app",
-  "version": "0.0.0-73c49372",
+  "version": "0.0.0-node-test",
   "private": false,
   "description": "Create an app to use it in CORVA.AI",
   "keywords": [
@@ -100,5 +100,6 @@
     "skip": {
       "tag": true
     }
-  }
+  },
+  "packageManager": "yarn@1.22.19+sha512.ff4579ab459bb25aa7c0ff75b62acebe576f6084b36aa842971cf250a5d8c6cd3bc9420b22ce63c7f93a0857bc6ef29291db39c3e7a23aab5adfd5a4dd6c5d71"
 }

package/template_extensions/corva/.github/workflows/develop.yml

@@ -11,6 +11,8 @@ jobs:
       - name: develop branch flow
         id: shared-workflow
         uses: corva-ai/gh-actions/shared-dc-workflows/develop@develop
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           qa-api-key: ${{ secrets.API_KEY_QA }}
           prod-api-key: ${{ secrets.API_KEY }}

package/templates/scheduler_data-time/javascript/__tests__/processor.spec.js

@@ -1,5 +1,5 @@
 const { ScheduledDataTimeEvent } = require('@corva/node-sdk');
-const { app_runner } = require('@corva/node-sdk/lib/testing');
+const { app_runner } = require('@corva/node-sdk/testing');
 
 const { processor } = require('..');
 

package/templates/scheduler_data-time/typescript/__tests__/processor.spec.ts

@@ -1,4 +1,4 @@
-import { app_runner } from '@corva/node-sdk/lib/testing';
+import { app_runner } from '@corva/node-sdk/testing';
 import { ScheduledDataTimeEvent } from '@corva/node-sdk';
 
 import { processor } from '..';

package/templates/scheduler_depth/javascript/__tests__/processor.spec.js

@@ -1,5 +1,5 @@
 const { ScheduledDepthEvent } = require('@corva/node-sdk');
-const { app_runner } = require('@corva/node-sdk/lib/testing');
+const { app_runner } = require('@corva/node-sdk/testing');
 
 const { processor } = require('..');
 

package/templates/scheduler_depth/typescript/__tests__/processor.spec.ts

@@ -1,4 +1,4 @@
-import { app_runner } from '@corva/node-sdk/lib/testing';
+import { app_runner } from '@corva/node-sdk/testing';
 import { ScheduledDepthEvent } from '@corva/node-sdk';
 
 import { processor } from '..';

package/templates/scheduler_natural-time/javascript/__tests__/processor.spec.js

@@ -1,5 +1,5 @@
 const { ScheduledNaturalTimeEvent } = require('@corva/node-sdk');
-const { app_runner } = require('@corva/node-sdk/lib/testing');
+const { app_runner } = require('@corva/node-sdk/testing');
 
 const { processor } = require('..');
 

package/templates/scheduler_natural-time/typescript/__tests__/processor.spec.ts

@@ -1,4 +1,4 @@
-import { app_runner } from '@corva/node-sdk/lib/testing';
+import { app_runner } from '@corva/node-sdk/testing';
 import { ScheduledNaturalTimeEvent } from '@corva/node-sdk';
 
 import { processor } from '..';

package/templates/stream_depth/javascript/__tests__/processor.spec.js

@@ -1,5 +1,5 @@
 const { StreamDepthEvent, StreamDepthRecord } = require('@corva/node-sdk');
-const { app_runner } = require('@corva/node-sdk/lib/testing');
+const { app_runner } = require('@corva/node-sdk/testing');
 
 const { processor } = require('..');
 

package/templates/stream_depth/typescript/__tests__/processor.spec.ts

@@ -1,4 +1,4 @@
-import { app_runner } from '@corva/node-sdk/lib/testing';
+import { app_runner } from '@corva/node-sdk/testing';
 import { StreamDepthEvent, StreamDepthRecord } from '@corva/node-sdk';
 
 import { processor } from '..';

package/templates/stream_time/javascript/__tests__/processor.spec.js

@@ -1,5 +1,5 @@
 const { StreamTimeEvent, StreamTimeRecord } = require('@corva/node-sdk');
-const { app_runner } = require('@corva/node-sdk/lib/testing');
+const { app_runner } = require('@corva/node-sdk/testing');
 
 const { processor } = require('..');
 

package/templates/stream_time/typescript/__tests__/processor.spec.ts

@@ -1,4 +1,4 @@
-import { app_runner } from '@corva/node-sdk/lib/testing';
+import { app_runner } from '@corva/node-sdk/testing';
 import { StreamTimeEvent, StreamTimeRecord } from '@corva/node-sdk';
 
 import { processor } from '..';

package/templates/task/javascript/__tests__/processor.spec.js

@@ -1,5 +1,5 @@
 const { TaskEvent } = require('@corva/node-sdk');
-const { app_runner } = require('@corva/node-sdk/lib/testing');
+const { app_runner } = require('@corva/node-sdk/testing');
 
 const { processor } = require('..');
 

package/templates/task/typescript/__tests__/processor.spec.ts

@@ -1,4 +1,4 @@
-import { app_runner } from '@corva/node-sdk/lib/testing';
+import { app_runner } from '@corva/node-sdk/testing';
 import { TaskEvent } from '@corva/node-sdk';
 
 import { processor } from '..';