Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cli #771

Open
wants to merge 28 commits into
base: master
Choose a base branch
from
Open

Cli #771

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
4386972
cli initial commit
nspringman Jul 21, 2020
cc84713
load ageDistribution as JSON, add country name age distribution argument
nspringman Jul 22, 2020
b9c3e91
load severity distribution as json instead of import
nspringman Jul 22, 2020
3019627
change ownership to group
nspringman Jul 23, 2020
6f7d256
cleanup
nspringman Jul 27, 2020
e36bc5e
merger
r-s-rai Jul 27, 2020
e65311f
Merge pull request #770 from 437su20-C-R-N/cli
r-s-rai Jul 27, 2020
a36dfb4
test file
r-s-rai Jul 27, 2020
3d0bf79
fix: update package.json to current dependency versions
nspringman Jul 28, 2020
5b1dba1
fix: add neodoc to package.json
nspringman Jul 28, 2020
9792ddf
fix: resolve most linting issues
nspringman Jul 28, 2020
2c3c98f
fix: upload yarn.lock to match updated package.json
nspringman Jul 29, 2020
7a7591f
chore: add typings for neodoc
ivan-aksamentov Jul 29, 2020
3f2736a
chore: disable unused eslint ignore
ivan-aksamentov Jul 29, 2020
5870d84
chore: create additional tsconfig for cli
ivan-aksamentov Jul 29, 2020
b1c6a36
fix: resolve typescript errors
nspringman Jul 29, 2020
1c2e65d
fix: resolve lint issues
nspringman Jul 30, 2020
0ed863f
More arguments
r-s-rai Aug 3, 2020
2fccf64
feat: allow for more cli arguments
calvinm4 Aug 4, 2020
9b27ebc
feat: add remaining arguments + option descriptions
calvinm4 Aug 4, 2020
2ff6d78
feat: add multiple mitigations from prompt
nspringman Aug 4, 2020
01b2fb0
feat: add scenario and override validation
nspringman Aug 5, 2020
5c82e14
fix: add more to input validation
nspringman Aug 10, 2020
c6104ad
fix: validation
nspringman Aug 11, 2020
8c061f2
Merge remote-tracking branch 'origin/master' into cli
ivan-aksamentov Aug 12, 2020
530610a
refactor: adjust cli to schema version 2.1.0
ivan-aksamentov Aug 12, 2020
65cbbc7
fix: format, apply eslint autofixes
ivan-aksamentov Aug 12, 2020
9409558
fix: bug when changing age distribution
calvinm4 Aug 14, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
211 changes: 106 additions & 105 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "covid19_scenarios",
"version": "1.8.1",
"version": "1.7.6",
"main": "index.js",
ivan-aksamentov marked this conversation as resolved.
Show resolved Hide resolved
"module": "src/index.tsx",
"license": "MIT",
Expand Down Expand Up @@ -55,17 +55,17 @@
"codeclimate": "UID=$(id -u) DOCKER_BUILDKIT=1 COMPOSE_DOCKER_CLI_BUILD=1 docker-compose -f docker/docker-compose.codeclimate.yml --compatibility up",
"snyk-protect": "snyk protect",
"prepare": "yarn run snyk-protect",
"cli": "yarn babel-node --extensions \".ts\" src/algorithms/cli.ts"
"cli": "yarn babel-node --extensions \".ts\" src/cli/cli.ts"
},
"dependencies": {
"@babel/runtime": "7.10.5",
"@devexpress/dx-core": "2.7.0",
"@devexpress/dx-grid-core": "2.7.0",
"@devexpress/dx-react-core": "2.7.0",
"@devexpress/dx-react-grid": "2.7.0",
"@devexpress/dx-react-grid-bootstrap4": "2.7.0",
"@loadable/component": "5.13.1",
"@mdx-js/react": "1.6.14",
"@babel/runtime": "7.10.2",
"@devexpress/dx-core": "2.6.3",
"@devexpress/dx-grid-core": "2.6.3",
"@devexpress/dx-react-core": "2.6.3",
"@devexpress/dx-react-grid": "2.6.3",
"@devexpress/dx-react-grid-bootstrap4": "2.6.3",
"@loadable/component": "5.12.0",
"@mdx-js/react": "1.6.5",
"@types/mathjs": "6.0.5",
"ajv-i18n": "3.5.0",
"animate.css": "4.1.0",
Expand All @@ -82,19 +82,20 @@
"fasy": "7.0.1",
"file-saver": "2.0.2",
"flag-icon-css": "3.5.0",
"formik": "2.1.5",
"formik": "2.1.4",
"history": "4.10.1",
"i18next": "19.6.2",
"i18next-browser-languagedetector": "5.0.0",
"immer": "7.0.5",
"i18next": "19.4.5",
"i18next-browser-languagedetector": "4.2.0",
"immer": "7.0.0",
"immutable": "3.8.2",
"jsurl": "0.1.5",
"jszip": "3.5.0",
"katex": "0.12.0",
"lodash": "4.17.19",
"mathjs": "7.1.0",
"moment": "2.27.0",
"numbro": "2.3.1",
"jszip": "3.4.0",
"katex": "0.11.1",
"lodash": "4.17.15",
"mathjs": "7.0.1",
"moment": "2.26.0",
"neodoc": "^2.0.2",
"numbro": "2.3.0",
"p-min-delay": "3.1.0",
"papaparse": "5.2.0",
"prop-types": "15.7.2",
Expand All @@ -106,68 +107,68 @@
"react-awesome-popover": "6.1.1",
"react-dates": "21.8.0",
"react-dom": "16.13.1",
"react-error-boundary": "2.3.0",
"react-error-boundary": "2.2.2",
"react-file-icon": "0.2.0",
"react-google-charts": "3.0.15",
"react-grid-layout": "1.0.0",
"react-i18next": "11.7.0",
"react-grid-layout": "0.18.3",
"react-i18next": "11.5.0",
"react-icons": "3.10.0",
"react-if": "3.4.3",
"react-loader-spinner": "3.1.14",
"react-media": "1.10.0",
"react-range": "1.6.7",
"react-redux": "7.2.0",
"react-resize-detector": "5.0.6",
"react-resize-detector": "4.2.3",
"react-router": "5.2.0",
"react-router-dom": "5.2.0",
"react-select": "3.1.0",
"react-share": "4.2.1",
"reactstrap": "8.5.1",
"react-share": "4.2.0",
"reactstrap": "8.4.1",
"recharts": "2.0.0-beta.6",
"redux": "4.0.5",
"redux-persist": "6.0.0",
"redux-saga": "1.1.3",
"redux-saga-test-plan": "4.0.0-rc.3",
"regenerator-runtime": "0.13.7",
"regenerator-runtime": "0.13.5",
"reselect": "4.0.0",
"semver": "7.3.2",
"snyk": "^1.364.2",
"snyk": "^1.339.0",
"typeface-source-sans-pro": "1.1.5",
"typescript-fsa": "3.0.0",
"typescript-fsa-reducers": "1.2.2",
"typescript-fsa-reducers": "1.2.1",
"url-join": "4.0.1",
"use-debounce": "3.4.3",
"uuid": "8.2.0",
"use-debounce": "3.4.2",
"uuid": "8.1.0",
"yup": "0.29.1"
},
"devDependencies": {
"@babel/code-frame": "7.10.4",
"@babel/core": "7.10.5",
"@babel/node": "7.10.5",
"@babel/plugin-proposal-numeric-separator": "7.10.4",
"@babel/plugin-transform-flow-strip-types": "7.10.4",
"@babel/plugin-transform-modules-commonjs": "7.10.4",
"@babel/plugin-transform-react-constant-elements": "7.10.4",
"@babel/plugin-transform-react-inline-elements": "7.10.4",
"@babel/plugin-transform-runtime": "7.10.5",
"@babel/preset-env": "7.10.4",
"@babel/preset-react": "7.10.4",
"@babel/preset-typescript": "7.10.4",
"@babel/register": "7.10.5",
"@babel/runtime-corejs3": "7.10.5",
"@cypress/webpack-preprocessor": "5.4.2",
"@babel/code-frame": "7.10.1",
"@babel/core": "7.10.2",
"@babel/node": "7.10.1",
"@babel/plugin-proposal-numeric-separator": "7.10.1",
"@babel/plugin-transform-flow-strip-types": "7.10.1",
"@babel/plugin-transform-modules-commonjs": "7.10.1",
"@babel/plugin-transform-react-constant-elements": "7.10.1",
"@babel/plugin-transform-react-inline-elements": "7.10.1",
"@babel/plugin-transform-runtime": "7.10.1",
"@babel/preset-env": "7.10.2",
"@babel/preset-react": "7.10.1",
"@babel/preset-typescript": "7.10.1",
"@babel/register": "7.10.1",
"@babel/runtime-corejs3": "7.10.2",
"@cypress/webpack-preprocessor": "5.4.1",
"@eirba/jest-ieee754": "^0.1.3",
"@loadable/babel-plugin": "5.13.0",
"@mdx-js/loader": "1.6.14",
"@loadable/babel-plugin": "5.12.0",
"@mdx-js/loader": "1.6.5",
"@nuxt/friendly-errors-webpack-plugin": "2.5.0",
"@pmmmwh/react-refresh-webpack-plugin": "0.4.0-beta.8",
"@primer/css": "15.0.0",
"@schemastore/package": "0.0.6",
"@pmmmwh/react-refresh-webpack-plugin": "0.4.0-beta.2",
"@primer/css": "14.4.0",
"@schemastore/package": "0.0.5",
"@svgr/webpack": "5.4.0",
"@testing-library/cypress": "6.0.0",
"@testing-library/jest-dom": "5.11.1",
"@testing-library/react": "10.4.7",
"@testing-library/user-event": "12.0.12",
"@testing-library/jest-dom": "5.9.0",
"@testing-library/react": "10.2.1",
"@testing-library/user-event": "11.4.1",
"@types/ajv-pack": "0.3.0",
"@types/babel__code-frame": "7.0.1",
"@types/chroma-js": "2.0.0",
Expand All @@ -177,82 +178,82 @@
"@types/copy-webpack-plugin": "6.0.0",
"@types/d3": "5.7.2",
"@types/d3-format": "1.3.1",
"@types/express": "4.17.7",
"@types/express": "4.17.6",
"@types/extra-watch-webpack-plugin": "1.0.1",
"@types/file-saver": "2.0.1",
"@types/friendly-errors-webpack-plugin": "0.1.2",
"@types/fs-extra": "9.0.1",
"@types/history": "4.7.6",
"@types/html-webpack-plugin": "3.2.3",
"@types/jest": "26.0.5",
"@types/jest-axe": "3.5.0",
"@types/js-yaml": "3.12.5",
"@types/jest": "26.0.0",
"@types/jest-axe": "3.2.2",
"@types/js-yaml": "3.12.4",
"@types/jszip": "3.4.1",
"@types/loadable__component": "5.13.0",
"@types/lodash": "4.14.158",
"@types/loadable__component": "5.10.0",
"@types/lodash": "4.14.155",
"@types/lodash-webpack-plugin": "0.11.4",
"@types/mdx-js__react": "1.5.2",
"@types/mini-css-extract-plugin": "0.9.1",
"@types/node": "14.0.24",
"@types/node": "14.0.13",
"@types/numeral": "0.0.28",
"@types/optimize-css-assets-webpack-plugin": "5.0.1",
"@types/papaparse": "5.0.4",
"@types/promise-timeout": "1.3.0",
"@types/proper-url-join": "2.0.0",
"@types/raf": "3.4.0",
"@types/react": "16.9.43",
"@types/react-dates": "17.1.13",
"@types/react": "16.9.36",
"@types/react-dates": "17.1.12",
"@types/react-dom": "16.9.8",
"@types/react-flags-select": "1.1.2",
"@types/react-loader-spinner": "3.1.0",
"@types/react-redux": "7.1.9",
"@types/react-resize-detector": "4.2.0",
"@types/react-router": "5.1.8",
"@types/react-router": "5.1.7",
"@types/react-router-dom": "5.1.5",
"@types/react-select": "3.0.14",
"@types/reactstrap": "8.5.0",
"@types/recharts": "1.8.14",
"@types/react-select": "3.0.13",
"@types/reactstrap": "8.4.2",
"@types/recharts": "1.8.11",
"@types/redux-testkit": "1.0.5",
"@types/rimraf": "3.0.0",
"@types/sass": "1.16.0",
"@types/semver": "7.3.1",
"@types/semver": "7.2.0",
"@types/terser-webpack-plugin": "3.0.0",
"@types/testing-library__cypress": "5.0.6",
"@types/testing-library__cypress": "5.0.5",
"@types/url-join": "4.0.0",
"@types/uuid": "8.0.0",
"@types/webpack": "4.41.21",
"@types/webpack": "4.41.17",
"@types/webpack-bundle-analyzer": "3.8.0",
"@types/webpackbar": "4.0.0",
"@types/worker-plugin": "4.0.0",
"@types/yup": "0.29.3",
"@types/worker-plugin": "3.2.0",
"@types/yup": "0.29.2",
"@typescript-eslint/eslint-plugin": "3.2.0",
"@typescript-eslint/eslint-plugin-tslint": "3.2.0",
"@typescript-eslint/parser": "3.2.0",
"@typescript-eslint/typescript-estree": "3.2.0",
"ajv": "6.12.3",
"ajv": "6.12.2",
"ajv-pack": "0.3.1",
"all-contributors-cli": "6.16.1",
"all-contributors-cli": "6.16.0",
"allow-methods": "2.0.0",
"babel-eslint": "10.1.0",
"babel-jest": "26.1.0",
"babel-jest": "26.0.1",
"babel-loader": "8.1.0",
"babel-plugin-dynamic-import-node": "2.3.3",
"babel-plugin-lodash": "3.3.4",
"babel-plugin-redux-saga": "1.1.2",
"babel-plugin-smart-webpack-import": "1.7.0",
"babel-plugin-transform-react-remove-prop-types": "0.4.24",
"babel-plugin-typescript-to-proptypes": "1.4.0",
"babel-plugin-typescript-to-proptypes": "1.3.2",
"chalk": "4.1.0",
"codecov": "3.7.2",
"codecov": "3.7.0",
"colorguard": "1.2.1",
"compression-webpack-plugin": "4.0.0",
"connect-history-api-fallback": "1.6.0",
"copy-webpack-plugin": "6.0.3",
"copy-webpack-plugin": "6.0.2",
"cross-env": "7.0.2",
"css-hot-loader": "1.4.4",
"css-loader": "3.6.0",
"css-loader": "3.5.3",
"cssnano": "4.1.10",
"cypress": "4.11.0",
"cypress": "4.8.0",
"dotenv": "8.2.0",
"eslint": "7.2.0",
"eslint-config-airbnb": "18.1.0",
Expand Down Expand Up @@ -285,7 +286,7 @@
"eslint-plugin-sonarjs": "0.5.0",
"eslint-plugin-unicorn": "20.1.0",
"express": "4.17.1",
"express-static-gzip": "2.0.7",
"express-static-gzip": "2.0.6",
"extra-watch-webpack-plugin": "1.0.3",
"fast-sass-loader": "1.5.0",
"file-loader": "6.0.0",
Expand All @@ -295,18 +296,18 @@
"glob-all": "3.2.1",
"html-webpack-plugin": "4.3.0",
"http-server": "0.12.3",
"i18next-parser": "2.1.2",
"i18next-parser": "2.0.0",
"identity-obj-proxy": "3.0.0",
"is-interactive": "1.0.0",
"jest": "26.1.0",
"jest-axe": "3.5.0",
"jest": "26.0.1",
"jest-axe": "3.4.0",
"jest-chain": "1.1.5",
"jest-extended": "0.11.5",
"jest-runner-eslint": "0.10.0",
"jest-transformer-mdx": "2.2.0",
"jest-runner-eslint": "0.9.0",
"jest-transformer-mdx": "2.1.0",
"jest-watch-typeahead": "0.6.0",
"js-yaml": "3.14.0",
"json-schema-to-typescript": "9.1.1",
"json-schema-to-typescript": "9.1.0",
"lodash-webpack-plugin": "0.11.5",
"map.prototype.tojson": "0.1.3",
"mini-css-extract-plugin": "0.9.0",
Expand All @@ -320,9 +321,9 @@
"preload-webpack-plugin": "3.0.0-beta.4",
"prettier": "2.0.5",
"promise-timeout": "1.3.0",
"purgecss-webpack-plugin": "2.3.0",
"quicktype-core": "6.0.66",
"react-dropzone": "11.0.2",
"purgecss-webpack-plugin": "2.2.0",
"quicktype-core": "6.0.65",
"react-dropzone": "11.0.1",
"react-refresh": "0.8.3",
"redux-devtools-extension": "2.13.8",
"redux-immutable-state-invariant": "2.1.0",
Expand All @@ -331,17 +332,17 @@
"remark-images": "2.0.0",
"remark-math": "2.0.1",
"rimraf": "3.0.2",
"sass": "1.26.10",
"sass-loader": "9.0.2",
"sass": "1.26.8",
"sass-loader": "8.0.2",
"set.prototype.tojson": "0.1.1",
"size-plugin": "2.0.1",
"source-map-loader": "1.0.1",
"source-map-loader": "1.0.0",
"style-loader": "1.2.1",
"stylehacks": "4.0.3",
"stylelint": "13.6.1",
"stylelint-bare-webpack-plugin": "2.0.2",
"stylelint": "13.6.0",
"stylelint-bare-webpack-plugin": "2.0.1",
"stylelint-config-css-modules": "2.2.0",
"stylelint-config-prettier": "8.0.2",
"stylelint-config-prettier": "8.0.1",
"stylelint-config-primer": "9.0.0",
"stylelint-config-recommended-scss": "4.2.0",
"stylelint-config-standard": "20.0.0",
Expand All @@ -351,13 +352,13 @@
"stylelint-no-indistinguishable-colors": "1.3.0",
"stylelint-order": "4.1.0",
"stylelint-prettier": "1.1.2",
"stylelint-scss": "3.18.0",
"stylelint-scss": "3.17.2",
"svgo": "1.3.2",
"terser": "4.8.0",
"terser-webpack-plugin": "3.0.7",
"terser": "4.7.0",
"terser-webpack-plugin": "3.0.3",
"tree-kill": "1.2.2",
"ts-essentials": "7.0.0",
"ts-jest": "26.1.3",
"ts-essentials": "6.0.5",
"ts-jest": "26.1.0",
"ts-node": "8.10.2",
"tslint": "6.1.2",
"tslint-config-airbnb": "5.11.2",
Expand All @@ -374,22 +375,22 @@
"utility-types": "3.10.0",
"webpack": "4.43.0",
"webpack-bundle-analyzer": "3.8.0",
"webpack-cli": "3.3.12",
"webpack-cli": "3.3.11",
"webpack-dev-server": "3.11.0",
"webpack-hot-middleware": "2.25.0",
"webpackbar": "4.0.0",
"worker-plugin": "4.0.3",
"yaml-loader": "0.6.0",
"yargs": "15.4.1"
"yargs": "15.3.1"
},
"resolutions": {
"**/babel-polyfill": "link:3rdparty/__empty-module",
"**/circular-json": "link:node_modules/flatted",
"**/core-js": "3.6.4",
"**/json3": "link:3rdparty/__empty-module",
"**/left-pad": "link:3rdparty/__empty-module",
"jszip": "3.5.0",
"moment": "2.27.0",
"jszip": "3.4.0",
"moment": "2.26.0",
"node-sass": "link:node_modules/sass",
"svgo": "1.3.2"
},
Expand Down
Loading