From ce80f99487f0d3107a3fec98a730d5f923fb9ef5 Mon Sep 17 00:00:00 2001 From: Tim Alby Date: Mon, 13 Jan 2020 19:20:38 +0100 Subject: [PATCH 01/18] update build scripts to 1.3.1 This also completes the Node version update. --- .../.github/PULL_REQUEST_TEMPLATE.md | 5 +++- services/notifications/.nvmrc | 2 +- services/notifications/Dockerfile | 5 ++++ services/notifications/Jenkinsfile | 1 + services/notifications/Makefile | 6 +++-- services/notifications/buildscript.txt | 8 +++--- services/notifications/docker-compose.ci.yml | 14 +++++------ services/notifications/docker-compose.yml | 25 +++++++------------ 8 files changed, 36 insertions(+), 30 deletions(-) diff --git a/services/notifications/.github/PULL_REQUEST_TEMPLATE.md b/services/notifications/.github/PULL_REQUEST_TEMPLATE.md index ed25ee83c1..12bb2eeb3f 100644 --- a/services/notifications/.github/PULL_REQUEST_TEMPLATE.md +++ b/services/notifications/.github/PULL_REQUEST_TEMPLATE.md @@ -1,4 +1,7 @@ - + + + + ### Description diff --git a/services/notifications/.nvmrc b/services/notifications/.nvmrc index bbf0c5a541..d19159826d 100644 --- a/services/notifications/.nvmrc +++ b/services/notifications/.nvmrc @@ -1 +1 @@ -6.14.1 +10.16.3 diff --git a/services/notifications/Dockerfile b/services/notifications/Dockerfile index 7656cf4526..ef0696e5ca 100644 --- a/services/notifications/Dockerfile +++ b/services/notifications/Dockerfile @@ -1,3 +1,8 @@ +# This file was auto-generated, do not edit it directly. +# Instead run bin/update_build_scripts from +# https://github.com/sharelatex/sharelatex-dev-environment +# Version: 1.3.1 + FROM node:10.16.3 as app WORKDIR /app diff --git a/services/notifications/Jenkinsfile b/services/notifications/Jenkinsfile index 43f6dc55b8..98a6156b2f 100644 --- a/services/notifications/Jenkinsfile +++ b/services/notifications/Jenkinsfile @@ -16,6 +16,7 @@ pipeline { } stages { + stage('Install') { steps { withCredentials([usernamePassword(credentialsId: 'GITHUB_INTEGRATION', usernameVariable: 'GH_AUTH_USERNAME', passwordVariable: 'GH_AUTH_PASSWORD')]) { diff --git a/services/notifications/Makefile b/services/notifications/Makefile index 1d611df09d..4201ed9d78 100644 --- a/services/notifications/Makefile +++ b/services/notifications/Makefile @@ -1,7 +1,7 @@ # This file was auto-generated, do not edit it directly. # Instead run bin/update_build_scripts from # https://github.com/sharelatex/sharelatex-dev-environment -# Version: 1.1.21 +# Version: 1.3.1 BUILD_NUMBER ?= local BRANCH_NAME ?= $(shell git rev-parse --abbrev-ref HEAD) @@ -35,7 +35,8 @@ test_clean: $(DOCKER_COMPOSE) down -v -t 0 test_acceptance_pre_run: - @[ ! -f test/acceptance/scripts/pre-run ] && echo "notifications has no pre acceptance tests task" || $(DOCKER_COMPOSE) run --rm test_acceptance test/acceptance/scripts/pre-run + @[ ! -f test/acceptance/js/scripts/pre-run ] && echo "notifications has no pre acceptance tests task" || $(DOCKER_COMPOSE) run --rm test_acceptance test/acceptance/js/scripts/pre-run + build: docker build --pull --tag ci/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) \ --tag gcr.io/overleaf-ops/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) \ @@ -48,4 +49,5 @@ publish: docker push $(DOCKER_REPO)/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) + .PHONY: clean test test_unit test_acceptance test_clean build publish diff --git a/services/notifications/buildscript.txt b/services/notifications/buildscript.txt index ed8d78caa4..41bcde56a7 100644 --- a/services/notifications/buildscript.txt +++ b/services/notifications/buildscript.txt @@ -1,8 +1,10 @@ notifications +--public-repo=True --language=coffeescript ---node-version=6.14.1 +--env-add= +--node-version=10.16.3 --acceptance-creds=None --dependencies=mongo,redis --docker-repos=gcr.io/overleaf-ops ---build-target=docker ---script-version=1.1.21 +--env-pass-through= +--script-version=1.3.1 diff --git a/services/notifications/docker-compose.ci.yml b/services/notifications/docker-compose.ci.yml index d2bcca9ec6..66470736dc 100644 --- a/services/notifications/docker-compose.ci.yml +++ b/services/notifications/docker-compose.ci.yml @@ -1,9 +1,9 @@ # This file was auto-generated, do not edit it directly. # Instead run bin/update_build_scripts from # https://github.com/sharelatex/sharelatex-dev-environment -# Version: 1.1.21 +# Version: 1.3.1 -version: "2" +version: "2.1" services: test_unit: @@ -25,13 +25,14 @@ services: MOCHA_GREP: ${MOCHA_GREP} NODE_ENV: test depends_on: - - mongo - - redis + mongo: + condition: service_healthy + redis: + condition: service_healthy user: node command: npm run test:acceptance:_run - tar: build: . image: ci/$PROJECT_NAME:$BRANCH_NAME-$BUILD_NUMBER @@ -39,9 +40,8 @@ services: - ./:/tmp/build/ command: tar -czf /tmp/build/build.tar.gz --exclude=build.tar.gz --exclude-vcs . user: root - redis: image: redis mongo: - image: mongo:3.4 + image: mongo:3.6 diff --git a/services/notifications/docker-compose.yml b/services/notifications/docker-compose.yml index 960e25433f..eb243ecc43 100644 --- a/services/notifications/docker-compose.yml +++ b/services/notifications/docker-compose.yml @@ -1,9 +1,9 @@ # This file was auto-generated, do not edit it directly. # Instead run bin/update_build_scripts from # https://github.com/sharelatex/sharelatex-dev-environment -# Version: 1.1.21 +# Version: 1.3.1 -version: "2" +version: "2.1" services: test_unit: @@ -18,7 +18,7 @@ services: user: node test_acceptance: - build: . + image: node:10.16.3 volumes: - .:/app working_dir: /app @@ -32,22 +32,15 @@ services: NODE_ENV: test user: node depends_on: - - mongo - - redis + mongo: + condition: service_healthy + redis: + condition: service_healthy command: npm run test:acceptance - - - tar: - build: . - image: ci/$PROJECT_NAME:$BRANCH_NAME-$BUILD_NUMBER - volumes: - - ./:/tmp/build/ - command: tar -czf /tmp/build/build.tar.gz --exclude=build.tar.gz --exclude-vcs . - user: root - redis: image: redis mongo: - image: mongo:3.4 + image: mongo:3.6 + From d2ed80a1fbf81f256c12da8fdec425613e686962 Mon Sep 17 00:00:00 2001 From: Tim Alby Date: Mon, 13 Jan 2020 19:35:22 +0100 Subject: [PATCH 02/18] decaffeinate: update build scripts to es --- services/notifications/.dockerignore | 2 - services/notifications/.eslintrc | 74 ++++++++++++++++++++++++++ services/notifications/.prettierrc | 8 +++ services/notifications/Dockerfile | 1 - services/notifications/Jenkinsfile | 7 +++ services/notifications/Makefile | 15 ++++-- services/notifications/buildscript.txt | 2 +- services/notifications/nodemon.json | 7 ++- services/notifications/package.json | 15 +++--- 9 files changed, 112 insertions(+), 19 deletions(-) create mode 100644 services/notifications/.eslintrc create mode 100644 services/notifications/.prettierrc diff --git a/services/notifications/.dockerignore b/services/notifications/.dockerignore index 386f26df30..ba1c3442de 100644 --- a/services/notifications/.dockerignore +++ b/services/notifications/.dockerignore @@ -5,5 +5,3 @@ gitrev .npm .nvmrc nodemon.json -app.js -**/js/* diff --git a/services/notifications/.eslintrc b/services/notifications/.eslintrc new file mode 100644 index 0000000000..0e4b23dc44 --- /dev/null +++ b/services/notifications/.eslintrc @@ -0,0 +1,74 @@ +// this file was auto-generated, do not edit it directly. +// instead run bin/update_build_scripts from +// https://github.com/sharelatex/sharelatex-dev-environment +// Version: 1.3.1 +{ + "extends": [ + "standard", + "prettier", + "prettier/standard" + ], + "parserOptions": { + "ecmaVersion": 2017 + }, + "plugins": [ + "mocha", + "chai-expect", + "chai-friendly" + ], + "env": { + "node": true, + "mocha": true + }, + "rules": { + // Swap the no-unused-expressions rule with a more chai-friendly one + "no-unused-expressions": 0, + "chai-friendly/no-unused-expressions": "error" + }, + "overrides": [ + { + // Test specific rules + "files": ["**/test/*/src/**/*.js"], + "globals": { + "expect": true + }, + "rules": { + // mocha-specific rules + "mocha/handle-done-callback": "error", + "mocha/no-exclusive-tests": "error", + "mocha/no-global-tests": "error", + "mocha/no-identical-title": "error", + "mocha/no-nested-tests": "error", + "mocha/no-pending-tests": "error", + "mocha/no-skipped-tests": "error", + "mocha/no-mocha-arrows": "error", + + // chai-specific rules + "chai-expect/missing-assertion": "error", + "chai-expect/terminating-properties": "error", + + // prefer-arrow-callback applies to all callbacks, not just ones in mocha tests. + // we don't enforce this at the top-level - just in tests to manage `this` scope + // based on mocha's context mechanism + "mocha/prefer-arrow-callback": "error" + } + }, + { + // Frontend test specific rules + "files": ["**/test/frontend/**/*.js"], + "globals": { + "expect": true, + "define": true, + "$": true + } + }, + { + // Backend specific rules + "files": ["**/app/src/**/*.js"], + "rules": { + // don't allow console.log in backend code + "no-console": "error" + } + } + ] +} diff --git a/services/notifications/.prettierrc b/services/notifications/.prettierrc new file mode 100644 index 0000000000..159e073fd4 --- /dev/null +++ b/services/notifications/.prettierrc @@ -0,0 +1,8 @@ +# This file was auto-generated, do not edit it directly. +# Instead run bin/update_build_scripts from +# https://github.com/sharelatex/sharelatex-dev-environment +# Version: 1.3.1 +{ + "semi": false, + "singleQuote": true +} diff --git a/services/notifications/Dockerfile b/services/notifications/Dockerfile index ef0696e5ca..c3a42c6b72 100644 --- a/services/notifications/Dockerfile +++ b/services/notifications/Dockerfile @@ -15,7 +15,6 @@ RUN npm install --quiet COPY . /app -RUN npm run compile:all FROM node:10.16.3 diff --git a/services/notifications/Jenkinsfile b/services/notifications/Jenkinsfile index 98a6156b2f..b4e187b826 100644 --- a/services/notifications/Jenkinsfile +++ b/services/notifications/Jenkinsfile @@ -37,6 +37,13 @@ pipeline { } } + stage('Linting') { + steps { + sh 'DOCKER_COMPOSE_FLAGS="-f docker-compose.ci.yml" make format' + sh 'DOCKER_COMPOSE_FLAGS="-f docker-compose.ci.yml" make lint' + } + } + stage('Unit Tests') { steps { sh 'DOCKER_COMPOSE_FLAGS="-f docker-compose.ci.yml" make test_unit' diff --git a/services/notifications/Makefile b/services/notifications/Makefile index 4201ed9d78..7655f8a79f 100644 --- a/services/notifications/Makefile +++ b/services/notifications/Makefile @@ -16,12 +16,17 @@ DOCKER_COMPOSE := BUILD_NUMBER=$(BUILD_NUMBER) \ clean: docker rmi ci/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) docker rmi gcr.io/overleaf-ops/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) - rm -f app.js - rm -rf app/js - rm -rf test/unit/js - rm -rf test/acceptance/js -test: test_unit test_acceptance +format: + $(DOCKER_COMPOSE) run --rm test_unit npm run format + +format_fix: + $(DOCKER_COMPOSE) run --rm test_unit npm run format:fix + +lint: + $(DOCKER_COMPOSE) run --rm test_unit npm run lint + +test: format lint test_unit test_acceptance test_unit: @[ ! -d test/unit ] && echo "notifications has no unit tests" || $(DOCKER_COMPOSE) run --rm test_unit diff --git a/services/notifications/buildscript.txt b/services/notifications/buildscript.txt index 41bcde56a7..94bb7e6eff 100644 --- a/services/notifications/buildscript.txt +++ b/services/notifications/buildscript.txt @@ -1,6 +1,6 @@ notifications --public-repo=True ---language=coffeescript +--language=es --env-add= --node-version=10.16.3 --acceptance-creds=None diff --git a/services/notifications/nodemon.json b/services/notifications/nodemon.json index 98db38d71b..5826281b84 100644 --- a/services/notifications/nodemon.json +++ b/services/notifications/nodemon.json @@ -10,10 +10,9 @@ }, "watch": [ - "app/coffee/", - "app.coffee", + "app/js/", + "app.js", "config/" ], - "ext": "coffee" - + "ext": "js" } diff --git a/services/notifications/package.json b/services/notifications/package.json index 44f28ff6f3..e8b9f38e61 100644 --- a/services/notifications/package.json +++ b/services/notifications/package.json @@ -5,16 +5,19 @@ "main": "app.js", "scripts": { "compile:app": "([ -e app/coffee ] && coffee -m $COFFEE_OPTIONS -o app/js -c app/coffee || echo 'No CoffeeScript folder to compile') && ( [ -e app.coffee ] && coffee -m $COFFEE_OPTIONS -c app.coffee || echo 'No CoffeeScript app to compile')", - "start": "npm run compile:app && node $NODE_APP_OPTIONS app.js", - "test:acceptance:_run": "mocha --recursive --reporter spec --timeout 30000 --exit $@ test/acceptance/js", - "test:acceptance": "npm run compile:app && npm run compile:acceptance_tests && npm run test:acceptance:_run -- --grep=$MOCHA_GREP", - "test:unit:_run": "mocha --recursive --reporter spec --exit $@ test/unit/js", - "test:unit": "npm run compile:app && npm run compile:unit_tests && npm run test:unit:_run -- --grep=$MOCHA_GREP", + "start": "node $NODE_APP_OPTIONS app.js", + "test:acceptance:_run": "mocha --recursive --reporter spec --timeout 15000 --exit $@ test/acceptance/js", + "test:acceptance": "npm run test:acceptance:_run -- --grep=$MOCHA_GREP", + "test:unit:_run": "mocha --recursive --reporter spec $@ test/unit/js", + "test:unit": "npm run test:unit:_run -- --grep=$MOCHA_GREP", "compile:unit_tests": "[ ! -e test/unit/coffee ] && echo 'No unit tests to compile' || coffee -o test/unit/js -c test/unit/coffee", "compile:acceptance_tests": "[ ! -e test/acceptance/coffee ] && echo 'No acceptance tests to compile' || coffee -o test/acceptance/js -c test/acceptance/coffee", "compile:all": "npm run compile:app && npm run compile:unit_tests && npm run compile:acceptance_tests && npm run compile:smoke_tests", "nodemon": "nodemon --config nodemon.json", - "compile:smoke_tests": "[ ! -e test/smoke/coffee ] && echo 'No smoke tests to compile' || coffee -o test/smoke/js -c test/smoke/coffee" + "compile:smoke_tests": "[ ! -e test/smoke/coffee ] && echo 'No smoke tests to compile' || coffee -o test/smoke/js -c test/smoke/coffee", + "lint": "node_modules/.bin/eslint .", + "format": "node_modules/.bin/prettier-eslint '**/*.js' --list-different", + "format:fix": "node_modules/.bin/prettier-eslint '**/*.js' --write" }, "author": "", "license": "ISC", From f82f4cac46ab6d8ec113d8925b55738e017d3939 Mon Sep 17 00:00:00 2001 From: Tim Alby Date: Mon, 13 Jan 2020 19:59:47 +0100 Subject: [PATCH 03/18] decaffeinate: update .gitignore --- services/notifications/.gitignore | 23 ----------------------- 1 file changed, 23 deletions(-) diff --git a/services/notifications/.gitignore b/services/notifications/.gitignore index c85910b85f..ba34389067 100644 --- a/services/notifications/.gitignore +++ b/services/notifications/.gitignore @@ -36,35 +36,12 @@ Thumbs.db node_modules/* data/* -app.js -example.js -app/js/* -**/*.map -test/unit/js/* -test/smoke/js/* cookies.txt -requestQueueWorker.js -TpdsWorker.js -BackgroundJobsWorker.js UserAndProjectPopulator.coffee -public/js/history/versiondetail.js -!public/js/libs/ -public/js/* -!public/js/ace/* -!public/js/libs/ -public/js/libs/sharejs.js -public/js/editor.js -public/js/home.js -public/js/forms.js -public/js/gui.js -public/js/admin.js -public/js/history/* public/stylesheets/style.css public/brand/plans.css -public/minjs/ -public/js/main.js Gemfile.lock *.swp From 8ba667fd20816f33e4cc14811658436e49f32555 Mon Sep 17 00:00:00 2001 From: Tim Alby Date: Mon, 13 Jan 2020 20:00:08 +0100 Subject: [PATCH 04/18] decaffeinate: add eslint and prettier packages --- services/notifications/package-lock.json | 3001 ++++++++++++++++++++++ services/notifications/package.json | 18 + 2 files changed, 3019 insertions(+) diff --git a/services/notifications/package-lock.json b/services/notifications/package-lock.json index ceb3c32bde..6a72ef732f 100644 --- a/services/notifications/package-lock.json +++ b/services/notifications/package-lock.json @@ -4,6 +4,156 @@ "lockfileVersion": 1, "requires": true, "dependencies": { + "@babel/code-frame": { + "version": "7.8.0", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.8.0.tgz", + "integrity": "sha512-AN2IR/wCUYsM+PdErq6Bp3RFTXl8W0p9Nmymm7zkpsCmh+r/YYcckaCGpU8Q/mEKmST19kkGRaG42A/jxOWwBA==", + "dev": true, + "requires": { + "@babel/highlight": "^7.8.0" + } + }, + "@babel/generator": { + "version": "7.8.0", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.8.0.tgz", + "integrity": "sha512-2Lp2e02CV2C7j/H4n4D9YvsvdhPVVg9GDIamr6Tu4tU35mL3mzOrzl1lZ8ZJtysfZXh+y+AGORc2rPS7yHxBUg==", + "dev": true, + "requires": { + "@babel/types": "^7.8.0", + "jsesc": "^2.5.1", + "lodash": "^4.17.13", + "source-map": "^0.5.0" + }, + "dependencies": { + "source-map": { + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", + "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", + "dev": true + } + } + }, + "@babel/helper-function-name": { + "version": "7.8.0", + "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.8.0.tgz", + "integrity": "sha512-x9psucuU0Xalw+0Vpr2FYJMLB7/KnPSLZhlkUyOGbYAWRDfmtZBrguYpJYiaNCRV7vGkYjO/gF6/J6yMvdWTDw==", + "dev": true, + "requires": { + "@babel/helper-get-function-arity": "^7.8.0", + "@babel/template": "^7.8.0", + "@babel/types": "^7.8.0" + } + }, + "@babel/helper-get-function-arity": { + "version": "7.8.0", + "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.8.0.tgz", + "integrity": "sha512-eUP5grliToMapQiTaYS2AAO/WwaCG7cuJztR1v/a1aPzUzUeGt+AaI9OvLATc/AfFkF8SLJ10d5ugGt/AQ9d6w==", + "dev": true, + "requires": { + "@babel/types": "^7.8.0" + } + }, + "@babel/helper-split-export-declaration": { + "version": "7.8.0", + "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.8.0.tgz", + "integrity": "sha512-YhYFhH4T6DlbT6CPtVgLfC1Jp2gbCawU/ml7WJvUpBg01bCrXSzTYMZZXbbIGjq/kHmK8YUATxTppcRGzj31pA==", + "dev": true, + "requires": { + "@babel/types": "^7.8.0" + } + }, + "@babel/highlight": { + "version": "7.8.0", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.8.0.tgz", + "integrity": "sha512-OsdTJbHlPtIk2mmtwXItYrdmalJ8T0zpVzNAbKSkHshuywj7zb29Y09McV/jQsQunc/nEyHiPV2oy9llYMLqxw==", + "dev": true, + "requires": { + "chalk": "^2.0.0", + "esutils": "^2.0.2", + "js-tokens": "^4.0.0" + } + }, + "@babel/parser": { + "version": "7.8.0", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.8.0.tgz", + "integrity": "sha512-VVtsnUYbd1+2A2vOVhm4P2qNXQE8L/W859GpUHfUcdhX8d3pEKThZuIr6fztocWx9HbK+00/CR0tXnhAggJ4CA==", + "dev": true + }, + "@babel/runtime": { + "version": "7.8.0", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.8.0.tgz", + "integrity": "sha512-Z7ti+HB0puCcLmFE3x90kzaVgbx6TRrYIReaygW6EkBEnJh1ajS4/inhF7CypzWeDV3NFl1AfWj0eMtdihojxw==", + "dev": true, + "requires": { + "regenerator-runtime": "^0.13.2" + } + }, + "@babel/runtime-corejs3": { + "version": "7.8.0", + "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.8.0.tgz", + "integrity": "sha512-5XaME/D4hTkUclw4BW+FeDyfUcxN5/Fox/+9UiWUqdyU33zsLxDAE74IexAmLccuHSQyFbIzF5+Yb4E6obVOSg==", + "dev": true, + "requires": { + "core-js-pure": "^3.0.0", + "regenerator-runtime": "^0.13.2" + } + }, + "@babel/template": { + "version": "7.8.0", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.8.0.tgz", + "integrity": "sha512-0NNMDsY2t3ltAVVK1WHNiaePo3tXPUeJpCX4I3xSKFoEl852wJHG8mrgHVADf8Lz1y+8al9cF7cSSfzSnFSYiw==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.8.0", + "@babel/parser": "^7.8.0", + "@babel/types": "^7.8.0" + } + }, + "@babel/traverse": { + "version": "7.8.0", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.8.0.tgz", + "integrity": "sha512-d/6sPXFLGlJHZO/zWDtgFaKyalCOHLedzxpVJn6el1cw+f2TZa7xZEszeXdOw6EUemqRFBAn106BWBvtSck9Qw==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.8.0", + "@babel/generator": "^7.8.0", + "@babel/helper-function-name": "^7.8.0", + "@babel/helper-split-export-declaration": "^7.8.0", + "@babel/parser": "^7.8.0", + "@babel/types": "^7.8.0", + "debug": "^4.1.0", + "globals": "^11.1.0", + "lodash": "^4.17.13" + }, + "dependencies": { + "debug": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", + "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "dev": true, + "requires": { + "ms": "^2.1.1" + } + }, + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true + } + } + }, + "@babel/types": { + "version": "7.8.0", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.8.0.tgz", + "integrity": "sha512-1RF84ehyx9HH09dMMwGWl3UTWlVoCPtqqJPjGuC4JzMe1ZIVDJ2DT8mv3cPv/A7veLD6sgR7vi95lJqm+ZayIg==", + "dev": true, + "requires": { + "esutils": "^2.0.2", + "lodash": "^4.17.13", + "to-fast-properties": "^2.0.0" + } + }, "@google-cloud/common": { "version": "0.32.1", "resolved": "https://registry.npmjs.org/@google-cloud/common/-/common-0.32.1.tgz", @@ -282,6 +432,12 @@ "@types/node": "*" } }, + "@types/eslint-visitor-keys": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@types/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz", + "integrity": "sha512-OCutwjDZ4aFS6PB1UZ988C4YgwlBHJd6wCeQqaLdmadZ/7e+w79+hbMUFC1QXDNCmdyoRfAFdm0RypzwR+Qpag==", + "dev": true + }, "@types/form-data": { "version": "2.2.1", "resolved": "https://registry.npmjs.org/@types/form-data/-/form-data-2.2.1.tgz", @@ -290,6 +446,12 @@ "@types/node": "*" } }, + "@types/json-schema": { + "version": "7.0.4", + "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.4.tgz", + "integrity": "sha512-8+KAKzEvSUdeo+kmqnKrqgeE+LcA0tjYWFY7RPProVYwnqDjukzO+3b6dLD56rYX5TdWejnEOLJYOIeh4CXKuA==", + "dev": true + }, "@types/long": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/@types/long/-/long-4.0.0.tgz", @@ -321,6 +483,59 @@ "resolved": "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-2.3.5.tgz", "integrity": "sha1-naRO11VxmZtlw3tgybK4jbVMWF0=" }, + "@typescript-eslint/experimental-utils": { + "version": "1.13.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-1.13.0.tgz", + "integrity": "sha512-zmpS6SyqG4ZF64ffaJ6uah6tWWWgZ8m+c54XXgwFtUv0jNz8aJAVx8chMCvnk7yl6xwn8d+d96+tWp7fXzTuDg==", + "dev": true, + "requires": { + "@types/json-schema": "^7.0.3", + "@typescript-eslint/typescript-estree": "1.13.0", + "eslint-scope": "^4.0.0" + }, + "dependencies": { + "eslint-scope": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.3.tgz", + "integrity": "sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==", + "dev": true, + "requires": { + "esrecurse": "^4.1.0", + "estraverse": "^4.1.1" + } + } + } + }, + "@typescript-eslint/parser": { + "version": "1.13.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-1.13.0.tgz", + "integrity": "sha512-ITMBs52PCPgLb2nGPoeT4iU3HdQZHcPaZVw+7CsFagRJHUhyeTgorEwHXhFf3e7Evzi8oujKNpHc8TONth8AdQ==", + "dev": true, + "requires": { + "@types/eslint-visitor-keys": "^1.0.0", + "@typescript-eslint/experimental-utils": "1.13.0", + "@typescript-eslint/typescript-estree": "1.13.0", + "eslint-visitor-keys": "^1.0.0" + } + }, + "@typescript-eslint/typescript-estree": { + "version": "1.13.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-1.13.0.tgz", + "integrity": "sha512-b5rCmd2e6DCC6tCTN9GSUAuxdYwCM/k/2wdjHGrIRGPSJotWMCe/dGpi66u42bhuh8q3QBzqM4TMA1GUUCJvdw==", + "dev": true, + "requires": { + "lodash.unescape": "4.0.1", + "semver": "5.5.0" + }, + "dependencies": { + "semver": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz", + "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==", + "dev": true + } + } + }, "abort-controller": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz", @@ -334,6 +549,12 @@ "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.1.1.tgz", "integrity": "sha1-fSWuBbuK0fm2mRCOEJTs14hK3B8=" }, + "acorn-jsx": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.1.0.tgz", + "integrity": "sha512-tMUqwBWfLFbJbizRmEcWSLw6HnFzfdJs2sOJEOwwtVPMoH/0Ay+E703oZz78VSXZiiDcZrQ5XKjPIUQixhmgVw==", + "dev": true + }, "agent-base": { "version": "4.3.0", "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-4.3.0.tgz", @@ -353,6 +574,70 @@ "uri-js": "^4.2.2" } }, + "ansi-escapes": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.0.tgz", + "integrity": "sha512-EiYhwo0v255HUL6eDyuLrXEkTi7WwVCLAw+SeOQ7M7qdun1z1pum4DEm/nuqIVbPvi9RPPc9k9LbyBv6H0DwVg==", + "dev": true, + "requires": { + "type-fest": "^0.8.1" + } + }, + "ansi-regex": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", + "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==", + "dev": true + }, + "ansi-styles": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", + "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", + "dev": true, + "requires": { + "color-convert": "^1.9.0" + } + }, + "argparse": { + "version": "1.0.10", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", + "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", + "dev": true, + "requires": { + "sprintf-js": "~1.0.2" + } + }, + "aria-query": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-3.0.0.tgz", + "integrity": "sha1-ZbP8wcoRVajJrmTW7uKX8V1RM8w=", + "dev": true, + "requires": { + "ast-types-flow": "0.0.7", + "commander": "^2.11.0" + } + }, + "array-includes": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.1.tgz", + "integrity": "sha512-c2VXaCHl7zPsvpkFsw4nxvFie4fh1ur9bpcgsVkIjqn0H/Xwdg+7fv3n2r/isyS8EBj5b06M9kHyZuIr4El6WQ==", + "dev": true, + "requires": { + "define-properties": "^1.1.3", + "es-abstract": "^1.17.0", + "is-string": "^1.0.5" + } + }, + "array.prototype.flat": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.2.3.tgz", + "integrity": "sha512-gBlRZV0VSmfPIeWfuuy56XZMvbVfbEUnOXUvt3F/eUUUSyzlgLxhEX4YAEpxNAogRGehPSnfXyPtYyKAhkzQhQ==", + "dev": true, + "requires": { + "define-properties": "^1.1.3", + "es-abstract": "^1.17.0-next.1" + } + }, "arrify": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/arrify/-/arrify-2.0.1.tgz", @@ -377,6 +662,18 @@ "integrity": "sha1-5gtrDo8wG9l+U3UhW9pAbIURjAs=", "dev": true }, + "ast-types-flow": { + "version": "0.0.7", + "resolved": "https://registry.npmjs.org/ast-types-flow/-/ast-types-flow-0.0.7.tgz", + "integrity": "sha1-9wtzXGvKGlycItmCw+Oef+ujva0=", + "dev": true + }, + "astral-regex": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-1.0.0.tgz", + "integrity": "sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==", + "dev": true + }, "async": { "version": "0.1.22", "resolved": "https://registry.npmjs.org/async/-/async-0.1.22.tgz", @@ -422,6 +719,41 @@ "is-buffer": "^2.0.2" } }, + "axobject-query": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-2.1.1.tgz", + "integrity": "sha512-lF98xa/yvy6j3fBHAgQXIYl+J4eZadOSqsPojemUqClzNbBV38wWGpUbQbVEyf4eUF5yF7eHmGgGA2JiHyjeqw==", + "dev": true, + "requires": { + "@babel/runtime": "^7.7.4", + "@babel/runtime-corejs3": "^7.7.4" + } + }, + "babel-eslint": { + "version": "10.0.3", + "resolved": "https://registry.npmjs.org/babel-eslint/-/babel-eslint-10.0.3.tgz", + "integrity": "sha512-z3U7eMY6r/3f3/JB9mTsLjyxrv0Yb1zb8PCWCLpguxfCzBIZUwy23R1t/XKewP+8mEN2Ck8Dtr4q20z6ce6SoA==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.0.0", + "@babel/parser": "^7.0.0", + "@babel/traverse": "^7.0.0", + "@babel/types": "^7.0.0", + "eslint-visitor-keys": "^1.0.0", + "resolve": "^1.12.0" + }, + "dependencies": { + "resolve": { + "version": "1.14.2", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.14.2.tgz", + "integrity": "sha512-EjlOBLBO1kxsUxsKjLt7TAECyKW6fOh1VRkykQkKGzcBbjjPIxBqGh0jf7GJ3k/f5mxMqW3htMD3WdTUVtW8HQ==", + "dev": true, + "requires": { + "path-parse": "^1.0.6" + } + } + } + }, "balanced-match": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", @@ -458,6 +790,12 @@ "resolved": "https://registry.npmjs.org/bintrees/-/bintrees-1.0.1.tgz", "integrity": "sha1-DmVcm5wkNeqraL9AJyJtK1WjRSQ=" }, + "boolify": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/boolify/-/boolify-1.0.1.tgz", + "integrity": "sha1-tcCeF8rNET0Rt7s+04TMASmU2Gs=", + "dev": true + }, "brace-expansion": { "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", @@ -494,6 +832,29 @@ "safe-json-stringify": "~1" } }, + "callsites": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", + "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", + "dev": true + }, + "camelcase": { + "version": "5.3.1", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", + "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==", + "dev": true + }, + "camelcase-keys": { + "version": "6.1.1", + "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-6.1.1.tgz", + "integrity": "sha512-kEPCddRFChEzO0d6w61yh0WbBiSv9gBnfZWGfXRYPlGqIdIGef6HMR6pgqVSEWCYkrp8B0AtEpEXNY+Jx0xk1A==", + "dev": true, + "requires": { + "camelcase": "^5.3.1", + "map-obj": "^4.0.0", + "quick-lru": "^4.0.1" + } + }, "caseless": { "version": "0.12.0", "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz", @@ -513,12 +874,97 @@ "type-detect": "^4.0.5" } }, + "chalk": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", + "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", + "dev": true, + "requires": { + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" + }, + "dependencies": { + "has-flag": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", + "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", + "dev": true + }, + "supports-color": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", + "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", + "dev": true, + "requires": { + "has-flag": "^3.0.0" + } + } + } + }, + "chardet": { + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz", + "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==", + "dev": true + }, "check-error": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.2.tgz", "integrity": "sha1-V00xLt2Iu13YkS6Sht1sCu1KrII=", "dev": true }, + "cli-cursor": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz", + "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==", + "dev": true, + "requires": { + "restore-cursor": "^3.1.0" + } + }, + "cli-width": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.0.tgz", + "integrity": "sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=", + "dev": true + }, + "cliui": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz", + "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==", + "dev": true, + "requires": { + "string-width": "^3.1.0", + "strip-ansi": "^5.2.0", + "wrap-ansi": "^5.1.0" + }, + "dependencies": { + "emoji-regex": { + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz", + "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==", + "dev": true + }, + "is-fullwidth-code-point": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", + "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", + "dev": true + }, + "string-width": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", + "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", + "dev": true, + "requires": { + "emoji-regex": "^7.0.1", + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^5.1.0" + } + } + } + }, "coffee-script": { "version": "1.7.1", "resolved": "https://registry.npmjs.org/coffee-script/-/coffee-script-1.7.1.tgz", @@ -534,6 +980,21 @@ } } }, + "color-convert": { + "version": "1.9.3", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", + "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", + "dev": true, + "requires": { + "color-name": "1.1.3" + } + }, + "color-name": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", + "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=", + "dev": true + }, "combined-stream": { "version": "1.0.8", "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", @@ -548,6 +1009,12 @@ "integrity": "sha1-FXFS/R56bI2YpbcVzzdt+SgARWM=", "dev": true }, + "common-tags": { + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/common-tags/-/common-tags-1.8.0.tgz", + "integrity": "sha512-6P6g0uetGpW/sdyUy/iQQCbFF0kWVMSIVSyYz7Zgjcgh8mgw8PQzDNZeyZ5DQ2gM7LBoZPHmnjz8rUthkBG5tw==", + "dev": true + }, "concat-map": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", @@ -558,6 +1025,12 @@ "resolved": "https://registry.npmjs.org/console-log-level/-/console-log-level-1.4.1.tgz", "integrity": "sha1-nFprue8e9lsFq6gwKLD/iUzfYwo=" }, + "contains-path": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/contains-path/-/contains-path-0.1.0.tgz", + "integrity": "sha1-/ozxhP9mcLa67wGp1IYaXL7EEgo=", + "dev": true + }, "continuation-local-storage": { "version": "3.2.1", "resolved": "https://registry.npmjs.org/continuation-local-storage/-/continuation-local-storage-3.2.1.tgz", @@ -572,11 +1045,50 @@ "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.3.1.tgz", "integrity": "sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s=" }, + "core-js": { + "version": "3.6.3", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.6.3.tgz", + "integrity": "sha512-DOO9b18YHR+Wk5kJ/c5YFbXuUETreD4TrvXb6edzqZE3aAEd0eJIAWghZ9HttMuiON8SVCnU3fqA4rPxRDD1HQ==", + "dev": true + }, + "core-js-pure": { + "version": "3.6.3", + "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.6.3.tgz", + "integrity": "sha512-4LhJ4fw0sC4/8X5krM9hI5oQ3cgYHYojWwwWnQKjC6k6vf/qIVS9d0r3+Bdn+FUADgRpD0xzPFQ9P7cOeuIwlA==", + "dev": true + }, "core-util-is": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=" }, + "cross-spawn": { + "version": "6.0.5", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", + "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", + "dev": true, + "requires": { + "nice-try": "^1.0.4", + "path-key": "^2.0.1", + "semver": "^5.5.0", + "shebang-command": "^1.2.0", + "which": "^1.2.9" + }, + "dependencies": { + "semver": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", + "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", + "dev": true + } + } + }, + "damerau-levenshtein": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/damerau-levenshtein/-/damerau-levenshtein-1.0.5.tgz", + "integrity": "sha512-CBCRqFnpu715iPmw1KrdOrzRqbdFwQTwAWyyyYS42+iAgHCuXZ+/TdMgQkUENPomxEz9z1BEzuQU2Xw0kUuAgA==", + "dev": true + }, "dashdash": { "version": "1.14.1", "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz", @@ -593,6 +1105,12 @@ "ms": "2.0.0" } }, + "decamelize": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", + "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=", + "dev": true + }, "deep-eql": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-3.0.1.tgz", @@ -602,6 +1120,21 @@ "type-detect": "^4.0.0" } }, + "deep-is": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz", + "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=", + "dev": true + }, + "define-properties": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz", + "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==", + "dev": true, + "requires": { + "object-keys": "^1.0.12" + } + }, "delay": { "version": "4.3.0", "resolved": "https://registry.npmjs.org/delay/-/delay-4.3.0.tgz", @@ -618,6 +1151,21 @@ "integrity": "sha1-qoVnpu7QPFMfyJ0/cRzQ5SWd7HU=", "dev": true }, + "dlv": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/dlv/-/dlv-1.1.3.tgz", + "integrity": "sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA==", + "dev": true + }, + "doctrine": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz", + "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==", + "dev": true, + "requires": { + "esutils": "^2.0.2" + } + }, "dtrace-provider": { "version": "0.8.7", "resolved": "https://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.8.7.tgz", @@ -663,6 +1211,12 @@ "shimmer": "^1.2.0" } }, + "emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "dev": true + }, "end-of-stream": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz", @@ -676,6 +1230,45 @@ "resolved": "https://registry.npmjs.org/ent/-/ent-2.2.0.tgz", "integrity": "sha1-6WQhkyWiHQX0RGai9obtbOX13R0=" }, + "error-ex": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz", + "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==", + "dev": true, + "requires": { + "is-arrayish": "^0.2.1" + } + }, + "es-abstract": { + "version": "1.17.0", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.0.tgz", + "integrity": "sha512-yYkE07YF+6SIBmg1MsJ9dlub5L48Ek7X0qz+c/CPCHS9EBXfESorzng4cJQjJW5/pB6vDF41u7F8vUhLVDqIug==", + "dev": true, + "requires": { + "es-to-primitive": "^1.2.1", + "function-bind": "^1.1.1", + "has": "^1.0.3", + "has-symbols": "^1.0.1", + "is-callable": "^1.1.5", + "is-regex": "^1.0.5", + "object-inspect": "^1.7.0", + "object-keys": "^1.1.1", + "object.assign": "^4.1.0", + "string.prototype.trimleft": "^2.1.1", + "string.prototype.trimright": "^2.1.1" + } + }, + "es-to-primitive": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz", + "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==", + "dev": true, + "requires": { + "is-callable": "^1.1.4", + "is-date-object": "^1.0.1", + "is-symbol": "^1.0.2" + } + }, "es6-promise": { "version": "4.2.8", "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.8.tgz", @@ -695,6 +1288,460 @@ "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=", "dev": true }, + "eslint": { + "version": "6.6.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-6.6.0.tgz", + "integrity": "sha512-PpEBq7b6qY/qrOmpYQ/jTMDYfuQMELR4g4WI1M/NaSDDD/bdcMb+dj4Hgks7p41kW2caXsPsEZAEAyAgjVVC0g==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.0.0", + "ajv": "^6.10.0", + "chalk": "^2.1.0", + "cross-spawn": "^6.0.5", + "debug": "^4.0.1", + "doctrine": "^3.0.0", + "eslint-scope": "^5.0.0", + "eslint-utils": "^1.4.3", + "eslint-visitor-keys": "^1.1.0", + "espree": "^6.1.2", + "esquery": "^1.0.1", + "esutils": "^2.0.2", + "file-entry-cache": "^5.0.1", + "functional-red-black-tree": "^1.0.1", + "glob-parent": "^5.0.0", + "globals": "^11.7.0", + "ignore": "^4.0.6", + "import-fresh": "^3.0.0", + "imurmurhash": "^0.1.4", + "inquirer": "^7.0.0", + "is-glob": "^4.0.0", + "js-yaml": "^3.13.1", + "json-stable-stringify-without-jsonify": "^1.0.1", + "levn": "^0.3.0", + "lodash": "^4.17.14", + "minimatch": "^3.0.4", + "mkdirp": "^0.5.1", + "natural-compare": "^1.4.0", + "optionator": "^0.8.2", + "progress": "^2.0.0", + "regexpp": "^2.0.1", + "semver": "^6.1.2", + "strip-ansi": "^5.2.0", + "strip-json-comments": "^3.0.1", + "table": "^5.2.3", + "text-table": "^0.2.0", + "v8-compile-cache": "^2.0.3" + }, + "dependencies": { + "debug": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", + "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "dev": true, + "requires": { + "ms": "^2.1.1" + } + }, + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true + }, + "semver": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "dev": true + } + } + }, + "eslint-config-prettier": { + "version": "6.9.0", + "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-6.9.0.tgz", + "integrity": "sha512-k4E14HBtcLv0uqThaI6I/n1LEqROp8XaPu6SO9Z32u5NlGRC07Enu1Bh2KEFw4FNHbekH8yzbIU9kUGxbiGmCA==", + "dev": true, + "requires": { + "get-stdin": "^6.0.0" + } + }, + "eslint-config-standard": { + "version": "14.1.0", + "resolved": "https://registry.npmjs.org/eslint-config-standard/-/eslint-config-standard-14.1.0.tgz", + "integrity": "sha512-EF6XkrrGVbvv8hL/kYa/m6vnvmUT+K82pJJc4JJVMM6+Qgqh0pnwprSxdduDLB9p/7bIxD+YV5O0wfb8lmcPbA==", + "dev": true + }, + "eslint-config-standard-jsx": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/eslint-config-standard-jsx/-/eslint-config-standard-jsx-8.1.0.tgz", + "integrity": "sha512-ULVC8qH8qCqbU792ZOO6DaiaZyHNS/5CZt3hKqHkEhVlhPEPN3nfBqqxJCyp59XrjIBZPu1chMYe9T2DXZ7TMw==", + "dev": true + }, + "eslint-config-standard-react": { + "version": "9.2.0", + "resolved": "https://registry.npmjs.org/eslint-config-standard-react/-/eslint-config-standard-react-9.2.0.tgz", + "integrity": "sha512-u+KRP2uCtthZ/W4DlLWCC59GZNV/y9k9yicWWammgTs/Omh8ZUUPF3EnYm81MAcbkYQq2Wg0oxutAhi/FQ8mIw==", + "dev": true, + "requires": { + "eslint-config-standard-jsx": "^8.0.0" + } + }, + "eslint-import-resolver-node": { + "version": "0.3.3", + "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.3.tgz", + "integrity": "sha512-b8crLDo0M5RSe5YG8Pu2DYBj71tSB6OvXkfzwbJU2w7y8P4/yo0MyF8jU26IEuEuHF2K5/gcAJE3LhQGqBBbVg==", + "dev": true, + "requires": { + "debug": "^2.6.9", + "resolve": "^1.13.1" + }, + "dependencies": { + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "dev": true, + "requires": { + "ms": "2.0.0" + } + }, + "resolve": { + "version": "1.14.2", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.14.2.tgz", + "integrity": "sha512-EjlOBLBO1kxsUxsKjLt7TAECyKW6fOh1VRkykQkKGzcBbjjPIxBqGh0jf7GJ3k/f5mxMqW3htMD3WdTUVtW8HQ==", + "dev": true, + "requires": { + "path-parse": "^1.0.6" + } + } + } + }, + "eslint-module-utils": { + "version": "2.5.2", + "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.5.2.tgz", + "integrity": "sha512-LGScZ/JSlqGKiT8OC+cYRxseMjyqt6QO54nl281CK93unD89ijSeRV6An8Ci/2nvWVKe8K/Tqdm75RQoIOCr+Q==", + "dev": true, + "requires": { + "debug": "^2.6.9", + "pkg-dir": "^2.0.0" + }, + "dependencies": { + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "dev": true, + "requires": { + "ms": "2.0.0" + } + } + } + }, + "eslint-plugin-chai-expect": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-chai-expect/-/eslint-plugin-chai-expect-2.1.0.tgz", + "integrity": "sha512-rd0/4mjMV6c3i0o4DKkWI4uaFN9DK707kW+/fDphaDI6HVgxXnhML9Xgt5vHnTXmSSnDhupuCFBgsEAEpchXmQ==", + "dev": true + }, + "eslint-plugin-chai-friendly": { + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-chai-friendly/-/eslint-plugin-chai-friendly-0.5.0.tgz", + "integrity": "sha512-Pxe6z8C9fP0pn2X2nGFU/b3GBOCM/5FVus1hsMwJsXP3R7RiXFl7g0ksJbsc0GxiLyidTW4mEFk77qsNn7Tk7g==", + "dev": true + }, + "eslint-plugin-es": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-es/-/eslint-plugin-es-3.0.0.tgz", + "integrity": "sha512-6/Jb/J/ZvSebydwbBJO1R9E5ky7YeElfK56Veh7e4QGFHCXoIXGH9HhVz+ibJLM3XJ1XjP+T7rKBLUa/Y7eIng==", + "dev": true, + "requires": { + "eslint-utils": "^2.0.0", + "regexpp": "^3.0.0" + }, + "dependencies": { + "eslint-utils": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.0.0.tgz", + "integrity": "sha512-0HCPuJv+7Wv1bACm8y5/ECVfYdfsAm9xmVb7saeFlxjPYALefjhbYoCkBjPdPzGH8wWyTpAez82Fh3VKYEZ8OA==", + "dev": true, + "requires": { + "eslint-visitor-keys": "^1.1.0" + } + }, + "regexpp": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.0.0.tgz", + "integrity": "sha512-Z+hNr7RAVWxznLPuA7DIh8UNX1j9CDrUQxskw9IrBE1Dxue2lyXT+shqEIeLUjrokxIP8CMy1WkjgG3rTsd5/g==", + "dev": true + } + } + }, + "eslint-plugin-eslint-plugin": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-eslint-plugin/-/eslint-plugin-eslint-plugin-2.2.0.tgz", + "integrity": "sha512-X5+NT9a2GuwWyb3sHJdEEe6aD/30Fhi3/9XCmYHe/OSnWKUhmKOxFTfFM1AXZfJXjAoX7811bnoLI3fZr5AX5Q==", + "dev": true + }, + "eslint-plugin-import": { + "version": "2.20.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.20.0.tgz", + "integrity": "sha512-NK42oA0mUc8Ngn4kONOPsPB1XhbUvNHqF+g307dPV28aknPoiNnKLFd9em4nkswwepdF5ouieqv5Th/63U7YJQ==", + "dev": true, + "requires": { + "array-includes": "^3.0.3", + "array.prototype.flat": "^1.2.1", + "contains-path": "^0.1.0", + "debug": "^2.6.9", + "doctrine": "1.5.0", + "eslint-import-resolver-node": "^0.3.2", + "eslint-module-utils": "^2.4.1", + "has": "^1.0.3", + "minimatch": "^3.0.4", + "object.values": "^1.1.0", + "read-pkg-up": "^2.0.0", + "resolve": "^1.12.0" + }, + "dependencies": { + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "dev": true, + "requires": { + "ms": "2.0.0" + } + }, + "doctrine": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-1.5.0.tgz", + "integrity": "sha1-N53Ocw9hZvds76TmcHoVmwLFpvo=", + "dev": true, + "requires": { + "esutils": "^2.0.2", + "isarray": "^1.0.0" + } + }, + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", + "dev": true + }, + "resolve": { + "version": "1.14.2", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.14.2.tgz", + "integrity": "sha512-EjlOBLBO1kxsUxsKjLt7TAECyKW6fOh1VRkykQkKGzcBbjjPIxBqGh0jf7GJ3k/f5mxMqW3htMD3WdTUVtW8HQ==", + "dev": true, + "requires": { + "path-parse": "^1.0.6" + } + } + } + }, + "eslint-plugin-jsx-a11y": { + "version": "6.2.3", + "resolved": "https://registry.npmjs.org/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.2.3.tgz", + "integrity": "sha512-CawzfGt9w83tyuVekn0GDPU9ytYtxyxyFZ3aSWROmnRRFQFT2BiPJd7jvRdzNDi6oLWaS2asMeYSNMjWTV4eNg==", + "dev": true, + "requires": { + "@babel/runtime": "^7.4.5", + "aria-query": "^3.0.0", + "array-includes": "^3.0.3", + "ast-types-flow": "^0.0.7", + "axobject-query": "^2.0.2", + "damerau-levenshtein": "^1.0.4", + "emoji-regex": "^7.0.2", + "has": "^1.0.3", + "jsx-ast-utils": "^2.2.1" + }, + "dependencies": { + "emoji-regex": { + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz", + "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==", + "dev": true + } + } + }, + "eslint-plugin-mocha": { + "version": "6.2.2", + "resolved": "https://registry.npmjs.org/eslint-plugin-mocha/-/eslint-plugin-mocha-6.2.2.tgz", + "integrity": "sha512-oNhPzfkT6Q6CJ0HMVJ2KLxEWG97VWGTmuHOoRcDLE0U88ugUyFNV9wrT2XIt5cGtqc5W9k38m4xTN34L09KhBA==", + "dev": true, + "requires": { + "ramda": "^0.26.1" + } + }, + "eslint-plugin-node": { + "version": "11.0.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-node/-/eslint-plugin-node-11.0.0.tgz", + "integrity": "sha512-chUs/NVID+sknFiJzxoN9lM7uKSOEta8GC8365hw1nDfwIPIjjpRSwwPvQanWv8dt/pDe9EV4anmVSwdiSndNg==", + "dev": true, + "requires": { + "eslint-plugin-es": "^3.0.0", + "eslint-utils": "^2.0.0", + "ignore": "^5.1.1", + "minimatch": "^3.0.4", + "resolve": "^1.10.1", + "semver": "^6.1.0" + }, + "dependencies": { + "eslint-utils": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.0.0.tgz", + "integrity": "sha512-0HCPuJv+7Wv1bACm8y5/ECVfYdfsAm9xmVb7saeFlxjPYALefjhbYoCkBjPdPzGH8wWyTpAez82Fh3VKYEZ8OA==", + "dev": true, + "requires": { + "eslint-visitor-keys": "^1.1.0" + } + }, + "ignore": { + "version": "5.1.4", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.4.tgz", + "integrity": "sha512-MzbUSahkTW1u7JpKKjY7LCARd1fU5W2rLdxlM4kdkayuCwZImjkpluF9CM1aLewYJguPDqewLam18Y6AU69A8A==", + "dev": true + } + } + }, + "eslint-plugin-prettier": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-3.1.2.tgz", + "integrity": "sha512-GlolCC9y3XZfv3RQfwGew7NnuFDKsfI4lbvRK+PIIo23SFH+LemGs4cKwzAaRa+Mdb+lQO/STaIayno8T5sJJA==", + "dev": true, + "requires": { + "prettier-linter-helpers": "^1.0.0" + } + }, + "eslint-plugin-promise": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/eslint-plugin-promise/-/eslint-plugin-promise-4.2.1.tgz", + "integrity": "sha512-VoM09vT7bfA7D+upt+FjeBO5eHIJQBUWki1aPvB+vbNiHS3+oGIJGIeyBtKQTME6UPXXy3vV07OL1tHd3ANuDw==", + "dev": true + }, + "eslint-plugin-react": { + "version": "7.17.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.17.0.tgz", + "integrity": "sha512-ODB7yg6lxhBVMeiH1c7E95FLD4E/TwmFjltiU+ethv7KPdCwgiFuOZg9zNRHyufStTDLl/dEFqI2Q1VPmCd78A==", + "dev": true, + "requires": { + "array-includes": "^3.0.3", + "doctrine": "^2.1.0", + "eslint-plugin-eslint-plugin": "^2.1.0", + "has": "^1.0.3", + "jsx-ast-utils": "^2.2.3", + "object.entries": "^1.1.0", + "object.fromentries": "^2.0.1", + "object.values": "^1.1.0", + "prop-types": "^15.7.2", + "resolve": "^1.13.1" + }, + "dependencies": { + "doctrine": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz", + "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==", + "dev": true, + "requires": { + "esutils": "^2.0.2" + } + }, + "resolve": { + "version": "1.14.2", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.14.2.tgz", + "integrity": "sha512-EjlOBLBO1kxsUxsKjLt7TAECyKW6fOh1VRkykQkKGzcBbjjPIxBqGh0jf7GJ3k/f5mxMqW3htMD3WdTUVtW8HQ==", + "dev": true, + "requires": { + "path-parse": "^1.0.6" + } + } + } + }, + "eslint-plugin-standard": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/eslint-plugin-standard/-/eslint-plugin-standard-4.0.1.tgz", + "integrity": "sha512-v/KBnfyaOMPmZc/dmc6ozOdWqekGp7bBGq4jLAecEfPGmfKiWS4sA8sC0LqiV9w5qmXAtXVn4M3p1jSyhY85SQ==", + "dev": true + }, + "eslint-scope": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.0.0.tgz", + "integrity": "sha512-oYrhJW7S0bxAFDvWqzvMPRm6pcgcnWc4QnofCAqRTRfQC0JcwenzGglTtsLyIuuWFfkqDG9vz67cnttSd53djw==", + "dev": true, + "requires": { + "esrecurse": "^4.1.0", + "estraverse": "^4.1.1" + } + }, + "eslint-utils": { + "version": "1.4.3", + "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.4.3.tgz", + "integrity": "sha512-fbBN5W2xdY45KulGXmLHZ3c3FHfVYmKg0IrAKGOkT/464PQsx2UeIzfz1RmEci+KLm1bBaAzZAh8+/E+XAeZ8Q==", + "dev": true, + "requires": { + "eslint-visitor-keys": "^1.1.0" + } + }, + "eslint-visitor-keys": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz", + "integrity": "sha512-8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A==", + "dev": true + }, + "espree": { + "version": "6.1.2", + "resolved": "https://registry.npmjs.org/espree/-/espree-6.1.2.tgz", + "integrity": "sha512-2iUPuuPP+yW1PZaMSDM9eyVf8D5P0Hi8h83YtZ5bPc/zHYjII5khoixIUTMO794NOY8F/ThF1Bo8ncZILarUTA==", + "dev": true, + "requires": { + "acorn": "^7.1.0", + "acorn-jsx": "^5.1.0", + "eslint-visitor-keys": "^1.1.0" + }, + "dependencies": { + "acorn": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.1.0.tgz", + "integrity": "sha512-kL5CuoXA/dgxlBbVrflsflzQ3PAas7RYZB52NOm/6839iVYJgKMJ3cQJD+t2i5+qFa8h3MDpEOJiS64E8JLnSQ==", + "dev": true + } + } + }, + "esprima": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", + "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", + "dev": true + }, + "esquery": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.0.1.tgz", + "integrity": "sha512-SmiyZ5zIWH9VM+SRUReLS5Q8a7GxtRdxEBVZpm98rJM7Sb+A9DVCndXfkeFUd3byderg+EbDkfnevfCwynWaNA==", + "dev": true, + "requires": { + "estraverse": "^4.0.0" + } + }, + "esrecurse": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.1.tgz", + "integrity": "sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==", + "dev": true, + "requires": { + "estraverse": "^4.1.0" + } + }, + "estraverse": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz", + "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==", + "dev": true + }, + "esutils": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", + "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==", + "dev": true + }, "event-target-shim": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/event-target-shim/-/event-target-shim-5.0.1.tgz", @@ -837,6 +1884,17 @@ "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz", "integrity": "sha1-+LETa0Bx+9jrFAr/hYsQGewpFfo=" }, + "external-editor": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz", + "integrity": "sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==", + "dev": true, + "requires": { + "chardet": "^0.7.0", + "iconv-lite": "^0.4.24", + "tmp": "^0.0.33" + } + }, "extsprintf": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz", @@ -847,26 +1905,107 @@ "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz", "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=" }, + "fast-diff": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/fast-diff/-/fast-diff-1.2.0.tgz", + "integrity": "sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w==", + "dev": true + }, "fast-json-stable-stringify": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz", "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I=" }, + "fast-levenshtein": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", + "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=", + "dev": true + }, "fast-text-encoding": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/fast-text-encoding/-/fast-text-encoding-1.0.0.tgz", "integrity": "sha1-PlzoKTQJz6pxd6cbnKhOGx5vJe8=" }, + "figures": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/figures/-/figures-3.1.0.tgz", + "integrity": "sha512-ravh8VRXqHuMvZt/d8GblBeqDMkdJMBdv/2KntFH+ra5MXkO7nxNKpzQ3n6QD/2da1kH0aWmNISdvhM7gl2gVg==", + "dev": true, + "requires": { + "escape-string-regexp": "^1.0.5" + } + }, + "file-entry-cache": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-5.0.1.tgz", + "integrity": "sha512-bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g==", + "dev": true, + "requires": { + "flat-cache": "^2.0.1" + } + }, "file-uri-to-path": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz", "integrity": "sha1-VTp7hEb/b2hDWcRF8eN6BdrMM90=" }, + "find-up": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz", + "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=", + "dev": true, + "requires": { + "locate-path": "^2.0.0" + } + }, "findit2": { "version": "2.2.3", "resolved": "https://registry.npmjs.org/findit2/-/findit2-2.2.3.tgz", "integrity": "sha1-WKRmaX34piBc39vzlVNri9d3pfY=" }, + "flat-cache": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-2.0.1.tgz", + "integrity": "sha512-LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA==", + "dev": true, + "requires": { + "flatted": "^2.0.0", + "rimraf": "2.6.3", + "write": "1.0.3" + }, + "dependencies": { + "glob": { + "version": "7.1.6", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz", + "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==", + "dev": true, + "requires": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + } + }, + "rimraf": { + "version": "2.6.3", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz", + "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==", + "dev": true, + "requires": { + "glob": "^7.1.3" + } + } + } + }, + "flatted": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/flatted/-/flatted-2.0.1.tgz", + "integrity": "sha512-a1hQMktqW9Nmqr5aktAux3JMNqaucxGcjtjWnZLHX7yyPCmlSV3M54nGYbqT8K+0GhF3NBgmJCc3ma+WOgX8Jg==", + "dev": true + }, "follow-redirects": { "version": "1.5.10", "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.10.tgz", @@ -896,6 +2035,18 @@ "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=", "dev": true }, + "function-bind": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", + "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==", + "dev": true + }, + "functional-red-black-tree": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz", + "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=", + "dev": true + }, "gaxios": { "version": "1.8.4", "resolved": "https://registry.npmjs.org/gaxios/-/gaxios-1.8.4.tgz", @@ -916,12 +2067,24 @@ "json-bigint": "^0.3.0" } }, + "get-caller-file": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", + "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", + "dev": true + }, "get-func-name": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.0.tgz", "integrity": "sha1-6td0q+5y4gQJQzoGY2YCPdaIekE=", "dev": true }, + "get-stdin": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-6.0.0.tgz", + "integrity": "sha512-jp4tHawyV7+fkkSKyvjuLZswblUtz+SQKzSWnBbii16BuZksJlU1wuBYXY75r+duh/llF1ur6oNwi+2ZzjKZ7g==", + "dev": true + }, "getpass": { "version": "0.1.7", "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz", @@ -943,6 +2106,21 @@ "path-is-absolute": "^1.0.0" } }, + "glob-parent": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.0.tgz", + "integrity": "sha512-qjtRgnIVmOfnKUE3NJAQEdk+lKrxfw8t5ke7SXtfMTHcjsBfOfWXCQfdb30zfDoZQ2IRSIiidmjtbHZPZ++Ihw==", + "dev": true, + "requires": { + "is-glob": "^4.0.1" + } + }, + "globals": { + "version": "11.12.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz", + "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==", + "dev": true + }, "google-auth-library": { "version": "3.1.2", "resolved": "https://registry.npmjs.org/google-auth-library/-/google-auth-library-3.1.2.tgz", @@ -975,6 +2153,12 @@ "pify": "^4.0.0" } }, + "graceful-fs": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.3.tgz", + "integrity": "sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==", + "dev": true + }, "growl": { "version": "1.10.3", "resolved": "https://registry.npmjs.org/growl/-/growl-1.10.3.tgz", @@ -1007,12 +2191,44 @@ "har-schema": "^2.0.0" } }, + "has": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", + "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", + "dev": true, + "requires": { + "function-bind": "^1.1.1" + } + }, + "has-ansi": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz", + "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=", + "dev": true, + "requires": { + "ansi-regex": "^2.0.0" + }, + "dependencies": { + "ansi-regex": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", + "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", + "dev": true + } + } + }, "has-flag": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz", "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=", "dev": true }, + "has-symbols": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz", + "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==", + "dev": true + }, "he": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/he/-/he-1.1.1.tgz", @@ -1024,6 +2240,12 @@ "resolved": "https://registry.npmjs.org/hex2dec/-/hex2dec-1.1.2.tgz", "integrity": "sha1-jhzkvvNqdPfVcjw/swkMKGAHczg=" }, + "hosted-git-info": { + "version": "2.8.5", + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.5.tgz", + "integrity": "sha512-kssjab8CvdXfcXMXVcvsXum4Hwdq9XGtRD3TteMEvEbq0LXyiNQr6AprqKqfeaDXze7SxWvRxdpwE6ku7ikLkg==", + "dev": true + }, "http-signature": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz", @@ -1043,6 +2265,43 @@ "debug": "^3.1.0" } }, + "iconv-lite": { + "version": "0.4.24", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", + "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", + "dev": true, + "requires": { + "safer-buffer": ">= 2.1.2 < 3" + } + }, + "ignore": { + "version": "4.0.6", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz", + "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==", + "dev": true + }, + "import-fresh": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.2.1.tgz", + "integrity": "sha512-6e1q1cnWP2RXD9/keSkxHScg508CdXqXWgWBaETNhyuBFz+kUZlKboh+ISK+bU++DmbHimVBrOz/zzPe0sZ3sQ==", + "dev": true, + "requires": { + "parent-module": "^1.0.0", + "resolve-from": "^4.0.0" + } + }, + "imurmurhash": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", + "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=", + "dev": true + }, + "indent-string": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz", + "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==", + "dev": true + }, "inflight": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", @@ -1057,16 +2316,106 @@ "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=" }, + "inquirer": { + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-7.0.3.tgz", + "integrity": "sha512-+OiOVeVydu4hnCGLCSX+wedovR/Yzskv9BFqUNNKq9uU2qg7LCcCo3R86S2E7WLo0y/x2pnEZfZe1CoYnORUAw==", + "dev": true, + "requires": { + "ansi-escapes": "^4.2.1", + "chalk": "^2.4.2", + "cli-cursor": "^3.1.0", + "cli-width": "^2.0.0", + "external-editor": "^3.0.3", + "figures": "^3.0.0", + "lodash": "^4.17.15", + "mute-stream": "0.0.8", + "run-async": "^2.2.0", + "rxjs": "^6.5.3", + "string-width": "^4.1.0", + "strip-ansi": "^5.1.0", + "through": "^2.3.6" + } + }, "is": { "version": "3.3.0", "resolved": "https://registry.npmjs.org/is/-/is-3.3.0.tgz", "integrity": "sha1-Yc/23TxBk9uUo9YlggcrROVkXXk=" }, + "is-arrayish": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", + "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=", + "dev": true + }, "is-buffer": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.3.tgz", "integrity": "sha1-Ts8/z3ScvR5HJonhCaxmJhol5yU=" }, + "is-callable": { + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.5.tgz", + "integrity": "sha512-ESKv5sMCJB2jnHTWZ3O5itG+O128Hsus4K4Qh1h2/cgn2vbgnLSVqfV46AeJA9D5EeeLa9w81KUXMtn34zhX+Q==", + "dev": true + }, + "is-date-object": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.2.tgz", + "integrity": "sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g==", + "dev": true + }, + "is-extglob": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", + "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=", + "dev": true + }, + "is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "dev": true + }, + "is-glob": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz", + "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==", + "dev": true, + "requires": { + "is-extglob": "^2.1.1" + } + }, + "is-promise": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz", + "integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=", + "dev": true + }, + "is-regex": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.5.tgz", + "integrity": "sha512-vlKW17SNq44owv5AQR3Cq0bQPEb8+kF3UKZ2fiZNOWtztYE5i0CzCZxFDwO58qAOWtxdBRVO/V5Qin1wjCqFYQ==", + "dev": true, + "requires": { + "has": "^1.0.3" + } + }, + "is-string": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.5.tgz", + "integrity": "sha512-buY6VNRjhQMiF1qWDouloZlQbRhDPCebwxSjxMjxgemYT46YMd2NR0/H+fBhEfWX4A/w9TBJ+ol+okqJKFE6vQ==", + "dev": true + }, + "is-symbol": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz", + "integrity": "sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==", + "dev": true, + "requires": { + "has-symbols": "^1.0.1" + } + }, "is-typedarray": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz", @@ -1078,16 +2427,44 @@ "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=", "dev": true }, + "isexe": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", + "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=", + "dev": true + }, "isstream": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz", "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=" }, + "js-tokens": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", + "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==", + "dev": true + }, + "js-yaml": { + "version": "3.13.1", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz", + "integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==", + "dev": true, + "requires": { + "argparse": "^1.0.7", + "esprima": "^4.0.0" + } + }, "jsbn": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz", "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=" }, + "jsesc": { + "version": "2.5.2", + "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz", + "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==", + "dev": true + }, "json-bigint": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/json-bigint/-/json-bigint-0.3.0.tgz", @@ -1106,6 +2483,12 @@ "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", "integrity": "sha1-afaofZUTq4u4/mO9sJecRI5oRmA=" }, + "json-stable-stringify-without-jsonify": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz", + "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=", + "dev": true + }, "json-stringify-safe": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz", @@ -1122,6 +2505,16 @@ "verror": "1.10.0" } }, + "jsx-ast-utils": { + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-2.2.3.tgz", + "integrity": "sha512-EdIHFMm+1BPynpKOpdPqiOsvnIrInRGJD7bzPZdPkjitQEqpdpUuFpq4T0npZFKTiB3RhWFdGN+oqOJIdhDhQA==", + "dev": true, + "requires": { + "array-includes": "^3.0.3", + "object.assign": "^4.1.0" + } + }, "just-extend": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/just-extend/-/just-extend-4.0.2.tgz", @@ -1147,17 +2540,81 @@ "safe-buffer": "^5.0.1" } }, + "levn": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz", + "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=", + "dev": true, + "requires": { + "prelude-ls": "~1.1.2", + "type-check": "~0.3.2" + } + }, + "load-json-file": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz", + "integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=", + "dev": true, + "requires": { + "graceful-fs": "^4.1.2", + "parse-json": "^2.2.0", + "pify": "^2.0.0", + "strip-bom": "^3.0.0" + }, + "dependencies": { + "pify": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", + "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", + "dev": true + } + } + }, + "locate-path": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz", + "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=", + "dev": true, + "requires": { + "p-locate": "^2.0.0", + "path-exists": "^3.0.0" + } + }, + "lodash": { + "version": "4.17.15", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz", + "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==", + "dev": true + }, "lodash.get": { "version": "4.4.2", "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz", "integrity": "sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=", "dev": true }, + "lodash.memoize": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz", + "integrity": "sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=", + "dev": true + }, + "lodash.merge": { + "version": "4.6.2", + "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", + "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==", + "dev": true + }, "lodash.pickby": { "version": "4.6.0", "resolved": "https://registry.npmjs.org/lodash.pickby/-/lodash.pickby-4.6.0.tgz", "integrity": "sha1-feoh2MGNdwOifHBMFdO4SmfjOv8=" }, + "lodash.unescape": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/lodash.unescape/-/lodash.unescape-4.0.1.tgz", + "integrity": "sha1-vyJJiGzlFM2hEvrpIYzcBlIR/Jw=", + "dev": true + }, "logger-sharelatex": { "version": "1.7.0", "resolved": "https://registry.npmjs.org/logger-sharelatex/-/logger-sharelatex-1.7.0.tgz", @@ -1197,6 +2654,64 @@ } } }, + "loglevel": { + "version": "1.6.6", + "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.6.6.tgz", + "integrity": "sha512-Sgr5lbboAUBo3eXCSPL4/KoVz3ROKquOjcctxmHIt+vol2DrqTQe3SwkKKuYhEiWB5kYa13YyopJ69deJ1irzQ==", + "dev": true + }, + "loglevel-colored-level-prefix": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/loglevel-colored-level-prefix/-/loglevel-colored-level-prefix-1.0.0.tgz", + "integrity": "sha1-akAhj9x64V/HbD0PPmdsRlOIYD4=", + "dev": true, + "requires": { + "chalk": "^1.1.3", + "loglevel": "^1.4.1" + }, + "dependencies": { + "ansi-regex": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", + "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", + "dev": true + }, + "ansi-styles": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", + "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=", + "dev": true + }, + "chalk": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", + "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", + "dev": true, + "requires": { + "ansi-styles": "^2.2.1", + "escape-string-regexp": "^1.0.2", + "has-ansi": "^2.0.0", + "strip-ansi": "^3.0.0", + "supports-color": "^2.0.0" + } + }, + "strip-ansi": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", + "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", + "dev": true, + "requires": { + "ansi-regex": "^2.0.0" + } + }, + "supports-color": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", + "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=", + "dev": true + } + } + }, "lolex": { "version": "2.7.5", "resolved": "https://registry.npmjs.org/lolex/-/lolex-2.7.5.tgz", @@ -1208,6 +2723,15 @@ "resolved": "https://registry.npmjs.org/long/-/long-4.0.0.tgz", "integrity": "sha1-mntxz7fTYaGU6lVSQckvdGjVvyg=" }, + "loose-envify": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz", + "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==", + "dev": true, + "requires": { + "js-tokens": "^3.0.0 || ^4.0.0" + } + }, "lru-cache": { "version": "5.1.1", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", @@ -1230,11 +2754,58 @@ "statsd-parser": "~0.0.4" } }, + "make-plural": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/make-plural/-/make-plural-4.3.0.tgz", + "integrity": "sha512-xTYd4JVHpSCW+aqDof6w/MebaMVNTVYBZhbB/vi513xXdiPT92JMVCo0Jq8W2UZnzYRFeVbQiQ+I25l13JuKvA==", + "dev": true, + "requires": { + "minimist": "^1.2.0" + }, + "dependencies": { + "minimist": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", + "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", + "dev": true, + "optional": true + } + } + }, + "map-obj": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-4.1.0.tgz", + "integrity": "sha512-glc9y00wgtwcDmp7GaE/0b0OnxpNJsVf3ael/An6Fe2Q51LLwN1er6sdomLRzz5h0+yMpiYLhWYF5R7HeqVd4g==", + "dev": true + }, "mersenne": { "version": "0.0.4", "resolved": "https://registry.npmjs.org/mersenne/-/mersenne-0.0.4.tgz", "integrity": "sha1-QB/ex+whzbngPNPTAhOY2iGycIU=" }, + "messageformat": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/messageformat/-/messageformat-2.3.0.tgz", + "integrity": "sha512-uTzvsv0lTeQxYI2y1NPa1lItL5VRI8Gb93Y2K2ue5gBPyrbJxfDi/EYWxh2PKv5yO42AJeeqblS9MJSh/IEk4w==", + "dev": true, + "requires": { + "make-plural": "^4.3.0", + "messageformat-formatters": "^2.0.1", + "messageformat-parser": "^4.1.2" + } + }, + "messageformat-formatters": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/messageformat-formatters/-/messageformat-formatters-2.0.1.tgz", + "integrity": "sha512-E/lQRXhtHwGuiQjI7qxkLp8AHbMD5r2217XNe/SREbBlSawe0lOqsFb7rflZJmlQFSULNLIqlcjjsCPlB3m3Mg==", + "dev": true + }, + "messageformat-parser": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/messageformat-parser/-/messageformat-parser-4.1.2.tgz", + "integrity": "sha512-7dWuifeyldz7vhEuL96Kwq1fhZXBW+TUfbnHN4UCrCxoXQTYjHnR78eI66Gk9LaLLsAvzPNVJBaa66DRfFNaiA==", + "dev": true + }, "methods": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz", @@ -1284,6 +2855,12 @@ "mime-db": "1.40.0" } }, + "mimic-fn": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", + "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==", + "dev": true + }, "minimatch": { "version": "3.0.4", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", @@ -1568,6 +3145,12 @@ "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" }, + "mute-stream": { + "version": "0.0.8", + "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz", + "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==", + "dev": true + }, "mv": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/mv/-/mv-2.1.1.tgz", @@ -1584,12 +3167,24 @@ "resolved": "https://registry.npmjs.org/nan/-/nan-2.11.1.tgz", "integrity": "sha1-kOIrzLjKV+pM03zIPTgZtS7qZ2Y=" }, + "natural-compare": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", + "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=", + "dev": true + }, "ncp": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ncp/-/ncp-2.0.0.tgz", "integrity": "sha1-GVoh1sRuNh0vsSgbo4uR6d9727M=", "optional": true }, + "nice-try": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz", + "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==", + "dev": true + }, "nise": { "version": "1.4.8", "resolved": "https://registry.npmjs.org/nise/-/nise-1.4.8.tgz", @@ -1628,11 +3223,97 @@ } } }, + "normalize-package-data": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz", + "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==", + "dev": true, + "requires": { + "hosted-git-info": "^2.1.4", + "resolve": "^1.10.0", + "semver": "2 || 3 || 4 || 5", + "validate-npm-package-license": "^3.0.1" + }, + "dependencies": { + "semver": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", + "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", + "dev": true + } + } + }, "oauth-sign": { "version": "0.9.0", "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz", "integrity": "sha1-R6ewFrqmi1+g7PPe4IqFxnmsZFU=" }, + "object-assign": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", + "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=", + "dev": true + }, + "object-inspect": { + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.7.0.tgz", + "integrity": "sha512-a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw==", + "dev": true + }, + "object-keys": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz", + "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==", + "dev": true + }, + "object.assign": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz", + "integrity": "sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==", + "dev": true, + "requires": { + "define-properties": "^1.1.2", + "function-bind": "^1.1.1", + "has-symbols": "^1.0.0", + "object-keys": "^1.0.11" + } + }, + "object.entries": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.1.tgz", + "integrity": "sha512-ilqR7BgdyZetJutmDPfXCDffGa0/Yzl2ivVNpbx/g4UeWrCdRnFDUBrKJGLhGieRHDATnyZXWBeCb29k9CJysQ==", + "dev": true, + "requires": { + "define-properties": "^1.1.3", + "es-abstract": "^1.17.0-next.1", + "function-bind": "^1.1.1", + "has": "^1.0.3" + } + }, + "object.fromentries": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.2.tgz", + "integrity": "sha512-r3ZiBH7MQppDJVLx6fhD618GKNG40CZYH9wgwdhKxBDDbQgjeWGGd4AtkZad84d291YxvWe7bJGuE65Anh0dxQ==", + "dev": true, + "requires": { + "define-properties": "^1.1.3", + "es-abstract": "^1.17.0-next.1", + "function-bind": "^1.1.1", + "has": "^1.0.3" + } + }, + "object.values": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.1.tgz", + "integrity": "sha512-WTa54g2K8iu0kmS/us18jEmdv1a4Wi//BZ/DTVYEcH0XhLM5NYdpDHja3gt57VrZLcNAO2WGA+KpWsDBaHt6eA==", + "dev": true, + "requires": { + "define-properties": "^1.1.3", + "es-abstract": "^1.17.0-next.1", + "function-bind": "^1.1.1", + "has": "^1.0.3" + } + }, "once": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", @@ -1641,6 +3322,35 @@ "wrappy": "1" } }, + "onetime": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.0.tgz", + "integrity": "sha512-5NcSkPHhwTVFIQN+TUqXoS5+dlElHXdpAWu9I0HP20YOtIi+aZ0Ct82jdlILDxjLEAWwvm+qj1m6aEtsDVmm6Q==", + "dev": true, + "requires": { + "mimic-fn": "^2.1.0" + } + }, + "optionator": { + "version": "0.8.3", + "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz", + "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==", + "dev": true, + "requires": { + "deep-is": "~0.1.3", + "fast-levenshtein": "~2.0.6", + "levn": "~0.3.0", + "prelude-ls": "~1.1.2", + "type-check": "~0.3.2", + "word-wrap": "~1.2.3" + } + }, + "os-tmpdir": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", + "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=", + "dev": true + }, "p-limit": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.0.tgz", @@ -1649,26 +3359,88 @@ "p-try": "^2.0.0" } }, + "p-locate": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz", + "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=", + "dev": true, + "requires": { + "p-limit": "^1.1.0" + }, + "dependencies": { + "p-limit": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz", + "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==", + "dev": true, + "requires": { + "p-try": "^1.0.0" + } + }, + "p-try": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz", + "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=", + "dev": true + } + } + }, "p-try": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", "integrity": "sha1-yyhoVA4xPWHeWPr741zpAE1VQOY=" }, + "parent-module": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", + "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==", + "dev": true, + "requires": { + "callsites": "^3.0.0" + } + }, "parse-duration": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/parse-duration/-/parse-duration-0.1.1.tgz", "integrity": "sha1-ExFN3JiRwezSgANiRFVN5DZHoiY=" }, + "parse-json": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz", + "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=", + "dev": true, + "requires": { + "error-ex": "^1.2.0" + } + }, "parse-ms": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/parse-ms/-/parse-ms-2.1.0.tgz", "integrity": "sha1-NIVlp1PUOR+lJAKZVrFyy3dTCX0=" }, + "path-exists": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", + "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=", + "dev": true + }, "path-is-absolute": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=" }, + "path-is-inside": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz", + "integrity": "sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=", + "dev": true + }, + "path-key": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz", + "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=", + "dev": true + }, "path-parse": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz", @@ -1683,6 +3455,23 @@ "isarray": "0.0.1" } }, + "path-type": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz", + "integrity": "sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=", + "dev": true, + "requires": { + "pify": "^2.0.0" + }, + "dependencies": { + "pify": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", + "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", + "dev": true + } + } + }, "pathval": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/pathval/-/pathval-1.1.0.tgz", @@ -1699,6 +3488,618 @@ "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz", "integrity": "sha1-SyzSXFDVmHNcUCkiJP2MbfQeMjE=" }, + "pkg-dir": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-2.0.0.tgz", + "integrity": "sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=", + "dev": true, + "requires": { + "find-up": "^2.1.0" + } + }, + "prelude-ls": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz", + "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=", + "dev": true + }, + "prettier": { + "version": "1.19.1", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-1.19.1.tgz", + "integrity": "sha512-s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew==", + "dev": true + }, + "prettier-eslint": { + "version": "9.0.1", + "resolved": "https://registry.npmjs.org/prettier-eslint/-/prettier-eslint-9.0.1.tgz", + "integrity": "sha512-KZT65QTosSAqBBqmrC+RpXbsMRe7Os2YSR9cAfFbDlyPAopzA/S5bioiZ3rpziNQNSJaOxmtXSx07EQ+o2Dlug==", + "dev": true, + "requires": { + "@typescript-eslint/parser": "^1.10.2", + "common-tags": "^1.4.0", + "core-js": "^3.1.4", + "dlv": "^1.1.0", + "eslint": "^5.0.0", + "indent-string": "^4.0.0", + "lodash.merge": "^4.6.0", + "loglevel-colored-level-prefix": "^1.0.0", + "prettier": "^1.7.0", + "pretty-format": "^23.0.1", + "require-relative": "^0.8.7", + "typescript": "^3.2.1", + "vue-eslint-parser": "^2.0.2" + }, + "dependencies": { + "ansi-escapes": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz", + "integrity": "sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==", + "dev": true + }, + "ansi-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", + "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", + "dev": true + }, + "cli-cursor": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz", + "integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=", + "dev": true, + "requires": { + "restore-cursor": "^2.0.0" + } + }, + "debug": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", + "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "dev": true, + "requires": { + "ms": "^2.1.1" + } + }, + "eslint": { + "version": "5.16.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-5.16.0.tgz", + "integrity": "sha512-S3Rz11i7c8AA5JPv7xAH+dOyq/Cu/VXHiHXBPOU1k/JAM5dXqQPt3qcrhpHSorXmrpu2g0gkIBVXAqCpzfoZIg==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.0.0", + "ajv": "^6.9.1", + "chalk": "^2.1.0", + "cross-spawn": "^6.0.5", + "debug": "^4.0.1", + "doctrine": "^3.0.0", + "eslint-scope": "^4.0.3", + "eslint-utils": "^1.3.1", + "eslint-visitor-keys": "^1.0.0", + "espree": "^5.0.1", + "esquery": "^1.0.1", + "esutils": "^2.0.2", + "file-entry-cache": "^5.0.1", + "functional-red-black-tree": "^1.0.1", + "glob": "^7.1.2", + "globals": "^11.7.0", + "ignore": "^4.0.6", + "import-fresh": "^3.0.0", + "imurmurhash": "^0.1.4", + "inquirer": "^6.2.2", + "js-yaml": "^3.13.0", + "json-stable-stringify-without-jsonify": "^1.0.1", + "levn": "^0.3.0", + "lodash": "^4.17.11", + "minimatch": "^3.0.4", + "mkdirp": "^0.5.1", + "natural-compare": "^1.4.0", + "optionator": "^0.8.2", + "path-is-inside": "^1.0.2", + "progress": "^2.0.0", + "regexpp": "^2.0.1", + "semver": "^5.5.1", + "strip-ansi": "^4.0.0", + "strip-json-comments": "^2.0.1", + "table": "^5.2.3", + "text-table": "^0.2.0" + } + }, + "eslint-scope": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.3.tgz", + "integrity": "sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==", + "dev": true, + "requires": { + "esrecurse": "^4.1.0", + "estraverse": "^4.1.1" + } + }, + "espree": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/espree/-/espree-5.0.1.tgz", + "integrity": "sha512-qWAZcWh4XE/RwzLJejfcofscgMc9CamR6Tn1+XRXNzrvUSSbiAjGOI/fggztjIi7y9VLPqnICMIPiGyr8JaZ0A==", + "dev": true, + "requires": { + "acorn": "^6.0.7", + "acorn-jsx": "^5.0.0", + "eslint-visitor-keys": "^1.0.0" + } + }, + "figures": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz", + "integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=", + "dev": true, + "requires": { + "escape-string-regexp": "^1.0.5" + } + }, + "glob": { + "version": "7.1.6", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz", + "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==", + "dev": true, + "requires": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + } + }, + "inquirer": { + "version": "6.5.2", + "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-6.5.2.tgz", + "integrity": "sha512-cntlB5ghuB0iuO65Ovoi8ogLHiWGs/5yNrtUcKjFhSSiVeAIVpD7koaSU9RM8mpXw5YDi9RdYXGQMaOURB7ycQ==", + "dev": true, + "requires": { + "ansi-escapes": "^3.2.0", + "chalk": "^2.4.2", + "cli-cursor": "^2.1.0", + "cli-width": "^2.0.0", + "external-editor": "^3.0.3", + "figures": "^2.0.0", + "lodash": "^4.17.12", + "mute-stream": "0.0.7", + "run-async": "^2.2.0", + "rxjs": "^6.4.0", + "string-width": "^2.1.0", + "strip-ansi": "^5.1.0", + "through": "^2.3.6" + }, + "dependencies": { + "ansi-regex": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", + "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", + "dev": true + }, + "strip-ansi": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", + "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", + "dev": true, + "requires": { + "ansi-regex": "^4.1.0" + } + } + } + }, + "is-fullwidth-code-point": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", + "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", + "dev": true + }, + "mimic-fn": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz", + "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==", + "dev": true + }, + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true + }, + "mute-stream": { + "version": "0.0.7", + "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz", + "integrity": "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=", + "dev": true + }, + "onetime": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz", + "integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=", + "dev": true, + "requires": { + "mimic-fn": "^1.0.0" + } + }, + "restore-cursor": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz", + "integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=", + "dev": true, + "requires": { + "onetime": "^2.0.0", + "signal-exit": "^3.0.2" + } + }, + "semver": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", + "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", + "dev": true + }, + "string-width": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", + "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", + "dev": true, + "requires": { + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^4.0.0" + } + }, + "strip-ansi": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", + "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", + "dev": true, + "requires": { + "ansi-regex": "^3.0.0" + } + }, + "strip-json-comments": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz", + "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=", + "dev": true + } + } + }, + "prettier-eslint-cli": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/prettier-eslint-cli/-/prettier-eslint-cli-5.0.0.tgz", + "integrity": "sha512-cei9UbN1aTrz3sQs88CWpvY/10PYTevzd76zoG1tdJ164OhmNTFRKPTOZrutVvscoQWzbnLKkviS3gu5JXwvZg==", + "dev": true, + "requires": { + "arrify": "^2.0.1", + "boolify": "^1.0.0", + "camelcase-keys": "^6.0.0", + "chalk": "^2.4.2", + "common-tags": "^1.8.0", + "core-js": "^3.1.4", + "eslint": "^5.0.0", + "find-up": "^4.1.0", + "get-stdin": "^7.0.0", + "glob": "^7.1.4", + "ignore": "^5.1.2", + "lodash.memoize": "^4.1.2", + "loglevel-colored-level-prefix": "^1.0.0", + "messageformat": "^2.2.1", + "prettier-eslint": "^9.0.0", + "rxjs": "^6.5.2", + "yargs": "^13.2.4" + }, + "dependencies": { + "ansi-escapes": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz", + "integrity": "sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==", + "dev": true + }, + "ansi-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", + "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", + "dev": true + }, + "cli-cursor": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz", + "integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=", + "dev": true, + "requires": { + "restore-cursor": "^2.0.0" + } + }, + "debug": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", + "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "dev": true, + "requires": { + "ms": "^2.1.1" + } + }, + "eslint": { + "version": "5.16.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-5.16.0.tgz", + "integrity": "sha512-S3Rz11i7c8AA5JPv7xAH+dOyq/Cu/VXHiHXBPOU1k/JAM5dXqQPt3qcrhpHSorXmrpu2g0gkIBVXAqCpzfoZIg==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.0.0", + "ajv": "^6.9.1", + "chalk": "^2.1.0", + "cross-spawn": "^6.0.5", + "debug": "^4.0.1", + "doctrine": "^3.0.0", + "eslint-scope": "^4.0.3", + "eslint-utils": "^1.3.1", + "eslint-visitor-keys": "^1.0.0", + "espree": "^5.0.1", + "esquery": "^1.0.1", + "esutils": "^2.0.2", + "file-entry-cache": "^5.0.1", + "functional-red-black-tree": "^1.0.1", + "glob": "^7.1.2", + "globals": "^11.7.0", + "ignore": "^4.0.6", + "import-fresh": "^3.0.0", + "imurmurhash": "^0.1.4", + "inquirer": "^6.2.2", + "js-yaml": "^3.13.0", + "json-stable-stringify-without-jsonify": "^1.0.1", + "levn": "^0.3.0", + "lodash": "^4.17.11", + "minimatch": "^3.0.4", + "mkdirp": "^0.5.1", + "natural-compare": "^1.4.0", + "optionator": "^0.8.2", + "path-is-inside": "^1.0.2", + "progress": "^2.0.0", + "regexpp": "^2.0.1", + "semver": "^5.5.1", + "strip-ansi": "^4.0.0", + "strip-json-comments": "^2.0.1", + "table": "^5.2.3", + "text-table": "^0.2.0" + }, + "dependencies": { + "ignore": { + "version": "4.0.6", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz", + "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==", + "dev": true + } + } + }, + "eslint-scope": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.3.tgz", + "integrity": "sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==", + "dev": true, + "requires": { + "esrecurse": "^4.1.0", + "estraverse": "^4.1.1" + } + }, + "espree": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/espree/-/espree-5.0.1.tgz", + "integrity": "sha512-qWAZcWh4XE/RwzLJejfcofscgMc9CamR6Tn1+XRXNzrvUSSbiAjGOI/fggztjIi7y9VLPqnICMIPiGyr8JaZ0A==", + "dev": true, + "requires": { + "acorn": "^6.0.7", + "acorn-jsx": "^5.0.0", + "eslint-visitor-keys": "^1.0.0" + } + }, + "figures": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz", + "integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=", + "dev": true, + "requires": { + "escape-string-regexp": "^1.0.5" + } + }, + "find-up": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", + "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", + "dev": true, + "requires": { + "locate-path": "^5.0.0", + "path-exists": "^4.0.0" + } + }, + "get-stdin": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-7.0.0.tgz", + "integrity": "sha512-zRKcywvrXlXsA0v0i9Io4KDRaAw7+a1ZpjRwl9Wox8PFlVCCHra7E9c4kqXCoCM9nR5tBkaTTZRBoCm60bFqTQ==", + "dev": true + }, + "glob": { + "version": "7.1.6", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz", + "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==", + "dev": true, + "requires": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + } + }, + "ignore": { + "version": "5.1.4", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.4.tgz", + "integrity": "sha512-MzbUSahkTW1u7JpKKjY7LCARd1fU5W2rLdxlM4kdkayuCwZImjkpluF9CM1aLewYJguPDqewLam18Y6AU69A8A==", + "dev": true + }, + "inquirer": { + "version": "6.5.2", + "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-6.5.2.tgz", + "integrity": "sha512-cntlB5ghuB0iuO65Ovoi8ogLHiWGs/5yNrtUcKjFhSSiVeAIVpD7koaSU9RM8mpXw5YDi9RdYXGQMaOURB7ycQ==", + "dev": true, + "requires": { + "ansi-escapes": "^3.2.0", + "chalk": "^2.4.2", + "cli-cursor": "^2.1.0", + "cli-width": "^2.0.0", + "external-editor": "^3.0.3", + "figures": "^2.0.0", + "lodash": "^4.17.12", + "mute-stream": "0.0.7", + "run-async": "^2.2.0", + "rxjs": "^6.4.0", + "string-width": "^2.1.0", + "strip-ansi": "^5.1.0", + "through": "^2.3.6" + }, + "dependencies": { + "ansi-regex": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", + "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", + "dev": true + }, + "strip-ansi": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", + "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", + "dev": true, + "requires": { + "ansi-regex": "^4.1.0" + } + } + } + }, + "is-fullwidth-code-point": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", + "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", + "dev": true + }, + "locate-path": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", + "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", + "dev": true, + "requires": { + "p-locate": "^4.1.0" + } + }, + "mimic-fn": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz", + "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==", + "dev": true + }, + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true + }, + "mute-stream": { + "version": "0.0.7", + "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz", + "integrity": "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=", + "dev": true + }, + "onetime": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz", + "integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=", + "dev": true, + "requires": { + "mimic-fn": "^1.0.0" + } + }, + "p-locate": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", + "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", + "dev": true, + "requires": { + "p-limit": "^2.2.0" + } + }, + "path-exists": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", + "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", + "dev": true + }, + "restore-cursor": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz", + "integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=", + "dev": true, + "requires": { + "onetime": "^2.0.0", + "signal-exit": "^3.0.2" + } + }, + "semver": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", + "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", + "dev": true + }, + "string-width": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", + "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", + "dev": true, + "requires": { + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^4.0.0" + } + }, + "strip-ansi": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", + "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", + "dev": true, + "requires": { + "ansi-regex": "^3.0.0" + } + }, + "strip-json-comments": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz", + "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=", + "dev": true + } + } + }, + "prettier-linter-helpers": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz", + "integrity": "sha512-GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w==", + "dev": true, + "requires": { + "fast-diff": "^1.1.2" + } + }, + "pretty-format": { + "version": "23.6.0", + "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-23.6.0.tgz", + "integrity": "sha512-zf9NV1NSlDLDjycnwm6hpFATCGl/K1lt0R/GdkAK2O5LN/rwJoB+Mh93gGJjut4YbmecbfgLWVGSTCr0Ewvvbw==", + "dev": true, + "requires": { + "ansi-regex": "^3.0.0", + "ansi-styles": "^3.2.0" + }, + "dependencies": { + "ansi-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", + "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", + "dev": true + } + } + }, "pretty-ms": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/pretty-ms/-/pretty-ms-4.0.0.tgz", @@ -1712,6 +4113,12 @@ "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz", "integrity": "sha1-o31zL0JxtKsa0HDTVQjoKQeI/6o=" }, + "progress": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz", + "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==", + "dev": true + }, "prom-client": { "version": "11.5.1", "resolved": "https://registry.npmjs.org/prom-client/-/prom-client-11.5.1.tgz", @@ -1720,6 +4127,17 @@ "tdigest": "^0.1.1" } }, + "prop-types": { + "version": "15.7.2", + "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.7.2.tgz", + "integrity": "sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==", + "dev": true, + "requires": { + "loose-envify": "^1.4.0", + "object-assign": "^4.1.1", + "react-is": "^16.8.1" + } + }, "protobufjs": { "version": "6.8.8", "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-6.8.8.tgz", @@ -1762,6 +4180,18 @@ "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz", "integrity": "sha1-yzroBuh0BERYTvFUzo7pjUA/PjY=" }, + "quick-lru": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-4.0.1.tgz", + "integrity": "sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g==", + "dev": true + }, + "ramda": { + "version": "0.26.1", + "resolved": "https://registry.npmjs.org/ramda/-/ramda-0.26.1.tgz", + "integrity": "sha512-hLWjpy7EnsDBb0p+Z3B7rPi3GDeRG5ZtiI33kJhTt+ORCd38AbAIjB/9zRIUoeTbE/AVX5ZkU7m6bznsvrf8eQ==", + "dev": true + }, "raven": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/raven/-/raven-1.1.3.tgz", @@ -1781,6 +4211,33 @@ } } }, + "react-is": { + "version": "16.12.0", + "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.12.0.tgz", + "integrity": "sha512-rPCkf/mWBtKc97aLL9/txD8DZdemK0vkA3JMLShjlJB3Pj3s+lpf1KaBzMfQrAmhMQB0n1cU/SUGgKKBCe837Q==", + "dev": true + }, + "read-pkg": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz", + "integrity": "sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=", + "dev": true, + "requires": { + "load-json-file": "^2.0.0", + "normalize-package-data": "^2.3.2", + "path-type": "^2.0.0" + } + }, + "read-pkg-up": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz", + "integrity": "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=", + "dev": true, + "requires": { + "find-up": "^2.0.0", + "read-pkg": "^2.0.0" + } + }, "readable-stream": { "version": "2.3.6", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", @@ -1802,6 +4259,18 @@ } } }, + "regenerator-runtime": { + "version": "0.13.3", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.3.tgz", + "integrity": "sha512-naKIZz2GQ8JWh///G7L3X6LaQUAMp2lvb1rvwwsURe/VXwD6VMfr+/1NuNw3ag8v2kY1aQ/go5SNn79O9JU7yw==", + "dev": true + }, + "regexpp": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-2.0.1.tgz", + "integrity": "sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw==", + "dev": true + }, "request": { "version": "2.81.0", "resolved": "https://registry.npmjs.org/request/-/request-2.81.0.tgz", @@ -2198,6 +4667,12 @@ } } }, + "require-directory": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", + "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=", + "dev": true + }, "require-in-the-middle": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/require-in-the-middle/-/require-in-the-middle-4.0.0.tgz", @@ -2229,6 +4704,18 @@ "integrity": "sha1-rW8wwTvs15cBDEaK+ndcDAprR/o=", "dev": true }, + "require-main-filename": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz", + "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==", + "dev": true + }, + "require-relative": { + "version": "0.8.7", + "resolved": "https://registry.npmjs.org/require-relative/-/require-relative-0.8.7.tgz", + "integrity": "sha1-eZlTn8ngR6N5KPoZb44VY9q9Nt4=", + "dev": true + }, "resolve": { "version": "1.11.0", "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.11.0.tgz", @@ -2237,6 +4724,22 @@ "path-parse": "^1.0.6" } }, + "resolve-from": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", + "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", + "dev": true + }, + "restore-cursor": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz", + "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==", + "dev": true, + "requires": { + "onetime": "^5.1.0", + "signal-exit": "^3.0.2" + } + }, "retry-axios": { "version": "0.3.2", "resolved": "https://registry.npmjs.org/retry-axios/-/retry-axios-0.3.2.tgz", @@ -2259,6 +4762,24 @@ "glob": "^6.0.1" } }, + "run-async": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.3.0.tgz", + "integrity": "sha1-A3GrSuC91yDUFm19/aZP96RFpsA=", + "dev": true, + "requires": { + "is-promise": "^2.1.0" + } + }, + "rxjs": { + "version": "6.5.4", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.5.4.tgz", + "integrity": "sha512-naMQXcgEo3csAEGvw/NydRA0fuS2nDZJiw1YUWFKU7aPPAPGZEsD4Iimit96qwCieH6y614MCLYwdkrWx7z/7Q==", + "dev": true, + "requires": { + "tslib": "^1.9.0" + } + }, "safe-buffer": { "version": "5.1.2", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", @@ -2290,6 +4811,12 @@ "resolved": "https://registry.npmjs.org/semver/-/semver-6.1.1.tgz", "integrity": "sha1-U/U9qbMLIQPNTxXqs6GOy8shDJs=" }, + "set-blocking": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", + "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=", + "dev": true + }, "settings-sharelatex": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/settings-sharelatex/-/settings-sharelatex-1.1.0.tgz", @@ -2305,11 +4832,32 @@ } } }, + "shebang-command": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz", + "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=", + "dev": true, + "requires": { + "shebang-regex": "^1.0.0" + } + }, + "shebang-regex": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz", + "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=", + "dev": true + }, "shimmer": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/shimmer/-/shimmer-1.2.1.tgz", "integrity": "sha1-YQhZ994ye1h+/r9QH7QxF/mv8zc=" }, + "signal-exit": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz", + "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=", + "dev": true + }, "sinon": { "version": "6.3.5", "resolved": "https://registry.npmjs.org/sinon/-/sinon-6.3.5.tgz", @@ -2350,11 +4898,62 @@ } } }, + "slice-ansi": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-2.1.0.tgz", + "integrity": "sha512-Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ==", + "dev": true, + "requires": { + "ansi-styles": "^3.2.0", + "astral-regex": "^1.0.0", + "is-fullwidth-code-point": "^2.0.0" + }, + "dependencies": { + "is-fullwidth-code-point": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", + "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", + "dev": true + } + } + }, "source-map": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", "integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM=" }, + "spdx-correct": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.0.tgz", + "integrity": "sha512-lr2EZCctC2BNR7j7WzJ2FpDznxky1sjfxvvYEyzxNyb6lZXHODmEoJeFu4JupYlkfha1KZpJyoqiJ7pgA1qq8Q==", + "dev": true, + "requires": { + "spdx-expression-parse": "^3.0.0", + "spdx-license-ids": "^3.0.0" + } + }, + "spdx-exceptions": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz", + "integrity": "sha512-2XQACfElKi9SlVb1CYadKDXvoajPgBVPn/gOQLrTvHdElaVhr7ZEbqJaRnJLVNeaI4cMEAgVCeBMKF6MWRDCRA==", + "dev": true + }, + "spdx-expression-parse": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz", + "integrity": "sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==", + "dev": true, + "requires": { + "spdx-exceptions": "^2.1.0", + "spdx-license-ids": "^3.0.0" + } + }, + "spdx-license-ids": { + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz", + "integrity": "sha512-J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q==", + "dev": true + }, "split": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/split/-/split-1.0.1.tgz", @@ -2363,6 +4962,12 @@ "through": "2" } }, + "sprintf-js": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", + "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=", + "dev": true + }, "sshpk": { "version": "1.16.1", "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz", @@ -2394,6 +4999,48 @@ "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.0.tgz", "integrity": "sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI=" }, + "string-width": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz", + "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==", + "dev": true, + "requires": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.0" + }, + "dependencies": { + "strip-ansi": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", + "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", + "dev": true, + "requires": { + "ansi-regex": "^5.0.0" + } + } + } + }, + "string.prototype.trimleft": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.1.tgz", + "integrity": "sha512-iu2AGd3PuP5Rp7x2kEZCrB2Nf41ehzh+goo8TV7z8/XDBbsvc6HQIlUl9RjkZ4oyrW1XM5UwlGl1oVEaDjg6Ag==", + "dev": true, + "requires": { + "define-properties": "^1.1.3", + "function-bind": "^1.1.1" + } + }, + "string.prototype.trimright": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.1.tgz", + "integrity": "sha512-qFvWL3/+QIgZXVmJBfpHmxLB7xsUXz6HsUmP8+5dRaC3Q7oKUv9Vo6aMCRZC1smrtyECFsIT30PqBJ1gTjAs+g==", + "dev": true, + "requires": { + "define-properties": "^1.1.3", + "function-bind": "^1.1.1" + } + }, "string_decoder": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", @@ -2402,6 +5049,35 @@ "safe-buffer": "~5.1.0" } }, + "strip-ansi": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", + "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", + "dev": true, + "requires": { + "ansi-regex": "^4.1.0" + }, + "dependencies": { + "ansi-regex": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", + "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", + "dev": true + } + } + }, + "strip-bom": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", + "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=", + "dev": true + }, + "strip-json-comments": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.0.1.tgz", + "integrity": "sha512-VTyMAUfdm047mwKl+u79WIdrZxtFtn+nBxHeb844XBQ9uMNTuTHdx2hc5RiAJYqwTj3wc/xe5HLSdJSkJ+WfZw==", + "dev": true + }, "supports-color": { "version": "4.4.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.4.0.tgz", @@ -2411,6 +5087,55 @@ "has-flag": "^2.0.0" } }, + "table": { + "version": "5.4.6", + "resolved": "https://registry.npmjs.org/table/-/table-5.4.6.tgz", + "integrity": "sha512-wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug==", + "dev": true, + "requires": { + "ajv": "^6.10.2", + "lodash": "^4.17.14", + "slice-ansi": "^2.1.0", + "string-width": "^3.0.0" + }, + "dependencies": { + "ajv": { + "version": "6.10.2", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.2.tgz", + "integrity": "sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==", + "dev": true, + "requires": { + "fast-deep-equal": "^2.0.1", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.4.1", + "uri-js": "^4.2.2" + } + }, + "emoji-regex": { + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz", + "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==", + "dev": true + }, + "is-fullwidth-code-point": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", + "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", + "dev": true + }, + "string-width": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", + "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", + "dev": true, + "requires": { + "emoji-regex": "^7.0.1", + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^5.1.0" + } + } + } + }, "tdigest": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/tdigest/-/tdigest-0.1.1.tgz", @@ -2435,6 +5160,12 @@ "integrity": "sha1-45mpgiV6J22uQou5KEXLcb3CbRk=", "dev": true }, + "text-table": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", + "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=", + "dev": true + }, "through": { "version": "2.3.8", "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", @@ -2449,6 +5180,21 @@ "xtend": "~4.0.1" } }, + "tmp": { + "version": "0.0.33", + "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz", + "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==", + "dev": true, + "requires": { + "os-tmpdir": "~1.0.2" + } + }, + "to-fast-properties": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz", + "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=", + "dev": true + }, "tough-cookie": { "version": "2.4.3", "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz", @@ -2465,6 +5211,12 @@ } } }, + "tslib": { + "version": "1.10.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.10.0.tgz", + "integrity": "sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ==", + "dev": true + }, "tunnel-agent": { "version": "0.6.0", "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", @@ -2478,12 +5230,33 @@ "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz", "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=" }, + "type-check": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz", + "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=", + "dev": true, + "requires": { + "prelude-ls": "~1.1.2" + } + }, "type-detect": { "version": "4.0.8", "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz", "integrity": "sha1-dkb7XxiHHPu3dJ5pvTmmOI63RQw=", "dev": true }, + "type-fest": { + "version": "0.8.1", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz", + "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==", + "dev": true + }, + "typescript": { + "version": "3.7.4", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.7.4.tgz", + "integrity": "sha512-A25xv5XCtarLwXpcDNZzCGvW2D1S3/bACratYBx2sax8PefsFhlYmkQicKHvpYflFS8if4zne5zT5kpJ7pzuvw==", + "dev": true + }, "underscore": { "version": "1.4.4", "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.4.4.tgz", @@ -2507,6 +5280,22 @@ "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz", "integrity": "sha1-G0r0lV6zB3xQHCOHL8ZROBFYcTE=" }, + "v8-compile-cache": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.1.0.tgz", + "integrity": "sha512-usZBT3PW+LOjM25wbqIlZwPeJV+3OSz3M1k1Ws8snlW39dZyYL9lOGC5FgPVHfk0jKmjiDV8Z0mIbVQPiwFs7g==", + "dev": true + }, + "validate-npm-package-license": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz", + "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==", + "dev": true, + "requires": { + "spdx-correct": "^3.0.0", + "spdx-expression-parse": "^3.0.0" + } + }, "verror": { "version": "1.10.0", "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz", @@ -2517,20 +5306,232 @@ "extsprintf": "^1.2.0" } }, + "vue-eslint-parser": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-2.0.3.tgz", + "integrity": "sha512-ZezcU71Owm84xVF6gfurBQUGg8WQ+WZGxgDEQu1IHFBZNx7BFZg3L1yHxrCBNNwbwFtE1GuvfJKMtb6Xuwc/Bw==", + "dev": true, + "requires": { + "debug": "^3.1.0", + "eslint-scope": "^3.7.1", + "eslint-visitor-keys": "^1.0.0", + "espree": "^3.5.2", + "esquery": "^1.0.0", + "lodash": "^4.17.4" + }, + "dependencies": { + "acorn": { + "version": "5.7.3", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.3.tgz", + "integrity": "sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw==", + "dev": true + }, + "acorn-jsx": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-3.0.1.tgz", + "integrity": "sha1-r9+UiPsezvyDSPb7IvRk4ypYs2s=", + "dev": true, + "requires": { + "acorn": "^3.0.4" + }, + "dependencies": { + "acorn": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz", + "integrity": "sha1-ReN/s56No/JbruP/U2niu18iAXo=", + "dev": true + } + } + }, + "eslint-scope": { + "version": "3.7.3", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-3.7.3.tgz", + "integrity": "sha512-W+B0SvF4gamyCTmUc+uITPY0989iXVfKvhwtmJocTaYoc/3khEHmEmvfY/Gn9HA9VV75jrQECsHizkNw1b68FA==", + "dev": true, + "requires": { + "esrecurse": "^4.1.0", + "estraverse": "^4.1.1" + } + }, + "espree": { + "version": "3.5.4", + "resolved": "https://registry.npmjs.org/espree/-/espree-3.5.4.tgz", + "integrity": "sha512-yAcIQxtmMiB/jL32dzEp2enBeidsB7xWPLNiw3IIkpVds1P+h7qF9YwJq1yUNzp2OKXgAprs4F61ih66UsoD1A==", + "dev": true, + "requires": { + "acorn": "^5.5.0", + "acorn-jsx": "^3.0.0" + } + } + } + }, + "which": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", + "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", + "dev": true, + "requires": { + "isexe": "^2.0.0" + } + }, + "which-module": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz", + "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=", + "dev": true + }, + "word-wrap": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz", + "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==", + "dev": true + }, + "wrap-ansi": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz", + "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==", + "dev": true, + "requires": { + "ansi-styles": "^3.2.0", + "string-width": "^3.0.0", + "strip-ansi": "^5.0.0" + }, + "dependencies": { + "emoji-regex": { + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz", + "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==", + "dev": true + }, + "is-fullwidth-code-point": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", + "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", + "dev": true + }, + "string-width": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", + "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", + "dev": true, + "requires": { + "emoji-regex": "^7.0.1", + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^5.1.0" + } + } + } + }, "wrappy": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=" }, + "write": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/write/-/write-1.0.3.tgz", + "integrity": "sha512-/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig==", + "dev": true, + "requires": { + "mkdirp": "^0.5.1" + } + }, "xtend": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz", "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=" }, + "y18n": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz", + "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==", + "dev": true + }, "yallist": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz", "integrity": "sha1-tLBJ4xS+VF486AIjbWzSLNkcPek=" + }, + "yargs": { + "version": "13.3.0", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.0.tgz", + "integrity": "sha512-2eehun/8ALW8TLoIl7MVaRUrg+yCnenu8B4kBlRxj3GJGDKU1Og7sMXPNm1BYyM1DOJmTZ4YeN/Nwxv+8XJsUA==", + "dev": true, + "requires": { + "cliui": "^5.0.0", + "find-up": "^3.0.0", + "get-caller-file": "^2.0.1", + "require-directory": "^2.1.1", + "require-main-filename": "^2.0.0", + "set-blocking": "^2.0.0", + "string-width": "^3.0.0", + "which-module": "^2.0.0", + "y18n": "^4.0.0", + "yargs-parser": "^13.1.1" + }, + "dependencies": { + "emoji-regex": { + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz", + "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==", + "dev": true + }, + "find-up": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz", + "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==", + "dev": true, + "requires": { + "locate-path": "^3.0.0" + } + }, + "is-fullwidth-code-point": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", + "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", + "dev": true + }, + "locate-path": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz", + "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==", + "dev": true, + "requires": { + "p-locate": "^3.0.0", + "path-exists": "^3.0.0" + } + }, + "p-locate": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz", + "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==", + "dev": true, + "requires": { + "p-limit": "^2.0.0" + } + }, + "string-width": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", + "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", + "dev": true, + "requires": { + "emoji-regex": "^7.0.1", + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^5.1.0" + } + } + } + }, + "yargs-parser": { + "version": "13.1.1", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.1.tgz", + "integrity": "sha512-oVAVsHz6uFrg3XQheFII8ESO2ssAf9luWuAd6Wexsu4F3OtIW0o8IribPXYrD4WC24LWtPrJlGy87y5udK+dxQ==", + "dev": true, + "requires": { + "camelcase": "^5.0.0", + "decamelize": "^1.2.0" + } } } } diff --git a/services/notifications/package.json b/services/notifications/package.json index e8b9f38e61..befd9912d6 100644 --- a/services/notifications/package.json +++ b/services/notifications/package.json @@ -34,9 +34,27 @@ "underscore": "1.4.4" }, "devDependencies": { + "babel-eslint": "^10.0.3", "bunyan": "^1.0.0", "chai": "^4.2.0", + "eslint": "^6.6.0", + "eslint-config-prettier": "^6.9.0", + "eslint-config-standard": "^14.1.0", + "eslint-config-standard-jsx": "^8.1.0", + "eslint-config-standard-react": "^9.2.0", + "eslint-plugin-chai-expect": "^2.1.0", + "eslint-plugin-chai-friendly": "^0.5.0", + "eslint-plugin-import": "^2.20.0", + "eslint-plugin-jsx-a11y": "^6.2.3", + "eslint-plugin-mocha": "^6.2.2", + "eslint-plugin-node": "^11.0.0", + "eslint-plugin-prettier": "^3.1.2", + "eslint-plugin-promise": "^4.2.1", + "eslint-plugin-react": "^7.17.0", + "eslint-plugin-standard": "^4.0.1", "mocha": "^4.1.0", + "prettier": "^1.19.1", + "prettier-eslint-cli": "^5.0.0", "sandboxed-module": "^2.0.3", "sinon": "^6.3.5" } From 27afdd47cd0d3488307416e32c2b3628cce1a841 Mon Sep 17 00:00:00 2001 From: decaffeinate Date: Mon, 13 Jan 2020 20:00:26 +0100 Subject: [PATCH 05/18] decaffeinate: Rename HealthCheckController.coffee and 2 other files from .coffee to .js --- .../{HealthCheckController.coffee => HealthCheckController.js} | 0 .../app/coffee/{Notifications.coffee => Notifications.js} | 0 ...{NotificationsController.coffee => NotificationsController.js} | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename services/notifications/app/coffee/{HealthCheckController.coffee => HealthCheckController.js} (100%) rename services/notifications/app/coffee/{Notifications.coffee => Notifications.js} (100%) rename services/notifications/app/coffee/{NotificationsController.coffee => NotificationsController.js} (100%) diff --git a/services/notifications/app/coffee/HealthCheckController.coffee b/services/notifications/app/coffee/HealthCheckController.js similarity index 100% rename from services/notifications/app/coffee/HealthCheckController.coffee rename to services/notifications/app/coffee/HealthCheckController.js diff --git a/services/notifications/app/coffee/Notifications.coffee b/services/notifications/app/coffee/Notifications.js similarity index 100% rename from services/notifications/app/coffee/Notifications.coffee rename to services/notifications/app/coffee/Notifications.js diff --git a/services/notifications/app/coffee/NotificationsController.coffee b/services/notifications/app/coffee/NotificationsController.js similarity index 100% rename from services/notifications/app/coffee/NotificationsController.coffee rename to services/notifications/app/coffee/NotificationsController.js From ddccb85dda1658a089875c60558d44dcd1ff6bf9 Mon Sep 17 00:00:00 2001 From: decaffeinate Date: Mon, 13 Jan 2020 20:00:33 +0100 Subject: [PATCH 06/18] decaffeinate: Convert HealthCheckController.coffee and 2 other files to JS --- .../app/coffee/HealthCheckController.js | 142 ++++++++-------- .../notifications/app/coffee/Notifications.js | 151 ++++++++++-------- .../app/coffee/NotificationsController.js | 76 +++++---- 3 files changed, 210 insertions(+), 159 deletions(-) diff --git a/services/notifications/app/coffee/HealthCheckController.js b/services/notifications/app/coffee/HealthCheckController.js index 1adb0433d4..3022d770f4 100644 --- a/services/notifications/app/coffee/HealthCheckController.js +++ b/services/notifications/app/coffee/HealthCheckController.js @@ -1,66 +1,82 @@ -ObjectId = require("mongojs").ObjectId -request = require("request") -async = require("async") -_ = require("underscore") -settings = require("settings-sharelatex") -port = settings.internal.notifications.port -logger = require "logger-sharelatex" +/* + * decaffeinate suggestions: + * DS102: Remove unnecessary code created because of implicit returns + * DS207: Consider shorter variations of null checks + * Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md + */ +const { ObjectId } = require("mongojs"); +const request = require("request"); +const async = require("async"); +const _ = require("underscore"); +const settings = require("settings-sharelatex"); +const { port } = settings.internal.notifications; +const logger = require("logger-sharelatex"); -mongojs = require('mongojs') -Settings = require 'settings-sharelatex' -db = mongojs(Settings.mongo?.url, ['notifications']) +const mongojs = require('mongojs'); +const Settings = require('settings-sharelatex'); +const db = mongojs(Settings.mongo != null ? Settings.mongo.url : undefined, ['notifications']); -module.exports = - check : (callback)-> - user_id = ObjectId() - cleanupNotifications = (callback)-> - db.notifications.remove {user_id:user_id}, callback +module.exports = { + check(callback){ + const user_id = ObjectId(); + const cleanupNotifications = callback=> db.notifications.remove({user_id}, callback); - notification_key = "smoke-test-notification-#{ObjectId()}" - getOpts = (endPath)-> {url:"http://localhost:#{port}/user/#{user_id}#{endPath}", timeout:5000} - logger.log user_id:user_id, opts:getOpts(), key:notification_key, user_id:user_id, "Health Check: running" - jobs = [ - (cb)-> - opts = getOpts("/") - opts.json = {key: notification_key, messageOpts:'', templateKey:'f4g5', user_id:user_id} - request.post(opts, cb) - (cb)-> - opts = getOpts("/") - opts.json = true - request.get opts, (err, res, body)-> - if err? - logger.err err:err, "Health Check: error getting notification" - return callback(err) - else if res.statusCode != 200 - e = "status code not 200 #{res.statusCode}" - logger.err err:err, e - return cb(e) - hasNotification = _.some body, (notification)-> - notification.key == notification_key and notification.user_id == user_id.toString() - if hasNotification - cb(null, body) - else - logger.err body:body, notification_key:notification_key, "Health Check: notification not in response" - return cb("notification not found in response") - ] - async.series jobs, (err, body)-> - if err? - logger.err err:err, "Health Check: error running health check" - cleanupNotifications -> - return callback(err) - else - notification_id = body[1][0]._id - notification_key = body[1][0].key - opts = getOpts("/notification/#{notification_id}") - logger.log notification_id:notification_id, notification_key:notification_key, "Health Check: doing cleanup" - request.del opts, (err, res, body)-> - if err? - logger.err err, opts, "Health Check: error cleaning up notification" - return callback(err) - opts = getOpts("") - opts.json = {key: notification_key} - request.del opts, (err, res, body)-> - if err? - logger.err err, opts, "Health Check: error cleaning up notification" - return callback(err) - cleanupNotifications callback + let notification_key = `smoke-test-notification-${ObjectId()}`; + const getOpts = endPath=> ({url:`http://localhost:${port}/user/${user_id}${endPath}`, timeout:5000}); + logger.log({user_id, opts:getOpts(), key:notification_key, user_id}, "Health Check: running"); + const jobs = [ + function(cb){ + const opts = getOpts("/"); + opts.json = {key: notification_key, messageOpts:'', templateKey:'f4g5', user_id}; + return request.post(opts, cb); + }, + function(cb){ + const opts = getOpts("/"); + opts.json = true; + return request.get(opts, function(err, res, body){ + if (err != null) { + logger.err({err}, "Health Check: error getting notification"); + return callback(err); + } else if (res.statusCode !== 200) { + const e = `status code not 200 ${res.statusCode}`; + logger.err({err}, e); + return cb(e); + } + const hasNotification = _.some(body, notification=> (notification.key === notification_key) && (notification.user_id === user_id.toString())); + if (hasNotification) { + return cb(null, body); + } else { + logger.err({body, notification_key}, "Health Check: notification not in response"); + return cb("notification not found in response"); + } + }); + } + ]; + return async.series(jobs, function(err, body){ + if (err != null) { + logger.err({err}, "Health Check: error running health check"); + return cleanupNotifications(() => callback(err)); + } else { + const notification_id = body[1][0]._id; + notification_key = body[1][0].key; + let opts = getOpts(`/notification/${notification_id}`); + logger.log({notification_id, notification_key}, "Health Check: doing cleanup"); + return request.del(opts, function(err, res, body){ + if (err != null) { + logger.err(err, opts, "Health Check: error cleaning up notification"); + return callback(err); + } + opts = getOpts(""); + opts.json = {key: notification_key}; + return request.del(opts, function(err, res, body){ + if (err != null) { + logger.err(err, opts, "Health Check: error cleaning up notification"); + return callback(err); + } + return cleanupNotifications(callback); + }); + }); + } + }); + } +}; diff --git a/services/notifications/app/coffee/Notifications.js b/services/notifications/app/coffee/Notifications.js index 5fc4084025..7db2053588 100644 --- a/services/notifications/app/coffee/Notifications.js +++ b/services/notifications/app/coffee/Notifications.js @@ -1,82 +1,107 @@ -Settings = require 'settings-sharelatex' -logger = require('logger-sharelatex') -mongojs = require('mongojs') -db = mongojs(Settings.mongo?.url, ['notifications']) -ObjectId = require("mongojs").ObjectId -metrics = require('metrics-sharelatex') +/* + * decaffeinate suggestions: + * DS102: Remove unnecessary code created because of implicit returns + * DS207: Consider shorter variations of null checks + * Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md + */ +let Notifications; +const Settings = require('settings-sharelatex'); +const logger = require('logger-sharelatex'); +const mongojs = require('mongojs'); +const db = mongojs(Settings.mongo != null ? Settings.mongo.url : undefined, ['notifications']); +const { ObjectId } = require("mongojs"); +const metrics = require('metrics-sharelatex'); -module.exports = Notifications = +module.exports = (Notifications = { - getUserNotifications: (user_id, callback = (err, notifications)->)-> - query = - user_id: ObjectId(user_id) + getUserNotifications(user_id, callback){ + if (callback == null) { callback = function(err, notifications){}; } + const query = { + user_id: ObjectId(user_id), templateKey: {"$exists":true} - db.notifications.find query, (err, notifications)-> - callback err, notifications + }; + return db.notifications.find(query, (err, notifications)=> callback(err, notifications)); + }, - _countExistingNotifications : (user_id, notification, callback = (err, count)->)-> - query = - user_id: ObjectId(user_id) + _countExistingNotifications(user_id, notification, callback){ + if (callback == null) { callback = function(err, count){}; } + const query = { + user_id: ObjectId(user_id), key: notification.key - db.notifications.count query, (err, count)-> - return callback(err) if err? - callback(null, count) + }; + return db.notifications.count(query, function(err, count){ + if (err != null) { return callback(err); } + return callback(null, count); + }); + }, - addNotification: (user_id, notification, callback)-> - @_countExistingNotifications user_id, notification, (err, count)-> - return callback(err) if err? - return callback() unless count == 0 || notification.forceCreate - doc = - user_id: ObjectId(user_id) - key: notification.key - messageOpts: notification.messageOpts + addNotification(user_id, notification, callback){ + return this._countExistingNotifications(user_id, notification, function(err, count){ + if (err != null) { return callback(err); } + if ((count !== 0) && !notification.forceCreate) { return callback(); } + const doc = { + user_id: ObjectId(user_id), + key: notification.key, + messageOpts: notification.messageOpts, templateKey: notification.templateKey - # TTL index on the optional `expires` field, which should arrive as an iso date-string, corresponding to - # a datetime in the future when the document should be automatically removed. - # in Mongo, TTL indexes only work on date fields, and ignore the document when that field is missing - # see `README.md` for instruction on creating TTL index - if notification.expires? - try - doc.expires = new Date(notification.expires) - _testValue = doc.expires.toISOString() - catch err - logger.error {user_id, expires: notification.expires}, "error converting `expires` field to Date" - return callback(err) - db.notifications.update({user_id: doc.user_id, key: notification.key}, doc, {upsert: true}, callback) + }; + // TTL index on the optional `expires` field, which should arrive as an iso date-string, corresponding to + // a datetime in the future when the document should be automatically removed. + // in Mongo, TTL indexes only work on date fields, and ignore the document when that field is missing + // see `README.md` for instruction on creating TTL index + if (notification.expires != null) { + try { + doc.expires = new Date(notification.expires); + const _testValue = doc.expires.toISOString(); + } catch (error) { + err = error; + logger.error({user_id, expires: notification.expires}, "error converting `expires` field to Date"); + return callback(err); + } + } + return db.notifications.update({user_id: doc.user_id, key: notification.key}, doc, {upsert: true}, callback); + }); + }, - removeNotificationId: (user_id, notification_id, callback)-> - searchOps = - user_id:ObjectId(user_id) + removeNotificationId(user_id, notification_id, callback){ + const searchOps = { + user_id:ObjectId(user_id), _id:ObjectId(notification_id) - updateOperation = - "$unset": {templateKey:true, messageOpts: true} - db.notifications.update searchOps, updateOperation, callback + }; + const updateOperation = + {"$unset": {templateKey:true, messageOpts: true}}; + return db.notifications.update(searchOps, updateOperation, callback); + }, - removeNotificationKey: (user_id, notification_key, callback)-> - searchOps = - user_id:ObjectId(user_id) + removeNotificationKey(user_id, notification_key, callback){ + const searchOps = { + user_id:ObjectId(user_id), key: notification_key - updateOperation = - "$unset": {templateKey:true} - db.notifications.update searchOps, updateOperation, callback + }; + const updateOperation = + {"$unset": {templateKey:true}}; + return db.notifications.update(searchOps, updateOperation, callback); + }, - removeNotificationByKeyOnly: (notification_key, callback)-> - searchOps = - key: notification_key - updateOperation = - "$unset": {templateKey:true} - db.notifications.update searchOps, updateOperation, callback + removeNotificationByKeyOnly(notification_key, callback){ + const searchOps = + {key: notification_key}; + const updateOperation = + {"$unset": {templateKey:true}}; + return db.notifications.update(searchOps, updateOperation, callback); + }, - # hard delete of doc, rather than removing the templateKey - deleteNotificationByKeyOnly: (notification_key, callback)-> - searchOps = - key: notification_key - db.notifications.remove searchOps, {justOne: true}, callback + // hard delete of doc, rather than removing the templateKey + deleteNotificationByKeyOnly(notification_key, callback){ + const searchOps = + {key: notification_key}; + return db.notifications.remove(searchOps, {justOne: true}, callback); + } +}); [ 'getUserNotifications', 'addNotification' -].map (method) -> - metrics.timeAsyncMethod(Notifications, method, 'mongo.Notifications', logger) +].map(method => metrics.timeAsyncMethod(Notifications, method, 'mongo.Notifications', logger)); diff --git a/services/notifications/app/coffee/NotificationsController.js b/services/notifications/app/coffee/NotificationsController.js index 416cdeccc0..01f2ef97ac 100644 --- a/services/notifications/app/coffee/NotificationsController.js +++ b/services/notifications/app/coffee/NotificationsController.js @@ -1,39 +1,49 @@ -Notifications = require("./Notifications") -logger = require("logger-sharelatex") -metrics = require('metrics-sharelatex') +/* + * decaffeinate suggestions: + * DS102: Remove unnecessary code created because of implicit returns + * DS207: Consider shorter variations of null checks + * Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md + */ +const Notifications = require("./Notifications"); +const logger = require("logger-sharelatex"); +const metrics = require('metrics-sharelatex'); -module.exports = +module.exports = { - getUserNotifications: (req, res)-> - logger.log user_id: req.params.user_id, "getting user unread notifications" - metrics.inc "getUserNotifications" - Notifications.getUserNotifications req.params.user_id, (err, notifications)-> - res.json(notifications) + getUserNotifications(req, res){ + logger.log({user_id: req.params.user_id}, "getting user unread notifications"); + metrics.inc("getUserNotifications"); + return Notifications.getUserNotifications(req.params.user_id, (err, notifications)=> res.json(notifications)); + }, - addNotification: (req, res)-> - logger.log user_id: req.params.user_id, notification:req.body, "adding notification" - metrics.inc "addNotification" - Notifications.addNotification req.params.user_id, req.body, (err, notifications)-> - if err? - res.send 500 - else - res.send() + addNotification(req, res){ + logger.log({user_id: req.params.user_id, notification:req.body}, "adding notification"); + metrics.inc("addNotification"); + return Notifications.addNotification(req.params.user_id, req.body, function(err, notifications){ + if (err != null) { + return res.send(500); + } else { + return res.send(); + } + }); + }, - removeNotificationId: (req, res)-> - logger.log user_id: req.params.user_id, notification_id: req.params.notification_id, "mark id notification as read" - metrics.inc "removeNotificationId" - Notifications.removeNotificationId req.params.user_id, req.params.notification_id, (err, notifications)-> - res.send() + removeNotificationId(req, res){ + logger.log({user_id: req.params.user_id, notification_id: req.params.notification_id}, "mark id notification as read"); + metrics.inc("removeNotificationId"); + return Notifications.removeNotificationId(req.params.user_id, req.params.notification_id, (err, notifications)=> res.send()); + }, - removeNotificationKey: (req, res)-> - logger.log user_id: req.params.user_id, notification_key: req.body.key, "mark key notification as read" - metrics.inc "removeNotificationKey" - Notifications.removeNotificationKey req.params.user_id, req.body.key, (err, notifications)-> - res.send() + removeNotificationKey(req, res){ + logger.log({user_id: req.params.user_id, notification_key: req.body.key}, "mark key notification as read"); + metrics.inc("removeNotificationKey"); + return Notifications.removeNotificationKey(req.params.user_id, req.body.key, (err, notifications)=> res.send()); + }, - removeNotificationByKeyOnly: (req, res)-> - notification_key = req.params.key - logger.log {notification_key}, "mark notification as read by key only" - metrics.inc "removeNotificationKey" - Notifications.removeNotificationByKeyOnly notification_key, (err, notifications)-> - res.send() + removeNotificationByKeyOnly(req, res){ + const notification_key = req.params.key; + logger.log({notification_key}, "mark notification as read by key only"); + metrics.inc("removeNotificationKey"); + return Notifications.removeNotificationByKeyOnly(notification_key, (err, notifications)=> res.send()); + } +}; From b667b9ad1caff34e0f1a4e0dc46bb0a38310add0 Mon Sep 17 00:00:00 2001 From: decaffeinate Date: Mon, 13 Jan 2020 20:00:40 +0100 Subject: [PATCH 07/18] decaffeinate: Run post-processing cleanups on HealthCheckController.coffee and 2 other files --- services/notifications/app/coffee/HealthCheckController.js | 7 +++++++ services/notifications/app/coffee/Notifications.js | 7 +++++++ .../notifications/app/coffee/NotificationsController.js | 6 ++++++ 3 files changed, 20 insertions(+) diff --git a/services/notifications/app/coffee/HealthCheckController.js b/services/notifications/app/coffee/HealthCheckController.js index 3022d770f4..57b24892b1 100644 --- a/services/notifications/app/coffee/HealthCheckController.js +++ b/services/notifications/app/coffee/HealthCheckController.js @@ -1,3 +1,10 @@ +/* eslint-disable + camelcase, + no-dupe-keys, + standard/no-callback-literal, +*/ +// TODO: This file was created by bulk-decaffeinate. +// Fix any style issues and re-enable lint. /* * decaffeinate suggestions: * DS102: Remove unnecessary code created because of implicit returns diff --git a/services/notifications/app/coffee/Notifications.js b/services/notifications/app/coffee/Notifications.js index 7db2053588..f1edf123c9 100644 --- a/services/notifications/app/coffee/Notifications.js +++ b/services/notifications/app/coffee/Notifications.js @@ -1,3 +1,10 @@ +/* eslint-disable + camelcase, + handle-callback-err, + no-unused-vars, +*/ +// TODO: This file was created by bulk-decaffeinate. +// Fix any style issues and re-enable lint. /* * decaffeinate suggestions: * DS102: Remove unnecessary code created because of implicit returns diff --git a/services/notifications/app/coffee/NotificationsController.js b/services/notifications/app/coffee/NotificationsController.js index 01f2ef97ac..82201ba645 100644 --- a/services/notifications/app/coffee/NotificationsController.js +++ b/services/notifications/app/coffee/NotificationsController.js @@ -1,3 +1,9 @@ +/* eslint-disable + camelcase, + handle-callback-err, +*/ +// TODO: This file was created by bulk-decaffeinate. +// Fix any style issues and re-enable lint. /* * decaffeinate suggestions: * DS102: Remove unnecessary code created because of implicit returns From 9835481cbf0403f00768fe98078b19603f167728 Mon Sep 17 00:00:00 2001 From: Tim Alby Date: Mon, 13 Jan 2020 20:00:46 +0100 Subject: [PATCH 08/18] decaffeinate: rename app/coffee dir to app/js --- .../notifications/app/{coffee => js}/HealthCheckController.js | 0 services/notifications/app/{coffee => js}/Notifications.js | 0 .../notifications/app/{coffee => js}/NotificationsController.js | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename services/notifications/app/{coffee => js}/HealthCheckController.js (100%) rename services/notifications/app/{coffee => js}/Notifications.js (100%) rename services/notifications/app/{coffee => js}/NotificationsController.js (100%) diff --git a/services/notifications/app/coffee/HealthCheckController.js b/services/notifications/app/js/HealthCheckController.js similarity index 100% rename from services/notifications/app/coffee/HealthCheckController.js rename to services/notifications/app/js/HealthCheckController.js diff --git a/services/notifications/app/coffee/Notifications.js b/services/notifications/app/js/Notifications.js similarity index 100% rename from services/notifications/app/coffee/Notifications.js rename to services/notifications/app/js/Notifications.js diff --git a/services/notifications/app/coffee/NotificationsController.js b/services/notifications/app/js/NotificationsController.js similarity index 100% rename from services/notifications/app/coffee/NotificationsController.js rename to services/notifications/app/js/NotificationsController.js From dc218cd50377e0b16e4df8f975f123bc1b47b182 Mon Sep 17 00:00:00 2001 From: Tim Alby Date: Mon, 13 Jan 2020 20:00:49 +0100 Subject: [PATCH 09/18] prettier: convert app/js decaffeinated files to Prettier format --- .../app/js/HealthCheckController.js | 179 +++++++++------- .../notifications/app/js/Notifications.js | 202 ++++++++++-------- .../app/js/NotificationsController.js | 105 +++++---- 3 files changed, 283 insertions(+), 203 deletions(-) diff --git a/services/notifications/app/js/HealthCheckController.js b/services/notifications/app/js/HealthCheckController.js index 57b24892b1..df14b9a496 100644 --- a/services/notifications/app/js/HealthCheckController.js +++ b/services/notifications/app/js/HealthCheckController.js @@ -11,79 +11,112 @@ * DS207: Consider shorter variations of null checks * Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md */ -const { ObjectId } = require("mongojs"); -const request = require("request"); -const async = require("async"); -const _ = require("underscore"); -const settings = require("settings-sharelatex"); -const { port } = settings.internal.notifications; -const logger = require("logger-sharelatex"); +const { ObjectId } = require('mongojs') +const request = require('request') +const async = require('async') +const _ = require('underscore') +const settings = require('settings-sharelatex') +const { port } = settings.internal.notifications +const logger = require('logger-sharelatex') -const mongojs = require('mongojs'); -const Settings = require('settings-sharelatex'); -const db = mongojs(Settings.mongo != null ? Settings.mongo.url : undefined, ['notifications']); +const mongojs = require('mongojs') +const Settings = require('settings-sharelatex') +const db = mongojs(Settings.mongo != null ? Settings.mongo.url : undefined, [ + 'notifications' +]) -module.exports = { - check(callback){ - const user_id = ObjectId(); - const cleanupNotifications = callback=> db.notifications.remove({user_id}, callback); +module.exports = { + check(callback) { + const user_id = ObjectId() + const cleanupNotifications = callback => + db.notifications.remove({ user_id }, callback) - let notification_key = `smoke-test-notification-${ObjectId()}`; - const getOpts = endPath=> ({url:`http://localhost:${port}/user/${user_id}${endPath}`, timeout:5000}); - logger.log({user_id, opts:getOpts(), key:notification_key, user_id}, "Health Check: running"); - const jobs = [ - function(cb){ - const opts = getOpts("/"); - opts.json = {key: notification_key, messageOpts:'', templateKey:'f4g5', user_id}; - return request.post(opts, cb); - }, - function(cb){ - const opts = getOpts("/"); - opts.json = true; - return request.get(opts, function(err, res, body){ - if (err != null) { - logger.err({err}, "Health Check: error getting notification"); - return callback(err); - } else if (res.statusCode !== 200) { - const e = `status code not 200 ${res.statusCode}`; - logger.err({err}, e); - return cb(e); - } - const hasNotification = _.some(body, notification=> (notification.key === notification_key) && (notification.user_id === user_id.toString())); - if (hasNotification) { - return cb(null, body); - } else { - logger.err({body, notification_key}, "Health Check: notification not in response"); - return cb("notification not found in response"); - } - }); - } - ]; - return async.series(jobs, function(err, body){ - if (err != null) { - logger.err({err}, "Health Check: error running health check"); - return cleanupNotifications(() => callback(err)); - } else { - const notification_id = body[1][0]._id; - notification_key = body[1][0].key; - let opts = getOpts(`/notification/${notification_id}`); - logger.log({notification_id, notification_key}, "Health Check: doing cleanup"); - return request.del(opts, function(err, res, body){ - if (err != null) { - logger.err(err, opts, "Health Check: error cleaning up notification"); - return callback(err); - } - opts = getOpts(""); - opts.json = {key: notification_key}; - return request.del(opts, function(err, res, body){ - if (err != null) { - logger.err(err, opts, "Health Check: error cleaning up notification"); - return callback(err); - } - return cleanupNotifications(callback); - }); - }); - } - }); - } -}; + let notification_key = `smoke-test-notification-${ObjectId()}` + const getOpts = endPath => ({ + url: `http://localhost:${port}/user/${user_id}${endPath}`, + timeout: 5000 + }) + logger.log( + { user_id, opts: getOpts(), key: notification_key, user_id }, + 'Health Check: running' + ) + const jobs = [ + function(cb) { + const opts = getOpts('/') + opts.json = { + key: notification_key, + messageOpts: '', + templateKey: 'f4g5', + user_id + } + return request.post(opts, cb) + }, + function(cb) { + const opts = getOpts('/') + opts.json = true + return request.get(opts, function(err, res, body) { + if (err != null) { + logger.err({ err }, 'Health Check: error getting notification') + return callback(err) + } else if (res.statusCode !== 200) { + const e = `status code not 200 ${res.statusCode}` + logger.err({ err }, e) + return cb(e) + } + const hasNotification = _.some( + body, + notification => + notification.key === notification_key && + notification.user_id === user_id.toString() + ) + if (hasNotification) { + return cb(null, body) + } else { + logger.err( + { body, notification_key }, + 'Health Check: notification not in response' + ) + return cb('notification not found in response') + } + }) + } + ] + return async.series(jobs, function(err, body) { + if (err != null) { + logger.err({ err }, 'Health Check: error running health check') + return cleanupNotifications(() => callback(err)) + } else { + const notification_id = body[1][0]._id + notification_key = body[1][0].key + let opts = getOpts(`/notification/${notification_id}`) + logger.log( + { notification_id, notification_key }, + 'Health Check: doing cleanup' + ) + return request.del(opts, function(err, res, body) { + if (err != null) { + logger.err( + err, + opts, + 'Health Check: error cleaning up notification' + ) + return callback(err) + } + opts = getOpts('') + opts.json = { key: notification_key } + return request.del(opts, function(err, res, body) { + if (err != null) { + logger.err( + err, + opts, + 'Health Check: error cleaning up notification' + ) + return callback(err) + } + return cleanupNotifications(callback) + }) + }) + } + }) + } +} diff --git a/services/notifications/app/js/Notifications.js b/services/notifications/app/js/Notifications.js index f1edf123c9..ec4007e50f 100644 --- a/services/notifications/app/js/Notifications.js +++ b/services/notifications/app/js/Notifications.js @@ -11,104 +11,120 @@ * DS207: Consider shorter variations of null checks * Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md */ -let Notifications; -const Settings = require('settings-sharelatex'); -const logger = require('logger-sharelatex'); -const mongojs = require('mongojs'); -const db = mongojs(Settings.mongo != null ? Settings.mongo.url : undefined, ['notifications']); -const { ObjectId } = require("mongojs"); -const metrics = require('metrics-sharelatex'); +let Notifications +const Settings = require('settings-sharelatex') +const logger = require('logger-sharelatex') +const mongojs = require('mongojs') +const db = mongojs(Settings.mongo != null ? Settings.mongo.url : undefined, [ + 'notifications' +]) +const { ObjectId } = require('mongojs') +const metrics = require('metrics-sharelatex') -module.exports = (Notifications = { +module.exports = Notifications = { + getUserNotifications(user_id, callback) { + if (callback == null) { + callback = function(err, notifications) {} + } + const query = { + user_id: ObjectId(user_id), + templateKey: { $exists: true } + } + return db.notifications.find(query, (err, notifications) => + callback(err, notifications) + ) + }, - getUserNotifications(user_id, callback){ - if (callback == null) { callback = function(err, notifications){}; } - const query = { - user_id: ObjectId(user_id), - templateKey: {"$exists":true} - }; - return db.notifications.find(query, (err, notifications)=> callback(err, notifications)); - }, + _countExistingNotifications(user_id, notification, callback) { + if (callback == null) { + callback = function(err, count) {} + } + const query = { + user_id: ObjectId(user_id), + key: notification.key + } + return db.notifications.count(query, function(err, count) { + if (err != null) { + return callback(err) + } + return callback(null, count) + }) + }, + addNotification(user_id, notification, callback) { + return this._countExistingNotifications(user_id, notification, function( + err, + count + ) { + if (err != null) { + return callback(err) + } + if (count !== 0 && !notification.forceCreate) { + return callback() + } + const doc = { + user_id: ObjectId(user_id), + key: notification.key, + messageOpts: notification.messageOpts, + templateKey: notification.templateKey + } + // TTL index on the optional `expires` field, which should arrive as an iso date-string, corresponding to + // a datetime in the future when the document should be automatically removed. + // in Mongo, TTL indexes only work on date fields, and ignore the document when that field is missing + // see `README.md` for instruction on creating TTL index + if (notification.expires != null) { + try { + doc.expires = new Date(notification.expires) + const _testValue = doc.expires.toISOString() + } catch (error) { + err = error + logger.error( + { user_id, expires: notification.expires }, + 'error converting `expires` field to Date' + ) + return callback(err) + } + } + return db.notifications.update( + { user_id: doc.user_id, key: notification.key }, + doc, + { upsert: true }, + callback + ) + }) + }, - _countExistingNotifications(user_id, notification, callback){ - if (callback == null) { callback = function(err, count){}; } - const query = { - user_id: ObjectId(user_id), - key: notification.key - }; - return db.notifications.count(query, function(err, count){ - if (err != null) { return callback(err); } - return callback(null, count); - }); - }, + removeNotificationId(user_id, notification_id, callback) { + const searchOps = { + user_id: ObjectId(user_id), + _id: ObjectId(notification_id) + } + const updateOperation = { $unset: { templateKey: true, messageOpts: true } } + return db.notifications.update(searchOps, updateOperation, callback) + }, - addNotification(user_id, notification, callback){ - return this._countExistingNotifications(user_id, notification, function(err, count){ - if (err != null) { return callback(err); } - if ((count !== 0) && !notification.forceCreate) { return callback(); } - const doc = { - user_id: ObjectId(user_id), - key: notification.key, - messageOpts: notification.messageOpts, - templateKey: notification.templateKey - }; - // TTL index on the optional `expires` field, which should arrive as an iso date-string, corresponding to - // a datetime in the future when the document should be automatically removed. - // in Mongo, TTL indexes only work on date fields, and ignore the document when that field is missing - // see `README.md` for instruction on creating TTL index - if (notification.expires != null) { - try { - doc.expires = new Date(notification.expires); - const _testValue = doc.expires.toISOString(); - } catch (error) { - err = error; - logger.error({user_id, expires: notification.expires}, "error converting `expires` field to Date"); - return callback(err); - } - } - return db.notifications.update({user_id: doc.user_id, key: notification.key}, doc, {upsert: true}, callback); - }); - }, + removeNotificationKey(user_id, notification_key, callback) { + const searchOps = { + user_id: ObjectId(user_id), + key: notification_key + } + const updateOperation = { $unset: { templateKey: true } } + return db.notifications.update(searchOps, updateOperation, callback) + }, - removeNotificationId(user_id, notification_id, callback){ - const searchOps = { - user_id:ObjectId(user_id), - _id:ObjectId(notification_id) - }; - const updateOperation = - {"$unset": {templateKey:true, messageOpts: true}}; - return db.notifications.update(searchOps, updateOperation, callback); - }, + removeNotificationByKeyOnly(notification_key, callback) { + const searchOps = { key: notification_key } + const updateOperation = { $unset: { templateKey: true } } + return db.notifications.update(searchOps, updateOperation, callback) + }, - removeNotificationKey(user_id, notification_key, callback){ - const searchOps = { - user_id:ObjectId(user_id), - key: notification_key - }; - const updateOperation = - {"$unset": {templateKey:true}}; - return db.notifications.update(searchOps, updateOperation, callback); - }, + // hard delete of doc, rather than removing the templateKey + deleteNotificationByKeyOnly(notification_key, callback) { + const searchOps = { key: notification_key } + return db.notifications.remove(searchOps, { justOne: true }, callback) + } +} - removeNotificationByKeyOnly(notification_key, callback){ - const searchOps = - {key: notification_key}; - const updateOperation = - {"$unset": {templateKey:true}}; - return db.notifications.update(searchOps, updateOperation, callback); - }, - - // hard delete of doc, rather than removing the templateKey - deleteNotificationByKeyOnly(notification_key, callback){ - const searchOps = - {key: notification_key}; - return db.notifications.remove(searchOps, {justOne: true}, callback); - } -}); - - -[ - 'getUserNotifications', - 'addNotification' -].map(method => metrics.timeAsyncMethod(Notifications, method, 'mongo.Notifications', logger)); +;['getUserNotifications', 'addNotification'].map(method => + metrics.timeAsyncMethod(Notifications, method, 'mongo.Notifications', logger) +) diff --git a/services/notifications/app/js/NotificationsController.js b/services/notifications/app/js/NotificationsController.js index 82201ba645..27587da25d 100644 --- a/services/notifications/app/js/NotificationsController.js +++ b/services/notifications/app/js/NotificationsController.js @@ -10,46 +10,77 @@ * DS207: Consider shorter variations of null checks * Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md */ -const Notifications = require("./Notifications"); -const logger = require("logger-sharelatex"); -const metrics = require('metrics-sharelatex'); +const Notifications = require('./Notifications') +const logger = require('logger-sharelatex') +const metrics = require('metrics-sharelatex') module.exports = { + getUserNotifications(req, res) { + logger.log( + { user_id: req.params.user_id }, + 'getting user unread notifications' + ) + metrics.inc('getUserNotifications') + return Notifications.getUserNotifications( + req.params.user_id, + (err, notifications) => res.json(notifications) + ) + }, - getUserNotifications(req, res){ - logger.log({user_id: req.params.user_id}, "getting user unread notifications"); - metrics.inc("getUserNotifications"); - return Notifications.getUserNotifications(req.params.user_id, (err, notifications)=> res.json(notifications)); - }, + addNotification(req, res) { + logger.log( + { user_id: req.params.user_id, notification: req.body }, + 'adding notification' + ) + metrics.inc('addNotification') + return Notifications.addNotification(req.params.user_id, req.body, function( + err, + notifications + ) { + if (err != null) { + return res.send(500) + } else { + return res.send() + } + }) + }, - addNotification(req, res){ - logger.log({user_id: req.params.user_id, notification:req.body}, "adding notification"); - metrics.inc("addNotification"); - return Notifications.addNotification(req.params.user_id, req.body, function(err, notifications){ - if (err != null) { - return res.send(500); - } else { - return res.send(); - } - }); - }, + removeNotificationId(req, res) { + logger.log( + { + user_id: req.params.user_id, + notification_id: req.params.notification_id + }, + 'mark id notification as read' + ) + metrics.inc('removeNotificationId') + return Notifications.removeNotificationId( + req.params.user_id, + req.params.notification_id, + (err, notifications) => res.send() + ) + }, - removeNotificationId(req, res){ - logger.log({user_id: req.params.user_id, notification_id: req.params.notification_id}, "mark id notification as read"); - metrics.inc("removeNotificationId"); - return Notifications.removeNotificationId(req.params.user_id, req.params.notification_id, (err, notifications)=> res.send()); - }, + removeNotificationKey(req, res) { + logger.log( + { user_id: req.params.user_id, notification_key: req.body.key }, + 'mark key notification as read' + ) + metrics.inc('removeNotificationKey') + return Notifications.removeNotificationKey( + req.params.user_id, + req.body.key, + (err, notifications) => res.send() + ) + }, - removeNotificationKey(req, res){ - logger.log({user_id: req.params.user_id, notification_key: req.body.key}, "mark key notification as read"); - metrics.inc("removeNotificationKey"); - return Notifications.removeNotificationKey(req.params.user_id, req.body.key, (err, notifications)=> res.send()); - }, - - removeNotificationByKeyOnly(req, res){ - const notification_key = req.params.key; - logger.log({notification_key}, "mark notification as read by key only"); - metrics.inc("removeNotificationKey"); - return Notifications.removeNotificationByKeyOnly(notification_key, (err, notifications)=> res.send()); - } -}; + removeNotificationByKeyOnly(req, res) { + const notification_key = req.params.key + logger.log({ notification_key }, 'mark notification as read by key only') + metrics.inc('removeNotificationKey') + return Notifications.removeNotificationByKeyOnly( + notification_key, + (err, notifications) => res.send() + ) + } +} From d4fa6e26726357b418e9d69d2257fbd972d5d11b Mon Sep 17 00:00:00 2001 From: decaffeinate Date: Mon, 13 Jan 2020 20:01:01 +0100 Subject: [PATCH 10/18] decaffeinate: Rename NotificationsControllerTest.coffee and 1 other file from .coffee to .js --- ...ationsControllerTest.coffee => NotificationsControllerTest.js} | 0 .../coffee/{NotificationsTests.coffee => NotificationsTests.js} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename services/notifications/test/unit/coffee/{NotificationsControllerTest.coffee => NotificationsControllerTest.js} (100%) rename services/notifications/test/unit/coffee/{NotificationsTests.coffee => NotificationsTests.js} (100%) diff --git a/services/notifications/test/unit/coffee/NotificationsControllerTest.coffee b/services/notifications/test/unit/coffee/NotificationsControllerTest.js similarity index 100% rename from services/notifications/test/unit/coffee/NotificationsControllerTest.coffee rename to services/notifications/test/unit/coffee/NotificationsControllerTest.js diff --git a/services/notifications/test/unit/coffee/NotificationsTests.coffee b/services/notifications/test/unit/coffee/NotificationsTests.js similarity index 100% rename from services/notifications/test/unit/coffee/NotificationsTests.coffee rename to services/notifications/test/unit/coffee/NotificationsTests.js From 34a61b9c6bf844d4601521237f7f8146c23dde26 Mon Sep 17 00:00:00 2001 From: decaffeinate Date: Mon, 13 Jan 2020 20:01:07 +0100 Subject: [PATCH 11/18] decaffeinate: Convert NotificationsControllerTest.coffee and 1 other file to JS --- .../coffee/NotificationsControllerTest.js | 176 +++++---- .../test/unit/coffee/NotificationsTests.js | 350 ++++++++++-------- 2 files changed, 309 insertions(+), 217 deletions(-) diff --git a/services/notifications/test/unit/coffee/NotificationsControllerTest.js b/services/notifications/test/unit/coffee/NotificationsControllerTest.js index c7c8fdd987..2172976d19 100644 --- a/services/notifications/test/unit/coffee/NotificationsControllerTest.js +++ b/services/notifications/test/unit/coffee/NotificationsControllerTest.js @@ -1,76 +1,122 @@ -sinon = require('sinon') -chai = require('chai') -should = chai.should() -modulePath = "../../../app/js/NotificationsController.js" -SandboxedModule = require('sandboxed-module') -assert = require('assert') +/* + * decaffeinate suggestions: + * DS102: Remove unnecessary code created because of implicit returns + * Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md + */ +const sinon = require('sinon'); +const chai = require('chai'); +const should = chai.should(); +const modulePath = "../../../app/js/NotificationsController.js"; +const SandboxedModule = require('sandboxed-module'); +const assert = require('assert'); -user_id = "51dc93e6fb625a261300003b" -notification_id = "fb625a26f09d" -notification_key = "my-notification-key" +const user_id = "51dc93e6fb625a261300003b"; +const notification_id = "fb625a26f09d"; +const notification_key = "my-notification-key"; -describe 'Notifications Controller', -> - beforeEach -> - self = @ - @notifications = {} - @controller = SandboxedModule.require modulePath, requires: - 'logger-sharelatex': log:-> - './Notifications':@notifications - 'metrics-sharelatex': +describe('Notifications Controller', function() { + beforeEach(function() { + const self = this; + this.notifications = {}; + this.controller = SandboxedModule.require(modulePath, { requires: { + 'logger-sharelatex': { log() {} + }, + './Notifications':this.notifications, + 'metrics-sharelatex': { inc: sinon.stub() + } + } + } + ); - @stubbedNotification = [{key: notification_key, messageOpts:"some info", templateKey:"template-key"}] + return this.stubbedNotification = [{key: notification_key, messageOpts:"some info", templateKey:"template-key"}];}); - describe "getUserNotifications", -> - it 'should ask the notifications for the users notifications', (done)-> - @notifications.getUserNotifications = sinon.stub().callsArgWith(1, null, @stubbedNotification) - req = - params: - user_id: user_id - @controller.getUserNotifications req, json:(result)=> - result.should.equal @stubbedNotification - @notifications.getUserNotifications.calledWith(user_id).should.equal true - done() + describe("getUserNotifications", () => + it('should ask the notifications for the users notifications', function(done){ + this.notifications.getUserNotifications = sinon.stub().callsArgWith(1, null, this.stubbedNotification); + const req = { + params: { + user_id + } + }; + return this.controller.getUserNotifications(req, { json:result=> { + result.should.equal(this.stubbedNotification); + this.notifications.getUserNotifications.calledWith(user_id).should.equal(true); + return done(); + } + } + ); + }) + ); - describe "addNotification", -> - it "should tell the notifications to add the notification for the user", (done)-> - @notifications.addNotification = sinon.stub().callsArgWith(2) - req = - params: - user_id: user_id - body: @stubbedNotification - @controller.addNotification req, send:(result)=> - @notifications.addNotification.calledWith(user_id, @stubbedNotification).should.equal true - done() + describe("addNotification", () => + it("should tell the notifications to add the notification for the user", function(done){ + this.notifications.addNotification = sinon.stub().callsArgWith(2); + const req = { + params: { + user_id + }, + body: this.stubbedNotification + }; + return this.controller.addNotification(req, { send:result=> { + this.notifications.addNotification.calledWith(user_id, this.stubbedNotification).should.equal(true); + return done(); + } + } + ); + }) + ); - describe "removeNotificationId", -> - it "should tell the notifications to mark the notification Id as read", (done)-> - @notifications.removeNotificationId = sinon.stub().callsArgWith(2) - req = - params: - user_id: user_id - notification_id: notification_id - @controller.removeNotificationId req, send:(result)=> - @notifications.removeNotificationId.calledWith(user_id, notification_id).should.equal true - done() + describe("removeNotificationId", () => + it("should tell the notifications to mark the notification Id as read", function(done){ + this.notifications.removeNotificationId = sinon.stub().callsArgWith(2); + const req = { + params: { + user_id, + notification_id + } + }; + return this.controller.removeNotificationId(req, { send:result=> { + this.notifications.removeNotificationId.calledWith(user_id, notification_id).should.equal(true); + return done(); + } + } + ); + }) + ); - describe "removeNotificationKey", -> - it "should tell the notifications to mark the notification Key as read", (done)-> - @notifications.removeNotificationKey = sinon.stub().callsArgWith(2) - req = - params: - user_id: user_id + describe("removeNotificationKey", () => + it("should tell the notifications to mark the notification Key as read", function(done){ + this.notifications.removeNotificationKey = sinon.stub().callsArgWith(2); + const req = { + params: { + user_id + }, body: {key: notification_key} - @controller.removeNotificationKey req, send:(result)=> - @notifications.removeNotificationKey.calledWith(user_id, notification_key).should.equal true - done() + }; + return this.controller.removeNotificationKey(req, { send:result=> { + this.notifications.removeNotificationKey.calledWith(user_id, notification_key).should.equal(true); + return done(); + } + } + ); + }) + ); - describe "removeNotificationByKeyOnly", -> - it "should tell the notifications to mark the notification Key as read", (done)-> - @notifications.removeNotificationByKeyOnly = sinon.stub().callsArgWith(1) - req = - params: + return describe("removeNotificationByKeyOnly", () => + it("should tell the notifications to mark the notification Key as read", function(done){ + this.notifications.removeNotificationByKeyOnly = sinon.stub().callsArgWith(1); + const req = { + params: { key: notification_key - @controller.removeNotificationByKeyOnly req, send:(result)=> - @notifications.removeNotificationByKeyOnly.calledWith(notification_key).should.equal true - done() + } + }; + return this.controller.removeNotificationByKeyOnly(req, { send:result=> { + this.notifications.removeNotificationByKeyOnly.calledWith(notification_key).should.equal(true); + return done(); + } + } + ); + }) + ); +}); diff --git a/services/notifications/test/unit/coffee/NotificationsTests.js b/services/notifications/test/unit/coffee/NotificationsTests.js index 47319fc912..db389e2890 100644 --- a/services/notifications/test/unit/coffee/NotificationsTests.js +++ b/services/notifications/test/unit/coffee/NotificationsTests.js @@ -1,203 +1,249 @@ -sinon = require('sinon') -chai = require('chai') -expect = chai.should -should = chai.should() -modulePath = "../../../app/js/Notifications.js" -SandboxedModule = require('sandboxed-module') -assert = require('assert') -ObjectId = require("mongojs").ObjectId +/* + * decaffeinate suggestions: + * DS102: Remove unnecessary code created because of implicit returns + * Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md + */ +const sinon = require('sinon'); +const chai = require('chai'); +const expect = chai.should; +const should = chai.should(); +const modulePath = "../../../app/js/Notifications.js"; +const SandboxedModule = require('sandboxed-module'); +const assert = require('assert'); +const { ObjectId } = require("mongojs"); -user_id = "51dc93e6fb625a261300003b" -notification_id = "fb625a26f09d" -notification_key = "notification-key" +const user_id = "51dc93e6fb625a261300003b"; +const notification_id = "fb625a26f09d"; +const notification_key = "notification-key"; -describe 'Notifications Tests', -> - beforeEach -> - self = @ - @findStub = sinon.stub() - @insertStub = sinon.stub() - @countStub = sinon.stub() - @updateStub = sinon.stub() - @removeStub = sinon.stub() - @mongojs = => - notifications: - update: self.mongojsUpdate - find: @findStub - insert: @insertStub - count: @countStub - update: @updateStub - remove: @removeStub - @mongojs.ObjectId = ObjectId - - @notifications = SandboxedModule.require modulePath, - requires: - 'logger-sharelatex': { - log:()-> - error:()-> +describe('Notifications Tests', function() { + beforeEach(function() { + const self = this; + this.findStub = sinon.stub(); + this.insertStub = sinon.stub(); + this.countStub = sinon.stub(); + this.updateStub = sinon.stub(); + this.removeStub = sinon.stub(); + this.mongojs = () => { + return { + notifications: { + update: self.mongojsUpdate, + find: this.findStub, + insert: this.insertStub, + count: this.countStub, + update: this.updateStub, + remove: this.removeStub } - 'settings-sharelatex': {} - 'mongojs':@mongojs + }; + }; + this.mongojs.ObjectId = ObjectId; + + this.notifications = SandboxedModule.require(modulePath, { + requires: { + 'logger-sharelatex': { + log(){}, + error(){} + }, + 'settings-sharelatex': {}, + 'mongojs':this.mongojs, 'metrics-sharelatex': {timeAsyncMethod: sinon.stub()} - globals: - console: console + }, + globals: { + console + } + } + ); - @stubbedNotification = {user_id: ObjectId(user_id), key:"notification-key", messageOpts:"some info", templateKey:"template-key"} - @stubbedNotificationArray = [@stubbedNotification] + this.stubbedNotification = {user_id: ObjectId(user_id), key:"notification-key", messageOpts:"some info", templateKey:"template-key"}; + return this.stubbedNotificationArray = [this.stubbedNotification];}); - describe 'getUserNotifications', -> - it "should find all notifications and return i", (done)-> - @findStub.callsArgWith(1, null, @stubbedNotificationArray) - @notifications.getUserNotifications user_id, (err, notifications)=> - notifications.should.equal @stubbedNotificationArray - assert.deepEqual(@findStub.args[0][0], {"user_id" :ObjectId(user_id), "templateKey": {"$exists":true}}) - done() + describe('getUserNotifications', () => + it("should find all notifications and return i", function(done){ + this.findStub.callsArgWith(1, null, this.stubbedNotificationArray); + return this.notifications.getUserNotifications(user_id, (err, notifications)=> { + notifications.should.equal(this.stubbedNotificationArray); + assert.deepEqual(this.findStub.args[0][0], {"user_id" :ObjectId(user_id), "templateKey": {"$exists":true}}); + return done(); + }); + }) + ); - describe 'addNotification', -> - beforeEach -> - @stubbedNotification = { + describe('addNotification', function() { + beforeEach(function() { + this.stubbedNotification = { user_id: ObjectId(user_id), key:"notification-key", messageOpts:"some info", templateKey:"template-key" - } - @expectedDocument = { - user_id: @stubbedNotification.user_id, + }; + this.expectedDocument = { + user_id: this.stubbedNotification.user_id, key:"notification-key", messageOpts:"some info", templateKey:"template-key" - } - @expectedQuery = { - user_id: @stubbedNotification.user_id, + }; + this.expectedQuery = { + user_id: this.stubbedNotification.user_id, key:"notification-key", - } - @updateStub.yields() - @countStub.yields(null, 0) + }; + this.updateStub.yields(); + return this.countStub.yields(null, 0); + }); - it 'should insert the notification into the collection', (done)-> - @notifications.addNotification user_id, @stubbedNotification, (err)=> - expect(err).not.exists - sinon.assert.calledWith(@updateStub, @expectedQuery, @expectedDocument, { upsert: true }) - done() + it('should insert the notification into the collection', function(done){ + return this.notifications.addNotification(user_id, this.stubbedNotification, err=> { + expect(err).not.exists; + sinon.assert.calledWith(this.updateStub, this.expectedQuery, this.expectedDocument, { upsert: true }); + return done(); + }); + }); - describe 'when there is an existing notification', (done) -> - beforeEach -> - @countStub.yields(null, 1) + describe('when there is an existing notification', function(done) { + beforeEach(function() { + return this.countStub.yields(null, 1); + }); - it 'should fail to insert', (done)-> - @notifications.addNotification user_id, @stubbedNotification, (err)=> - expect(err).not.exists - sinon.assert.notCalled(@updateStub) - done() + it('should fail to insert', function(done){ + return this.notifications.addNotification(user_id, this.stubbedNotification, err=> { + expect(err).not.exists; + sinon.assert.notCalled(this.updateStub); + return done(); + }); + }); - it "should update the key if forceCreate is true", (done) -> - @stubbedNotification.forceCreate = true - @notifications.addNotification user_id, @stubbedNotification, (err)=> - expect(err).not.exists - sinon.assert.calledWith(@updateStub, @expectedQuery, @expectedDocument, { upsert: true }) - done() + return it("should update the key if forceCreate is true", function(done) { + this.stubbedNotification.forceCreate = true; + return this.notifications.addNotification(user_id, this.stubbedNotification, err=> { + expect(err).not.exists; + sinon.assert.calledWith(this.updateStub, this.expectedQuery, this.expectedDocument, { upsert: true }); + return done(); + }); + }); + }); - describe 'when the notification is set to expire', () -> - beforeEach -> - @stubbedNotification = { + describe('when the notification is set to expire', function() { + beforeEach(function() { + this.stubbedNotification = { user_id: ObjectId(user_id), key:"notification-key", messageOpts:"some info", templateKey:"template-key", expires: '2922-02-13T09:32:56.289Z' - } - @expectedDocument = { - user_id: @stubbedNotification.user_id, + }; + this.expectedDocument = { + user_id: this.stubbedNotification.user_id, key:"notification-key", messageOpts:"some info", templateKey:"template-key", - expires: new Date(@stubbedNotification.expires), - } - @expectedQuery = { - user_id: @stubbedNotification.user_id, + expires: new Date(this.stubbedNotification.expires), + }; + return this.expectedQuery = { + user_id: this.stubbedNotification.user_id, key:"notification-key", - } + };}); - it 'should add an `expires` Date field to the document', (done)-> - @notifications.addNotification user_id, @stubbedNotification, (err)=> - expect(err).not.exists - sinon.assert.calledWith(@updateStub, @expectedQuery, @expectedDocument, { upsert: true }) - done() + return it('should add an `expires` Date field to the document', function(done){ + return this.notifications.addNotification(user_id, this.stubbedNotification, err=> { + expect(err).not.exists; + sinon.assert.calledWith(this.updateStub, this.expectedQuery, this.expectedDocument, { upsert: true }); + return done(); + }); + }); + }); - describe 'when the notification has a nonsensical expires field', () -> - beforeEach -> - @stubbedNotification = { + return describe('when the notification has a nonsensical expires field', function() { + beforeEach(function() { + this.stubbedNotification = { user_id: ObjectId(user_id), key:"notification-key", messageOpts:"some info", templateKey:"template-key", expires: 'WAT' - } - @expectedDocument = { - user_id: @stubbedNotification.user_id, + }; + return this.expectedDocument = { + user_id: this.stubbedNotification.user_id, key:"notification-key", messageOpts:"some info", templateKey:"template-key", - expires: new Date(@stubbedNotification.expires), - } + expires: new Date(this.stubbedNotification.expires), + };}); - it 'should produce an error', (done)-> - @notifications.addNotification user_id, @stubbedNotification, (err)=> - (err instanceof Error).should.equal true - sinon.assert.notCalled(@updateStub) - done() + return it('should produce an error', function(done){ + return this.notifications.addNotification(user_id, this.stubbedNotification, err=> { + (err instanceof Error).should.equal(true); + sinon.assert.notCalled(this.updateStub); + return done(); + }); + }); + }); + }); - describe 'removeNotificationId', -> - it 'should mark the notification id as read', (done)-> - @updateStub.callsArgWith(2, null) + describe('removeNotificationId', () => + it('should mark the notification id as read', function(done){ + this.updateStub.callsArgWith(2, null); - @notifications.removeNotificationId user_id, notification_id, (err)=> - searchOps = - user_id:ObjectId(user_id) + return this.notifications.removeNotificationId(user_id, notification_id, err=> { + const searchOps = { + user_id:ObjectId(user_id), _id:ObjectId(notification_id) - updateOperation = - "$unset": {templateKey:true, messageOpts:true} - assert.deepEqual(@updateStub.args[0][0], searchOps) - assert.deepEqual(@updateStub.args[0][1], updateOperation) - done() + }; + const updateOperation = + {"$unset": {templateKey:true, messageOpts:true}}; + assert.deepEqual(this.updateStub.args[0][0], searchOps); + assert.deepEqual(this.updateStub.args[0][1], updateOperation); + return done(); + }); + }) + ); - describe 'removeNotificationKey', -> - it 'should mark the notification key as read', (done)-> - @updateStub.callsArgWith(2, null) + describe('removeNotificationKey', () => + it('should mark the notification key as read', function(done){ + this.updateStub.callsArgWith(2, null); - @notifications.removeNotificationKey user_id, notification_key, (err)=> - searchOps = { - user_id:ObjectId(user_id) + return this.notifications.removeNotificationKey(user_id, notification_key, err=> { + const searchOps = { + user_id:ObjectId(user_id), key: notification_key - } - updateOperation = { + }; + const updateOperation = { "$unset": {templateKey:true} - } - assert.deepEqual(@updateStub.args[0][0], searchOps) - assert.deepEqual(@updateStub.args[0][1], updateOperation) - done() + }; + assert.deepEqual(this.updateStub.args[0][0], searchOps); + assert.deepEqual(this.updateStub.args[0][1], updateOperation); + return done(); + }); + }) + ); - describe 'removeNotificationByKeyOnly', -> - it 'should mark the notification key as read', (done)-> - @updateStub.callsArgWith(2, null) + describe('removeNotificationByKeyOnly', () => + it('should mark the notification key as read', function(done){ + this.updateStub.callsArgWith(2, null); - @notifications.removeNotificationByKeyOnly notification_key, (err)=> - searchOps = - key: notification_key - updateOperation = - "$unset": {templateKey:true} - assert.deepEqual(@updateStub.args[0][0], searchOps) - assert.deepEqual(@updateStub.args[0][1], updateOperation) - done() + return this.notifications.removeNotificationByKeyOnly(notification_key, err=> { + const searchOps = + {key: notification_key}; + const updateOperation = + {"$unset": {templateKey:true}}; + assert.deepEqual(this.updateStub.args[0][0], searchOps); + assert.deepEqual(this.updateStub.args[0][1], updateOperation); + return done(); + }); + }) + ); - describe 'deleteNotificationByKeyOnly', -> - it 'should completely remove the notification', (done)-> - @removeStub.callsArgWith(2, null) + return describe('deleteNotificationByKeyOnly', () => + it('should completely remove the notification', function(done){ + this.removeStub.callsArgWith(2, null); - @notifications.deleteNotificationByKeyOnly notification_key, (err)=> - searchOps = - key: notification_key - opts = - justOne: true - assert.deepEqual(@removeStub.args[0][0], searchOps) - assert.deepEqual(@removeStub.args[0][1], opts) - done() + return this.notifications.deleteNotificationByKeyOnly(notification_key, err=> { + const searchOps = + {key: notification_key}; + const opts = + {justOne: true}; + assert.deepEqual(this.removeStub.args[0][0], searchOps); + assert.deepEqual(this.removeStub.args[0][1], opts); + return done(); + }); + }) + ); +}); From c7ee5c6f5839b2a6730712d6f98bfb567b3799a0 Mon Sep 17 00:00:00 2001 From: decaffeinate Date: Mon, 13 Jan 2020 20:01:13 +0100 Subject: [PATCH 12/18] decaffeinate: Run post-processing cleanups on NotificationsControllerTest.coffee and 1 other file --- .../test/unit/coffee/NotificationsControllerTest.js | 7 +++++++ .../notifications/test/unit/coffee/NotificationsTests.js | 9 +++++++++ 2 files changed, 16 insertions(+) diff --git a/services/notifications/test/unit/coffee/NotificationsControllerTest.js b/services/notifications/test/unit/coffee/NotificationsControllerTest.js index 2172976d19..d60a0777e4 100644 --- a/services/notifications/test/unit/coffee/NotificationsControllerTest.js +++ b/services/notifications/test/unit/coffee/NotificationsControllerTest.js @@ -1,3 +1,10 @@ +/* eslint-disable + camelcase, + no-return-assign, + no-unused-vars, +*/ +// TODO: This file was created by bulk-decaffeinate. +// Fix any style issues and re-enable lint. /* * decaffeinate suggestions: * DS102: Remove unnecessary code created because of implicit returns diff --git a/services/notifications/test/unit/coffee/NotificationsTests.js b/services/notifications/test/unit/coffee/NotificationsTests.js index db389e2890..90a9756972 100644 --- a/services/notifications/test/unit/coffee/NotificationsTests.js +++ b/services/notifications/test/unit/coffee/NotificationsTests.js @@ -1,3 +1,12 @@ +/* eslint-disable + camelcase, + handle-callback-err, + no-dupe-keys, + no-return-assign, + no-unused-vars, +*/ +// TODO: This file was created by bulk-decaffeinate. +// Fix any style issues and re-enable lint. /* * decaffeinate suggestions: * DS102: Remove unnecessary code created because of implicit returns From 100209c2dbc3aa49bdcb78215214873a5ecacfaa Mon Sep 17 00:00:00 2001 From: Tim Alby Date: Mon, 13 Jan 2020 20:01:18 +0100 Subject: [PATCH 13/18] decaffeinate: rename test/unit/coffee to test/unit/js --- .../test/unit/{coffee => js}/NotificationsControllerTest.js | 0 .../notifications/test/unit/{coffee => js}/NotificationsTests.js | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename services/notifications/test/unit/{coffee => js}/NotificationsControllerTest.js (100%) rename services/notifications/test/unit/{coffee => js}/NotificationsTests.js (100%) diff --git a/services/notifications/test/unit/coffee/NotificationsControllerTest.js b/services/notifications/test/unit/js/NotificationsControllerTest.js similarity index 100% rename from services/notifications/test/unit/coffee/NotificationsControllerTest.js rename to services/notifications/test/unit/js/NotificationsControllerTest.js diff --git a/services/notifications/test/unit/coffee/NotificationsTests.js b/services/notifications/test/unit/js/NotificationsTests.js similarity index 100% rename from services/notifications/test/unit/coffee/NotificationsTests.js rename to services/notifications/test/unit/js/NotificationsTests.js From fc0d1f8485d9a52b82fe1073ec1b4ae7f0b1ec38 Mon Sep 17 00:00:00 2001 From: Tim Alby Date: Mon, 13 Jan 2020 20:01:20 +0100 Subject: [PATCH 14/18] prettier: convert test/unit decaffeinated files to Prettier format --- .../unit/js/NotificationsControllerTest.js | 231 ++++---- .../test/unit/js/NotificationsTests.js | 496 ++++++++++-------- 2 files changed, 398 insertions(+), 329 deletions(-) diff --git a/services/notifications/test/unit/js/NotificationsControllerTest.js b/services/notifications/test/unit/js/NotificationsControllerTest.js index d60a0777e4..219a72573a 100644 --- a/services/notifications/test/unit/js/NotificationsControllerTest.js +++ b/services/notifications/test/unit/js/NotificationsControllerTest.js @@ -10,120 +10,135 @@ * DS102: Remove unnecessary code created because of implicit returns * Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md */ -const sinon = require('sinon'); -const chai = require('chai'); -const should = chai.should(); -const modulePath = "../../../app/js/NotificationsController.js"; -const SandboxedModule = require('sandboxed-module'); -const assert = require('assert'); +const sinon = require('sinon') +const chai = require('chai') +const should = chai.should() +const modulePath = '../../../app/js/NotificationsController.js' +const SandboxedModule = require('sandboxed-module') +const assert = require('assert') -const user_id = "51dc93e6fb625a261300003b"; -const notification_id = "fb625a26f09d"; -const notification_key = "my-notification-key"; +const user_id = '51dc93e6fb625a261300003b' +const notification_id = 'fb625a26f09d' +const notification_key = 'my-notification-key' describe('Notifications Controller', function() { - beforeEach(function() { - const self = this; - this.notifications = {}; - this.controller = SandboxedModule.require(modulePath, { requires: { - 'logger-sharelatex': { log() {} - }, - './Notifications':this.notifications, - 'metrics-sharelatex': { - inc: sinon.stub() - } - } - } - ); + beforeEach(function() { + const self = this + this.notifications = {} + this.controller = SandboxedModule.require(modulePath, { + requires: { + 'logger-sharelatex': { log() {} }, + './Notifications': this.notifications, + 'metrics-sharelatex': { + inc: sinon.stub() + } + } + }) - return this.stubbedNotification = [{key: notification_key, messageOpts:"some info", templateKey:"template-key"}];}); + return (this.stubbedNotification = [ + { + key: notification_key, + messageOpts: 'some info', + templateKey: 'template-key' + } + ]) + }) - describe("getUserNotifications", () => - it('should ask the notifications for the users notifications', function(done){ - this.notifications.getUserNotifications = sinon.stub().callsArgWith(1, null, this.stubbedNotification); - const req = { - params: { - user_id - } - }; - return this.controller.getUserNotifications(req, { json:result=> { - result.should.equal(this.stubbedNotification); - this.notifications.getUserNotifications.calledWith(user_id).should.equal(true); - return done(); - } - } - ); - }) - ); + describe('getUserNotifications', () => + it('should ask the notifications for the users notifications', function(done) { + this.notifications.getUserNotifications = sinon + .stub() + .callsArgWith(1, null, this.stubbedNotification) + const req = { + params: { + user_id + } + } + return this.controller.getUserNotifications(req, { + json: result => { + result.should.equal(this.stubbedNotification) + this.notifications.getUserNotifications + .calledWith(user_id) + .should.equal(true) + return done() + } + }) + })) - describe("addNotification", () => - it("should tell the notifications to add the notification for the user", function(done){ - this.notifications.addNotification = sinon.stub().callsArgWith(2); - const req = { - params: { - user_id - }, - body: this.stubbedNotification - }; - return this.controller.addNotification(req, { send:result=> { - this.notifications.addNotification.calledWith(user_id, this.stubbedNotification).should.equal(true); - return done(); - } - } - ); - }) - ); + describe('addNotification', () => + it('should tell the notifications to add the notification for the user', function(done) { + this.notifications.addNotification = sinon.stub().callsArgWith(2) + const req = { + params: { + user_id + }, + body: this.stubbedNotification + } + return this.controller.addNotification(req, { + send: result => { + this.notifications.addNotification + .calledWith(user_id, this.stubbedNotification) + .should.equal(true) + return done() + } + }) + })) - describe("removeNotificationId", () => - it("should tell the notifications to mark the notification Id as read", function(done){ - this.notifications.removeNotificationId = sinon.stub().callsArgWith(2); - const req = { - params: { - user_id, - notification_id - } - }; - return this.controller.removeNotificationId(req, { send:result=> { - this.notifications.removeNotificationId.calledWith(user_id, notification_id).should.equal(true); - return done(); - } - } - ); - }) - ); + describe('removeNotificationId', () => + it('should tell the notifications to mark the notification Id as read', function(done) { + this.notifications.removeNotificationId = sinon.stub().callsArgWith(2) + const req = { + params: { + user_id, + notification_id + } + } + return this.controller.removeNotificationId(req, { + send: result => { + this.notifications.removeNotificationId + .calledWith(user_id, notification_id) + .should.equal(true) + return done() + } + }) + })) - describe("removeNotificationKey", () => - it("should tell the notifications to mark the notification Key as read", function(done){ - this.notifications.removeNotificationKey = sinon.stub().callsArgWith(2); - const req = { - params: { - user_id - }, - body: {key: notification_key} - }; - return this.controller.removeNotificationKey(req, { send:result=> { - this.notifications.removeNotificationKey.calledWith(user_id, notification_key).should.equal(true); - return done(); - } - } - ); - }) - ); + describe('removeNotificationKey', () => + it('should tell the notifications to mark the notification Key as read', function(done) { + this.notifications.removeNotificationKey = sinon.stub().callsArgWith(2) + const req = { + params: { + user_id + }, + body: { key: notification_key } + } + return this.controller.removeNotificationKey(req, { + send: result => { + this.notifications.removeNotificationKey + .calledWith(user_id, notification_key) + .should.equal(true) + return done() + } + }) + })) - return describe("removeNotificationByKeyOnly", () => - it("should tell the notifications to mark the notification Key as read", function(done){ - this.notifications.removeNotificationByKeyOnly = sinon.stub().callsArgWith(1); - const req = { - params: { - key: notification_key - } - }; - return this.controller.removeNotificationByKeyOnly(req, { send:result=> { - this.notifications.removeNotificationByKeyOnly.calledWith(notification_key).should.equal(true); - return done(); - } - } - ); - }) - ); -}); + return describe('removeNotificationByKeyOnly', () => + it('should tell the notifications to mark the notification Key as read', function(done) { + this.notifications.removeNotificationByKeyOnly = sinon + .stub() + .callsArgWith(1) + const req = { + params: { + key: notification_key + } + } + return this.controller.removeNotificationByKeyOnly(req, { + send: result => { + this.notifications.removeNotificationByKeyOnly + .calledWith(notification_key) + .should.equal(true) + return done() + } + }) + })) +}) diff --git a/services/notifications/test/unit/js/NotificationsTests.js b/services/notifications/test/unit/js/NotificationsTests.js index 90a9756972..3c2166f302 100644 --- a/services/notifications/test/unit/js/NotificationsTests.js +++ b/services/notifications/test/unit/js/NotificationsTests.js @@ -12,247 +12,301 @@ * DS102: Remove unnecessary code created because of implicit returns * Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md */ -const sinon = require('sinon'); -const chai = require('chai'); -const expect = chai.should; -const should = chai.should(); -const modulePath = "../../../app/js/Notifications.js"; -const SandboxedModule = require('sandboxed-module'); -const assert = require('assert'); -const { ObjectId } = require("mongojs"); +const sinon = require('sinon') +const chai = require('chai') +const expect = chai.should +const should = chai.should() +const modulePath = '../../../app/js/Notifications.js' +const SandboxedModule = require('sandboxed-module') +const assert = require('assert') +const { ObjectId } = require('mongojs') -const user_id = "51dc93e6fb625a261300003b"; -const notification_id = "fb625a26f09d"; -const notification_key = "notification-key"; +const user_id = '51dc93e6fb625a261300003b' +const notification_id = 'fb625a26f09d' +const notification_key = 'notification-key' describe('Notifications Tests', function() { - beforeEach(function() { - const self = this; - this.findStub = sinon.stub(); - this.insertStub = sinon.stub(); - this.countStub = sinon.stub(); - this.updateStub = sinon.stub(); - this.removeStub = sinon.stub(); - this.mongojs = () => { - return { - notifications: { - update: self.mongojsUpdate, - find: this.findStub, - insert: this.insertStub, - count: this.countStub, - update: this.updateStub, - remove: this.removeStub - } - }; - }; - this.mongojs.ObjectId = ObjectId; + beforeEach(function() { + const self = this + this.findStub = sinon.stub() + this.insertStub = sinon.stub() + this.countStub = sinon.stub() + this.updateStub = sinon.stub() + this.removeStub = sinon.stub() + this.mongojs = () => { + return { + notifications: { + update: self.mongojsUpdate, + find: this.findStub, + insert: this.insertStub, + count: this.countStub, + update: this.updateStub, + remove: this.removeStub + } + } + } + this.mongojs.ObjectId = ObjectId - this.notifications = SandboxedModule.require(modulePath, { - requires: { - 'logger-sharelatex': { - log(){}, - error(){} - }, - 'settings-sharelatex': {}, - 'mongojs':this.mongojs, - 'metrics-sharelatex': {timeAsyncMethod: sinon.stub()} - }, - globals: { - console - } - } - ); + this.notifications = SandboxedModule.require(modulePath, { + requires: { + 'logger-sharelatex': { + log() {}, + error() {} + }, + 'settings-sharelatex': {}, + mongojs: this.mongojs, + 'metrics-sharelatex': { timeAsyncMethod: sinon.stub() } + }, + globals: { + console + } + }) - this.stubbedNotification = {user_id: ObjectId(user_id), key:"notification-key", messageOpts:"some info", templateKey:"template-key"}; - return this.stubbedNotificationArray = [this.stubbedNotification];}); + this.stubbedNotification = { + user_id: ObjectId(user_id), + key: 'notification-key', + messageOpts: 'some info', + templateKey: 'template-key' + } + return (this.stubbedNotificationArray = [this.stubbedNotification]) + }) - describe('getUserNotifications', () => - it("should find all notifications and return i", function(done){ - this.findStub.callsArgWith(1, null, this.stubbedNotificationArray); - return this.notifications.getUserNotifications(user_id, (err, notifications)=> { - notifications.should.equal(this.stubbedNotificationArray); - assert.deepEqual(this.findStub.args[0][0], {"user_id" :ObjectId(user_id), "templateKey": {"$exists":true}}); - return done(); - }); - }) - ); + describe('getUserNotifications', () => + it('should find all notifications and return i', function(done) { + this.findStub.callsArgWith(1, null, this.stubbedNotificationArray) + return this.notifications.getUserNotifications( + user_id, + (err, notifications) => { + notifications.should.equal(this.stubbedNotificationArray) + assert.deepEqual(this.findStub.args[0][0], { + user_id: ObjectId(user_id), + templateKey: { $exists: true } + }) + return done() + } + ) + })) - describe('addNotification', function() { - beforeEach(function() { - this.stubbedNotification = { - user_id: ObjectId(user_id), - key:"notification-key", - messageOpts:"some info", - templateKey:"template-key" - }; - this.expectedDocument = { - user_id: this.stubbedNotification.user_id, - key:"notification-key", - messageOpts:"some info", - templateKey:"template-key" - }; - this.expectedQuery = { - user_id: this.stubbedNotification.user_id, - key:"notification-key", - }; - this.updateStub.yields(); - return this.countStub.yields(null, 0); - }); + describe('addNotification', function() { + beforeEach(function() { + this.stubbedNotification = { + user_id: ObjectId(user_id), + key: 'notification-key', + messageOpts: 'some info', + templateKey: 'template-key' + } + this.expectedDocument = { + user_id: this.stubbedNotification.user_id, + key: 'notification-key', + messageOpts: 'some info', + templateKey: 'template-key' + } + this.expectedQuery = { + user_id: this.stubbedNotification.user_id, + key: 'notification-key' + } + this.updateStub.yields() + return this.countStub.yields(null, 0) + }) - it('should insert the notification into the collection', function(done){ - return this.notifications.addNotification(user_id, this.stubbedNotification, err=> { - expect(err).not.exists; - sinon.assert.calledWith(this.updateStub, this.expectedQuery, this.expectedDocument, { upsert: true }); - return done(); - }); - }); + it('should insert the notification into the collection', function(done) { + return this.notifications.addNotification( + user_id, + this.stubbedNotification, + err => { + expect(err).not.exists + sinon.assert.calledWith( + this.updateStub, + this.expectedQuery, + this.expectedDocument, + { upsert: true } + ) + return done() + } + ) + }) - describe('when there is an existing notification', function(done) { - beforeEach(function() { - return this.countStub.yields(null, 1); - }); + describe('when there is an existing notification', function(done) { + beforeEach(function() { + return this.countStub.yields(null, 1) + }) - it('should fail to insert', function(done){ - return this.notifications.addNotification(user_id, this.stubbedNotification, err=> { - expect(err).not.exists; - sinon.assert.notCalled(this.updateStub); - return done(); - }); - }); + it('should fail to insert', function(done) { + return this.notifications.addNotification( + user_id, + this.stubbedNotification, + err => { + expect(err).not.exists + sinon.assert.notCalled(this.updateStub) + return done() + } + ) + }) - return it("should update the key if forceCreate is true", function(done) { - this.stubbedNotification.forceCreate = true; - return this.notifications.addNotification(user_id, this.stubbedNotification, err=> { - expect(err).not.exists; - sinon.assert.calledWith(this.updateStub, this.expectedQuery, this.expectedDocument, { upsert: true }); - return done(); - }); - }); - }); + return it('should update the key if forceCreate is true', function(done) { + this.stubbedNotification.forceCreate = true + return this.notifications.addNotification( + user_id, + this.stubbedNotification, + err => { + expect(err).not.exists + sinon.assert.calledWith( + this.updateStub, + this.expectedQuery, + this.expectedDocument, + { upsert: true } + ) + return done() + } + ) + }) + }) - describe('when the notification is set to expire', function() { - beforeEach(function() { - this.stubbedNotification = { - user_id: ObjectId(user_id), - key:"notification-key", - messageOpts:"some info", - templateKey:"template-key", - expires: '2922-02-13T09:32:56.289Z' - }; - this.expectedDocument = { - user_id: this.stubbedNotification.user_id, - key:"notification-key", - messageOpts:"some info", - templateKey:"template-key", - expires: new Date(this.stubbedNotification.expires), - }; - return this.expectedQuery = { - user_id: this.stubbedNotification.user_id, - key:"notification-key", - };}); + describe('when the notification is set to expire', function() { + beforeEach(function() { + this.stubbedNotification = { + user_id: ObjectId(user_id), + key: 'notification-key', + messageOpts: 'some info', + templateKey: 'template-key', + expires: '2922-02-13T09:32:56.289Z' + } + this.expectedDocument = { + user_id: this.stubbedNotification.user_id, + key: 'notification-key', + messageOpts: 'some info', + templateKey: 'template-key', + expires: new Date(this.stubbedNotification.expires) + } + return (this.expectedQuery = { + user_id: this.stubbedNotification.user_id, + key: 'notification-key' + }) + }) - return it('should add an `expires` Date field to the document', function(done){ - return this.notifications.addNotification(user_id, this.stubbedNotification, err=> { - expect(err).not.exists; - sinon.assert.calledWith(this.updateStub, this.expectedQuery, this.expectedDocument, { upsert: true }); - return done(); - }); - }); - }); + return it('should add an `expires` Date field to the document', function(done) { + return this.notifications.addNotification( + user_id, + this.stubbedNotification, + err => { + expect(err).not.exists + sinon.assert.calledWith( + this.updateStub, + this.expectedQuery, + this.expectedDocument, + { upsert: true } + ) + return done() + } + ) + }) + }) - return describe('when the notification has a nonsensical expires field', function() { - beforeEach(function() { - this.stubbedNotification = { - user_id: ObjectId(user_id), - key:"notification-key", - messageOpts:"some info", - templateKey:"template-key", - expires: 'WAT' - }; - return this.expectedDocument = { - user_id: this.stubbedNotification.user_id, - key:"notification-key", - messageOpts:"some info", - templateKey:"template-key", - expires: new Date(this.stubbedNotification.expires), - };}); + return describe('when the notification has a nonsensical expires field', function() { + beforeEach(function() { + this.stubbedNotification = { + user_id: ObjectId(user_id), + key: 'notification-key', + messageOpts: 'some info', + templateKey: 'template-key', + expires: 'WAT' + } + return (this.expectedDocument = { + user_id: this.stubbedNotification.user_id, + key: 'notification-key', + messageOpts: 'some info', + templateKey: 'template-key', + expires: new Date(this.stubbedNotification.expires) + }) + }) - return it('should produce an error', function(done){ - return this.notifications.addNotification(user_id, this.stubbedNotification, err=> { - (err instanceof Error).should.equal(true); - sinon.assert.notCalled(this.updateStub); - return done(); - }); - }); - }); - }); + return it('should produce an error', function(done) { + return this.notifications.addNotification( + user_id, + this.stubbedNotification, + err => { + ;(err instanceof Error).should.equal(true) + sinon.assert.notCalled(this.updateStub) + return done() + } + ) + }) + }) + }) - describe('removeNotificationId', () => - it('should mark the notification id as read', function(done){ - this.updateStub.callsArgWith(2, null); + describe('removeNotificationId', () => + it('should mark the notification id as read', function(done) { + this.updateStub.callsArgWith(2, null) - return this.notifications.removeNotificationId(user_id, notification_id, err=> { - const searchOps = { - user_id:ObjectId(user_id), - _id:ObjectId(notification_id) - }; - const updateOperation = - {"$unset": {templateKey:true, messageOpts:true}}; - assert.deepEqual(this.updateStub.args[0][0], searchOps); - assert.deepEqual(this.updateStub.args[0][1], updateOperation); - return done(); - }); - }) - ); + return this.notifications.removeNotificationId( + user_id, + notification_id, + err => { + const searchOps = { + user_id: ObjectId(user_id), + _id: ObjectId(notification_id) + } + const updateOperation = { + $unset: { templateKey: true, messageOpts: true } + } + assert.deepEqual(this.updateStub.args[0][0], searchOps) + assert.deepEqual(this.updateStub.args[0][1], updateOperation) + return done() + } + ) + })) - describe('removeNotificationKey', () => - it('should mark the notification key as read', function(done){ - this.updateStub.callsArgWith(2, null); + describe('removeNotificationKey', () => + it('should mark the notification key as read', function(done) { + this.updateStub.callsArgWith(2, null) - return this.notifications.removeNotificationKey(user_id, notification_key, err=> { - const searchOps = { - user_id:ObjectId(user_id), - key: notification_key - }; - const updateOperation = { - "$unset": {templateKey:true} - }; - assert.deepEqual(this.updateStub.args[0][0], searchOps); - assert.deepEqual(this.updateStub.args[0][1], updateOperation); - return done(); - }); - }) - ); + return this.notifications.removeNotificationKey( + user_id, + notification_key, + err => { + const searchOps = { + user_id: ObjectId(user_id), + key: notification_key + } + const updateOperation = { + $unset: { templateKey: true } + } + assert.deepEqual(this.updateStub.args[0][0], searchOps) + assert.deepEqual(this.updateStub.args[0][1], updateOperation) + return done() + } + ) + })) - describe('removeNotificationByKeyOnly', () => - it('should mark the notification key as read', function(done){ - this.updateStub.callsArgWith(2, null); + describe('removeNotificationByKeyOnly', () => + it('should mark the notification key as read', function(done) { + this.updateStub.callsArgWith(2, null) - return this.notifications.removeNotificationByKeyOnly(notification_key, err=> { - const searchOps = - {key: notification_key}; - const updateOperation = - {"$unset": {templateKey:true}}; - assert.deepEqual(this.updateStub.args[0][0], searchOps); - assert.deepEqual(this.updateStub.args[0][1], updateOperation); - return done(); - }); - }) - ); + return this.notifications.removeNotificationByKeyOnly( + notification_key, + err => { + const searchOps = { key: notification_key } + const updateOperation = { $unset: { templateKey: true } } + assert.deepEqual(this.updateStub.args[0][0], searchOps) + assert.deepEqual(this.updateStub.args[0][1], updateOperation) + return done() + } + ) + })) - return describe('deleteNotificationByKeyOnly', () => - it('should completely remove the notification', function(done){ - this.removeStub.callsArgWith(2, null); + return describe('deleteNotificationByKeyOnly', () => + it('should completely remove the notification', function(done) { + this.removeStub.callsArgWith(2, null) - return this.notifications.deleteNotificationByKeyOnly(notification_key, err=> { - const searchOps = - {key: notification_key}; - const opts = - {justOne: true}; - assert.deepEqual(this.removeStub.args[0][0], searchOps); - assert.deepEqual(this.removeStub.args[0][1], opts); - return done(); - }); - }) - ); -}); + return this.notifications.deleteNotificationByKeyOnly( + notification_key, + err => { + const searchOps = { key: notification_key } + const opts = { justOne: true } + assert.deepEqual(this.removeStub.args[0][0], searchOps) + assert.deepEqual(this.removeStub.args[0][1], opts) + return done() + } + ) + })) +}) From 2eda6119c9063a352926666b99ee3097198e96e3 Mon Sep 17 00:00:00 2001 From: Tim Alby Date: Mon, 13 Jan 2020 20:01:20 +0100 Subject: [PATCH 15/18] decaffeinate: rename individual coffee files to js files --- services/notifications/{app.coffee => app.js} | 0 .../config/{settings.defaults.coffee => settings.defaults.js} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename services/notifications/{app.coffee => app.js} (100%) rename services/notifications/config/{settings.defaults.coffee => settings.defaults.js} (100%) diff --git a/services/notifications/app.coffee b/services/notifications/app.js similarity index 100% rename from services/notifications/app.coffee rename to services/notifications/app.js diff --git a/services/notifications/config/settings.defaults.coffee b/services/notifications/config/settings.defaults.js similarity index 100% rename from services/notifications/config/settings.defaults.coffee rename to services/notifications/config/settings.defaults.js From 30860286c3b408c41b5f68cf3a241d0dffb99b54 Mon Sep 17 00:00:00 2001 From: Tim Alby Date: Mon, 13 Jan 2020 20:01:22 +0100 Subject: [PATCH 16/18] decaffeinate: convert individual files to js --- services/notifications/app.js | 90 +++++++++++-------- .../notifications/config/settings.defaults.js | 19 ++-- 2 files changed, 63 insertions(+), 46 deletions(-) diff --git a/services/notifications/app.js b/services/notifications/app.js index 7d5b007e22..d12686976b 100644 --- a/services/notifications/app.js +++ b/services/notifications/app.js @@ -1,48 +1,60 @@ -metrics = require("metrics-sharelatex") -metrics.initialize("notifications") -Settings = require 'settings-sharelatex' -logger = require 'logger-sharelatex' -logger.initialize("notifications-sharelatex") -express = require('express') -app = express() -controller = require("./app/js/NotificationsController") -mongojs = require('mongojs') -db = mongojs(Settings.mongo.url, ['notifications']) -Path = require("path") +/* + * decaffeinate suggestions: + * DS102: Remove unnecessary code created because of implicit returns + * DS103: Rewrite code to no longer use __guard__ + * DS207: Consider shorter variations of null checks + * Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md + */ +const metrics = require("metrics-sharelatex"); +metrics.initialize("notifications"); +const Settings = require('settings-sharelatex'); +const logger = require('logger-sharelatex'); +logger.initialize("notifications-sharelatex"); +const express = require('express'); +const app = express(); +const controller = require("./app/js/NotificationsController"); +const mongojs = require('mongojs'); +const db = mongojs(Settings.mongo.url, ['notifications']); +const Path = require("path"); -metrics.memory.monitor(logger) +metrics.memory.monitor(logger); -HealthCheckController = require("./app/js/HealthCheckController") +const HealthCheckController = require("./app/js/HealthCheckController"); -app.configure ()-> - app.use express.methodOverride() - app.use express.bodyParser() - app.use metrics.http.monitor(logger) - app.use express.errorHandler() +app.configure(function(){ + app.use(express.methodOverride()); + app.use(express.bodyParser()); + app.use(metrics.http.monitor(logger)); + return app.use(express.errorHandler()); +}); -metrics.injectMetricsRoute(app) +metrics.injectMetricsRoute(app); -app.post '/user/:user_id', controller.addNotification -app.get '/user/:user_id', controller.getUserNotifications -app.del '/user/:user_id/notification/:notification_id', controller.removeNotificationId -app.del '/user/:user_id', controller.removeNotificationKey -app.del '/key/:key', controller.removeNotificationByKeyOnly +app.post('/user/:user_id', controller.addNotification); +app.get('/user/:user_id', controller.getUserNotifications); +app.del('/user/:user_id/notification/:notification_id', controller.removeNotificationId); +app.del('/user/:user_id', controller.removeNotificationKey); +app.del('/key/:key', controller.removeNotificationByKeyOnly); -app.get '/status', (req, res)-> - res.send('notifications sharelatex up') +app.get('/status', (req, res)=> res.send('notifications sharelatex up')); -app.get '/health_check', (req, res)-> - HealthCheckController.check (err)-> - if err? - logger.err err:err, "error performing health check" - res.send 500 - else - res.send 200 +app.get('/health_check', (req, res)=> + HealthCheckController.check(function(err){ + if (err != null) { + logger.err({err}, "error performing health check"); + return res.send(500); + } else { + return res.send(200); + } + }) +); -app.get '*', (req, res)-> - res.send 404 +app.get('*', (req, res)=> res.send(404)); -host = Settings.internal?.notifications?.host || "localhost" -port = Settings.internal?.notifications?.port || 3042 -app.listen port, host, -> - logger.info "notifications starting up, listening on #{host}:#{port}" +const host = __guard__(Settings.internal != null ? Settings.internal.notifications : undefined, x => x.host) || "localhost"; +const port = __guard__(Settings.internal != null ? Settings.internal.notifications : undefined, x1 => x1.port) || 3042; +app.listen(port, host, () => logger.info(`notifications starting up, listening on ${host}:${port}`)); + +function __guard__(value, transform) { + return (typeof value !== 'undefined' && value !== null) ? transform(value) : undefined; +} \ No newline at end of file diff --git a/services/notifications/config/settings.defaults.js b/services/notifications/config/settings.defaults.js index 3baacee60f..5307d600a4 100644 --- a/services/notifications/config/settings.defaults.js +++ b/services/notifications/config/settings.defaults.js @@ -1,8 +1,13 @@ -module.exports = Settings = - internal: - notifications: - port: 3042 - host: process.env["LISTEN_ADDRESS"] or "localhost" +let Settings; +module.exports = (Settings = { + internal: { + notifications: { + port: 3042, + host: process.env["LISTEN_ADDRESS"] || "localhost" + } + }, - mongo: - url: process.env['MONGO_CONNECTION_STRING'] or "mongodb://#{process.env["MONGO_HOST"] or "localhost"}/sharelatex" + mongo: { + url: process.env['MONGO_CONNECTION_STRING'] || `mongodb://${process.env["MONGO_HOST"] || "localhost"}/sharelatex` + } +}); From 36a899fd2fd3c5f148544dacd028c86e17deddd8 Mon Sep 17 00:00:00 2001 From: Tim Alby Date: Mon, 13 Jan 2020 20:01:23 +0100 Subject: [PATCH 17/18] prettier: convert individual decaffeinated files to Prettier format --- services/notifications/app.js | 99 +++++++++++-------- .../notifications/config/settings.defaults.js | 26 ++--- 2 files changed, 71 insertions(+), 54 deletions(-) diff --git a/services/notifications/app.js b/services/notifications/app.js index d12686976b..e57fa7671c 100644 --- a/services/notifications/app.js +++ b/services/notifications/app.js @@ -5,56 +5,71 @@ * DS207: Consider shorter variations of null checks * Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md */ -const metrics = require("metrics-sharelatex"); -metrics.initialize("notifications"); -const Settings = require('settings-sharelatex'); -const logger = require('logger-sharelatex'); -logger.initialize("notifications-sharelatex"); -const express = require('express'); -const app = express(); -const controller = require("./app/js/NotificationsController"); -const mongojs = require('mongojs'); -const db = mongojs(Settings.mongo.url, ['notifications']); -const Path = require("path"); +const metrics = require('metrics-sharelatex') +metrics.initialize('notifications') +const Settings = require('settings-sharelatex') +const logger = require('logger-sharelatex') +logger.initialize('notifications-sharelatex') +const express = require('express') +const app = express() +const controller = require('./app/js/NotificationsController') +const mongojs = require('mongojs') +const db = mongojs(Settings.mongo.url, ['notifications']) +const Path = require('path') -metrics.memory.monitor(logger); +metrics.memory.monitor(logger) -const HealthCheckController = require("./app/js/HealthCheckController"); +const HealthCheckController = require('./app/js/HealthCheckController') -app.configure(function(){ - app.use(express.methodOverride()); - app.use(express.bodyParser()); - app.use(metrics.http.monitor(logger)); - return app.use(express.errorHandler()); -}); +app.configure(function() { + app.use(express.methodOverride()) + app.use(express.bodyParser()) + app.use(metrics.http.monitor(logger)) + return app.use(express.errorHandler()) +}) -metrics.injectMetricsRoute(app); +metrics.injectMetricsRoute(app) -app.post('/user/:user_id', controller.addNotification); -app.get('/user/:user_id', controller.getUserNotifications); -app.del('/user/:user_id/notification/:notification_id', controller.removeNotificationId); -app.del('/user/:user_id', controller.removeNotificationKey); -app.del('/key/:key', controller.removeNotificationByKeyOnly); +app.post('/user/:user_id', controller.addNotification) +app.get('/user/:user_id', controller.getUserNotifications) +app.del( + '/user/:user_id/notification/:notification_id', + controller.removeNotificationId +) +app.del('/user/:user_id', controller.removeNotificationKey) +app.del('/key/:key', controller.removeNotificationByKeyOnly) -app.get('/status', (req, res)=> res.send('notifications sharelatex up')); +app.get('/status', (req, res) => res.send('notifications sharelatex up')) -app.get('/health_check', (req, res)=> - HealthCheckController.check(function(err){ - if (err != null) { - logger.err({err}, "error performing health check"); - return res.send(500); - } else { - return res.send(200); - } - }) -); +app.get('/health_check', (req, res) => + HealthCheckController.check(function(err) { + if (err != null) { + logger.err({ err }, 'error performing health check') + return res.send(500) + } else { + return res.send(200) + } + }) +) -app.get('*', (req, res)=> res.send(404)); +app.get('*', (req, res) => res.send(404)) -const host = __guard__(Settings.internal != null ? Settings.internal.notifications : undefined, x => x.host) || "localhost"; -const port = __guard__(Settings.internal != null ? Settings.internal.notifications : undefined, x1 => x1.port) || 3042; -app.listen(port, host, () => logger.info(`notifications starting up, listening on ${host}:${port}`)); +const host = + __guard__( + Settings.internal != null ? Settings.internal.notifications : undefined, + x => x.host + ) || 'localhost' +const port = + __guard__( + Settings.internal != null ? Settings.internal.notifications : undefined, + x1 => x1.port + ) || 3042 +app.listen(port, host, () => + logger.info(`notifications starting up, listening on ${host}:${port}`) +) function __guard__(value, transform) { - return (typeof value !== 'undefined' && value !== null) ? transform(value) : undefined; -} \ No newline at end of file + return typeof value !== 'undefined' && value !== null + ? transform(value) + : undefined +} diff --git a/services/notifications/config/settings.defaults.js b/services/notifications/config/settings.defaults.js index 5307d600a4..0343132d42 100644 --- a/services/notifications/config/settings.defaults.js +++ b/services/notifications/config/settings.defaults.js @@ -1,13 +1,15 @@ -let Settings; -module.exports = (Settings = { - internal: { - notifications: { - port: 3042, - host: process.env["LISTEN_ADDRESS"] || "localhost" - } - }, +let Settings +module.exports = Settings = { + internal: { + notifications: { + port: 3042, + host: process.env.LISTEN_ADDRESS || 'localhost' + } + }, - mongo: { - url: process.env['MONGO_CONNECTION_STRING'] || `mongodb://${process.env["MONGO_HOST"] || "localhost"}/sharelatex` - } -}); + mongo: { + url: + process.env.MONGO_CONNECTION_STRING || + `mongodb://${process.env.MONGO_HOST || 'localhost'}/sharelatex` + } +} From 4323b6a155e03582cefb3c6a49ea3b2547414a1a Mon Sep 17 00:00:00 2001 From: Tim Alby Date: Tue, 14 Jan 2020 17:02:13 +0100 Subject: [PATCH 18/18] remove `compile:*` commands --- services/notifications/package.json | 5 ----- 1 file changed, 5 deletions(-) diff --git a/services/notifications/package.json b/services/notifications/package.json index befd9912d6..73a6066049 100644 --- a/services/notifications/package.json +++ b/services/notifications/package.json @@ -4,17 +4,12 @@ "description": "An API to handle user notifications", "main": "app.js", "scripts": { - "compile:app": "([ -e app/coffee ] && coffee -m $COFFEE_OPTIONS -o app/js -c app/coffee || echo 'No CoffeeScript folder to compile') && ( [ -e app.coffee ] && coffee -m $COFFEE_OPTIONS -c app.coffee || echo 'No CoffeeScript app to compile')", "start": "node $NODE_APP_OPTIONS app.js", "test:acceptance:_run": "mocha --recursive --reporter spec --timeout 15000 --exit $@ test/acceptance/js", "test:acceptance": "npm run test:acceptance:_run -- --grep=$MOCHA_GREP", "test:unit:_run": "mocha --recursive --reporter spec $@ test/unit/js", "test:unit": "npm run test:unit:_run -- --grep=$MOCHA_GREP", - "compile:unit_tests": "[ ! -e test/unit/coffee ] && echo 'No unit tests to compile' || coffee -o test/unit/js -c test/unit/coffee", - "compile:acceptance_tests": "[ ! -e test/acceptance/coffee ] && echo 'No acceptance tests to compile' || coffee -o test/acceptance/js -c test/acceptance/coffee", - "compile:all": "npm run compile:app && npm run compile:unit_tests && npm run compile:acceptance_tests && npm run compile:smoke_tests", "nodemon": "nodemon --config nodemon.json", - "compile:smoke_tests": "[ ! -e test/smoke/coffee ] && echo 'No smoke tests to compile' || coffee -o test/smoke/js -c test/smoke/coffee", "lint": "node_modules/.bin/eslint .", "format": "node_modules/.bin/prettier-eslint '**/*.js' --list-different", "format:fix": "node_modules/.bin/prettier-eslint '**/*.js' --write"