@corva/create-app 0.28.0-2 → 0.28.0-3

package/lib/constants/manifest.js

@@ -103,7 +103,7 @@ const SCHEDULER_TYPE_NATURAL_TIME = { name: 'Natural Time', value: 1 };
 const SCHEDULER_TYPE_DATA_TIME = { name: 'Data Time', value: 2 };
 const SCHEDULER_TYPE_DEPTH = { name: 'Date Depth', value: 4 };
 
-const manifestOptions = (projectName) => [
+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' },
   {

package/lib/constants/package.js

@@ -1,41 +1,38 @@
-const dependencies = {
-  devDependencies: {
-    'postcss-loader': '4.1.0',
-  },
-  dependencies: {
-    '@corva/ui': 'latest',
-    '@material-ui/core': '4.11.2',
-    '@material-ui/icons': '4.9.1',
-    '@material-ui/lab': '4.0.0-alpha.57',
-    '@material-ui/pickers': '3.2.10',
-    'classnames': '2.2.6',
-    'corva-convert-units': '1.10.17',
-    'highcharts': '8.1.2',
-    'highcharts-react-official': '2.2.2',
-    'lodash': '^4.17.4',
-    'mapbox.js': '3.2.1',
-    'moment': '2.23.0',
-    'moment-timezone': '0.5.23',
-    'prop-types': '^15.6.1',
-    'react': '17.0.1',
-    'react-dom': '17.0.1',
-  },
-};
+const uiDependencies = {
+  '@corva/ui': 'latest',
+  '@material-ui/core': '4.11.2',
+  '@material-ui/icons': '4.9.1',
+  '@material-ui/lab': '4.0.0-alpha.57',
+  '@material-ui/pickers': '3.2.10',
+  'classnames': '2.2.6',
+  'corva-convert-units': '1.10.17',
+  'highcharts': '8.1.2',
+  'highcharts-react-official': '2.2.2',
+  'lodash': '^4.17.4',
+  'mapbox.js': '3.2.1',
+  'moment': '2.23.0',
+  'moment-timezone': '0.5.23',
+  'prop-types': '^15.6.1',
+  'react': '17.0.1',
+  'react-dom': '17.0.1',
+}
 
-const tsDependencies = {
-  devDependencies: {
-    '@tsconfig/create-react-app': '1.0.2',
-    '@types/material-ui': '0.21.9',
-    '@types/react': '^17.0.22',
-    '@types/react-dom': '^17.0.9',
-    '@typescript-eslint/eslint-plugin': '^4.31.2',
-    '@typescript-eslint/parser': '^4.31.2',
-    'ts-loader': '8.2.0',
-    'typescript': '^4.4.3',
-  },
+const jsUiDevDependencies = {
+  'postcss-loader': '4.1.0',
+}
+
+const tsUiDevDependencies = {
+  '@tsconfig/create-react-app': '1.0.2',
+  '@types/material-ui': '0.21.9',
+  '@types/react': '^17.0.22',
+  '@types/react-dom': '^17.0.9',
+  '@typescript-eslint/eslint-plugin': '^4.31.2',
+  '@typescript-eslint/parser': '^4.31.2',
+  'ts-loader': '8.2.0',
+  'typescript': '^4.4.3',
 };
 
-const scripts = {
+const uiScripts = {
   build: 'webpack --config=./config-overrides.js --mode production',
   start: 'webpack-dev-server --config=./config-overrides.js --open --mode development',
   zip: 'create-corva-app zip .',
@@ -43,8 +40,122 @@ const scripts = {
   release: 'create-corva-app release .',
 };
 
-module.exports = {
-  tsDependencies,
-  dependencies,
-  scripts,
+const uiPackage = {
+  version: '0.0.1',
+  main: 'src/index.js',
+  scripts: uiScripts,
+  dependencies: uiDependencies,
+  devDependencies: jsUiDevDependencies
+}
+
+const tsUiPackage = {
+  ...uiPackage,
+  devDependencies: tsUiDevDependencies
+}
+
+const nodeNpmScripts = {
+  "bundle": "create-corva-app zip .",
+  "test": "npm audit --production && npm run unit",
+  "unit": "jest --passWithNoTests"
 };
+
+const nodeDependencies = {
+  "@corva/node-sdk": "^6.2.0"
+}
+
+const nodeDevDependencies = {
+  "jest": "^27.5.1"
+}
+
+const nodeTsDevDependencies = {
+  "@types/jest": "^27.4.1",
+  "jest": "^27.5.1",
+  "ts-jest": "^27.1.4",
+  "typescript": "^4.6.3"
+}
+
+const nodeYarnScripts = {
+  ...nodeNpmScripts,
+  "test": "yarn audit --groups dependencies && yarn unit",
+}
+
+const nodeTsScripts = {
+  ...nodeNpmScripts,
+  "build": "tsc -p tsconfig.build.json",
+}
+
+const nodeTsYarnScripts = {
+  ...nodeYarnScripts,
+  "build": "tsc -p tsconfig.build.json",
+}
+
+const nodeNpmPackage = {
+  version: '0.0.1',
+  main: 'index.js',
+  private: true,
+  dependencies: nodeDependencies,
+  devDependencies: nodeDevDependencies,
+  scripts: nodeNpmScripts
+}
+
+const nodeYarnPackage = {
+  ...nodeNpmPackage,
+  scripts: nodeYarnScripts
+}
+
+const nodeTsNpmPackage = {
+  ...nodeNpmPackage,
+  devDependencies: nodeTsDevDependencies,
+  scripts: nodeTsScripts
+}
+
+const nodeTsYarnPackage = {
+  ...nodeTsNpmPackage,
+  scripts: nodeTsYarnScripts
+}
+
+const extendWithTsConfig = (package, version) => {
+  package.devDependencies = {
+    [`@tsconfig/node${version}`]: `^${version === '12' ? '1.0.9' : '1.0.1'}`,
+    ...package.devDependencies,
+  };
+
+  return package;
+}
+
+const defaults = {
+  javascript: {
+    yarn: {
+      ui: () => uiPackage,
+      task: () => nodeYarnPackage,
+      scheduler: () => nodeYarnPackage,
+      stream: () => nodeYarnPackage
+    },
+    npm: {
+      ui: () => uiPackage,
+      task: () => nodeNpmPackage,
+      scheduler: () => nodeNpmPackage,
+      stream: () => nodeNpmPackage
+    },
+  },
+  typescript: {
+    yarn: {
+      ui: () => tsUiPackage,
+      task: ({ version }) => extendWithTsConfig(nodeTsYarnPackage, version),
+      scheduler: ({ version }) => extendWithTsConfig(nodeTsYarnPackage, version),
+      stream: ({ version }) => extendWithTsConfig(nodeTsYarnPackage, version)
+    },
+    npm: {
+      ui: () => tsUiPackage,
+      task: ({ version }) => extendWithTsConfig(nodeTsNpmPackage, version),
+      scheduler: ({ version }) => extendWithTsConfig(nodeTsNpmPackage, version),
+      stream: ({ version }) => extendWithTsConfig(nodeTsNpmPackage, version)
+    }
+  }
+};
+
+module.exports = {
+  getDefaultsForPackageJson: (manifest, runtime) => {
+    return defaults[runtime.language][runtime.packageManager][manifest.type](runtime);
+  }
+}

package/lib/flows/lib/manifest.js

@@ -1,4 +1,4 @@
-const { APP_TYPES, APP_RUNTIMES } = require('../../constants/cli');
+const { APP_TYPES, APP_RUNTIMES, TEMPLATE_TYPES } = require('../../constants/cli');
 
 const NODE_RUNTIMES = [APP_RUNTIMES.NODE12, APP_RUNTIMES.NODE14];
 
@@ -11,6 +11,18 @@ class Manifest {
     return this.manifest.settings.runtime;
   }
 
+  get type() {
+    return this.manifest.application.type
+  }
+
+  get name() {
+    return this.manifest.application.name
+  }
+
+  get description() {
+    return this.manifest.application.description
+  }
+
   isNode() {
     return NODE_RUNTIMES.includes(this.manifest.settings.runtime);
   }
@@ -26,6 +38,10 @@ class Manifest {
   isPython() {
     return this.manifest.settings.runtime === APP_RUNTIMES.PYTHON3;
   }
+
+  isScheduler() {
+    return this.manifest.application.type === APP_TYPES.SCHEDULER;
+  }
 }
 
 module.exports = { Manifest };

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

@@ -0,0 +1,29 @@
+const { APP_TYPES } = require("../constants/cli");
+
+const resolveAppRuntime = (opts) => {
+  if (opts.appType === APP_TYPES.UI) {
+    return {
+      language: opts.useTypescript ? "typescript" : "javascript",
+      packageManager: opts.packageManager,
+      version: process.version.replace(/^v/, ""),
+    }
+  }
+
+  if (opts.runtime.startsWith('node')) {
+    const version = /nodejs(\d{2})\.x/.exec(opts.runtime)[1];
+
+    return {
+      language: opts.useTypescript ? "typescript" : "javascript",
+      packageManager: opts.packageManager,
+      version
+    }
+  }
+
+  return {
+    language: "python",
+    packageManager: 'pip',
+    version: '3.8'
+  }
+};
+
+module.exports = { resolveAppRuntime };

package/lib/helpers/utils.js

@@ -13,29 +13,29 @@ function copyFileSync(source, target) {
   fs.writeFileSync(targetFile, fs.readFileSync(source));
 }
 
-function copyFolderRecursiveSync(source, target, excludeFolderName) {
-  let files = [];
-
+function copyFolderRecursiveSync(sourceFolder, targetFolder) {
   //check if folder needs to be created or integrated
-  let targetFolder;
-  if (path.basename(source) !== excludeFolderName) {
-    targetFolder = path.join(target, path.basename(source));
-  } else targetFolder = target;
   if (!fs.existsSync(targetFolder)) {
     fs.mkdirSync(targetFolder);
   }
 
+  if (!fs.lstatSync(sourceFolder).isDirectory()) {
+    return;
+  }
+
   //copy
-  if (fs.lstatSync(source).isDirectory()) {
-    files = fs.readdirSync(source);
-    files.forEach(function (file) {
-      const curSource = path.join(source, file);
-      if (fs.lstatSync(curSource).isDirectory()) {
-        copyFolderRecursiveSync(curSource, targetFolder, excludeFolderName);
-      } else {
-        copyFileSync(curSource, targetFolder);
-      }
-    });
+  const items = fs.readdirSync(sourceFolder);
+
+  for (const item of items) {
+    const curSource = path.join(sourceFolder, item);
+
+    if (fs.lstatSync(curSource).isDirectory()) {
+      copyFolderRecursiveSync(curSource, path.join(targetFolder, item));
+
+      continue;
+    }
+
+    copyFileSync(curSource, targetFolder);
   }
 }