@corva/create-app 0.28.0-1 → 0.28.0-5

package/common/node/gitignore

@@ -0,0 +1,130 @@
+# Logs
+logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+lerna-debug.log*
+.pnpm-debug.log*
+
+# Diagnostic reports (https://nodejs.org/api/report.html)
+report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json
+
+# Runtime data
+pids
+*.pid
+*.seed
+*.pid.lock
+
+# Directory for instrumented libs generated by jscoverage/JSCover
+lib-cov
+
+# Coverage directory used by tools like istanbul
+coverage
+*.lcov
+
+# nyc test coverage
+.nyc_output
+
+# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files)
+.grunt
+
+# Bower dependency directory (https://bower.io/)
+bower_components
+
+# node-waf configuration
+.lock-wscript
+
+# Compiled binary addons (https://nodejs.org/api/addons.html)
+build/Release
+
+# Dependency directories
+node_modules/
+jspm_packages/
+
+# Snowpack dependency directory (https://snowpack.dev/)
+web_modules/
+
+# TypeScript cache
+*.tsbuildinfo
+
+# Optional npm cache directory
+.npm
+
+# Optional eslint cache
+.eslintcache
+
+# Optional stylelint cache
+.stylelintcache
+
+# Microbundle cache
+.rpt2_cache/
+.rts2_cache_cjs/
+.rts2_cache_es/
+.rts2_cache_umd/
+
+# Optional REPL history
+.node_repl_history
+
+# Output of 'npm pack'
+*.tgz
+
+# Yarn Integrity file
+.yarn-integrity
+
+# dotenv environment variable files
+.env
+.env.development.local
+.env.test.local
+.env.production.local
+.env.local
+
+# parcel-bundler cache (https://parceljs.org/)
+.cache
+.parcel-cache
+
+# Next.js build output
+.next
+out
+
+# Nuxt.js build / generate output
+.nuxt
+dist
+
+# Gatsby files
+.cache/
+# Comment in the public line in if your project uses Gatsby and not Next.js
+# https://nextjs.org/blog/next-9-1#public-directory-support
+# public
+
+# vuepress build output
+.vuepress/dist
+
+# vuepress v2.x temp and cache directory
+.temp
+.cache
+
+# Docusaurus cache and generated files
+.docusaurus
+
+# Serverless directories
+.serverless/
+
+# FuseBox cache
+.fusebox/
+
+# DynamoDB Local files
+.dynamodb/
+
+# TernJS port file
+.tern-port
+
+# Stores VSCode versions used for testing VSCode extensions
+.vscode-test
+
+# yarn v2
+.yarn/cache
+.yarn/unplugged
+.yarn/build-state.yml
+.yarn/install-state.gz
+.pnp.*

package/{templates/scheduler → common}/python/Makefile

@@ -12,4 +12,3 @@ release:
 	@create-corva-app release . --bump-version=skip
 test: venv
 	@. venv/bin/activate && pytest
-

package/common/python/gitignore

@@ -0,0 +1,160 @@
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+wheels/
+share/python-wheels/
+*.egg-info/
+.installed.cfg
+*.egg
+MANIFEST
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.nox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*.cover
+*.py,cover
+.hypothesis/
+.pytest_cache/
+cover/
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+local_settings.py
+db.sqlite3
+db.sqlite3-journal
+
+# Flask stuff:
+instance/
+.webassets-cache
+
+# Scrapy stuff:
+.scrapy
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+.pybuilder/
+target/
+
+# Jupyter Notebook
+.ipynb_checkpoints
+
+# IPython
+profile_default/
+ipython_config.py
+
+# pyenv
+#   For a library or package, you might want to ignore these files since the code is
+#   intended to run in multiple environments; otherwise, check them in:
+# .python-version
+
+# pipenv
+#   According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
+#   However, in case of collaboration, if having platform-specific dependencies or dependencies
+#   having no cross-platform support, pipenv may install dependencies that don't work, or not
+#   install all needed dependencies.
+#Pipfile.lock
+
+# poetry
+#   Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control.
+#   This is especially recommended for binary packages to ensure reproducibility, and is more
+#   commonly ignored for libraries.
+#   https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control
+#poetry.lock
+
+# pdm
+#   Similar to Pipfile.lock, it is generally recommended to include pdm.lock in version control.
+#pdm.lock
+#   pdm stores project-wide configurations in .pdm.toml, but it is recommended to not include it
+#   in version control.
+#   https://pdm.fming.dev/#use-with-ide
+.pdm.toml
+
+# PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm
+__pypackages__/
+
+# Celery stuff
+celerybeat-schedule
+celerybeat.pid
+
+# SageMath parsed files
+*.sage.py
+
+# Environments
+.env
+.venv
+env/
+venv/
+ENV/
+env.bak/
+venv.bak/
+
+# Spyder project settings
+.spyderproject
+.spyproject
+
+# Rope project settings
+.ropeproject
+
+# mkdocs documentation
+/site
+
+# mypy
+.mypy_cache/
+.dmypy.json
+dmypy.json
+
+# Pyre type checker
+.pyre/
+
+# pytype static type analyzer
+.pytype/
+
+# Cython debug symbols
+cython_debug/
+
+# PyCharm
+#  JetBrains specific template is maintained in a separate JetBrains.gitignore that can
+#  be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
+#  and can be added to the global gitignore or merged into this file.  For a more nuclear
+#  option (not recommended) you can uncomment the following to ignore the entire idea folder.
+#.idea/

package/lib/constants/manifest.js

@@ -69,14 +69,6 @@ const defaultDataAppPythonManifest = {
   },
 };
 
-const defaultTimeSchedulerSettings = {
-  cron_string: '*/5 * * * *',
-};
-
-const defaultDepthSchedulerSettings = {
-  depth_milestone: 1,
-};
-
 const getManifestMandatoryKeys = (opts) => {
   const keys = manifestOptions(opts.projectName).reduce((acc, option) => {
     if (option.required) {
@@ -111,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' },
   {
@@ -219,8 +211,6 @@ module.exports = {
   defaultUIAppManifest,
   defaultDataAppNodeManifest,
   defaultDataAppPythonManifest,
-  defaultTimeSchedulerSettings,
-  defaultDepthSchedulerSettings,
   manifestOptions,
   getManifestMandatoryKeys,
   SCHEDULER_TYPE_NATURAL_TIME,

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/manifest.js

@@ -34,7 +34,7 @@ function fillManifest(answers) {
     settings: {
       ...defaultManifestProperties.settings,
       runtime,
-      ...defaultAppSettings({
+      app: defaultAppSettings({
         type: answers.appType,
         schedulerType: answers.schedulerType,
         cronString: answers.cronString,
@@ -63,19 +63,17 @@ function defaultAppSettings({ type, schedulerType, cronString, depthMilestone })
     return {};
   }
 
-  const schedulerAppSettings =
-    schedulerType === manifestConstants.SCHEDULER_TYPE_DEPTH.value
-      ? manifestConstants.defaultDepthSchedulerSettings
-      : manifestConstants.defaultTimeSchedulerSettings;
+  if (schedulerType === manifestConstants.SCHEDULER_TYPE_DEPTH.value) {
+    return {
+      scheduler_type: schedulerType,
+      depth_milestone: depthMilestone || 1
+    }
+  }
 
   return {
-    app: {
-      ...schedulerAppSettings,
-      scheduler_type: schedulerType,
-      cron_string: cronString,
-      depth_milestone: depthMilestone,
-    },
-  };
+    scheduler_type: schedulerType,
+    cron_string: cronString || '*/5 * * * *',
+  }
 }
 
 module.exports = {

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);
   }
 }