diff --git a/.eslintignore b/.eslintignore new file mode 100644 index 0000000..8c16183 --- /dev/null +++ b/.eslintignore @@ -0,0 +1,6 @@ +node_modules +jest.config.js +dist +.eslintrc.js +scripts +test diff --git a/.eslintrc.js b/.eslintrc.js new file mode 100644 index 0000000..66e4107 --- /dev/null +++ b/.eslintrc.js @@ -0,0 +1,80 @@ +module.exports = { + root: true, + parser: '@typescript-eslint/parser', + parserOptions: { + tsconfigRootDir: __dirname, + project: ['./tsconfig.json'], + }, + plugins: [ + '@typescript-eslint', + ], + extends: [ + 'eslint:recommended', + 'plugin:import/errors', + 'plugin:import/warnings', + 'plugin:import/typescript', + 'plugin:@typescript-eslint/recommended', + 'plugin:@typescript-eslint/recommended-requiring-type-checking' + ], + rules: { + 'quotes': [ + 'warn', + 'single', + { + 'avoidEscape': true + } + ], + 'semi': [ + 'warn', + 'always' + ], + '@typescript-eslint/explicit-function-return-type': 'off', + '@typescript-eslint/explicit-module-boundary-types': 'off', + '@typescript-eslint/no-unsafe-assignment': 'off', + '@typescript-eslint/no-misused-promises': 'off', + '@typescript-eslint/no-non-null-assertion': 'off', + '@typescript-eslint/quotes': [ + 'warn', + 'single', + { + 'avoidEscape': true + } + ], + '@typescript-eslint/semi': [ + 'warn', + 'always' + ], + 'import/order': [ + 'error', + { + 'groups': [ + 'builtin', + 'external', + 'parent', + 'sibling', + 'index' + ], + 'newlines-between': 'always', + 'alphabetize': { + 'order': 'asc', + 'caseInsensitive': true + } + } + ] + }, + env: { + node: true, + browser: false, + es6: true + }, + settings: { + 'import/parsers': { + '@typescript-eslint/parser': ['.ts'] + }, + 'import/resolver': { + typescript: { + alwaysTryTypes: true + }, + } + } +}; diff --git a/Dockerfile b/Dockerfile index 04cb644..8f9737b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM node:12-alpine +FROM node:alpine WORKDIR /usr/src/backend diff --git a/README.md b/README.md index a7a82af..d9053b8 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ backend of recruitment system for Unique Studio -## Tool Chain +## Tech stack 1. `node.js` 2. `typescript` diff --git a/jest.config.js b/jest.config.js index 1a1553f..c54fd35 100644 --- a/jest.config.js +++ b/jest.config.js @@ -1,18 +1,30 @@ +const tsconfig = require('./tsconfig.json'); + +const paths = tsconfig.compilerOptions.paths; + +const moduleNameMapper = Object.keys(paths).reduce((acc, curr) => { + return { + ...acc, + [`^${curr.match(/@.*\//)[0]}(.*)$`]: '' + paths[curr][0].replace('*', '$1'), + }; +}, {}); + module.exports = { - "roots": [ - "/test" + roots: [ + '/test', ], - "transform": { - "^.+\\.ts?$": "ts-jest" + transform: { + '^.+\\.ts?$': 'ts-jest', }, - "testRegex": "(/__tests__/.*|(\\.|/)(test|spec))\\.ts?$", - "moduleFileExtensions": [ - "ts", - "tsx", - "js", - "jsx", - "json", - "node" + testRegex: '(/__tests__/.*|(\\.|/)(test|spec))\\.ts?$', + moduleFileExtensions: [ + 'ts', + 'tsx', + 'js', + 'jsx', + 'json', + 'node', ], - "testEnvironment": "node" + testEnvironment: 'node', + moduleNameMapper, }; diff --git a/package.json b/package.json index 47ea147..1808d7a 100644 --- a/package.json +++ b/package.json @@ -19,49 +19,54 @@ "acm-client": "^3.1.0", "cron": "^1.8.2", "express": "^4.17.1", - "express-validator": "^6.6.0", + "express-validator": "^6.6.1", + "ioredis": "^4.19.2", "jsonwebtoken": "^8.5.1", - "mkdirp": "^1.0.4", - "moment": "^2.27.0", - "mongodb": "^3.5.9", - "mongoose": "5.7.5", + "mongodb": "^3.6.3", + "mongoose": "^5.10.13", + "morgan": "^1.10.0", "multer": "^1.4.2", - "node-fetch": "^2.6.0", - "nodemailer": "^6.4.10", - "redis": "^3.0.2", - "socket.io": "^2.3.0" + "node-fetch": "^2.6.1", + "nodemailer": "^6.4.15", + "socket.io": "^2.3.0", + "winston": "^3.3.3" }, "devDependencies": { "@types/cron": "^1.7.2", - "@types/express": "^4.17.6", - "@types/jest": "^26.0.3", + "@types/express": "^4.17.8", + "@types/ioredis": "^4.17.7", + "@types/jest": "^26.0.15", "@types/jsonwebtoken": "^8.5.0", - "@types/mkdirp": "^1.0.1", - "@types/mongodb": "^3.5.25", - "@types/mongoose": "5.5.6", - "@types/multer": "^1.4.3", - "@types/node": "^14.0.14", + "@types/mongodb": "^3.5.33", + "@types/mongoose": "^5.7.37", + "@types/morgan": "^1.9.2", + "@types/multer": "^1.4.4", + "@types/node": "^14.14.6", "@types/node-fetch": "^2.5.7", "@types/nodemailer": "^6.4.0", - "@types/redis": "^2.8.22", - "@types/socket.io": "^2.1.8", - "@types/socket.io-client": "^1.4.33", - "@types/supertest": "^2.0.9", - "jest": "^26.1.0", + "@types/socket.io": "^2.1.11", + "@types/socket.io-client": "^1.4.34", + "@types/supertest": "^2.0.10", + "@typescript-eslint/eslint-plugin": "^4.6.1", + "@typescript-eslint/parser": "^4.6.1", + "eslint": "^7.13.0", + "eslint-import-resolver-typescript": "^2.3.0", + "eslint-plugin-import": "^2.22.1", + "jest": "^26.6.3", "socket.io-client": "^2.3.0", - "supertest": "^4.0.2", - "ts-jest": "^26.1.1", - "ts-node": "^8.10.2", + "supertest": "^6.0.1", + "ts-jest": "^26.4.3", + "ts-node": "^9.0.0", "tsc-alias": "^1.1.1", "tsconfig-paths": "^3.9.0", - "tslint": "^6.1.2", - "typescript": "^3.9.5" + "typescript": "^4.0.5" }, "scripts": { "build": "tsc", + "lint": "eslint . --fix", "postbuild": "ts-node scripts/resolveAlias.ts", "test": "jest --forceExit", "startProd": "node build/src/index.js", "startDev": "ts-node -r tsconfig-paths/register --files src/index.ts" } -} \ No newline at end of file +} diff --git a/src/actions/candidate/addCandidate.ts b/src/actions/candidate/addCandidate.ts index 37c9e83..e4ebaba 100644 --- a/src/actions/candidate/addCandidate.ts +++ b/src/actions/candidate/addCandidate.ts @@ -1,18 +1,19 @@ -import { RequestHandler } from 'express'; -import { body, validationResult } from 'express-validator'; import path from 'path'; -import { io } from '../../app'; -import { GENDERS, GRADES, GROUPS_, RANKS } from '@config/consts'; +import { body, validationResult } from 'express-validator'; + +import { sendSMS } from '@actions/candidate/sendSMS'; +import { GENDERS, GRADES, GROUPS_, RANKS, TITLE_REGEX } from '@config/consts'; +import { Candidate, Handler } from '@config/types'; import { CandidateRepo, RecruitmentRepo } from '@database/model'; -import { titleConverter } from '@utils/titleConverter'; +import { io } from '@servers/websocket'; import { copyFile } from '@utils/copyFile'; import { errorRes } from '@utils/errorRes'; import { logger } from '@utils/logger'; import sendEmail from '@utils/sendEmail'; -import { sendSMS } from './sendSMS'; +import { titleConverter } from '@utils/titleConverter'; -export const addCandidate: RequestHandler = async (req, res, next) => { +export const addCandidate: Handler = async (req, res, next) => { try { const errors = validationResult(req); if (!errors.isEmpty()) { @@ -23,7 +24,7 @@ export const addCandidate: RequestHandler = async (req, res, next) => { if (req.file) { const { originalname: filename, path: oldPath } = req.file; filepath = path.join('./data/resumes', title, group); - filepath = await copyFile(oldPath, filepath, `${name} - ${filename}`); + filepath = copyFile(oldPath, filepath, `${name} - ${filename}`); } const info = await CandidateRepo.createAndInsert({ name, @@ -39,12 +40,12 @@ export const addCandidate: RequestHandler = async (req, res, next) => { isQuick, title, resume: filepath, - referrer + referrer, }); await RecruitmentRepo.update({ title, 'groups.name': group }, { 'groups.$.total': await CandidateRepo.count({ title, group }), 'groups.$.steps.0': await CandidateRepo.count({ title, group, step: 0 }), - 'total': await CandidateRepo.count({ title }) + 'total': await CandidateRepo.count({ title }), }); res.json({ type: 'success' }); io.emit('addCandidate', { candidate: info }); @@ -67,7 +68,7 @@ export const addCandidate: RequestHandler = async (req, res, next) => { } }; -export const verifyTitle = body('title').matches(/\d{4}[ASC]/, 'g').withMessage('Title is invalid!') +export const verifyTitle = body('title').matches(TITLE_REGEX).withMessage('Title is invalid!') .custom(async (title) => { const recruitment = (await RecruitmentRepo.query({ title }))[0]; if (!recruitment) { @@ -90,8 +91,8 @@ export const addCandidateVerify = [ body('gender').isInt({ lt: GENDERS.length, gt: -1 }).withMessage('Gender is invalid!'), body('isQuick').isBoolean().withMessage('IsQuick is invalid!'), body('phone').isMobilePhone('zh-CN').withMessage('Phone is invalid!'), - body('phone').custom(async (phone, { req }) => { - if ((await CandidateRepo.query({ phone, title: req.body.title })).length !== 0) { + body('phone').custom(async (phone, { req: { body: { title } } }) => { + if ((await CandidateRepo.query({ phone, title })).length !== 0) { throw new Error('You have already applied!'); } }), @@ -103,5 +104,5 @@ export const addCandidateVerify = [ body('rank').isInt({ lt: RANKS.length, gt: -1 }).withMessage('Rank is invalid!'), body('intro').isString().withMessage('Intro is invalid!'), body('referrer').isString().withMessage('Referrer is invalid!'), - verifyTitle + verifyTitle, ]; diff --git a/src/actions/candidate/addComment.ts b/src/actions/candidate/addComment.ts index 3e03585..a6b45f2 100644 --- a/src/actions/candidate/addComment.ts +++ b/src/actions/candidate/addComment.ts @@ -1,8 +1,8 @@ import { Socket } from 'socket.io'; -import { io } from '../../app'; import { Comment } from '@config/types'; import { CandidateRepo, UserRepo } from '@database/model'; +import { io } from '@servers/websocket'; import { errorRes } from '@utils/errorRes'; import { logger } from '@utils/logger'; import { verifyJWT } from '@utils/verifyJWT'; @@ -31,7 +31,7 @@ export const onAddComment = (socket: Socket) => async (req: { cid: string, comme if (!updated) { return socket.emit('addCommentError', errorRes('Failed to add comment!', 'warning')); } - return io.emit('addComment', { cid, title, comment: updated.comments.slice(-1)[0] }); + return io.emit('addComment', { cid, title, comment: updated.comments[updated.comments.length - 1] }); } catch ({ message }) { logger.error(message); return socket.emit('addCommentError', errorRes(message, 'error')); diff --git a/src/actions/candidate/allocateAll.ts b/src/actions/candidate/allocateAll.ts index e1b8fc7..172f443 100644 --- a/src/actions/candidate/allocateAll.ts +++ b/src/actions/candidate/allocateAll.ts @@ -1,11 +1,17 @@ -import { RequestHandler } from 'express'; import { param, validationResult } from 'express-validator'; + +import { verifyTitle } from './addCandidate'; + +import { Handler } from '@config/types'; import { CandidateRepo, RecruitmentRepo, UserRepo } from '@database/model'; import { allocateTime } from '@utils/allocateTime'; import { errorRes } from '@utils/errorRes'; -import { verifyTitle } from './addCandidate'; -export const allocateAll: RequestHandler = async (req, res, next) => { +interface Body { + title: string; +} + +export const allocateAll: Handler = async (req, res, next) => { try { const errors = validationResult(req); if (!errors.isEmpty()) { @@ -19,6 +25,9 @@ export const allocateAll: RequestHandler = async (req, res, next) => { const { title } = req.body; const { type } = req.params; const recruitment = (await RecruitmentRepo.query({ title }))[0]; + if (!recruitment) { + return next(errorRes('Recruitment doesn\'t exist!', 'warning')); + } if (type === 'group') { const groupData = recruitment.groups.find(({ name }) => name === group); if (!groupData) { @@ -37,13 +46,13 @@ export const allocateAll: RequestHandler = async (req, res, next) => { 'interviews.group.selection.0': { $exists: true }, // selected }); const allocations = allocateTime(groupData.interview, candidates, 'group'); - const promises = allocations.map(async ({ id, time }) => { + await Promise.all(allocations.map(async ({ id, time }) => { if (time) { return CandidateRepo.updateById(id, { 'interviews.group.allocation': time }); } return; - }); - Promise.all(promises).then(() => res.json({ type: 'success', allocations })); + })); + res.json({ type: 'success', allocations }); } else { if (!recruitment.interview.length) { return next(errorRes('Please set team interview time first!', 'warning')); @@ -57,13 +66,13 @@ export const allocateAll: RequestHandler = async (req, res, next) => { 'interviews.team.selection.0': { $exists: true }, // selected }); const allocations = allocateTime(recruitment.interview, candidates, 'team'); - const promises = allocations.map(async ({ time, id }) => { + await Promise.all(allocations.map(async ({ time, id }) => { if (time) { return CandidateRepo.updateById(id, { 'interviews.team.allocation': time }); } return; - }); - Promise.all(promises).then(() => res.json({ type: 'success', allocations })); + })); + res.json({ type: 'success', allocations }); } } catch (error) { return next(error); @@ -72,5 +81,5 @@ export const allocateAll: RequestHandler = async (req, res, next) => { export const allocateAllVerify = [ param('type').custom((type) => ['group', 'team'].includes(type)).withMessage('Interview type is invalid!'), - verifyTitle + verifyTitle, ]; diff --git a/src/actions/candidate/allocateOne.ts b/src/actions/candidate/allocateOne.ts index d03ffe9..e4edb11 100644 --- a/src/actions/candidate/allocateOne.ts +++ b/src/actions/candidate/allocateOne.ts @@ -1,9 +1,10 @@ -import { RequestHandler } from 'express'; import { body, param, validationResult } from 'express-validator'; + +import { Handler } from '@config/types'; import { CandidateRepo, RecruitmentRepo } from '@database/model'; import { errorRes } from '@utils/errorRes'; -export const allocateOne: RequestHandler = async (req, res, next) => { +export const allocateOne: Handler = async (req, res, next) => { try { const errors = validationResult(req); if (!errors.isEmpty()) { diff --git a/src/actions/candidate/getCandidates.ts b/src/actions/candidate/getCandidates.ts index 52a41c7..61ef74b 100644 --- a/src/actions/candidate/getCandidates.ts +++ b/src/actions/candidate/getCandidates.ts @@ -1,10 +1,12 @@ -import { RequestHandler } from 'express'; import { param, validationResult } from 'express-validator'; + +import { TITLE_REGEX } from '@config/consts'; +import { Handler } from '@config/types'; import { CandidateRepo, RecruitmentRepo, UserRepo } from '@database/model'; import { compareTitle } from '@utils/compareTitle'; import { errorRes } from '@utils/errorRes'; -export const getCandidates: RequestHandler = async (req, res, next) => { +export const getCandidates: Handler = async (req, res, next) => { try { const errors = validationResult(req); if (!errors.isEmpty()) { @@ -35,6 +37,6 @@ export const getCandidateVerify = [ param('query').isJSON().withMessage('Query is invalid!') .custom((query) => { const { title } = JSON.parse(query); - return title.match(/\d{4}[ASC]/g); - }).withMessage('Title is invalid!') + return TITLE_REGEX.test(title); + }).withMessage('Title is invalid!'), ]; diff --git a/src/actions/candidate/getForm.ts b/src/actions/candidate/getForm.ts index 42eb149..e3264c2 100644 --- a/src/actions/candidate/getForm.ts +++ b/src/actions/candidate/getForm.ts @@ -1,11 +1,12 @@ -import { RequestHandler } from 'express'; import { param, validationResult } from 'express-validator'; + import { GROUPS_ } from '@config/consts'; +import { Handler } from '@config/types'; import { RecruitmentRepo } from '@database/model'; import { errorRes } from '@utils/errorRes'; import { generateJWT } from '@utils/generateJWT'; -export const getForm: RequestHandler = async (req, res, next) => { +export const getForm: Handler = async (req, res, next) => { try { const errors = validationResult(req); if (!errors.isEmpty()) { diff --git a/src/actions/candidate/getResume.ts b/src/actions/candidate/getResume.ts index 32c22f2..c08f07a 100644 --- a/src/actions/candidate/getResume.ts +++ b/src/actions/candidate/getResume.ts @@ -1,9 +1,10 @@ -import { RequestHandler } from 'express'; import { basename, resolve } from 'path'; + +import { Handler } from '@config/types'; import { CandidateRepo } from '@database/model'; import { errorRes } from '@utils/errorRes'; -export const getResume: RequestHandler = async (req, res) => { +export const getResume: Handler = async (req, res) => { try { const data = await CandidateRepo.queryById(req.params.cid); if (!data || !data.resume) { @@ -14,7 +15,7 @@ export const getResume: RequestHandler = async (req, res) => { res.header('Access-Control-Expose-Headers', 'Content-Length, Content-Disposition') .download(path, filename); } - } catch (err) { - res.status(500).send(errorRes(err.message, 'error')); + } catch ({ message }) { + res.status(500).send(errorRes(message, 'error')); } }; diff --git a/src/actions/candidate/index.ts b/src/actions/candidate/index.ts index f711d75..2671c54 100644 --- a/src/actions/candidate/index.ts +++ b/src/actions/candidate/index.ts @@ -9,5 +9,5 @@ export { onRemoveComment } from './removeComment'; export { setCandidate, setCandidateVerify } from './setCandidate'; export { allocateOne, allocateOneVerify } from './allocateOne'; export { allocateAll, allocateAllVerify } from './allocateAll'; -export { newGetFormVerify, newGetForm } from './newGetForm' -export { newSetCandidateVerify, newSetCandidate } from './newSetCandidate' \ No newline at end of file +export { newGetForm, newGetFormVerify } from './newGetForm'; +export { newSetCandidate, newSetCandidateVerify } from './newSetCandidate'; diff --git a/src/actions/candidate/moveCandidate.ts b/src/actions/candidate/moveCandidate.ts index 749e678..d9c17e7 100644 --- a/src/actions/candidate/moveCandidate.ts +++ b/src/actions/candidate/moveCandidate.ts @@ -1,11 +1,13 @@ import { Socket } from 'socket.io'; -import { io } from '../../app'; + +import { Step } from '@config/types'; import { CandidateRepo, RecruitmentRepo } from '@database/model'; +import { io } from '@servers/websocket'; import { errorRes } from '@utils/errorRes'; import { logger } from '@utils/logger'; import { verifyJWT } from '@utils/verifyJWT'; -export const onMoveCandidate = (socket: Socket) => async (req: { cid: string, from: number, to: number, token: string }) => { +export const onMoveCandidate = (socket: Socket) => async (req: { cid: string, from: Step, to: Step, token: string }) => { const { cid, from, to, token } = req; try { verifyJWT(token); @@ -15,6 +17,9 @@ export const onMoveCandidate = (socket: Socket) => async (req: { cid: string, fr } const { step, title, group } = candidate; const recruitment = (await RecruitmentRepo.query({ title }))[0]; + if (!recruitment) { + return socket.emit('moveCandidateError', errorRes('Recruitment doesn\'t exist!', 'warning', { cid, to, from })); + } if (recruitment.end < Date.now()) { return socket.emit('moveCandidateError', errorRes('This recruitment has already ended!', 'warning', { cid, to, from })); } diff --git a/src/actions/candidate/newGetForm.ts b/src/actions/candidate/newGetForm.ts index 7be7eee..0386bd7 100644 --- a/src/actions/candidate/newGetForm.ts +++ b/src/actions/candidate/newGetForm.ts @@ -1,11 +1,13 @@ -import { RequestHandler } from 'express'; import { param, validationResult } from 'express-validator'; -import { PayloadRepo, RecruitmentRepo } from '@database/model'; + import { redisAsync } from '../../redis'; + +import { Handler } from '@config/types'; +import { PayloadRepo, RecruitmentRepo } from '@database/model'; import { errorRes } from '@utils/errorRes'; import { generateJWT } from '@utils/generateJWT'; -export const newGetForm: RequestHandler = async (req, res, next) => { +export const newGetForm: Handler = async (req, res, next) => { try { const errors = validationResult(req); if (!errors.isEmpty()) { @@ -13,8 +15,11 @@ export const newGetForm: RequestHandler = async (req, res, next) => { } const hash = req.params.hash; - const catchedId = await redisAsync.get(`payload:${hash}`); - let payload = await PayloadRepo.queryById(catchedId); + const payloadId = await redisAsync.get(`payload:${hash}`); + if (!payloadId) { + return next(errorRes('Payload ID doesn\'t exist!', 'warning')); + } + let payload = await PayloadRepo.queryById(payloadId); if (!payload) { payload = (await PayloadRepo.query({ hash }))[0]; if (!payload) { @@ -32,7 +37,10 @@ export const newGetForm: RequestHandler = async (req, res, next) => { return next(errorRes('Recruitment doesn\'t exist!', 'warning')); } const groupData = recruitment.groups.find((group) => group.name === groupName); - return res.json({ type: 'success', time: groupData!.interview, token, step }); + if (!groupData) { + return next(errorRes('Group doesn\'t exist!', 'warning')); + } + return res.json({ type: 'success', time: groupData.interview, token, step }); } case 'team': { // 群面 diff --git a/src/actions/candidate/newSetCandidate.ts b/src/actions/candidate/newSetCandidate.ts index 24b0b96..4be7c87 100644 --- a/src/actions/candidate/newSetCandidate.ts +++ b/src/actions/candidate/newSetCandidate.ts @@ -1,14 +1,22 @@ -import { RequestHandler } from 'express'; import { body, param, validationResult } from 'express-validator'; -import { CandidateRepo, RecruitmentRepo } from '@database/model'; -import { PayloadRepo } from '@database/model'; + import { redisAsync } from '../../redis'; + +import { sendSMS } from './sendSMS'; + +import { Handler, Time } from '@config/types'; +import { CandidateRepo, PayloadRepo, RecruitmentRepo } from '@database/model'; import { checkInterview } from '@utils/checkInterview'; import { errorRes } from '@utils/errorRes'; -import { sendSMS } from './sendSMS'; import { logger } from '@utils/logger'; -export const newSetCandidate: RequestHandler = async (req, res, next) => { +interface Body { + teamInterview: Time[]; + groupInterview: Time[]; + abandon: boolean; +} + +export const newSetCandidate: Handler = async (req, res, next) => { try { const errors = validationResult(req); if (!errors.isEmpty()) { @@ -17,8 +25,11 @@ export const newSetCandidate: RequestHandler = async (req, res, next) => { const { id } = res.locals; // from JWT const { teamInterview, groupInterview, abandon } = req.body; const hash = req.params.hash; - const pid = await redisAsync.getThenDel(`payload:${hash}`); - let payload = await PayloadRepo.queryById(pid); + const payloadId = await redisAsync.getThenDel(`payload:${hash}`); + if (!payloadId) { + return next(errorRes('Payload ID doesn\'t exist!', 'warning')); + } + let payload = await PayloadRepo.queryById(payloadId); if (!payload) { payload = (await PayloadRepo.query({ hash }))[0]; if (!payload) { @@ -45,7 +56,7 @@ export const newSetCandidate: RequestHandler = async (req, res, next) => { CandidateRepo.updateById(id, { abandon }), - redisAsync.del(`payload:${hash}`) + redisAsync.del(`payload:${hash}`), ]); return res.json({ type: 'success' }); } @@ -68,11 +79,11 @@ export const newSetCandidate: RequestHandler = async (req, res, next) => { CandidateRepo.updateById(id, { 'interviews.group.selection': groupInterview, }), - PayloadRepo.deleteById(pid), + PayloadRepo.deleteById(payloadId), ]); - res.json({ type: 'success' }); // {{1}你好，您当前状态是{2}，请关注手机短信以便获取后续通知。 sendSMS(phone, { template: 670908, param_list: [name, '成功选择组面时间'] }).catch((e) => logger.error(e)); + return res.json({ type: 'success' }); } case 'team': { const recruitment = await RecruitmentRepo.queryById(recruitmentId); @@ -92,11 +103,11 @@ export const newSetCandidate: RequestHandler = async (req, res, next) => { CandidateRepo.updateById(id, { 'interviews.team.selection': teamInterview, }), - PayloadRepo.deleteById(pid), + PayloadRepo.deleteById(payloadId), ]); - res.json({ type: 'success' }); // {1}你好，您当前状态是{2}，请关注手机短信以便获取后续通知。 sendSMS(phone, { template: 670908, param_list: [name, '成功选择群面时间'] }).catch((e) => logger.error(e)); + return res.json({ type: 'success' }); } default: { return next(errorRes('Failed to set!', 'warning')); diff --git a/src/actions/candidate/removeCandidate.ts b/src/actions/candidate/removeCandidate.ts index 52cb9a5..406029e 100644 --- a/src/actions/candidate/removeCandidate.ts +++ b/src/actions/candidate/removeCandidate.ts @@ -1,6 +1,7 @@ import { Socket } from 'socket.io'; -import { io } from '../../app'; + import { CandidateRepo, RecruitmentRepo } from '@database/model'; +import { io } from '@servers/websocket'; import { deleteFile } from '@utils/deleteFile'; import { errorRes } from '@utils/errorRes'; import { logger } from '@utils/logger'; diff --git a/src/actions/candidate/removeComment.ts b/src/actions/candidate/removeComment.ts index fce97d8..f924754 100644 --- a/src/actions/candidate/removeComment.ts +++ b/src/actions/candidate/removeComment.ts @@ -1,7 +1,8 @@ import { Types } from 'mongoose'; import { Socket } from 'socket.io'; -import { io } from '../../app'; + import { CandidateRepo } from '@database/model'; +import { io } from '@servers/websocket'; import { errorRes } from '@utils/errorRes'; import { logger } from '@utils/logger'; import { verifyJWT } from '@utils/verifyJWT'; diff --git a/src/actions/candidate/sendSMS.ts b/src/actions/candidate/sendSMS.ts index e59ce71..62a51d2 100644 --- a/src/actions/candidate/sendSMS.ts +++ b/src/actions/candidate/sendSMS.ts @@ -1,4 +1,5 @@ import fetch from 'node-fetch'; + import { smsAPI, token } from '@config/consts'; export const sendSMS = async (phone: string, body: { template: number, param_list: string[] }) => { @@ -6,12 +7,12 @@ export const sendSMS = async (phone: string, body: { template: number, param_lis method: 'POST', headers: { Token: token, - 'Content-Type': 'application/json' + 'Content-Type': 'application/json', }, body: JSON.stringify({ phone, - ...body - }) + ...body, + }), }); const { code, message }: { code: number, message: string } = await resp.json(); if (code !== 200) { diff --git a/src/actions/candidate/setCandidate.ts b/src/actions/candidate/setCandidate.ts index 9010a0e..0b2cb20 100644 --- a/src/actions/candidate/setCandidate.ts +++ b/src/actions/candidate/setCandidate.ts @@ -1,10 +1,17 @@ -import { RequestHandler } from 'express'; import { body, param, validationResult } from 'express-validator'; + +import { Handler, Time } from '@config/types'; import { CandidateRepo, RecruitmentRepo } from '@database/model'; import { checkInterview } from '@utils/checkInterview'; import { errorRes } from '@utils/errorRes'; -export const setCandidate: RequestHandler = async (req, res, next) => { +interface Body { + teamInterview: Time[]; + groupInterview: Time[]; + abandon: boolean; +} + +export const setCandidate: Handler = async (req, res, next) => { try { const errors = validationResult(req); if (!errors.isEmpty()) { diff --git a/src/actions/recruitment/getAllRecruitments.ts b/src/actions/recruitment/getAllRecruitments.ts index 6e5cb98..b411f1e 100644 --- a/src/actions/recruitment/getAllRecruitments.ts +++ b/src/actions/recruitment/getAllRecruitments.ts @@ -1,9 +1,8 @@ -import { RequestHandler } from 'express'; - -import { RecruitmentRepo/*, UserRepo*/ } from '@database/model'; +import { Handler } from '@config/types'; +import { RecruitmentRepo } from '@database/model'; import { errorRes } from '@utils/errorRes'; -export const getAllRecruitments: RequestHandler = async (req, res, next) => { +export const getAllRecruitments: Handler = async (req, res, next) => { try { // const user = await UserRepo.queryById(res.locals.id); // if (!user) { diff --git a/src/actions/recruitment/getOneRecruitment.ts b/src/actions/recruitment/getOneRecruitment.ts index 64f3679..2ed23e0 100644 --- a/src/actions/recruitment/getOneRecruitment.ts +++ b/src/actions/recruitment/getOneRecruitment.ts @@ -1,9 +1,8 @@ -import { RequestHandler } from 'express'; - -import { RecruitmentRepo/*, UserRepo*/ } from '@database/model'; +import { Handler } from '@config/types'; +import { RecruitmentRepo } from '@database/model'; import { errorRes } from '@utils/errorRes'; -export const getOneRecruitment: RequestHandler = async (req, res, next) => { +export const getOneRecruitment: Handler = async (req, res, next) => { try { // const user = await UserRepo.queryById(res.locals.id); // if (!user) { diff --git a/src/actions/recruitment/getPendingTitles.ts b/src/actions/recruitment/getPendingTitles.ts index c034133..1dbd304 100644 --- a/src/actions/recruitment/getPendingTitles.ts +++ b/src/actions/recruitment/getPendingTitles.ts @@ -1,15 +1,17 @@ -import { RequestHandler } from 'express'; - +import { Handler } from '@config/types'; import { RecruitmentRepo } from '@database/model'; import { errorRes } from '@utils/errorRes'; -export const getPendingTitles: RequestHandler = async (req, res, next) => { +export const getPendingTitles: Handler = async (req, res, next) => { try { const pending = await RecruitmentRepo.query({ stop: { $gt: Date.now() }, begin: { $lt: Date.now() } }); if (pending.length === 0) { return next(errorRes('No pending recruitment!', 'info')); + } else if (pending.length === 1) { // return an array of one element for backward compatibility + res.json({ data: [pending[0].title], type: 'success' }); + } else { + res.json({ data: [pending.map((item) => item.title).find((title) => !title.includes('O'))], type: 'success' }); } - res.json({ data: pending.map((item) => item.title), type: 'success' }); } catch (error) { return next(error); } diff --git a/src/actions/recruitment/launchRecruitment.ts b/src/actions/recruitment/launchRecruitment.ts index f4e1219..02f33c3 100644 --- a/src/actions/recruitment/launchRecruitment.ts +++ b/src/actions/recruitment/launchRecruitment.ts @@ -1,12 +1,22 @@ -import { RequestHandler } from 'express'; import { body, validationResult } from 'express-validator'; -import { io } from '../../app'; -import { GROUPS_ } from '@config/consts'; + +import { GROUPS_, TITLE_REGEX } from '@config/consts'; +import { Handler } from '@config/types'; import { RecruitmentRepo, UserRepo } from '@database/model'; +import { io } from '@servers/websocket'; import { errorRes } from '@utils/errorRes'; -export const launchRecruitment: RequestHandler = async (req, res, next) => { +interface Body { + code: string; + phone: string; + title: string; + begin: number; + end: number; + stop: number; +} + +export const launchRecruitment: Handler = async (req, res, next) => { try { const errors = validationResult(req); if (!errors.isEmpty()) { @@ -37,15 +47,15 @@ export const launchRecruitment: RequestHandler = async (req, res, next) => { }; export const launchRecruitmentVerify = [ - body('title').matches(/\d{4}[ASC]/, 'g').withMessage('Title is invalid!').custom(async (title) => { + body('title').matches(TITLE_REGEX).withMessage('Title is invalid!').custom(async (title) => { if ((await RecruitmentRepo.query({ title })).length) { throw new Error('Current recruitment has already been launched!'); } }), body('begin').isInt().withMessage('Begin time is invalid!') - .custom((begin, { req }) => begin < req.body.stop).withMessage('Stop time should be later than begin time'), + .custom((begin, { req: { body: { stop } } }) => begin < stop).withMessage('Stop time should be later than begin time'), body('stop').isInt().withMessage('Stop time is invalid!') - .custom((stop, { req }) => stop < req.body.end).withMessage('End time should be later than stop time'), + .custom((stop, { req: { body: { end } } }) => stop < end).withMessage('End time should be later than stop time'), body('end').isInt().withMessage('End time is invalid!') - .custom((end, { req }) => end > req.body.begin).withMessage('End time should be later than begin time'), + .custom((end, { req: { body: { begin } } }) => end > begin).withMessage('End time should be later than begin time'), ]; diff --git a/src/actions/recruitment/setRecruitment.ts b/src/actions/recruitment/setRecruitment.ts index e6958dd..b1809ff 100644 --- a/src/actions/recruitment/setRecruitment.ts +++ b/src/actions/recruitment/setRecruitment.ts @@ -1,11 +1,23 @@ -import { RequestHandler } from 'express'; import { body, param, validationResult } from 'express-validator'; -import { io } from '../../app'; + + +import { TITLE_REGEX } from '@config/consts'; +import { Group, Handler, Time } from '@config/types'; import { RecruitmentRepo, UserRepo } from '@database/model'; +import { io } from '@servers/websocket'; import { checkInterview } from '@utils/checkInterview'; import { errorRes } from '@utils/errorRes'; -export const setRecruitment: RequestHandler = async (req, res, next) => { +interface Body { + begin: number; + end: number; + stop: number; + group: Group; + teamInterview?: Time[]; + groupInterview?: Time[]; +} + +export const setRecruitment: Handler = async (req, res, next) => { try { const errors = validationResult(req); if (!errors.isEmpty()) { @@ -24,7 +36,7 @@ export const setRecruitment: RequestHandler = async (req, res, next) => { await RecruitmentRepo.update({ title }, { begin, end, - stop + stop, }); if (teamInterview && teamInterview.length) { await RecruitmentRepo.update({ title }, { @@ -42,7 +54,7 @@ export const setRecruitment: RequestHandler = async (req, res, next) => { title, 'groups.name': group, }, { - 'groups.$.interview': groupInterview + 'groups.$.interview': groupInterview, }); } io.emit('updateRecruitment'); @@ -53,7 +65,7 @@ export const setRecruitment: RequestHandler = async (req, res, next) => { }; export const setRecruitmentVerify = [ - param('title').matches(/\d{4}[ASC]/, 'g').withMessage('Title is invalid!') + param('title').matches(TITLE_REGEX).withMessage('Title is invalid!') .custom(async (title) => { const recruitment = (await RecruitmentRepo.query({ title }))[0]; if (!recruitment) { @@ -67,11 +79,11 @@ export const setRecruitmentVerify = [ } }), body('begin').isInt().withMessage('Begin time is invalid!') - .custom((begin, { req }) => begin < req.body.stop).withMessage('Stop applying time should be later than begin time'), + .custom((begin, { req: { body: { stop } } }) => begin < stop).withMessage('Stop applying time should be later than begin time'), body('stop').isInt().withMessage('Stop applying time is invalid!') - .custom((stop, { req }) => stop < req.body.end).withMessage('End time should be later than stop applying time'), + .custom((stop, { req: { body: { end } } }) => stop < end).withMessage('End time should be later than stop applying time'), body('end').isInt().withMessage('End time is invalid!') - .custom((end, { req }) => end > req.body.begin).withMessage('End time should be later than begin time'), + .custom((end, { req: { body: { begin } } }) => end > begin).withMessage('End time should be later than begin time'), body('teamInterview').custom(checkInterview).withMessage('Interview time is invalid!'), body('groupInterview').custom(checkInterview).withMessage('Interview time is invalid!'), ]; diff --git a/src/actions/sms/sendCandidateCode.ts b/src/actions/sms/sendCandidateCode.ts index f51d989..1947335 100644 --- a/src/actions/sms/sendCandidateCode.ts +++ b/src/actions/sms/sendCandidateCode.ts @@ -1,38 +1,39 @@ -import { RequestHandler } from 'express'; import { param, validationResult } from 'express-validator'; import fetch from 'node-fetch'; -import { smsAPI, token } from '@config/consts'; import { redisAsync } from '../../redis'; + +import { smsAPI, token } from '@config/consts'; +import { Handler } from '@config/types'; import { errorRes } from '@utils/errorRes'; import { getRandom } from '@utils/getRandom'; -export const sendCandidateCode: RequestHandler = async (req, res, next) => { +export const sendCandidateCode: Handler = async (req, res, next) => { try { const errors = validationResult(req); if (!errors.isEmpty()) { return next(errorRes(errors.array({ onlyFirstError: true })[0]['msg'], 'warning')); } const phone = req.params.phone; - const code = getRandom(1000, 10000).toString(); + const verificationCode = getRandom(1000, 10000).toString(); const response = await fetch(smsAPI, { method: 'POST', headers: { 'Token': token, - 'Content-Type': 'application/json' + 'Content-Type': 'application/json', }, // 您{1}的验证码为：{2}，请于3分钟内填写。如非本人操作，请忽略本短信。 body: JSON.stringify({ phone, template: 719160, - param_list: ['报名本次招新', code] - }) + param_list: ['报名本次招新', verificationCode], + }), }); - const result = await response.json(); - if (result.code !== 200) { - return next(errorRes(result.message, 'warning')); + const { code, message } = await response.json(); + if (code !== 200) { + return next(errorRes(message, 'warning')); } - await redisAsync.set(`candidateCode:${phone}`, code, 'EX', 600); + await redisAsync.set(`candidateCode:${phone}`, verificationCode, 'EX', 600); res.json({ type: 'success' }); } catch (error) { return next(error); @@ -40,5 +41,5 @@ export const sendCandidateCode: RequestHandler = async (req, res, next) => { }; export const sendCandidateCodeVerify = [ - param('phone').isMobilePhone('zh-CN').withMessage('Phone is invalid!') + param('phone').isMobilePhone('zh-CN').withMessage('Phone is invalid!'), ]; diff --git a/src/actions/sms/sendSMS.ts b/src/actions/sms/sendSMS.ts index 262b38c..6eaeb32 100644 --- a/src/actions/sms/sendSMS.ts +++ b/src/actions/sms/sendSMS.ts @@ -1,30 +1,40 @@ -import { Request, RequestHandler } from 'express'; import { body, validationResult } from 'express-validator'; -import moment from 'moment'; import fetch from 'node-fetch'; -import { shortenURL } from '@utils/shortenURL'; + +import { redisAsync } from '../../redis'; + import { formURL, smsAPI, token } from '@config/consts'; +import { Handler } from '@config/types'; import { CandidateRepo, PayloadRepo, RecruitmentRepo } from '@database/model'; -import { redisAsync } from '../../redis'; import { errorRes } from '@utils/errorRes'; import { generateSMS } from '@utils/generateSMS'; import md5 from '@utils/md5'; +import { shortenURL } from '@utils/shortenURL'; import { titleConverter } from '@utils/titleConverter'; -const padZero = (toPad: number) => toPad.toString().padStart(2, '0'); - const dateTranslator = (timestamp: number) => { - const date = moment(timestamp).utcOffset(8); - return `${date.month() + 1}月${date.date()}日${padZero(date.hour())}:${padZero(date.minute())}`; + return new Date(timestamp).toLocaleString('zh-CN', { timeZone: 'Asia/Shanghai' }); }; -const send = (req: Request) => { +interface Body { + code: string; + phone: string; + step: number; + type: string; + time: string; + place: string; + rest: string; + next: number; + candidates: string[]; +} + +const send = (req: Parameters>[0]) => { const { step, type, time, place, rest, next: nextStep, candidates } = req.body; let recruitmentId = ''; - return candidates.map(async (id: string) => { + return candidates.map(async (id) => { const candidateInfo = await CandidateRepo.queryById(id); if (!candidateInfo) { - return new Error("Candidate doesn't exist!"); + return new Error('Candidate doesn\'t exist!'); } const { name, title, group, interviews, phone } = candidateInfo; let hash = ''; @@ -34,6 +44,9 @@ const send = (req: Request) => { // 仅执行一次，用于生成含有recruitment id的formId // 以后所有的candidates都可以复用这个formId const recruitment = (await RecruitmentRepo.query({ title }))[0]; + if (!recruitment) { + return new Error('Recruitment doesn\'t exist!'); + } if (recruitment.end < Date.now()) { return new Error('This recruitment has already ended!'); } @@ -41,7 +54,7 @@ const send = (req: Request) => { // 组面 const data = recruitment.groups.find((groupData) => groupData.name === group); if (!data) { - return new Error("Group doesn't exist!"); + return new Error('Group doesn\'t exist!'); } if (!data.interview.length) { return new Error('Please set group interview time first!'); @@ -52,20 +65,20 @@ const send = (req: Request) => { return new Error('Please set team interview time first!'); } } - recruitmentId = `${recruitment._id}`; + recruitmentId = recruitment._id.toString(); } const payload = { recruitmentId, id, step: nextStep === 2 ? 'group' : 'team', - group + group, }; hash = md5(payload); Promise.all([ PayloadRepo.createAndInsert({ ...payload, hash }), - redisAsync.set(`payload:${hash}`, id, 'EX', 60 * 60 * 24 * 2) - ]).catch((e) => { - throw new Error(`Error in ${name}: ${e}`); + redisAsync.set(`payload:${hash}`, id, 'EX', 60 * 60 * 24 * 2), + ]).catch(({ message }: Error) => { + throw new Error(`Error in ${name}: ${message}`); }); } if (type === 'reject') { @@ -85,19 +98,19 @@ const send = (req: Request) => { rest, nextStep, url, - time: type === 'accept' ? time : allocated && dateTranslator(allocated), - place + time: type === 'accept' ? time : allocated ? dateTranslator(allocated) : '', + place, }); const response = await fetch(smsAPI, { method: 'POST', headers: { Token: token, - 'Content-Type': 'application/json' + 'Content-Type': 'application/json', }, body: JSON.stringify({ phone, - ...smsBody - }) + ...smsBody, + }), }); const { code, message }: { code: number, message: string } = await response.json(); if (code !== 200) { @@ -105,12 +118,12 @@ const send = (req: Request) => { } return; } catch ({ message }) { - return new Error(`Error in ${name}: ${message}`); + return new Error(`Error in ${name}: ${message as string}`); } }); }; -export const sendSMS: RequestHandler = async (req, res, next) => { +export const sendSMS: Handler = (req, res, next) => { try { const validationErrors = validationResult(req); if (!validationErrors.isEmpty()) { @@ -119,7 +132,7 @@ export const sendSMS: RequestHandler = async (req, res, next) => { Promise .all(send(req)) .then((values) => { - const errors = values.filter((value) => value instanceof Error).map(({ message }) => message); + const errors = values.filter((value) => value instanceof Error).map(({ message }: Error) => message); if (errors.length) { res.json({ type: 'warning', messages: errors }); } else { diff --git a/src/actions/sms/sendUserCode.ts b/src/actions/sms/sendUserCode.ts index 77988f1..9adeebc 100644 --- a/src/actions/sms/sendUserCode.ts +++ b/src/actions/sms/sendUserCode.ts @@ -1,12 +1,14 @@ -import { RequestHandler } from 'express'; import fetch from 'node-fetch'; + +import { redisAsync } from '../../redis'; + import { smsAPI, token } from '@config/consts'; +import { Handler } from '@config/types'; import { UserRepo } from '@database/model'; -import { redisAsync } from '../../redis'; import { errorRes } from '@utils/errorRes'; import { getRandom } from '@utils/getRandom'; -export const sendUserCode: RequestHandler = async (req, res, next) => { +export const sendUserCode: Handler = async (req, res, next) => { try { const { id: uid } = res.locals; const user = await UserRepo.queryById(uid); @@ -17,25 +19,25 @@ export const sendUserCode: RequestHandler = async (req, res, next) => { if (!phone) { return next(errorRes('Phone number doesn\'t exist!', 'warning')); } - const code = getRandom(1000, 10000).toString(); + const verificationCode = getRandom(1000, 10000).toString(); const response = await fetch(smsAPI, { method: 'POST', headers: { 'Token': token, - 'Content-Type': 'application/json' + 'Content-Type': 'application/json', }, // 您{1}的验证码为：{2}，请于3分钟内填写。如非本人操作，请忽略本短信。 body: JSON.stringify({ phone, template: 719160, - param_list: ['dashboard中', code] - }) + param_list: ['dashboard中', verificationCode], + }), }); - const result = await response.json(); - if (result.code !== 200) { - return next(errorRes(result.message, 'warning')); + const { code, message } = await response.json(); + if (code !== 200) { + return next(errorRes(message, 'warning')); } - await redisAsync.set(`userCode:${uid}`, code, 'EX', 600); + await redisAsync.set(`userCode:${uid}`, verificationCode, 'EX', 600); res.json({ type: 'success' }); } catch (error) { return next(error); diff --git a/src/actions/user/getGroup.ts b/src/actions/user/getGroup.ts index ae8bcb6..a316150 100644 --- a/src/actions/user/getGroup.ts +++ b/src/actions/user/getGroup.ts @@ -1,8 +1,8 @@ -import { RequestHandler } from 'express'; +import { Handler } from '@config/types'; import { UserRepo } from '@database/model'; import { errorRes } from '@utils/errorRes'; -export const getGroup: RequestHandler = async (req, res, next) => { +export const getGroup: Handler = async (req, res, next) => { try { const user = await UserRepo.queryById(res.locals.id); if (!user) { diff --git a/src/actions/user/getInfo.ts b/src/actions/user/getInfo.ts index 9382b5a..b598ca7 100644 --- a/src/actions/user/getInfo.ts +++ b/src/actions/user/getInfo.ts @@ -1,8 +1,8 @@ -import { RequestHandler } from 'express'; +import { Handler } from '@config/types'; import { UserRepo } from '@database/model'; import { errorRes } from '@utils/errorRes'; -export const getInfo: RequestHandler = async (req, res, next) => { +export const getInfo: Handler = async (req, res, next) => { try { const user = await UserRepo.queryById(res.locals.id); if (!user) { diff --git a/src/actions/user/handleLogin.ts b/src/actions/user/handleLogin.ts index f254aaf..276c0c3 100644 --- a/src/actions/user/handleLogin.ts +++ b/src/actions/user/handleLogin.ts @@ -1,11 +1,18 @@ import crypto from 'crypto'; -import { RequestHandler } from 'express'; + import { body, validationResult } from 'express-validator'; + +import { Handler } from '@config/types'; import { UserRepo } from '@database/model'; import { errorRes } from '@utils/errorRes'; import { generateJWT } from '@utils/generateJWT'; -export const handleLogin: RequestHandler = async (req, res, next) => { +interface Body { + phone: string; + password: string; +} + +export const handleLogin: Handler = async (req, res, next) => { try { const errors = validationResult(req); if (!errors.isEmpty()) { @@ -26,7 +33,7 @@ export const handleLogin: RequestHandler = async (req, res, next) => { if (hash !== crypto.scryptSync(password, salt, 64).toString()) { return next(errorRes('Password is incorrect!', 'warning')); } - const token = generateJWT({ id: user._id }, 604800); + const token = generateJWT({ id: user._id.toString() }, 604800); res.json({ token, type: 'success' }); } catch (error) { return next(error); diff --git a/src/actions/user/handleQR.ts b/src/actions/user/handleQR.ts index 9cc4088..5c25d86 100644 --- a/src/actions/user/handleQR.ts +++ b/src/actions/user/handleQR.ts @@ -1,12 +1,13 @@ -import { RequestHandler } from 'express'; import fetch from 'node-fetch'; + import { getQRCodeURL } from '@config/consts'; +import { Handler } from '@config/types'; -export const handleQR: RequestHandler = async (req, res, next) => { +export const handleQR: Handler = async (req, res, next) => { try { const response = await fetch(getQRCodeURL); const html = await response.text(); - const key = html.match(/key ?: ?"\w+/)![0].replace(/key ?: ?"/, ''); + const key = /key ?: ?"\w+/.exec(html)![0].replace(/key ?: ?"/, ''); res.json({ key, type: 'success' }); } catch (error) { return next(error); diff --git a/src/actions/user/handleScan.ts b/src/actions/user/handleScan.ts index 51eec0c..93cac21 100644 --- a/src/actions/user/handleScan.ts +++ b/src/actions/user/handleScan.ts @@ -1,6 +1,7 @@ -import { RequestHandler } from 'express'; import fetch from 'node-fetch'; + import { accessTokenURL, ID_TO_GROUP, scanningURL, userIDURL, userInfoURL } from '@config/consts'; +import { Handler } from '@config/types'; import { UserRepo } from '@database/model'; import { errorRes } from '@utils/errorRes'; import { generateJWT } from '@utils/generateJWT'; @@ -31,10 +32,10 @@ const parseUserInfo = (data: Data) => { gender, extattr, email: mail, - department + department, } = data; const isCaptain = isleader === 1 || is_leader_in_dept.includes(1); - const groups = department.filter((i: number) => ID_TO_GROUP[i] !== undefined); + const groups = department.filter((i) => ID_TO_GROUP[i] !== undefined); if (!groups[0]) { throw new Error('Please set group info in WeChat first!'); } @@ -43,10 +44,8 @@ const parseUserInfo = (data: Data) => { } const group = ID_TO_GROUP[groups[0]]; const { attrs } = extattr; - let joinTime; - try { - joinTime = attrs.filter((attr: { name: string, value: string }) => attr.name === '加入时间')[0].value; - } catch (error) { + let joinTime = attrs.find((attr) => attr.name === '加入时间')?.value; + if (!joinTime) { throw new Error('Please set join time in WeChat first!'); } if (joinTime.includes('春')) { @@ -68,36 +67,32 @@ const parseUserInfo = (data: Data) => { isCaptain, isAdmin: false, gender: +gender, - group + group, }; }; // API of WeChat is a shit -export const handleScan: RequestHandler = async (req, res, next) => { +export const handleScan: Handler = async (req, res, next) => { try { const scanResponse = await fetch(`${scanningURL}${req.params.key}`); const scanResult = await scanResponse.text(); - const status = JSON.parse(scanResult.match(/{.+}/)![0]).status; + const { status } = JSON.parse(/{.+}/.exec(scanResult)![0]); if (status !== 'QRCODE_SCAN_ING') { return next(errorRes('Time out, please login again', 'info')); } else { - const loginResponse = await fetch(`${scanningURL}${req.params.key}&lastStatus=${status}`); + const loginResponse = await fetch(`${scanningURL}${req.params.key}&lastStatus=QRCODE_SCAN_ING`); const loginResult = await loginResponse.text(); - const loginObj = JSON.parse(loginResult.match(/{.+}/)![0]); + const { status, auth_code } = JSON.parse(/{.+}/.exec(loginResult)![0]); - if (loginObj.status !== 'QRCODE_SCAN_SUCC') { + if (status !== 'QRCODE_SCAN_SUCC') { return next(errorRes('Failed to login', 'warning')); } else { - const auth_code = loginObj.auth_code; - const accessTokenResponse = await fetch(accessTokenURL); - const accessTokenResult = await accessTokenResponse.json(); - const accessToken = accessTokenResult.access_token; + const { access_token: accessToken } = await accessTokenResponse.json(); const userIDResponse = await fetch(userIDURL(accessToken, auth_code)); - const userIDResult = await userIDResponse.json(); - const userID = userIDResult.UserId; + const { UserId: userID } = await userIDResponse.json(); const userInfoResponse = await fetch(userInfoURL(accessToken, userID)); const userInfoResult = await userInfoResponse.json(); @@ -105,9 +100,9 @@ export const handleScan: RequestHandler = async (req, res, next) => { const users = await UserRepo.query({ weChatID: data.weChatID }); const user = users.length ? users[0] : await UserRepo.createAndInsert(data); if (data.isCaptain && !user.isCaptain) { - await UserRepo.updateById(user._id, { isCaptain: true, isAdmin: true }); + await UserRepo.updateById(user._id.toString(), { isCaptain: true, isAdmin: true }); } - const token = generateJWT({ id: user._id }, 604800); + const token = generateJWT({ id: user._id.toString() }, 604800); res.json({ token, type: 'success' }); } } diff --git a/src/actions/user/messenger.ts b/src/actions/user/messenger.ts index c55a767..6536469 100644 --- a/src/actions/user/messenger.ts +++ b/src/actions/user/messenger.ts @@ -1,4 +1,5 @@ import { Socket } from 'socket.io'; + import { Message } from '@config/types'; export const messenger = (socket: Socket) => ({ message }: { message: Message }) => { diff --git a/src/actions/user/setAdmin.ts b/src/actions/user/setAdmin.ts index 0a8f247..041951a 100644 --- a/src/actions/user/setAdmin.ts +++ b/src/actions/user/setAdmin.ts @@ -1,13 +1,19 @@ -import { RequestHandler } from 'express'; -import { UserRepo } from '@database/model'; -import { errorRes } from '@utils/errorRes'; import { body, validationResult } from 'express-validator'; + import { GROUPS_ } from '@config/consts'; +import { Group, Handler } from '@config/types'; +import { UserRepo } from '@database/model'; +import { errorRes } from '@utils/errorRes'; + +interface Body { + group: Group; + who: string[]; +} // set users to admin, only admin or captain can do this // notice that non-exist user will be ignore // and can only add admin within same group -export const setAdmin: RequestHandler = async (req, res, next) => { +export const setAdmin: Handler = async (req, res, next) => { try { const errors = validationResult(req); if (!errors.isEmpty()) { @@ -17,7 +23,7 @@ export const setAdmin: RequestHandler = async (req, res, next) => { const { id: uid } = res.locals; const user = await UserRepo.queryById(uid); if (!user) { - return next(errorRes("User doesn't exist!", 'warning')); + return next(errorRes('User doesn\'t exist!', 'warning')); } if (!user.isAdmin && !user.isCaptain) { return next(errorRes('User has no permission', 'warning')); @@ -35,8 +41,8 @@ export const setAdmin: RequestHandler = async (req, res, next) => { } await UserRepo.updateByIds( - admins.map((u) => u._id), - { isAdmin: true } + admins.map(({ _id }) => _id.toString()), + { isAdmin: true }, ); res.json({ type: 'success', newAdmins: admins.map(({ phone }) => phone) }); diff --git a/src/actions/user/setInfo.ts b/src/actions/user/setInfo.ts index a588f10..9c8dbbd 100644 --- a/src/actions/user/setInfo.ts +++ b/src/actions/user/setInfo.ts @@ -1,10 +1,18 @@ import crypto from 'crypto'; -import { RequestHandler } from 'express'; + import { body, validationResult } from 'express-validator'; + +import { Handler } from '@config/types'; import { UserRepo } from '@database/model'; import { errorRes } from '@utils/errorRes'; -export const setInfo: RequestHandler = async (req, res, next) => { +interface Body { + phone: string; + mail: string; + password: string; +} + +export const setInfo: Handler = async (req, res, next) => { try { const errors = validationResult(req); if (!errors.isEmpty()) { @@ -16,14 +24,14 @@ export const setInfo: RequestHandler = async (req, res, next) => { return next(errorRes('User doesn\'t exist!', 'warning')); } const { phone, mail, password } = req.body; - if (password && typeof password === 'string') { + if (password) { const salt = crypto.randomBytes(16).toString('base64'); const hash = crypto.scryptSync(password, salt, 64).toString(); await UserRepo.updateById(id, { password: { salt, - hash - } + hash, + }, }); } await UserRepo.updateById(id, { diff --git a/src/app.ts b/src/app.ts deleted file mode 100644 index b98f6d0..0000000 --- a/src/app.ts +++ /dev/null @@ -1,33 +0,0 @@ -import express from 'express'; -import fs from 'fs'; -import http from 'http'; -import https from 'https'; - -import { jsonParser, urlencodedParser } from './middlewares/bodyParser'; -import { cors } from './middlewares/cors'; -import { errorHandler } from './middlewares/errorHandler'; -import { infoLogger } from './middlewares/infoLogger'; -import { routes } from './routes'; -import { isDev } from './utils/environment'; -import { wsServer } from './websocket'; - -export const app = express(); - -app.use(urlencodedParser); - -app.use(jsonParser); - -app.use(cors); - -app.use(infoLogger); - -app.use(routes); - -app.use(errorHandler); - -export const server = isDev() ? http.createServer(app) : https.createServer({ - key: fs.readFileSync('uniqcert.key'), - cert: fs.readFileSync('uniqcert.fullchain') -}, app); - -export const io = wsServer(server); diff --git a/src/config/acm.ts b/src/config/acm.ts index f337075..622bf4b 100644 --- a/src/config/acm.ts +++ b/src/config/acm.ts @@ -1,6 +1,7 @@ import { ACMClient } from 'acm-client'; + +import { Acm } from '@config/consts'; import { logger } from '@utils/logger'; -import { Acm } from './consts'; logger.info(JSON.stringify(Acm)); @@ -10,6 +11,7 @@ export const loadConfig = async () => { ...Acm, requestTimeout: 6000, // Request timeout, 6s by default }); + // eslint-disable-next-line @typescript-eslint/no-unsafe-call await acm.ready(); acm.subscribe({ dataId: Acm.dataId, diff --git a/src/config/consts.ts b/src/config/consts.ts index 493ebd4..12c67e0 100644 --- a/src/config/consts.ts +++ b/src/config/consts.ts @@ -1,18 +1,31 @@ -const { APP_ID, AGENT_ID, REDIRECT_URI, CORP_ID, CORP_SECRET, TOKEN, DB_PORT, SECRET } = process.env; -const { ACM_DATAID, ACM_GROUP, ACM_NAMESPACE, ACM_ACCESS_KEY, ACM_SECRET_KEY } = process.env; -const QRCodeAPI = `https://open.work.weixin.qq.com/wwopen/sso`; +const { + APP_ID, + AGENT_ID, + REDIRECT_URI, + CORP_ID, + CORP_SECRET, + TOKEN, + DB_PORT, + SECRET, + ACM_DATAID, + ACM_GROUP, + ACM_NAMESPACE, + ACM_ACCESS_KEY, + ACM_SECRET_KEY, +} = process.env; +const QRCodeAPI = 'https://open.work.weixin.qq.com/wwopen/sso'; export const getQRCodeURL = `${QRCodeAPI}/qrConnect?appid=${APP_ID}&agentid=${AGENT_ID}&redirect_uri=${REDIRECT_URI}`; export const scanningURL = `${QRCodeAPI}/l/qrConnect?key=`; const weChatAPI = 'https://qyapi.weixin.qq.com/cgi-bin'; export const accessTokenURL = `${weChatAPI}/gettoken?corpid=${CORP_ID}&corpsecret=${CORP_SECRET}`; export const userIDURL = (accessToken: string, code: string) => `${weChatAPI}/user/getuserinfo?access_token=${accessToken}&code=${code}`; export const userInfoURL = (accessToken: string, uid: string) => `${weChatAPI}/user/get?access_token=${accessToken}&userid=${uid}`; -export const smsAPI = `https://open.hustunique.com/message/sms`; -export const token = TOKEN!; +export const smsAPI = 'https://open.hustunique.com/message/sms'; +export const token = TOKEN; export const formURL = 'https://join.hustunique.com'; export const dbURI = `mongodb://mongodb:${DB_PORT}/recruitment`; // TODO: move this into open service -export const shortenURLAPI = `https://v1.alapi.cn/api/url`; +export const shortenURLAPI = 'https://v1.alapi.cn/api/url'; export const GROUPS = ['Web', 'Lab', 'AI', 'Game', 'Android', 'iOS', 'Design', 'PM']; export const GROUPS_ = GROUPS.map((group) => group.toLowerCase()); @@ -43,16 +56,18 @@ export const ID_TO_GROUP = { 24: 'lab', 25: 'pm', }; -export const secret = SECRET!; +export const secret = SECRET; export const Acm = { endpoint: 'acm.aliyun.com', - dataId: ACM_DATAID!, - group: ACM_GROUP!, - namespace: ACM_NAMESPACE!, - accessKey: ACM_ACCESS_KEY!, - secretKey: ACM_SECRET_KEY! + dataId: ACM_DATAID, + group: ACM_GROUP, + namespace: ACM_NAMESPACE, + accessKey: ACM_ACCESS_KEY, + secretKey: ACM_SECRET_KEY, }; export const ENV_DEV = 'development'; export const ENV_PROD = 'production'; + +export const TITLE_REGEX = /\d{4}[ASCO]/g; diff --git a/src/config/types.ts b/src/config/types.ts index b284ba4..3963c63 100644 --- a/src/config/types.ts +++ b/src/config/types.ts @@ -1,3 +1,5 @@ +import { NextFunction, Request, RequestHandler, Response } from 'express'; +import { ObjectId } from 'mongodb'; import { Document } from 'mongoose'; export interface Payload { @@ -5,6 +7,7 @@ export interface Payload { } export interface FormPayload extends Document { + _id: ObjectId; id: string; recruitmentId: string; step: 'group' | 'team'; // group: 组面, team: 群面 @@ -20,6 +23,7 @@ export type Rank = 0 | 1 | 2 | 3 | 4; // 1: 10%, 2: 25%, 3: 50%, 4: 10 export type Evaluation = 0 | 1 | 2; // 0: bad, 1: so-so, 2: good export interface Candidate extends Document { + _id: ObjectId; name: string; gender: Gender; grade: Grade; @@ -45,6 +49,7 @@ export interface Candidate extends Document { } export interface Comment extends Document { + _id: ObjectId; uid: string; username: string; content: string; @@ -52,6 +57,7 @@ export interface Comment extends Document { } export interface User extends Document { + _id: ObjectId; weChatID: string; username: string; password?: { @@ -81,6 +87,7 @@ export interface Interview { } export interface Recruitment extends Document { + _id: ObjectId; title: string; // e.g. 2018A || 2018S (A: AUTUMN, S: SPRING, C: CAMP) begin: number; end: number; @@ -105,3 +112,15 @@ export interface Message { avatar: string; content: string; } + +type Req = Request, unknown, Body>; + +interface Res extends Response { + locals: { + id: string; + } +} + +type Next = NextFunction; + +export type Handler> = (req: Req, res: Res, next: Next) => ReturnType; diff --git a/src/database/index.ts b/src/database/index.ts index dda0735..349502f 100644 --- a/src/database/index.ts +++ b/src/database/index.ts @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/ban-types */ import { connect, Document, Model, Schema, SchemaDefinition, set } from 'mongoose'; import { dbURI } from '@config/consts'; @@ -7,7 +8,7 @@ set('useFindAndModify', false); connect(dbURI, { useNewUrlParser: true }) .then(() => logger.info('Connected to MongoDB')) - .catch((err) => logger.error(err.message)); + .catch(({ message }) => logger.error(message)); export class RepositoryBase { private readonly model: Model; @@ -21,7 +22,7 @@ export class RepositoryBase { } insert(item: T) { - return this.model.create(item); + return this.model.create(item as any); } createAndInsert(item: object) { @@ -37,23 +38,23 @@ export class RepositoryBase { } update(condition: object, newItem: object, isRemove = false) { - return this.model.findOneAndUpdate(condition, { [isRemove ? '$unset' : '$set']: newItem }, { new: true }); + return this.model.findOneAndUpdate(condition, { [isRemove ? '$unset' : '$set']: newItem } as any, { new: true }); } updateById(id: string, newItem: object, isRemove = false) { - return this.model.findByIdAndUpdate(id, { [isRemove ? '$unset' : '$set']: newItem }, { new: true }); + return this.model.findByIdAndUpdate(id, { [isRemove ? '$unset' : '$set']: newItem } as any, { new: true }); } updateByIds(ids: string[], newItem: object, isRemove = false) { - return this.model.updateMany({ _id: { $in: ids } }, { [isRemove ? '$unset' : '$set']: newItem }, { new: true }); + return this.model.updateMany({ _id: { $in: ids } } as any, { [isRemove ? '$unset' : '$set']: newItem } as any, { new: true }); } pushById(id: string, newItem: object) { - return this.model.findByIdAndUpdate(id, { $push: newItem }, { new: true }); + return this.model.findByIdAndUpdate(id, { $push: newItem } as any, { new: true }); } pullById(id: string, deleteItem: object) { - return this.model.findByIdAndUpdate(id, { $pull: deleteItem }, { new: true }); + return this.model.findByIdAndUpdate(id, { $pull: deleteItem } as any, { new: true }); } delete(condition: object) { diff --git a/src/database/model.ts b/src/database/model.ts index 65048b3..51efd7d 100644 --- a/src/database/model.ts +++ b/src/database/model.ts @@ -1,7 +1,9 @@ import { model } from 'mongoose'; + +import { createSchema, RepositoryBase } from './index'; + import { EVALUATIONS, GENDERS, GRADES, GROUPS_, RANKS, STEPS } from '@config/consts'; import { Candidate, FormPayload, Recruitment, User } from '@config/types'; -import { createSchema, RepositoryBase } from './index'; const arrayToIndex = (array: string[]) => array.map((i, j) => j); diff --git a/src/index.ts b/src/index.ts index 82de2a3..53d7379 100644 --- a/src/index.ts +++ b/src/index.ts @@ -1,12 +1,8 @@ -import crypto from 'crypto'; - -import { io, server } from './app'; -import { loadConfig } from './config/acm'; -import { UserRepo } from './database/model'; -import { task } from './task'; -import { isDev } from './utils/environment'; -import { logger } from './utils/logger'; -import { wsHandler } from './websocket'; +import { loadConfig } from '@config/acm'; +import { server } from '@servers/http'; +import { io, wsHandler } from '@servers/websocket'; +import { tasks } from '@tasks/index'; +import { logger } from '@utils/logger'; loadConfig().catch((e) => logger.error(e)); @@ -18,30 +14,4 @@ server.listen(port, () => { wsHandler(io); -task().then(() => logger.info(`Task started`)); - -(async () => { - if (isDev()) { - const users = await UserRepo.query({ weChatID: 'foo' }); - if (!users.length) { - const salt = crypto.randomBytes(16).toString('base64'); - const hash = crypto.scryptSync('P@ssw0rd', salt, 64).toString(); - await UserRepo.createAndInsert({ - weChatID: 'foo', - username: 'w1nd3r1c4', - joinTime: '2020C', - phone: '19876543210', - avatar: '', - mail: 'foo@bar.com', - isCaptain: true, - isAdmin: true, - gender: 0, - group: 'web', - password: { - salt, - hash - } - }); - } - } -})(); +tasks.forEach((task) => task()); diff --git a/src/middlewares/accessLogger.ts b/src/middlewares/accessLogger.ts new file mode 100644 index 0000000..bee2c4a --- /dev/null +++ b/src/middlewares/accessLogger.ts @@ -0,0 +1,40 @@ +import morgan from 'morgan'; + +import { logger } from '@utils/logger'; + +const format = ':remote-addr ":method :url HTTP/:http-version" :status :res[content-length] ":referrer" ":user-agent" :response-time ms'; + +export const infoLogger = morgan(format, { + skip: (_req, res) => { + return res.statusCode >= 400; + }, + stream: { + write: (message) => { + logger.info(message.trim()); + } + } +}); + +export const warnLogger = morgan(format, { + skip: (_req, res) => { + return res.statusCode < 400 || res.statusCode >= 500; + }, + stream: { + write: (message) => { + logger.warn(message.trim()); + } + } +}); + +export const errorLogger = morgan(format, { + skip: (_req, res) => { + return res.statusCode < 500; + }, + stream: { + write: (message) => { + logger.error(message.trim()); + } + } +}); + +export const accessLoggers = [infoLogger, warnLogger, errorLogger]; diff --git a/src/middlewares/authenticator.ts b/src/middlewares/authenticator.ts index bd4a46b..7f56dcf 100644 --- a/src/middlewares/authenticator.ts +++ b/src/middlewares/authenticator.ts @@ -1,8 +1,8 @@ -import { NextFunction, Request, Response } from 'express'; +import { Handler } from '@config/types'; import { errorRes } from '@utils/errorRes'; import { verifyJWT } from '@utils/verifyJWT'; -export const authenticator = (req: Request, res: Response, next: NextFunction) => { +export const authenticator: Handler = (req, res, next) => { if (req.method === 'OPTIONS') { return next(); } diff --git a/src/middlewares/codeChecker.ts b/src/middlewares/codeChecker.ts index 6b9b82f..264653f 100644 --- a/src/middlewares/codeChecker.ts +++ b/src/middlewares/codeChecker.ts @@ -1,11 +1,16 @@ -import { RequestHandler } from 'express'; - import { redisAsync } from '../redis'; + +import { Handler } from '@config/types'; import { isProd } from '@utils/environment'; import { errorRes } from '@utils/errorRes'; -export const codeChecker = (type: 'user' | 'candidate'): RequestHandler => async (req, res, next) => { - if (isProd()) { +interface Body { + code: string; + phone: string; +} + +export const codeChecker = (type: 'user' | 'candidate'): Handler => async (req, res, next) => { + if (isProd) { const { id } = res.locals; const { code, phone } = req.body; if (!code) { diff --git a/src/middlewares/cors.ts b/src/middlewares/cors.ts index dfd211f..494ea46 100644 --- a/src/middlewares/cors.ts +++ b/src/middlewares/cors.ts @@ -1,6 +1,6 @@ -import { RequestHandler } from 'express'; +import { Handler } from '@config/types'; -export const cors: RequestHandler = (req, res, next) => { +export const cors: Handler = (req, res, next) => { res.header('Access-Control-Allow-Origin', '*'); res.header('Access-Control-Allow-Methods', 'POST, OPTIONS, GET, PUT, DELETE'); res.header('Access-Control-Allow-Headers', 'Origin, X-Requested-With, Content-Type, Accept, Authorization'); diff --git a/src/middlewares/errorHandler.ts b/src/middlewares/errorHandler.ts index 588d020..2f750fd 100644 --- a/src/middlewares/errorHandler.ts +++ b/src/middlewares/errorHandler.ts @@ -1,4 +1,5 @@ import { ErrorRequestHandler } from 'express'; + import { logger } from '@utils/logger'; export const errorHandler: ErrorRequestHandler = (error, req, res, next) => { diff --git a/src/middlewares/fileHandler.ts b/src/middlewares/fileHandler.ts index dfccf0a..3f3797f 100644 --- a/src/middlewares/fileHandler.ts +++ b/src/middlewares/fileHandler.ts @@ -1,16 +1,16 @@ -import { Request } from 'express'; -import multer from 'multer'; +import multer, { diskStorage } from 'multer'; -const storage = multer.diskStorage({ +const storage = diskStorage({ destination: (req, file, cb) => cb(null, '/tmp/resumes'), - filename: (req: Request, file, cb) => { + filename: (req, file, cb) => { const filename = `${Date.now()} - ${file.originalname}`; cb(null, filename); - } + }, }); + export const fileHandler = multer({ storage, limits: { - fileSize: 104857600 // 100MB - } + fileSize: 104857600, // 100MB + }, }); diff --git a/src/middlewares/infoLogger.ts b/src/middlewares/infoLogger.ts deleted file mode 100644 index e707ea1..0000000 --- a/src/middlewares/infoLogger.ts +++ /dev/null @@ -1,7 +0,0 @@ -import { RequestHandler } from 'express'; -import { logger } from '@utils/logger'; - -export const infoLogger: RequestHandler = (req, res, next) => { - logger.info(`Requested ${req.url} from ${req.ip}`); - next(); -}; diff --git a/src/redis/index.ts b/src/redis/index.ts index 8931485..647a0b4 100644 --- a/src/redis/index.ts +++ b/src/redis/index.ts @@ -1,16 +1,12 @@ -import redis from 'redis'; -import { promisify } from 'util'; -import { logger } from '@utils/logger'; +import IORedis from 'ioredis'; + +const redisClient = new IORedis({ host: 'redis' }); -const redisClient = redis.createClient({ host: 'redis' }); export const redisAsync = { - get: promisify(redisClient.get).bind(redisClient), - del: promisify(redisClient.del).bind(redisClient), - set: promisify(redisClient.set).bind(redisClient), + ...redisClient, getThenDel: async (query: string) => { - const result = await redisAsync.get(query); - await redisAsync.del(query); + const result = await redisClient.get(query); + await redisClient.del(query); return result; - } + }, }; -redisClient.on('error', logger.error); diff --git a/src/routes/candidate.ts b/src/routes/candidate.ts index c8a9824..e43312e 100644 --- a/src/routes/candidate.ts +++ b/src/routes/candidate.ts @@ -1,7 +1,4 @@ import { Router } from 'express'; -import { authenticator } from '@mw/authenticator'; -import { codeChecker } from '@mw/codeChecker'; -import { fileHandler } from '@mw/fileHandler'; import { addCandidate, @@ -20,9 +17,14 @@ import { newSetCandidate, newSetCandidateVerify, setCandidate, - setCandidateVerify + setCandidateVerify, } from '../actions/candidate'; +import { authenticator } from '@mw/authenticator'; +import { codeChecker } from '@mw/codeChecker'; +import { fileHandler } from '@mw/fileHandler'; + + const router = Router(); // add new candidate diff --git a/src/routes/index.ts b/src/routes/index.ts index afbb416..038e7e3 100644 --- a/src/routes/index.ts +++ b/src/routes/index.ts @@ -1,4 +1,5 @@ import express from 'express'; + import { candidate } from './candidate'; import { recruitment } from './recruitment'; import { sms } from './sms'; diff --git a/src/routes/recruitment.ts b/src/routes/recruitment.ts index 47293db..dc54ae1 100644 --- a/src/routes/recruitment.ts +++ b/src/routes/recruitment.ts @@ -1,8 +1,13 @@ import { Router } from 'express'; + import { - getAllRecruitments, getOneRecruitment, getPendingTitles, - launchRecruitment, launchRecruitmentVerify, - setRecruitment, setRecruitmentVerify + getAllRecruitments, + getOneRecruitment, + getPendingTitles, + launchRecruitment, + launchRecruitmentVerify, + setRecruitment, + setRecruitmentVerify, } from '../actions/recruitment'; import { authenticator } from '@mw/authenticator'; diff --git a/src/routes/sms.ts b/src/routes/sms.ts index f758f8b..d34281e 100644 --- a/src/routes/sms.ts +++ b/src/routes/sms.ts @@ -1,7 +1,8 @@ import { Router } from 'express'; -import { authenticator } from '@mw/authenticator'; import { sendCandidateCode, sendCandidateCodeVerify, sendSMS, sendSMSVerify, sendUserCode } from '../actions/sms'; + +import { authenticator } from '@mw/authenticator'; import { codeChecker } from '@mw/codeChecker'; const router = Router(); diff --git a/src/routes/user.ts b/src/routes/user.ts index 22b4542..63232db 100644 --- a/src/routes/user.ts +++ b/src/routes/user.ts @@ -1,4 +1,5 @@ import { Router } from 'express'; + import { getGroup, getInfo, @@ -6,11 +7,12 @@ import { handleLoginVerify, handleQR, handleScan, - setInfo, - setInfoVerify, setAdmin, setAdminVerify, + setInfo, + setInfoVerify, } from '../actions/user'; + import { authenticator } from '@mw/authenticator'; const router = Router(); diff --git a/src/servers/http.ts b/src/servers/http.ts new file mode 100644 index 0000000..583b7c9 --- /dev/null +++ b/src/servers/http.ts @@ -0,0 +1,31 @@ +import fs from 'fs'; +import http from 'http'; +import https from 'https'; + +import express from 'express'; + +import { accessLoggers } from '@mw/accessLogger'; +import { jsonParser, urlencodedParser } from '@mw/bodyParser'; +import { cors } from '@mw/cors'; +import { errorHandler } from '@mw/errorHandler'; +import { routes } from '@routes/index'; +import { isDev } from '@utils/environment'; + +export const app = express(); + +app.use(urlencodedParser); + +app.use(jsonParser); + +app.use(cors); + +accessLoggers.forEach((accessLogger) => app.use(accessLogger)); + +app.use(routes); + +app.use(errorHandler); + +export const server = isDev ? http.createServer(app) : https.createServer({ + key: fs.readFileSync('uniqcert.key'), + cert: fs.readFileSync('uniqcert.fullchain'), +}, app); diff --git a/src/websocket.ts b/src/servers/websocket.ts similarity index 68% rename from src/websocket.ts rename to src/servers/websocket.ts index e003047..9eac13b 100644 --- a/src/websocket.ts +++ b/src/servers/websocket.ts @@ -1,14 +1,12 @@ import socketIO, { Server } from 'socket.io'; -import { onAddComment, onMoveCandidate, onRemoveCandidate, onRemoveComment } from './actions/candidate'; -import { messenger } from './actions/user'; +import { onAddComment, onMoveCandidate, onRemoveCandidate, onRemoveComment } from '@actions/candidate'; +import { messenger } from '@actions/user'; +import { server } from '@servers/http'; +import { logger } from '@utils/logger'; -import { logger } from './utils/logger'; - -export const wsServer = (server: T) => socketIO(server); - -export const wsHandler = (IOServer: Server) => - IOServer.on('connection', (socket) => { +export const wsHandler = (IOServer: Server) => { + return IOServer.on('connection', (socket) => { logger.info('WebSocket connected'); // move a candidate from step a to step b socket.on('moveCandidate', onMoveCandidate(socket)); @@ -21,3 +19,6 @@ export const wsHandler = (IOServer: Server) => // instant messenger socket.on('sendMessage', messenger(socket)); }); +}; + +export const io = socketIO(server); diff --git a/src/task.ts b/src/task.ts deleted file mode 100644 index 338bdb9..0000000 --- a/src/task.ts +++ /dev/null @@ -1,23 +0,0 @@ -import { CronJob } from 'cron'; -import fs from 'fs'; -import mkdirp from 'mkdirp'; -import { join } from 'path'; -import { promisify } from 'util'; -import { logger } from './utils/logger'; - -const readdir = promisify(fs.readdir); -const unlink = promisify(fs.unlink); - -export const task = async () => { - const directory = '/tmp/resumes'; - mkdirp.sync(directory); - new CronJob('0 0 * * * *', async () => { - try { - const files = await readdir(directory); - const unlinkPromises = files.map((file) => unlink(join(directory, file))); - await Promise.all(unlinkPromises); - } catch (error) { - logger.error(error); - } - }); -}; diff --git a/src/tasks/backdoor.ts b/src/tasks/backdoor.ts new file mode 100644 index 0000000..061a784 --- /dev/null +++ b/src/tasks/backdoor.ts @@ -0,0 +1,30 @@ +import { randomBytes, scryptSync } from 'crypto'; + +import { UserRepo } from '@database/model'; +import { isDev } from '@utils/environment'; + +// dev-only backdoor +export const backdoor = async () => { + if (isDev) { + if (!await UserRepo.count({ weChatID: 'foo' })) { + const salt = randomBytes(16).toString('base64'); + const hash = scryptSync('P@ssw0rd', salt, 64).toString(); + await UserRepo.createAndInsert({ + weChatID: 'foo', + username: 'w1nd3r1c4', + joinTime: '2020C', + phone: '19876543210', + avatar: '', + mail: 'foo@bar.com', + isCaptain: true, + isAdmin: true, + gender: 0, + group: 'web', + password: { + salt, + hash, + }, + }); + } + } +}; diff --git a/src/tasks/cleaner.ts b/src/tasks/cleaner.ts new file mode 100644 index 0000000..cde0a7a --- /dev/null +++ b/src/tasks/cleaner.ts @@ -0,0 +1,21 @@ +import { mkdirSync, readdirSync, unlinkSync } from 'fs'; +import { join } from 'path'; + +import { CronJob } from 'cron'; + +import { logger } from '@utils/logger'; + +const directory = '/tmp/resumes'; + +export const cleaner = () => { + mkdirSync(directory, { recursive: true }); + new CronJob('0 0 * * * *', () => { + try { + const files = readdirSync(directory); + files.forEach((file) => unlinkSync(join(directory, file))); + logger.info('pruned /tmp'); + } catch (error) { + logger.error(error); + } + }); +}; diff --git a/src/tasks/index.ts b/src/tasks/index.ts new file mode 100644 index 0000000..d4c20b1 --- /dev/null +++ b/src/tasks/index.ts @@ -0,0 +1,4 @@ +import { backdoor } from '@tasks/backdoor'; +import { cleaner } from '@tasks/cleaner'; + +export const tasks = [cleaner, backdoor]; diff --git a/src/utils/allocateTime.ts b/src/utils/allocateTime.ts index fff28b5..6015533 100644 --- a/src/utils/allocateTime.ts +++ b/src/utils/allocateTime.ts @@ -1,11 +1,7 @@ -import moment from 'moment'; import { Candidate, Time } from '@config/types'; -const padZero = (toPad: number) => toPad.toString().padStart(2, '0'); - const getDate = (timestamp: number) => { - const date = moment(timestamp).utcOffset(8); - return `${padZero(date.year())}-${padZero(date.month() + 1)}-${padZero(date.date())}`; + return new Date(timestamp).toLocaleDateString('zh-CN', { timeZone: 'Asia/Shanghai' }); }; export const allocateTime = (interviewTime: Time[], candidates: Candidate[], type: 'group' | 'team') => { @@ -13,7 +9,7 @@ export const allocateTime = (interviewTime: Time[], candidates: Candidate[], typ const timeSlots = { morning: ['09:00', '09:30', '10:00', '10:30', '11:00', '11:30', '08:00', '08:30'], afternoon: ['14:30', '15:00', '15:30', '16:00', '16:30', '17:00', '13:30', '14:00'], - evening: ['18:30', '19:00', '19:30', '20:00', '20:30', '21:00', '21:30', '18:00'] + evening: ['18:30', '19:00', '19:30', '20:00', '20:30', '21:00', '21:30', '18:00'], }; let selections = candidates.map(({ interviews: { [type]: { selection } }, _id }) => ({ selection, id: _id })); @@ -24,14 +20,14 @@ export const allocateTime = (interviewTime: Time[], candidates: Candidate[], typ morning: [...timeSlots.morning].slice(0, morning), })); - const allocations = [] as { id: string, time?: number }[]; + const allocations: { id: string, time?: number }[] = []; while (selections.length) { let minLength = Infinity; let minItems = [] as typeof selections; selections = selections.filter((selection) => { const lengthInDates = selection.selection.map(({ morning, afternoon, evening }) => - (morning ? 1 : 0) + (afternoon ? 1 : 0) + (evening ? 1 : 0) + (morning ? 1 : 0) + (afternoon ? 1 : 0) + (evening ? 1 : 0), ); const length = lengthInDates.reduce((i, j) => i + j); if (length < minLength) { @@ -69,15 +65,15 @@ export const allocateTime = (interviewTime: Time[], candidates: Candidate[], typ continue; } allocations.push({ - id: selection.id, - time: moment(`${getDate(item.date)}T${time}+08:00`).valueOf() + id: selection.id.toString(), + time: +new Date(`${getDate(item.date)} ${time} +08:00`), }); hasPlaced = true; } if (!hasPlaced) { allocations.push({ - id: selection.id, - time: undefined + id: selection.id.toString(), + time: undefined, }); } } diff --git a/src/utils/checkInterview.ts b/src/utils/checkInterview.ts index 8e35187..2f0084d 100644 --- a/src/utils/checkInterview.ts +++ b/src/utils/checkInterview.ts @@ -14,6 +14,6 @@ export const checkInterview: CustomValidator = (interview) => { typeof date !== 'number' || typeof morning !== 'number' || typeof afternoon !== 'number' - || typeof evening !== 'number' + || typeof evening !== 'number', ).length === 0; }; diff --git a/src/utils/copyFile.ts b/src/utils/copyFile.ts index 8342812..1d8dbf4 100644 --- a/src/utils/copyFile.ts +++ b/src/utils/copyFile.ts @@ -1,13 +1,9 @@ -import fs from 'fs'; -import mkdirp from 'mkdirp'; +import { copyFileSync, mkdirSync } from 'fs'; import { join } from 'path'; -import { promisify } from 'util'; -const copy = promisify(fs.copyFile); - -export const copyFile = async (oldPath: string, newDirectory: string, name: string) => { - mkdirp.sync(newDirectory); +export const copyFile = (oldPath: string, newDirectory: string, name: string) => { + mkdirSync(newDirectory, { recursive: true }); const newPath = join(newDirectory, name); - await copy(oldPath, newPath); + copyFileSync(oldPath, newPath); return newPath; }; diff --git a/src/utils/deleteFile.ts b/src/utils/deleteFile.ts index f047ba7..1513c17 100644 --- a/src/utils/deleteFile.ts +++ b/src/utils/deleteFile.ts @@ -1,5 +1,6 @@ import fs from 'fs'; import { promisify } from 'util'; + const unlink = promisify(fs.unlink); export const deleteFile = async (filename: string) => { diff --git a/src/utils/environment.ts b/src/utils/environment.ts index 706361c..2a5bc6a 100644 --- a/src/utils/environment.ts +++ b/src/utils/environment.ts @@ -1,4 +1,4 @@ import { ENV_DEV, ENV_PROD } from '@config/consts'; -export const isDev = () => process.env.NODE_ENV === ENV_DEV; -export const isProd = () => process.env.NODE_ENV === ENV_PROD; +export const isDev = process.env.NODE_ENV === ENV_DEV; +export const isProd = process.env.NODE_ENV === ENV_PROD; diff --git a/src/utils/errorRes.ts b/src/utils/errorRes.ts index b856786..ec3f0bd 100644 --- a/src/utils/errorRes.ts +++ b/src/utils/errorRes.ts @@ -1,5 +1,5 @@ -export const errorRes = (message: string, type: string, data?: object) => ({ +export const errorRes = (message: string, type: string, data?: Record) => ({ message, type, - data + data, }); diff --git a/src/utils/generateJWT.ts b/src/utils/generateJWT.ts index aef9415..e6f98c8 100644 --- a/src/utils/generateJWT.ts +++ b/src/utils/generateJWT.ts @@ -1,9 +1,10 @@ -import jwt from 'jsonwebtoken'; +import { sign } from 'jsonwebtoken'; + import { secret } from '@config/consts'; import { Payload } from '@config/types'; export const generateJWT = (payload: Payload, expire: number) => { - return jwt.sign(payload, secret, { - expiresIn: expire + return sign(payload, secret, { + expiresIn: expire, }); }; diff --git a/src/utils/generateSMS.ts b/src/utils/generateSMS.ts index 38b5c66..e7a1afb 100644 --- a/src/utils/generateSMS.ts +++ b/src/utils/generateSMS.ts @@ -62,7 +62,7 @@ export const generateSMS = ({ name, title, step, type, group, time, place, rest, if (!place) throw new Error('Place not provided!'); if (!time) throw new Error('Time not provided!'); // {1}你好，请于{2}在启明学院亮胜楼{3}参加{4}，请准时到场。 - return { template: 670906, param_list: [name, time, place, `团队群面`] }; + return { template: 670906, param_list: [name, time, place, '团队群面'] }; } default: diff --git a/src/utils/logger.ts b/src/utils/logger.ts index ab39f5b..c711771 100644 --- a/src/utils/logger.ts +++ b/src/utils/logger.ts @@ -1,13 +1,26 @@ -import fs from 'fs'; +import { createLogger, format, transports } from 'winston'; -const logInfo = fs.createWriteStream('./logs/stdout.log'); -const logError = fs.createWriteStream('./logs/stderr.log'); +import { isDev } from '@utils/environment'; -export const logger = { - info: (message: string) => { - logInfo.write(`${new Date().toISOString()} [INFO] ${message}\n`); - }, - error: (message: string) => { - logError.write(`${new Date().toISOString()} [ERROR] ${message}\n`); - } -}; +export const logger = createLogger({ + level: 'info', + format: format.combine( + format.timestamp({ + format: 'YYYY-MM-DD HH:mm:ss', + }), + format.printf(({ level, message, timestamp }) => `[${level}] ${timestamp as string} | ${message}`), + ), + transports: [ + new transports.File({ filename: 'logs/error.log', level: 'error' }), + new transports.File({ filename: 'logs/access.log' }), + ], +}); + +if (isDev) { + logger.add(new transports.Console({ + format: format.combine( + format.colorize(), + format.simple(), + ), + })); +} diff --git a/src/utils/md5.ts b/src/utils/md5.ts index 3b2c586..c90c484 100644 --- a/src/utils/md5.ts +++ b/src/utils/md5.ts @@ -1,6 +1,6 @@ import { createHash } from 'crypto'; -export default (payload: object): string => { +export default (payload: unknown): string => { return createHash('md5') .update(JSON.stringify(payload)) .digest('hex'); diff --git a/src/utils/sendEmail.ts b/src/utils/sendEmail.ts index cecfebe..333b4a3 100644 --- a/src/utils/sendEmail.ts +++ b/src/utils/sendEmail.ts @@ -7,9 +7,9 @@ const transport = createTransport({ port: 465, auth: { user: 'robot@mail.hustunique.com', - pass: EMAIL_PASS! + pass: EMAIL_PASS!, }, - secure: true + secure: true, }); interface Receiver { @@ -24,7 +24,7 @@ export default async (to: Receiver, url: string, description: string, title: str from: '联创团队', to, subject: `联创团队${title}报名成功通知`, - html + html, }; await transport.sendMail(message); // logger.info(info); diff --git a/src/utils/shortenURL.ts b/src/utils/shortenURL.ts index c694664..5f80449 100644 --- a/src/utils/shortenURL.ts +++ b/src/utils/shortenURL.ts @@ -1,15 +1,17 @@ -import fetch from "node-fetch"; -import { shortenURLAPI } from "@config/consts"; -import { URLSearchParams } from "url"; +import { URLSearchParams } from 'url'; + +import fetch from 'node-fetch'; + +import { shortenURLAPI } from '@config/consts'; interface IAlAPIShortURLResp { - code: number; - msg: string; - data: { - type: number; - long_url: string; - short_url?: string; - }; + code: number; + msg: string; + data: { + type: number; + long_url: string; + short_url?: string; + }; } /** @@ -19,24 +21,24 @@ interface IAlAPIShortURLResp { * @see https://www.alapi.cn/doc/show/16.html */ export const shortenURL = async (url: string) => { - try { - const resp = await fetch(shortenURLAPI, { - method: "POST", - body: new URLSearchParams({ - url, - type: "1", - }), - }); - const { - data: { short_url }, - msg, - } = (await resp.json()) as IAlAPIShortURLResp; - if (!short_url) { - throw new Error(`API doesn't provide a short URL: ${msg}`); + try { + const resp = await fetch(shortenURLAPI, { + method: 'POST', + body: new URLSearchParams({ + url, + type: '1', + }), + }); + const { + data: { short_url }, + msg, + } = (await resp.json()) as IAlAPIShortURLResp; + if (!short_url) { + throw new Error(`API doesn't provide a short URL: ${msg}`); + } + return short_url; + } catch (e) { + console.log(e); + return url; // return raw url anyway } - return short_url; - } catch (e) { - console.log(e); - return url; // return raw url anyway - } }; diff --git a/src/utils/titleConverter.ts b/src/utils/titleConverter.ts index b427666..c9d7d1e 100644 --- a/src/utils/titleConverter.ts +++ b/src/utils/titleConverter.ts @@ -1,7 +1,7 @@ export const titleConverter = (title: string) => { const last = title.slice(4); - const abbr = ['S', 'C', 'A']; - const full = ['春季招新', '夏令营招新', '秋季招新']; + const abbr = ['S', 'C', 'A', 'O']; + const full = ['春季招新', '夏令营招新', '秋季招新', '日常招新']; const i = abbr.indexOf(last); if (i >= 0) { return title.slice(0, 4) + full[i]; diff --git a/src/utils/verifyJWT.ts b/src/utils/verifyJWT.ts index 6a33315..7d2f4b7 100644 --- a/src/utils/verifyJWT.ts +++ b/src/utils/verifyJWT.ts @@ -1,4 +1,5 @@ -import jwt from 'jsonwebtoken'; +import { verify } from 'jsonwebtoken'; + import { secret } from '@config/consts'; import { FormPayload } from '@config/types'; @@ -10,8 +11,7 @@ export const extractJWT = (token?: string): FormPayload => { token = token.replace('Bearer ', ''); } - const payload = jwt.verify(token, secret) as FormPayload; - return payload; + return verify(token, secret) as FormPayload; }; export const verifyJWT = (token?: string) => { diff --git a/test/addCandidate.test.ts b/test/addCandidate.test.ts index a313a02..e83d04a 100644 --- a/test/addCandidate.test.ts +++ b/test/addCandidate.test.ts @@ -1,5 +1,5 @@ import request from 'supertest'; -import { app } from '../src/app'; +import { app } from '../src/servers/http'; describe('POST /candidate', () => { it('should return success', (done) => { diff --git a/test/addComment.test.ts b/test/addComment.test.ts index 611c6b6..3881be5 100644 --- a/test/addComment.test.ts +++ b/test/addComment.test.ts @@ -29,7 +29,7 @@ describe('WebSocket /addComment', () => { const users = await UserRepo.query({ weChatID: 'foo' }); const candidates = await CandidateRepo.query({ name: 'test', title: '2021C' }); expect(users.length).toBe(1); - const token = generateJWT({ id: users[0]._id }, 100000); + const token = generateJWT({ id: users[0]._id.toString() }, 100000); socket.emit('addComment', { cid: candidates[0]._id, comment: { uid: users[0]._id, content: 'testddd', evaluation: 1, username: 'w1nd3r1c4' }, diff --git a/test/getAllRecruitments.test.ts b/test/getAllRecruitments.test.ts index 5f7bef7..faa8fd7 100644 --- a/test/getAllRecruitments.test.ts +++ b/test/getAllRecruitments.test.ts @@ -1,5 +1,5 @@ import request from 'supertest'; -import { app } from '../src/app'; +import { app } from '../src/servers/http'; import { UserRepo } from '../src/database/model'; import { generateJWT } from '../src/utils/generateJWT'; @@ -7,7 +7,7 @@ describe('GET /recruitment', () => { it('should return success', async (done) => { const users = await UserRepo.query({ weChatID: 'foo' }); expect(users.length).toBe(1); - const token = generateJWT({ id: users[0]._id }, 100000); + const token = generateJWT({ id: users[0]._id.toString() }, 100000); request(app) .get('/recruitment') .set({ diff --git a/test/getCandidates.test.ts b/test/getCandidates.test.ts index 648e521..7ec3113 100644 --- a/test/getCandidates.test.ts +++ b/test/getCandidates.test.ts @@ -1,5 +1,5 @@ import request from 'supertest'; -import { app } from '../src/app'; +import { app } from '../src/servers/http'; import { UserRepo } from '../src/database/model'; import { generateJWT } from '../src/utils/generateJWT'; @@ -7,7 +7,7 @@ describe('GET /candidate', () => { it('should return success', async (done) => { const users = await UserRepo.query({ weChatID: 'foo' }); expect(users.length).toBe(1); - const token = generateJWT({ id: users[0]._id }, 100000); + const token = generateJWT({ id: users[0]._id.toString() }, 100000); request(app) .get(`/candidate/${JSON.stringify({title: '2021C', group: 'web'})}`) .set({ diff --git a/test/launchRecruitment.test.ts b/test/launchRecruitment.test.ts index c6c3c4c..6f772bc 100644 --- a/test/launchRecruitment.test.ts +++ b/test/launchRecruitment.test.ts @@ -1,5 +1,5 @@ import request from 'supertest'; -import { app } from '../src/app'; +import { app } from '../src/servers/http'; import { UserRepo } from '../src/database/model'; import { generateJWT } from '../src/utils/generateJWT'; @@ -7,18 +7,18 @@ describe('POST /recruitment', () => { it('should create a new recruitment', async (done) => { const users = await UserRepo.query({ weChatID: 'foo' }); expect(users.length).toBe(1); - const token = generateJWT({ id: users[0]._id }, 100000); + const token = generateJWT({ id: users[0]._id.toString() }, 100000); request(app) .post('/recruitment') .set({ - Authorization: token + Authorization: token, }) .send({ title: '2021C', begin: `${Date.now()}`, stop: `${Date.now() + 5000000}`, end: `${Date.now() + 10000000}`, - code: '1234' + code: '1234', }) .end((err, res) => { console.log(JSON.parse(res.text)); diff --git a/test/setAdmin.test.ts b/test/setAdmin.test.ts index 62a2b36..1090860 100644 --- a/test/setAdmin.test.ts +++ b/test/setAdmin.test.ts @@ -1,5 +1,5 @@ import request from 'supertest'; -import { app } from '../src/app'; +import { app } from '../src/servers/http'; import { UserRepo } from '../src/database/model'; import { generateJWT } from '../src/utils/generateJWT'; import { randomBytes, scryptSync } from 'crypto'; @@ -30,9 +30,9 @@ describe('POST /user/admin', () => { } }); } else { - await UserRepo.updateById(admin[0]._id, { isAdmin: false }); + await UserRepo.updateById(admin[0]._id.toString(), { isAdmin: false }); } - const token = generateJWT({ id: users[0]._id }, 100000); + const token = generateJWT({ id: users[0]._id.toString() }, 100000); request(app) .post('/user/admin') .set({ diff --git a/tsconfig.json b/tsconfig.json index b122017..f3432d7 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -17,6 +17,15 @@ ], "@actions/*": [ "src/actions/*" + ], + "@servers/*": [ + "src/servers/*" + ], + "@routes/*": [ + "src/routes/*" + ], + "@tasks/*": [ + "src/tasks/*" ] }, "module": "commonjs", @@ -41,7 +50,10 @@ "strictNullChecks": true, "suppressImplicitAnyIndexErrors": true, "noUnusedLocals": true, - "experimentalDecorators": true + "emitDecoratorMetadata": true, + "experimentalDecorators": true, + "noErrorTruncation": true, + "skipLibCheck": true }, "exclude": [ "node_modules", @@ -52,4 +64,4 @@ "test", "jest.config.js" ] -} \ No newline at end of file +} diff --git a/tslint.json b/tslint.json deleted file mode 100644 index c9fb589..0000000 --- a/tslint.json +++ /dev/null @@ -1,234 +0,0 @@ -{ - "extends": "tslint:recommended", - "rulesDirectory": [ - "./src" - ], - "rules": { - "adjacent-overload-signatures": true, - "align": { - "options": [ - "parameters", - "statements" - ] - }, - "array-type": { - "options": [ - "array" - ] - }, - "arrow-parens": true, - "arrow-return-shorthand": true, - "ban-types": { - "options": [ - [ - "Object", - "Avoid using the `Object` type. Did you mean `object`?" - ], - [ - "Function", - "Avoid using the `Function` type. Prefer a specific function type, like `() => void`." - ], - [ - "Boolean", - "Avoid using the `Boolean` type. Did you mean `boolean`?" - ], - [ - "Number", - "Avoid using the `Number` type. Did you mean `number`?" - ], - [ - "String", - "Avoid using the `String` type. Did you mean `string`?" - ], - [ - "Symbol", - "Avoid using the `Symbol` type. Did you mean `symbol`?" - ] - ] - }, - "callable-types": true, - "class-name": true, - "comment-format": { - "options": [ - "check-space" - ] - }, - "curly": false, - "cyclomatic-complexity": false, - "eofline": true, - "forin": true, - "import-spacing": true, - "indent": { - "options": [ - "spaces" - ] - }, - "interface-name": { - "options": [ - "never-prefix" - ] - }, - "interface-over-type-literal": true, - "jsdoc-format": true, - "label-position": true, - "max-classes-per-file": { - "options": [ - 1 - ] - }, - "max-line-length": { - "options": [ - 160 - ] - }, - "member-access": false, - "member-ordering": { - "options": { - "order": "statics-first" - } - }, - "new-parens": true, - "no-angle-bracket-type-assertion": true, - "no-any": false, - "no-arg": true, - "no-bitwise": false, - "no-conditional-assignment": true, - "no-consecutive-blank-lines": true, - "no-console": false, - "no-construct": true, - "no-debugger": true, - "no-duplicate-super": true, - "no-empty": true, - "no-empty-interface": true, - "no-eval": true, - "no-internal-module": true, - "no-invalid-this": false, - "no-misused-new": true, - "no-namespace": true, - "no-parameter-properties": false, - "no-reference": true, - "no-reference-import": true, - "no-shadowed-variable": true, - "no-string-literal": false, - "no-string-throw": true, - "no-switch-case-fall-through": false, - "no-trailing-whitespace": true, - "no-unnecessary-initializer": true, - "no-unsafe-finally": true, - "no-unused-expression": false, - // disable this rule as it is very heavy performance-wise and not that useful - "no-use-before-declare": false, - "no-var-keyword": true, - "no-var-requires": true, - "object-literal-key-quotes": false, - "object-literal-shorthand": true, - "object-literal-sort-keys": false, - "one-line": { - "options": [ - "check-catch", - "check-else", - "check-finally", - "check-open-brace", - "check-whitespace" - ] - }, - "one-variable-per-declaration": { - "options": [ - "ignore-for-loop" - ] - }, - "only-arrow-functions": { - "options": [ - "allow-declarations", - "allow-named-functions" - ] - }, - "ordered-imports": { - "options": { - "import-sources-order": "case-insensitive", - "named-imports-order": "case-insensitive" - } - }, - "prefer-const": true, - "prefer-for-of": true, - "quotemark": { - "options": [ - "single", - "avoid-escape" - ] - }, - "radix": true, - "semicolon": { - "options": [ - "always", - "ignore-bound-class-methods" - ] - }, - "space-before-function-paren": { - "options": { - "anonymous": "never", - "asyncArrow": "always", - "constructor": "never", - "method": "never", - "named": "never" - } - }, - "trailing-comma": { - "options": { - "singleline": "never" - } - }, - "triple-equals": { - "options": [ - "allow-null-check" - ] - }, - "typedef": false, - "typedef-whitespace": { - "options": [ - { - "call-signature": "nospace", - "index-signature": "nospace", - "parameter": "nospace", - "property-declaration": "nospace", - "variable-declaration": "nospace" - }, - { - "call-signature": "onespace", - "index-signature": "onespace", - "parameter": "onespace", - "property-declaration": "onespace", - "variable-declaration": "onespace" - } - ] - }, - "typeof-compare": false, - // deprecated in TSLint 5.9.0 - "unified-signatures": true, - "use-isnan": true, - "variable-name": { - "options": [ - "ban-keywords", - "check-format", - "allow-pascal-case" - ] - }, - "whitespace": { - "options": [ - "check-branch", - "check-decl", - "check-operator", - "check-separator", - "check-type", - "check-typecast" - ] - } - }, - "jsRules": { - "max-line-length": { - "options": [ - 160 - ] - } - } -} diff --git a/typings/global.d.ts b/typings/global.d.ts index df8bdd0..11450d9 100644 --- a/typings/global.d.ts +++ b/typings/global.d.ts @@ -1,7 +1,23 @@ -declare module NodeJS { +declare namespace NodeJS { interface Global { acmConfig: Questions } + interface ProcessEnv { + NODE_ENV: string; + APP_ID: string; + AGENT_ID: string; + REDIRECT_URI: string; + CORP_ID: string; + CORP_SECRET: string; + TOKEN: string; + DB_PORT: string; + SECRET: string; + ACM_DATAID: string; + ACM_GROUP: string; + ACM_NAMESPACE: string; + ACM_ACCESS_KEY: string; + ACM_SECRET_KEY: string; + } } interface Question { description: string; @@ -17,4 +33,4 @@ interface Questions { ios: Question; lab: Question; design: Question; -} \ No newline at end of file +} diff --git a/yarn.lock b/yarn.lock index 4ca39e9..c550bf8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -96,6 +96,11 @@ resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.3.tgz#aac45cccf8bc1873b99a85f34bceef3beb5d3244" integrity sha512-j/+j8NAWUTxOtx4LKHybpSClxHoq6I91DQ/mKgAXn5oNUPIUiGppjPIX3TDtJWPrdfP9Kfl7e4fgVMiQR9VE/g== +"@babel/helper-plugin-utils@^7.10.4": + version "7.10.4" + resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz#2f75a831269d4f677de49986dff59927533cf375" + integrity sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg== + "@babel/helper-replace-supers@^7.10.1": version "7.10.1" resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.10.1.tgz#ec6859d20c5d8087f6a2dc4e014db7228975f13d" @@ -226,6 +231,13 @@ dependencies: "@babel/helper-plugin-utils" "^7.8.0" +"@babel/plugin-syntax-top-level-await@^7.8.3": + version "7.12.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.12.1.tgz#dd6c0b357ac1bb142d98537450a319625d13d2a0" + integrity sha512-i7ooMZFS+a/Om0crxZodrTzNEPJHZrlMVGMTEpFAj6rYY/bKCddB0Dk/YxfPuYXOopuhKk/e1jV6h+WUU9XN3A== + dependencies: + "@babel/helper-plugin-utils" "^7.10.4" + "@babel/template@^7.10.1", "@babel/template@^7.10.3", "@babel/template@^7.3.3": version "7.10.3" resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.10.3.tgz#4d13bc8e30bf95b0ce9d175d30306f42a2c9a7b8" @@ -272,6 +284,31 @@ exec-sh "^0.3.2" minimist "^1.2.0" +"@dabh/diagnostics@^2.0.2": + version "2.0.2" + resolved "https://registry.yarnpkg.com/@dabh/diagnostics/-/diagnostics-2.0.2.tgz#290d08f7b381b8f94607dc8f471a12c675f9db31" + integrity sha512-+A1YivoVDNNVCdfozHSR8v/jyuuLTMXwjWuxPFlFlUapXoGc+Gj9mDlTDDfrwl7rXCl2tNZ0kE8sIBO6YOn96Q== + dependencies: + colorspace "1.1.x" + enabled "2.0.x" + kuler "^2.0.0" + +"@eslint/eslintrc@^0.2.1": + version "0.2.1" + resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.2.1.tgz#f72069c330461a06684d119384435e12a5d76e3c" + integrity sha512-XRUeBZ5zBWLYgSANMpThFddrZZkEbGHgUdt5UJjZfnlN9BGCiUBrf+nvbRupSjMvqzwnQN0qwCmOxITt1cfywA== + dependencies: + ajv "^6.12.4" + debug "^4.1.1" + espree "^7.3.0" + globals "^12.1.0" + ignore "^4.0.6" + import-fresh "^3.2.1" + js-yaml "^3.13.1" + lodash "^4.17.19" + minimatch "^3.0.4" + strip-json-comments "^3.1.1" + "@istanbuljs/load-nyc-config@^1.0.0": version "1.1.0" resolved "https://registry.yarnpkg.com/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz#fd3db1d59ecf7cf121e80650bb86712f9b55eced" @@ -288,89 +325,100 @@ resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.2.tgz#26520bf09abe4a5644cd5414e37125a8954241dd" integrity sha512-tsAQNx32a8CoFhjhijUIhI4kccIAgmGhy8LZMZgGfmXcpMbPRUqn5LWmgRttILi6yeGmBJd2xsPkFMs0PzgPCw== -"@jest/console@^26.1.0": - version "26.1.0" - resolved "https://registry.yarnpkg.com/@jest/console/-/console-26.1.0.tgz#f67c89e4f4d04dbcf7b052aed5ab9c74f915b954" - integrity sha512-+0lpTHMd/8pJp+Nd4lyip+/Iyf2dZJvcCqrlkeZQoQid+JlThA4M9vxHtheyrQ99jJTMQam+es4BcvZ5W5cC3A== +"@jest/console@^26.6.2": + version "26.6.2" + resolved "https://registry.yarnpkg.com/@jest/console/-/console-26.6.2.tgz#4e04bc464014358b03ab4937805ee36a0aeb98f2" + integrity sha512-IY1R2i2aLsLr7Id3S6p2BA82GNWryt4oSvEXLAKc+L2zdi89dSkE8xC1C+0kpATG4JhBJREnQOH7/zmccM2B0g== dependencies: - "@jest/types" "^26.1.0" + "@jest/types" "^26.6.2" + "@types/node" "*" chalk "^4.0.0" - jest-message-util "^26.1.0" - jest-util "^26.1.0" + jest-message-util "^26.6.2" + jest-util "^26.6.2" slash "^3.0.0" -"@jest/core@^26.1.0": - version "26.1.0" - resolved "https://registry.yarnpkg.com/@jest/core/-/core-26.1.0.tgz#4580555b522de412a7998b3938c851e4f9da1c18" - integrity sha512-zyizYmDJOOVke4OO/De//aiv8b07OwZzL2cfsvWF3q9YssfpcKfcnZAwDY8f+A76xXSMMYe8i/f/LPocLlByfw== +"@jest/core@^26.6.3": + version "26.6.3" + resolved "https://registry.yarnpkg.com/@jest/core/-/core-26.6.3.tgz#7639fcb3833d748a4656ada54bde193051e45fad" + integrity sha512-xvV1kKbhfUqFVuZ8Cyo+JPpipAHHAV3kcDBftiduK8EICXmTFddryy3P7NfZt8Pv37rA9nEJBKCCkglCPt/Xjw== dependencies: - "@jest/console" "^26.1.0" - "@jest/reporters" "^26.1.0" - "@jest/test-result" "^26.1.0" - "@jest/transform" "^26.1.0" - "@jest/types" "^26.1.0" + "@jest/console" "^26.6.2" + "@jest/reporters" "^26.6.2" + "@jest/test-result" "^26.6.2" + "@jest/transform" "^26.6.2" + "@jest/types" "^26.6.2" + "@types/node" "*" ansi-escapes "^4.2.1" chalk "^4.0.0" exit "^0.1.2" graceful-fs "^4.2.4" - jest-changed-files "^26.1.0" - jest-config "^26.1.0" - jest-haste-map "^26.1.0" - jest-message-util "^26.1.0" + jest-changed-files "^26.6.2" + jest-config "^26.6.3" + jest-haste-map "^26.6.2" + jest-message-util "^26.6.2" jest-regex-util "^26.0.0" - jest-resolve "^26.1.0" - jest-resolve-dependencies "^26.1.0" - jest-runner "^26.1.0" - jest-runtime "^26.1.0" - jest-snapshot "^26.1.0" - jest-util "^26.1.0" - jest-validate "^26.1.0" - jest-watcher "^26.1.0" + jest-resolve "^26.6.2" + jest-resolve-dependencies "^26.6.3" + jest-runner "^26.6.3" + jest-runtime "^26.6.3" + jest-snapshot "^26.6.2" + jest-util "^26.6.2" + jest-validate "^26.6.2" + jest-watcher "^26.6.2" micromatch "^4.0.2" p-each-series "^2.1.0" rimraf "^3.0.0" slash "^3.0.0" strip-ansi "^6.0.0" -"@jest/environment@^26.1.0": - version "26.1.0" - resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-26.1.0.tgz#378853bcdd1c2443b4555ab908cfbabb851e96da" - integrity sha512-86+DNcGongbX7ai/KE/S3/NcUVZfrwvFzOOWX/W+OOTvTds7j07LtC+MgGydH5c8Ri3uIrvdmVgd1xFD5zt/xA== +"@jest/create-cache-key-function@^26.5.0": + version "26.6.2" + resolved "https://registry.yarnpkg.com/@jest/create-cache-key-function/-/create-cache-key-function-26.6.2.tgz#04cf439207a4fd12418d8aee551cddc86f9ac5f5" + integrity sha512-LgEuqU1f/7WEIPYqwLPIvvHuc1sB6gMVbT6zWhin3txYUNYK/kGQrC1F2WR4gR34YlI9bBtViTm5z98RqVZAaw== dependencies: - "@jest/fake-timers" "^26.1.0" - "@jest/types" "^26.1.0" - jest-mock "^26.1.0" + "@jest/types" "^26.6.2" -"@jest/fake-timers@^26.1.0": - version "26.1.0" - resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-26.1.0.tgz#9a76b7a94c351cdbc0ad53e5a748789f819a65fe" - integrity sha512-Y5F3kBVWxhau3TJ825iuWy++BAuQzK/xEa+wD9vDH3RytW9f2DbMVodfUQC54rZDX3POqdxCgcKdgcOL0rYUpA== +"@jest/environment@^26.6.2": + version "26.6.2" + resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-26.6.2.tgz#ba364cc72e221e79cc8f0a99555bf5d7577cf92c" + integrity sha512-nFy+fHl28zUrRsCeMB61VDThV1pVTtlEokBRgqPrcT1JNq4yRNIyTHfyht6PqtUvY9IsuLGTrbG8kPXjSZIZwA== dependencies: - "@jest/types" "^26.1.0" + "@jest/fake-timers" "^26.6.2" + "@jest/types" "^26.6.2" + "@types/node" "*" + jest-mock "^26.6.2" + +"@jest/fake-timers@^26.6.2": + version "26.6.2" + resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-26.6.2.tgz#459c329bcf70cee4af4d7e3f3e67848123535aad" + integrity sha512-14Uleatt7jdzefLPYM3KLcnUl1ZNikaKq34enpb5XG9i81JpppDb5muZvonvKyrl7ftEHkKS5L5/eB/kxJ+bvA== + dependencies: + "@jest/types" "^26.6.2" "@sinonjs/fake-timers" "^6.0.1" - jest-message-util "^26.1.0" - jest-mock "^26.1.0" - jest-util "^26.1.0" + "@types/node" "*" + jest-message-util "^26.6.2" + jest-mock "^26.6.2" + jest-util "^26.6.2" -"@jest/globals@^26.1.0": - version "26.1.0" - resolved "https://registry.yarnpkg.com/@jest/globals/-/globals-26.1.0.tgz#6cc5d7cbb79b76b120f2403d7d755693cf063ab1" - integrity sha512-MKiHPNaT+ZoG85oMaYUmGHEqu98y3WO2yeIDJrs2sJqHhYOy3Z6F7F/luzFomRQ8SQ1wEkmahFAz2291Iv8EAw== +"@jest/globals@^26.6.2": + version "26.6.2" + resolved "https://registry.yarnpkg.com/@jest/globals/-/globals-26.6.2.tgz#5b613b78a1aa2655ae908eba638cc96a20df720a" + integrity sha512-85Ltnm7HlB/KesBUuALwQ68YTU72w9H2xW9FjZ1eL1U3lhtefjjl5c2MiUbpXt/i6LaPRvoOFJ22yCBSfQ0JIA== dependencies: - "@jest/environment" "^26.1.0" - "@jest/types" "^26.1.0" - expect "^26.1.0" + "@jest/environment" "^26.6.2" + "@jest/types" "^26.6.2" + expect "^26.6.2" -"@jest/reporters@^26.1.0": - version "26.1.0" - resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-26.1.0.tgz#08952e90c90282e14ff49e927bdf1873617dae78" - integrity sha512-SVAysur9FOIojJbF4wLP0TybmqwDkdnFxHSPzHMMIYyBtldCW9gG+Q5xWjpMFyErDiwlRuPyMSJSU64A67Pazg== +"@jest/reporters@^26.6.2": + version "26.6.2" + resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-26.6.2.tgz#1f518b99637a5f18307bd3ecf9275f6882a667f6" + integrity sha512-h2bW53APG4HvkOnVMo8q3QXa6pcaNt1HkwVsOPMBV6LD/q9oSpxNSYZQYkAnjdMjrJ86UuYeLo+aEZClV6opnw== dependencies: "@bcoe/v8-coverage" "^0.2.3" - "@jest/console" "^26.1.0" - "@jest/test-result" "^26.1.0" - "@jest/transform" "^26.1.0" - "@jest/types" "^26.1.0" + "@jest/console" "^26.6.2" + "@jest/test-result" "^26.6.2" + "@jest/transform" "^26.6.2" + "@jest/types" "^26.6.2" chalk "^4.0.0" collect-v8-coverage "^1.0.0" exit "^0.1.2" @@ -381,79 +429,69 @@ istanbul-lib-report "^3.0.0" istanbul-lib-source-maps "^4.0.0" istanbul-reports "^3.0.2" - jest-haste-map "^26.1.0" - jest-resolve "^26.1.0" - jest-util "^26.1.0" - jest-worker "^26.1.0" + jest-haste-map "^26.6.2" + jest-resolve "^26.6.2" + jest-util "^26.6.2" + jest-worker "^26.6.2" slash "^3.0.0" source-map "^0.6.0" string-length "^4.0.1" terminal-link "^2.0.0" - v8-to-istanbul "^4.1.3" + v8-to-istanbul "^7.0.0" optionalDependencies: - node-notifier "^7.0.0" + node-notifier "^8.0.0" -"@jest/source-map@^26.1.0": - version "26.1.0" - resolved "https://registry.yarnpkg.com/@jest/source-map/-/source-map-26.1.0.tgz#a6a020d00e7d9478f4b690167c5e8b77e63adb26" - integrity sha512-XYRPYx4eEVX15cMT9mstnO7hkHP3krNtKfxUYd8L7gbtia8JvZZ6bMzSwa6IQJENbudTwKMw5R1BePRD+bkEmA== +"@jest/source-map@^26.6.2": + version "26.6.2" + resolved "https://registry.yarnpkg.com/@jest/source-map/-/source-map-26.6.2.tgz#29af5e1e2e324cafccc936f218309f54ab69d535" + integrity sha512-YwYcCwAnNmOVsZ8mr3GfnzdXDAl4LaenZP5z+G0c8bzC9/dugL8zRmxZzdoTl4IaS3CryS1uWnROLPFmb6lVvA== dependencies: callsites "^3.0.0" graceful-fs "^4.2.4" source-map "^0.6.0" -"@jest/test-result@^26.1.0": - version "26.1.0" - resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-26.1.0.tgz#a93fa15b21ad3c7ceb21c2b4c35be2e407d8e971" - integrity sha512-Xz44mhXph93EYMA8aYDz+75mFbarTV/d/x0yMdI3tfSRs/vh4CqSxgzVmCps1fPkHDCtn0tU8IH9iCKgGeGpfw== +"@jest/test-result@^26.6.2": + version "26.6.2" + resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-26.6.2.tgz#55da58b62df134576cc95476efa5f7949e3f5f18" + integrity sha512-5O7H5c/7YlojphYNrK02LlDIV2GNPYisKwHm2QTKjNZeEzezCbwYs9swJySv2UfPMyZ0VdsmMv7jIlD/IKYQpQ== dependencies: - "@jest/console" "^26.1.0" - "@jest/types" "^26.1.0" + "@jest/console" "^26.6.2" + "@jest/types" "^26.6.2" "@types/istanbul-lib-coverage" "^2.0.0" collect-v8-coverage "^1.0.0" -"@jest/test-sequencer@^26.1.0": - version "26.1.0" - resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-26.1.0.tgz#41a6fc8b850c3f33f48288ea9ea517c047e7f14e" - integrity sha512-Z/hcK+rTq56E6sBwMoQhSRDVjqrGtj1y14e2bIgcowARaIE1SgOanwx6gvY4Q9gTKMoZQXbXvptji+q5GYxa6Q== +"@jest/test-sequencer@^26.6.3": + version "26.6.3" + resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-26.6.3.tgz#98e8a45100863886d074205e8ffdc5a7eb582b17" + integrity sha512-YHlVIjP5nfEyjlrSr8t/YdNfU/1XEt7c5b4OxcXCjyRhjzLYu/rO69/WHPuYcbCWkz8kAeZVZp2N2+IOLLEPGw== dependencies: - "@jest/test-result" "^26.1.0" + "@jest/test-result" "^26.6.2" graceful-fs "^4.2.4" - jest-haste-map "^26.1.0" - jest-runner "^26.1.0" - jest-runtime "^26.1.0" + jest-haste-map "^26.6.2" + jest-runner "^26.6.3" + jest-runtime "^26.6.3" -"@jest/transform@^26.1.0": - version "26.1.0" - resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-26.1.0.tgz#697f48898c2a2787c9b4cb71d09d7e617464e509" - integrity sha512-ICPm6sUXmZJieq45ix28k0s+d/z2E8CHDsq+WwtWI6kW8m7I8kPqarSEcUN86entHQ570ZBRci5OWaKL0wlAWw== +"@jest/transform@^26.6.2": + version "26.6.2" + resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-26.6.2.tgz#5ac57c5fa1ad17b2aae83e73e45813894dcf2e4b" + integrity sha512-E9JjhUgNzvuQ+vVAL21vlyfy12gP0GhazGgJC4h6qUt1jSdUXGWJ1wfu/X7Sd8etSgxV4ovT1pb9v5D6QW4XgA== dependencies: "@babel/core" "^7.1.0" - "@jest/types" "^26.1.0" + "@jest/types" "^26.6.2" babel-plugin-istanbul "^6.0.0" chalk "^4.0.0" convert-source-map "^1.4.0" fast-json-stable-stringify "^2.0.0" graceful-fs "^4.2.4" - jest-haste-map "^26.1.0" + jest-haste-map "^26.6.2" jest-regex-util "^26.0.0" - jest-util "^26.1.0" + jest-util "^26.6.2" micromatch "^4.0.2" pirates "^4.0.1" slash "^3.0.0" source-map "^0.6.1" write-file-atomic "^3.0.0" -"@jest/types@^25.5.0": - version "25.5.0" - resolved "https://registry.yarnpkg.com/@jest/types/-/types-25.5.0.tgz#4d6a4793f7b9599fc3680877b856a97dbccf2a9d" - integrity sha512-OXD0RgQ86Tu3MazKo8bnrkDRaDXXMGUqd+kTtLtK1Zb7CRzQcaSRPPPV37SvYTdevXEBVxe0HXylEjs8ibkmCw== - dependencies: - "@types/istanbul-lib-coverage" "^2.0.0" - "@types/istanbul-reports" "^1.1.1" - "@types/yargs" "^15.0.0" - chalk "^3.0.0" - "@jest/types@^26.1.0": version "26.1.0" resolved "https://registry.yarnpkg.com/@jest/types/-/types-26.1.0.tgz#f8afaaaeeb23b5cad49dd1f7779689941dcb6057" @@ -464,6 +502,17 @@ "@types/yargs" "^15.0.0" chalk "^4.0.0" +"@jest/types@^26.6.2": + version "26.6.2" + resolved "https://registry.yarnpkg.com/@jest/types/-/types-26.6.2.tgz#bef5a532030e1d88a2f5a6d933f84e97226ed48e" + integrity sha512-fC6QCp7Sc5sX6g8Tvbmj4XUTbyrik0akgRy03yjXbQaBWWNWGE7SGtJk98m0N8nzegD/7SggrUlivxo5ax4KWQ== + dependencies: + "@types/istanbul-lib-coverage" "^2.0.0" + "@types/istanbul-reports" "^3.0.0" + "@types/node" "*" + "@types/yargs" "^15.0.0" + chalk "^4.0.0" + "@jfonx/console-utils@^1.0.3": version "1.0.3" resolved "https://registry.yarnpkg.com/@jfonx/console-utils/-/console-utils-1.0.3.tgz#cbb7f911e4191a4a2fe1ba4807d29f100b5d099f" @@ -486,11 +535,32 @@ call-me-maybe "^1.0.1" glob-to-regexp "^0.3.0" +"@nodelib/fs.scandir@2.1.3": + version "2.1.3" + resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.3.tgz#3a582bdb53804c6ba6d146579c46e52130cf4a3b" + integrity sha512-eGmwYQn3gxo4r7jdQnkrrN6bY478C3P+a/y72IJukF8LjB6ZHeB3c+Ehacj3sYeSmUXGlnA67/PmbM9CVwL7Dw== + dependencies: + "@nodelib/fs.stat" "2.0.3" + run-parallel "^1.1.9" + +"@nodelib/fs.stat@2.0.3", "@nodelib/fs.stat@^2.0.2": + version "2.0.3" + resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.3.tgz#34dc5f4cabbc720f4e60f75a747e7ecd6c175bd3" + integrity sha512-bQBFruR2TAwoevBEd/NWMoAAtNGzTRgdrqnYCc7dhzfoNvqPzLyqlEQnzZ3kVnNrSp25iyxE00/3h2fqGAGArA== + "@nodelib/fs.stat@^1.1.2": version "1.1.3" resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz#2b5a3ab3f918cca48a8c754c08168e3f03eba61b" integrity sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw== +"@nodelib/fs.walk@^1.2.3": + version "1.2.4" + resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.4.tgz#011b9202a70a6366e436ca5c065844528ab04976" + integrity sha512-1V9XOY4rDW0rehzbrcqAmHnz8e7SKvX27gh8Gt2WgB0+pdzdiLV83p72kZPU+jvMbS1qU5mauP2iOvO8rhmurQ== + dependencies: + "@nodelib/fs.scandir" "2.1.3" + fastq "^1.6.0" + "@sinonjs/commons@^1.7.0": version "1.8.0" resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.0.tgz#c8d68821a854c555bba172f3b06959a0039b236d" @@ -538,6 +608,13 @@ dependencies: "@babel/types" "^7.3.0" +"@types/babel__traverse@^7.0.4": + version "7.0.15" + resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.0.15.tgz#db9e4238931eb69ef8aab0ad6523d4d4caa39d03" + integrity sha512-Pzh9O3sTK8V6I1olsXpCfj2k/ygO2q1X0vhhnDrEQyYLHZesWz+zMZMVcwXLCYf0U36EtmyYaFGPfXlTtDHe3A== + dependencies: + "@babel/types" "^7.3.0" + "@types/body-parser@*": version "1.19.0" resolved "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.19.0.tgz#0685b3c47eb3006ffed117cdd55164b61f80538f" @@ -594,7 +671,7 @@ "@types/qs" "*" "@types/range-parser" "*" -"@types/express@*", "@types/express@^4.17.6": +"@types/express@*": version "4.17.6" resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.6.tgz#6bce49e49570507b86ea1b07b806f04697fac45e" integrity sha512-n/mr9tZI83kd4azlPG5y997C/M4DNABK9yErhFM6hKdym4kkmd9j0vtsJyjFIwfRBxtrxZtAfGZCNRIBMFLK5w== @@ -604,6 +681,16 @@ "@types/qs" "*" "@types/serve-static" "*" +"@types/express@^4.17.8": + version "4.17.8" + resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.8.tgz#3df4293293317e61c60137d273a2e96cd8d5f27a" + integrity sha512-wLhcKh3PMlyA2cNAB9sjM1BntnhPMiM0JOBwPBqttjHev2428MLEB4AYVN+d8s2iyCVZac+o41Pflm/ZH5vLXQ== + dependencies: + "@types/body-parser" "*" + "@types/express-serve-static-core" "*" + "@types/qs" "*" + "@types/serve-static" "*" + "@types/glob@^7.1.1": version "7.1.3" resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.3.tgz#e6ba80f36b7daad2c685acd9266382e68985c183" @@ -619,6 +706,13 @@ dependencies: "@types/node" "*" +"@types/ioredis@^4.17.7": + version "4.17.7" + resolved "https://registry.yarnpkg.com/@types/ioredis/-/ioredis-4.17.7.tgz#5007a56380fd387315efabc6c777c050feabb121" + integrity sha512-M8/KDSGmNYhPFMn+CxDDpIEHP27b2muEHgnK1UgIQIMEO2KXH9mznHx3epeRlD+AjF94HFh3dy2/9zqO+pPDqQ== + dependencies: + "@types/node" "*" + "@types/istanbul-lib-coverage@*", "@types/istanbul-lib-coverage@^2.0.0", "@types/istanbul-lib-coverage@^2.0.1": version "2.0.3" resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz#4ba8ddb720221f432e443bd5f9117fd22cfd4762" @@ -639,13 +733,25 @@ "@types/istanbul-lib-coverage" "*" "@types/istanbul-lib-report" "*" -"@types/jest@^26.0.3": - version "26.0.3" - resolved "https://registry.yarnpkg.com/@types/jest/-/jest-26.0.3.tgz#79534e0e94857171c0edc596db0ebe7cb7863251" - integrity sha512-v89ga1clpVL/Y1+YI0eIu1VMW+KU7Xl8PhylVtDKVWaSUHBHYPLXMQGBdrpHewaKoTvlXkksbYqPgz8b4cmRZg== +"@types/istanbul-reports@^3.0.0": + version "3.0.0" + resolved "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-3.0.0.tgz#508b13aa344fa4976234e75dddcc34925737d821" + integrity sha512-nwKNbvnwJ2/mndE9ItP/zc2TCzw6uuodnF4EHYWD+gCQDVBuRQL5UzbZD0/ezy1iKsFU2ZQiDqg4M9dN4+wZgA== dependencies: - jest-diff "^25.2.1" - pretty-format "^25.2.1" + "@types/istanbul-lib-report" "*" + +"@types/jest@26.x", "@types/jest@^26.0.15": + version "26.0.15" + resolved "https://registry.yarnpkg.com/@types/jest/-/jest-26.0.15.tgz#12e02c0372ad0548e07b9f4e19132b834cb1effe" + integrity sha512-s2VMReFXRg9XXxV+CW9e5Nz8fH2K1aEhwgjUqPPbQd7g95T0laAcvLv032EhFHIa5GHsZ8W7iJEQVaJq6k3Gog== + dependencies: + jest-diff "^26.0.0" + pretty-format "^26.0.0" + +"@types/json-schema@^7.0.3": + version "7.0.6" + resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.6.tgz#f4c7ec43e81b319a9815115031709f26987891f0" + integrity sha512-3c+yGKvVP5Y9TYBEibGNR+kLtijnj7mYrXRg+WpFb2X9xm04g/DXYkfg4hmzJQosc9snFNUPkbYIhu+KAm6jJw== "@types/json5@^0.0.29": version "0.0.29" @@ -669,33 +775,33 @@ resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d" integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA== -"@types/mkdirp@^1.0.1": - version "1.0.1" - resolved "https://registry.yarnpkg.com/@types/mkdirp/-/mkdirp-1.0.1.tgz#0930b948914a78587de35458b86c907b6e98bbf6" - integrity sha512-HkGSK7CGAXncr8Qn/0VqNtExEE+PHMWb+qlR1faHMao7ng6P3tAaoWWBMdva0gL5h4zprjIO89GJOLXsMcDm1Q== +"@types/mongodb@*", "@types/mongodb@^3.5.33": + version "3.5.33" + resolved "https://registry.yarnpkg.com/@types/mongodb/-/mongodb-3.5.33.tgz#1084c3004a426df11b5a985641e7f58d7ceb52a6" + integrity sha512-biMkaYFyUP8jNczbi2BgtvVfiEtPZ+NTf+Jz4LmsQjO+Zk+kx1WNjz8gNArWlA/5DXVwMVWgIFtbj6Tslt1yWw== dependencies: + "@types/bson" "*" "@types/node" "*" -"@types/mongodb@*", "@types/mongodb@^3.5.25": - version "3.5.25" - resolved "https://registry.yarnpkg.com/@types/mongodb/-/mongodb-3.5.25.tgz#ab187db04d79f8e3f15af236327dc9139d9d4736" - integrity sha512-2H/Owt+pHCl9YmBOYnXc3VdnxejJEjVdH+QCWL5ZAfPehEn3evygKBX3/vKRv7aTwfNbUd0E5vjJdQklH/9a6w== +"@types/mongoose@^5.7.37": + version "5.7.37" + resolved "https://registry.yarnpkg.com/@types/mongoose/-/mongoose-5.7.37.tgz#8aa6960a52e551ee49edbb6b0dce587bbb66762b" + integrity sha512-PRAZiDZvo3D1Dzs1xtFQBT8YTZIXI9MexkTWyTwIy6C/6jAEGQen2ayg4NjHhjM+5eE4isHq0vbUjzzVWu2qJQ== dependencies: - "@types/bson" "*" + "@types/mongodb" "*" "@types/node" "*" -"@types/mongoose@5.5.6": - version "5.5.6" - resolved "https://registry.yarnpkg.com/@types/mongoose/-/mongoose-5.5.6.tgz#8ef6c56d5ebb79b34e92946b5679b7a053919b38" - integrity sha512-Duco8iiwOEGB756eIyafsrFbsAxjXQPkb/nplZtbxGOhfmsA90rXjO/GbDsBYbUz5nkGOCRHuNfxOJzoVAMHMg== +"@types/morgan@^1.9.2": + version "1.9.2" + resolved "https://registry.yarnpkg.com/@types/morgan/-/morgan-1.9.2.tgz#450f958a4d3fb0694a3ba012b09c8106f9a2885e" + integrity sha512-edtGMEdit146JwwIeyQeHHg9yID4WSolQPxpEorHmN3KuytuCHyn2ELNr5Uxy8SerniFbbkmgKMrGM933am5BQ== dependencies: - "@types/mongodb" "*" "@types/node" "*" -"@types/multer@^1.4.3": - version "1.4.3" - resolved "https://registry.yarnpkg.com/@types/multer/-/multer-1.4.3.tgz#bdff74b334c38a8ee1de9fbedb5d1d3dbc377422" - integrity sha512-tWsKbF5LYtXrJ7eOfI0aLBgEv9B7fnJe1JRXTj5+Z6EMfX0yHVsRFsNGnKyN8Bs0gtDv+JR37xAqsPnALyVTqg== +"@types/multer@^1.4.4": + version "1.4.4" + resolved "https://registry.yarnpkg.com/@types/multer/-/multer-1.4.4.tgz#bb5d9abc410da82726ceca74008bb81813349a88" + integrity sha512-wdfkiKBBEMTODNbuF3J+qDDSqJxt50yB9pgDiTcFew7f97Gcc7/sM4HR66ofGgpJPOALWOqKAch4gPyqEXSkeQ== dependencies: "@types/express" "*" @@ -707,11 +813,16 @@ "@types/node" "*" form-data "^3.0.0" -"@types/node@*", "@types/node@^14.0.14": +"@types/node@*": version "14.0.14" resolved "https://registry.yarnpkg.com/@types/node/-/node-14.0.14.tgz#24a0b5959f16ac141aeb0c5b3cd7a15b7c64cbce" integrity sha512-syUgf67ZQpaJj01/tRTknkMNoBBLWJOBODF0Zm4NrXmiSuxjymFrxnTu1QVYRubhVkRcZLYZG8STTwJRdVm/WQ== +"@types/node@^14.14.6": + version "14.14.6" + resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.6.tgz#146d3da57b3c636cc0d1769396ce1cfa8991147f" + integrity sha512-6QlRuqsQ/Ox/aJEQWBEJG7A9+u7oSYl3mem/K8IzxXG/kAGbV1YPD9Bg9Zw3vyxC/YP+zONKwy8hGkSt1jxFMw== + "@types/nodemailer@^6.4.0": version "6.4.0" resolved "https://registry.yarnpkg.com/@types/nodemailer/-/nodemailer-6.4.0.tgz#d8c039be3ed685c4719a026455555be82c124b74" @@ -739,13 +850,6 @@ resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.3.tgz#7ee330ba7caafb98090bece86a5ee44115904c2c" integrity sha512-ewFXqrQHlFsgc09MK5jP5iR7vumV/BYayNC6PgJO2LPe8vrnNFyjQjSppfEngITi0qvfKtzFvgKymGheFM9UOA== -"@types/redis@^2.8.22": - version "2.8.22" - resolved "https://registry.yarnpkg.com/@types/redis/-/redis-2.8.22.tgz#8935227cbe39080506b625276d64974ddbcb9ea4" - integrity sha512-O21YLcAtcSzax8wy4CfxMNjIMNf5X2c1pKTXDWLMa2p77Igvy7wuNjWVv+Db93wTvRvLLev6oq3IE7gxNKFZyg== - dependencies: - "@types/node" "*" - "@types/serve-static@*": version "1.13.4" resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.13.4.tgz#6662a93583e5a6cabca1b23592eb91e12fa80e7c" @@ -754,23 +858,23 @@ "@types/express-serve-static-core" "*" "@types/mime" "*" -"@types/socket.io-client@^1.4.33": - version "1.4.33" - resolved "https://registry.yarnpkg.com/@types/socket.io-client/-/socket.io-client-1.4.33.tgz#8e705b9b3f7fba6cb329d27cd2eda222812adbf1" - integrity sha512-m4LnxkljsI9fMsjwpW5QhRpMixo2BeeLpFmg0AE+sS4H1pzAd/cs/ftTiL60FLZgfFa8PFRPx5KsHu8O0bADKQ== +"@types/socket.io-client@^1.4.34": + version "1.4.34" + resolved "https://registry.yarnpkg.com/@types/socket.io-client/-/socket.io-client-1.4.34.tgz#8ca5f5732a9ad92b79aba71083cda5e5821e3ed9" + integrity sha512-Lzia5OTQFJZJ5R4HsEEldywiiqT9+W2rDbyHJiiTGqOcju89sCsQ8aUXDljY6Ls33wKZZGC0bfMhr/VpOyjtXg== -"@types/socket.io@^2.1.8": - version "2.1.8" - resolved "https://registry.yarnpkg.com/@types/socket.io/-/socket.io-2.1.8.tgz#ffc3aac0163a58bf50a463d50b1baabed91638cc" - integrity sha512-NIQfh9WwJuJKlgmby4NgwMpoBOmNPCDgaRNPiLYZBtkbHkszK/9R52B5yGkd5a34rbVdAADuo8FhOS/5AZDemw== +"@types/socket.io@^2.1.11": + version "2.1.11" + resolved "https://registry.yarnpkg.com/@types/socket.io/-/socket.io-2.1.11.tgz#e0d6759880e5f9818d5297a3328b36641bae996b" + integrity sha512-bVprmqPhJMLb9ZCm8g0Xy8kwBFRbnanOWSxzWkDkkIwxTvud5tKMfAJymXX6LQbizUKCS1yima7JM4BeLqjNqA== dependencies: "@types/engine.io" "*" "@types/node" "*" -"@types/stack-utils@^1.0.1": - version "1.0.1" - resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-1.0.1.tgz#0a851d3bd96498fa25c33ab7278ed3bd65f06c3e" - integrity sha512-l42BggppR6zLmpfU6fq9HEa2oGPEI8yrSPL3GITjfRInppYFahObbIQOQK3UGxEnyQpltZLaPe75046NOZQikw== +"@types/stack-utils@^2.0.0": + version "2.0.0" + resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-2.0.0.tgz#7036640b4e21cc2f259ae826ce843d277dad8cff" + integrity sha512-RJJrrySY7A8havqpGObOB4W92QXKJo63/jFLLgpvOtsGUqbQZ9Sbgl35KMm1DjC6j7AvmmU2bIno+3IyEaemaw== "@types/superagent@*": version "4.1.7" @@ -780,10 +884,10 @@ "@types/cookiejar" "*" "@types/node" "*" -"@types/supertest@^2.0.9": - version "2.0.9" - resolved "https://registry.yarnpkg.com/@types/supertest/-/supertest-2.0.9.tgz#049bddbcb0ee0d60a9b836ccc977d813a1c32325" - integrity sha512-0BTpWWWAO1+uXaP/oA0KW1eOZv4hc0knhrWowV06Gwwz3kqQxNO98fUFM2e15T+PdPRmOouNFrYvaBgdojPJ3g== +"@types/supertest@^2.0.10": + version "2.0.10" + resolved "https://registry.yarnpkg.com/@types/supertest/-/supertest-2.0.10.tgz#630d79b4d82c73e043e43ff777a9ca98d457cab7" + integrity sha512-Xt8TbEyZTnD5Xulw95GLMOkmjGICrOQyJ2jqgkSjAUR3mm7pAIzSR0NFBaMcwlzVvlpCjNwbATcWWwjNiZiFrQ== dependencies: "@types/superagent" "*" @@ -799,6 +903,76 @@ dependencies: "@types/yargs-parser" "*" +"@typescript-eslint/eslint-plugin@^4.6.1": + version "4.6.1" + resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.6.1.tgz#99d77eb7a016fd5a5e749d2c44a7e4c317eb7da3" + integrity sha512-SNZyflefTMK2JyrPfFFzzoy2asLmZvZJ6+/L5cIqg4HfKGiW2Gr1Go1OyEVqne/U4QwmoasuMwppoBHWBWF2nA== + dependencies: + "@typescript-eslint/experimental-utils" "4.6.1" + "@typescript-eslint/scope-manager" "4.6.1" + debug "^4.1.1" + functional-red-black-tree "^1.0.1" + regexpp "^3.0.0" + semver "^7.3.2" + tsutils "^3.17.1" + +"@typescript-eslint/experimental-utils@4.6.1": + version "4.6.1" + resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.6.1.tgz#a9c691dfd530a9570274fe68907c24c07a06c4aa" + integrity sha512-qyPqCFWlHZXkEBoV56UxHSoXW2qnTr4JrWVXOh3soBP3q0o7p4pUEMfInDwIa0dB/ypdtm7gLOS0hg0a73ijfg== + dependencies: + "@types/json-schema" "^7.0.3" + "@typescript-eslint/scope-manager" "4.6.1" + "@typescript-eslint/types" "4.6.1" + "@typescript-eslint/typescript-estree" "4.6.1" + eslint-scope "^5.0.0" + eslint-utils "^2.0.0" + +"@typescript-eslint/parser@^4.6.1": + version "4.6.1" + resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.6.1.tgz#b801bff67b536ecc4a840ac9289ba2be57e02428" + integrity sha512-lScKRPt1wM9UwyKkGKyQDqf0bh6jm8DQ5iN37urRIXDm16GEv+HGEmum2Fc423xlk5NUOkOpfTnKZc/tqKZkDQ== + dependencies: + "@typescript-eslint/scope-manager" "4.6.1" + "@typescript-eslint/types" "4.6.1" + "@typescript-eslint/typescript-estree" "4.6.1" + debug "^4.1.1" + +"@typescript-eslint/scope-manager@4.6.1": + version "4.6.1" + resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.6.1.tgz#21872b91cbf7adfc7083f17b8041149148baf992" + integrity sha512-f95+80r6VdINYscJY1KDUEDcxZ3prAWHulL4qRDfNVD0I5QAVSGqFkwHERDoLYJJWmEAkUMdQVvx7/c2Hp+Bjg== + dependencies: + "@typescript-eslint/types" "4.6.1" + "@typescript-eslint/visitor-keys" "4.6.1" + +"@typescript-eslint/types@4.6.1": + version "4.6.1" + resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.6.1.tgz#d3ad7478f53f22e7339dc006ab61aac131231552" + integrity sha512-k2ZCHhJ96YZyPIsykickez+OMHkz06xppVLfJ+DY90i532/Cx2Z+HiRMH8YZQo7a4zVd/TwNBuRCdXlGK4yo8w== + +"@typescript-eslint/typescript-estree@4.6.1": + version "4.6.1" + resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.6.1.tgz#6025cce724329413f57e4959b2d676fceeca246f" + integrity sha512-/J/kxiyjQQKqEr5kuKLNQ1Finpfb8gf/NpbwqFFYEBjxOsZ621r9AqwS9UDRA1Rrr/eneX/YsbPAIhU2rFLjXQ== + dependencies: + "@typescript-eslint/types" "4.6.1" + "@typescript-eslint/visitor-keys" "4.6.1" + debug "^4.1.1" + globby "^11.0.1" + is-glob "^4.0.1" + lodash "^4.17.15" + semver "^7.3.2" + tsutils "^3.17.1" + +"@typescript-eslint/visitor-keys@4.6.1": + version "4.6.1" + resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.6.1.tgz#6b125883402d8939df7b54528d879e88f7ba3614" + integrity sha512-owABze4toX7QXwOLT3/D5a8NecZEjEWU1srqxENTfqsY3bwVnl3YYbOh6s1rp2wQKO9RTHFGjKes08FgE7SVMw== + dependencies: + "@typescript-eslint/types" "4.6.1" + eslint-visitor-keys "^2.0.0" + abab@^2.0.3: version "2.0.3" resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.3.tgz#623e2075e02eb2d3f2475e49f99c91846467907a" @@ -839,6 +1013,11 @@ acorn-globals@^6.0.0: acorn "^7.1.1" acorn-walk "^7.1.1" +acorn-jsx@^5.2.0: + version "5.3.1" + resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.1.tgz#fc8661e11b7ac1539c47dbfea2e72b3af34d267b" + integrity sha512-K0Ptm/47OKfQRpNQ2J/oIN/3QYiK6FwW+eJbILhsdxh2WTLdl+30o8aGdTbm5JbffpFFAg/g+zi1E+jvJha5ng== + acorn-walk@^7.1.1: version "7.2.0" resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-7.2.0.tgz#0de889a601203909b0fbe07b8938dc21d2e967bc" @@ -849,6 +1028,11 @@ acorn@^7.1.1: resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.3.1.tgz#85010754db53c3fbaf3b9ea3e083aa5c5d147ffd" integrity sha512-tLc0wSnatxAQHVHUapaHdz72pi9KUyHjq5KyHjGg9Y8Ifdc79pTh2XvI6I1/chZbnM7QtNKzh66ooDogPZSleA== +acorn@^7.4.0: + version "7.4.1" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa" + integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A== + address@>=0.0.1: version "1.1.2" resolved "https://registry.yarnpkg.com/address/-/address-1.1.2.tgz#bf1116c9c758c51b7a933d296b72c221ed9428b6" @@ -873,6 +1057,16 @@ agent-base@~4.2.1: dependencies: es6-promisify "^5.0.0" +ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.4: + version "6.12.6" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4" + integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g== + dependencies: + fast-deep-equal "^3.1.1" + fast-json-stable-stringify "^2.0.0" + json-schema-traverse "^0.4.1" + uri-js "^4.2.2" + ajv@^6.5.5: version "6.12.2" resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.2.tgz#c629c5eced17baf314437918d2da88c99d5958cd" @@ -883,6 +1077,11 @@ ajv@^6.5.5: json-schema-traverse "^0.4.1" uri-js "^4.2.2" +ansi-colors@^4.1.1: + version "4.1.1" + resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz#cbb9ae256bf750af1eab344f229aa27fe94ba348" + integrity sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA== + ansi-escapes@^4.2.1: version "4.3.1" resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.1.tgz#a5c47cc43181f1f38ffd7076837700d395522a61" @@ -890,12 +1089,17 @@ ansi-escapes@^4.2.1: dependencies: type-fest "^0.11.0" +ansi-regex@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997" + integrity sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg== + ansi-regex@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz#388539f55179bf39339c81af30a654d69f87cb75" integrity sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg== -ansi-styles@^3.2.1: +ansi-styles@^3.2.0, ansi-styles@^3.2.1: version "3.2.1" resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d" integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA== @@ -968,6 +1172,15 @@ array-flatten@1.1.1: resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2" integrity sha1-ml9pkFGx5wczKPKgCJaLZOopVdI= +array-includes@^3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.1.tgz#cdd67e6852bdf9c1215460786732255ed2459348" + integrity sha512-c2VXaCHl7zPsvpkFsw4nxvFie4fh1ur9bpcgsVkIjqn0H/Xwdg+7fv3n2r/isyS8EBj5b06M9kHyZuIr4El6WQ== + dependencies: + define-properties "^1.1.3" + es-abstract "^1.17.0" + is-string "^1.0.5" + array-union@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/array-union/-/array-union-1.0.2.tgz#9a34410e4f4e3da23dea375be5be70f24778ec39" @@ -975,6 +1188,11 @@ array-union@^1.0.2: dependencies: array-uniq "^1.0.1" +array-union@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d" + integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw== + array-uniq@^1.0.1: version "1.0.3" resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6" @@ -985,6 +1203,14 @@ array-unique@^0.3.2: resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428" integrity sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg= +array.prototype.flat@^1.2.3: + version "1.2.3" + resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.2.3.tgz#0de82b426b0318dbfdb940089e38b043d37f6c7b" + integrity sha512-gBlRZV0VSmfPIeWfuuy56XZMvbVfbEUnOXUvt3F/eUUUSyzlgLxhEX4YAEpxNAogRGehPSnfXyPtYyKAhkzQhQ== + dependencies: + define-properties "^1.1.3" + es-abstract "^1.17.0-next.1" + arraybuffer.slice@~0.0.7: version "0.0.7" resolved "https://registry.yarnpkg.com/arraybuffer.slice/-/arraybuffer.slice-0.0.7.tgz#3bbc4275dd584cc1b10809b89d4e8b63a69e7675" @@ -1012,11 +1238,21 @@ ast-types@0.x.x: resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.13.3.tgz#50da3f28d17bdbc7969a3a2d83a0e4a72ae755a7" integrity sha512-XTZ7xGML849LkQP86sWdQzfhwbt3YwIO6MqbX9mUNYY98VKaaVZP7YNNm70IpwecbkkxmfC5IYAzOQ/2p29zRA== +astral-regex@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-1.0.0.tgz#6c8c3fb827dd43ee3918f27b82782ab7658a6fd9" + integrity sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg== + async-limiter@~1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.1.tgz#dd379e94f0db8310b08291f9d64c3209766617fd" integrity sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ== +async@^3.1.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/async/-/async-3.2.0.tgz#b3a2685c5ebb641d3de02d161002c60fc9f85720" + integrity sha512-TR2mEZFVOj2pLStYxLht7TyfuRzaydfpxr3k9RpHIzMgw7A64dzsdqCxH1WJyQdoe8T10nDXd9wnEigmiuHIZw== + asynckit@^0.4.0: version "0.4.0" resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" @@ -1049,16 +1285,16 @@ aws4@^1.8.0: resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.10.0.tgz#a17b3a8ea811060e74d47d306122400ad4497ae2" integrity sha512-3YDiu347mtVtjpyV3u5kVqQLP242c06zwDOgpeRnybmXlYYsLbtTrUBUm8i8srONt+FWobl5aibnU1030PeeuA== -babel-jest@^26.1.0: - version "26.1.0" - resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-26.1.0.tgz#b20751185fc7569a0f135730584044d1cb934328" - integrity sha512-Nkqgtfe7j6PxLO6TnCQQlkMm8wdTdnIF8xrdpooHCuD5hXRzVEPbPneTJKknH5Dsv3L8ip9unHDAp48YQ54Dkg== +babel-jest@^26.6.3: + version "26.6.3" + resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-26.6.3.tgz#d87d25cb0037577a0c89f82e5755c5d293c01056" + integrity sha512-pl4Q+GAVOHwvjrck6jKjvmGhnO3jHX/xuB9d27f+EJZ/6k+6nMuPjorrYp7s++bKKdANwzElBWnLWaObvTnaZA== dependencies: - "@jest/transform" "^26.1.0" - "@jest/types" "^26.1.0" + "@jest/transform" "^26.6.2" + "@jest/types" "^26.6.2" "@types/babel__core" "^7.1.7" babel-plugin-istanbul "^6.0.0" - babel-preset-jest "^26.1.0" + babel-preset-jest "^26.6.2" chalk "^4.0.0" graceful-fs "^4.2.4" slash "^3.0.0" @@ -1074,20 +1310,20 @@ babel-plugin-istanbul@^6.0.0: istanbul-lib-instrument "^4.0.0" test-exclude "^6.0.0" -babel-plugin-jest-hoist@^26.1.0: - version "26.1.0" - resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-26.1.0.tgz#c6a774da08247a28285620a64dfadbd05dd5233a" - integrity sha512-qhqLVkkSlqmC83bdMhM8WW4Z9tB+JkjqAqlbbohS9sJLT5Ha2vfzuKqg5yenXrAjOPG2YC0WiXdH3a9PvB+YYw== +babel-plugin-jest-hoist@^26.6.2: + version "26.6.2" + resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-26.6.2.tgz#8185bd030348d254c6d7dd974355e6a28b21e62d" + integrity sha512-PO9t0697lNTmcEHH69mdtYiOIkkOlj9fySqfO3K1eCcdISevLAE0xY59VLLUj0SoiPiTX/JU2CYFpILydUa5Lw== dependencies: "@babel/template" "^7.3.3" "@babel/types" "^7.3.3" "@types/babel__core" "^7.0.0" "@types/babel__traverse" "^7.0.6" -babel-preset-current-node-syntax@^0.1.2: - version "0.1.3" - resolved "https://registry.yarnpkg.com/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-0.1.3.tgz#b4b547acddbf963cba555ba9f9cbbb70bfd044da" - integrity sha512-uyexu1sVwcdFnyq9o8UQYsXwXflIh8LvrF5+cKrYam93ned1CStffB3+BEcsxGSgagoA3GEyjDqO4a/58hyPYQ== +babel-preset-current-node-syntax@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.0.tgz#cf5feef29551253471cfa82fc8e0f5063df07a77" + integrity sha512-mGkvkpocWJes1CmMKtgGUwCeeq0pOhALyymozzDWYomHTbDLwueDYG6p4TK1YOeYHCzBzYPsWkgTto10JubI1Q== dependencies: "@babel/plugin-syntax-async-generators" "^7.8.4" "@babel/plugin-syntax-bigint" "^7.8.3" @@ -1100,14 +1336,15 @@ babel-preset-current-node-syntax@^0.1.2: "@babel/plugin-syntax-object-rest-spread" "^7.8.3" "@babel/plugin-syntax-optional-catch-binding" "^7.8.3" "@babel/plugin-syntax-optional-chaining" "^7.8.3" + "@babel/plugin-syntax-top-level-await" "^7.8.3" -babel-preset-jest@^26.1.0: - version "26.1.0" - resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-26.1.0.tgz#612f714e5b457394acfd863793c564cbcdb7d1c1" - integrity sha512-na9qCqFksknlEj5iSdw1ehMVR06LCCTkZLGKeEtxDDdhg8xpUF09m29Kvh1pRbZ07h7AQ5ttLYUwpXL4tO6w7w== +babel-preset-jest@^26.6.2: + version "26.6.2" + resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-26.6.2.tgz#747872b1171df032252426586881d62d31798fee" + integrity sha512-YvdtlVm9t3k777c5NPQIv6cxFFFapys25HiUmuSgHwIZhfifweR5c5Sf5nwE3MAbfu327CYSvps8Yx6ANLyleQ== dependencies: - babel-plugin-jest-hoist "^26.1.0" - babel-preset-current-node-syntax "^0.1.2" + babel-plugin-jest-hoist "^26.6.2" + babel-preset-current-node-syntax "^1.0.0" backo2@1.0.2: version "1.0.2" @@ -1142,6 +1379,13 @@ base@^0.11.1: mixin-deep "^1.2.0" pascalcase "^0.1.1" +basic-auth@~2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/basic-auth/-/basic-auth-2.0.1.tgz#b998279bf47ce38344b4f3cf916d4679bbf51e3a" + integrity sha512-NF+epuEdnUYVlGuhaxbbq+dvJttwLnGY+YixlXlME5KpQ5W3CnXA5cVTneY3SPbPDRkcjMbifrwmFYcClgOZeg== + dependencies: + safe-buffer "5.1.2" + bcrypt-pbkdf@^1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz#a4301d389b6a43f9b67ff3ca11a3f6637e360e9e" @@ -1161,7 +1405,7 @@ binary-extensions@^2.0.0: resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.1.0.tgz#30fa40c9e7fe07dbc895678cd287024dea241dd9" integrity sha512-1Yj8h9Q+QDF5FzhMs/c9+6UntbD5MkRfRwac8DoEm9ZfUBZ7tZ55YcGVAzEe4bXsdQHEk+s9S5wsOKVdZrw0tQ== -bl@^2.2.0: +bl@^2.2.1: version "2.2.1" resolved "https://registry.yarnpkg.com/bl/-/bl-2.2.1.tgz#8c11a7b730655c5d56898cdc871224f40fd901d5" integrity sha512-6Pesp1w0DEX1N550i/uGV/TqucVL4AM/pgThFSN/Qq9si1/DF9aIHs1BxD8V/QU0HoeHO6cQRTAuYnLPKq1e4g== @@ -1245,7 +1489,7 @@ bser@2.1.1: dependencies: node-int64 "^0.4.0" -bson@^1.1.1, bson@^1.1.4, bson@~1.1.1: +bson@^1.1.4: version "1.1.4" resolved "https://registry.yarnpkg.com/bson/-/bson-1.1.4.tgz#f76870d799f15b854dffb7ee32f0a874797f7e89" integrity sha512-S/yKGU1syOMzO86+dGpg2qGoDL0zvzcb262G+gqEy6TgP6rt6z6qxSFX/8X6vLC91P7G7C3nLs0+bvDzmvBA3Q== @@ -1260,11 +1504,6 @@ buffer-from@1.x, buffer-from@^1.0.0: resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef" integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A== -builtin-modules@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f" - integrity sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8= - busboy@^0.2.11: version "0.2.14" resolved "https://registry.yarnpkg.com/busboy/-/busboy-0.2.14.tgz#6c2a622efcf47c57bbbe1e2a9c37ad36c7925453" @@ -1302,6 +1541,14 @@ cache-base@^1.0.1: union-value "^1.0.0" unset-value "^1.0.0" +call-bind@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.0.tgz#24127054bb3f9bdcb4b1fb82418186072f77b8ce" + integrity sha512-AEXsYIyyDY3MCzbwdhzG3Jx1R0J2wetQyUynn6dYHAO+bg8l1k7jwZtRv4ryryFs7EP+NDlikJlVe59jr0cM2w== + dependencies: + function-bind "^1.1.1" + get-intrinsic "^1.0.0" + call-me-maybe@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/call-me-maybe/-/call-me-maybe-1.0.1.tgz#26d208ea89e37b5cbde60250a15f031c16a4d66b" @@ -1339,7 +1586,7 @@ caseless@~0.12.0: resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc" integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw= -chalk@^2.0.0, chalk@^2.3.0, chalk@^2.4.1: +chalk@^2.0.0, chalk@^2.4.1: version "2.4.2" resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ== @@ -1348,14 +1595,6 @@ chalk@^2.0.0, chalk@^2.3.0, chalk@^2.4.1: escape-string-regexp "^1.0.5" supports-color "^5.3.0" -chalk@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-3.0.0.tgz#3f73c2bf526591f574cc492c51e2456349f844e4" - integrity sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg== - dependencies: - ansi-styles "^4.1.0" - supports-color "^7.1.0" - chalk@^4.0.0: version "4.1.0" resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.0.tgz#4e14870a618d9e2edd97dd8345fd9d9dc315646a" @@ -1394,6 +1633,11 @@ circular-json-for-egg@^1.0.0: resolved "https://registry.yarnpkg.com/circular-json-for-egg/-/circular-json-for-egg-1.0.0.tgz#eacb71b57af28b4822cabc52a5961cd2f0817fc5" integrity sha512-BzMR1dg0+YqcFoMETHq0gFeQNNKliXI1Oe+C0nx/4npLaohsR7/Oj3UFht65MLwF7zs6x13gOr+f4+JeYni6vw== +cjs-module-lexer@^0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/cjs-module-lexer/-/cjs-module-lexer-0.6.0.tgz#4186fcca0eae175970aee870b9fe2d6cf8d5655f" + integrity sha512-uc2Vix1frTfnuzxxu1Hp4ktSvM3QaI4oXl4ZUqL1wjTu/BGki9TrCWoqLTg/drR1KwAEarXuRFCG2Svr1GxPFw== + class-utils@^0.3.5: version "0.3.6" resolved "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.6.tgz#f93369ae8b9a7ce02fd41faad0ca83033190c463" @@ -1431,6 +1675,11 @@ cluster-client@^2.1.1: tcp-base "^3.1.0" utility "^1.15.0" +cluster-key-slot@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/cluster-key-slot/-/cluster-key-slot-1.1.0.tgz#30474b2a981fb12172695833052bc0d01336d10d" + integrity sha512-2Nii8p3RwAPiFwsnZvukotvow2rIHM+yQ6ZcBXGHdniadkYGZYiGmkHJIbZPIV9nfv7m/U1IPMVVcAhoWFeklw== + co-gather@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/co-gather/-/co-gather-1.0.1.tgz#71631d11122ac293819d083818d4ae7f3a39da4b" @@ -1456,7 +1705,7 @@ collection-visit@^1.0.0: map-visit "^1.0.0" object-visit "^1.0.0" -color-convert@^1.9.0: +color-convert@^1.9.0, color-convert@^1.9.1: version "1.9.3" resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8" integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg== @@ -1475,16 +1724,40 @@ color-name@1.1.3: resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25" integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU= -color-name@~1.1.4: +color-name@^1.0.0, color-name@~1.1.4: version "1.1.4" resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== -colors@^1.3.3: +color-string@^1.5.2: + version "1.5.4" + resolved "https://registry.yarnpkg.com/color-string/-/color-string-1.5.4.tgz#dd51cd25cfee953d138fe4002372cc3d0e504cb6" + integrity sha512-57yF5yt8Xa3czSEW1jfQDE79Idk0+AkN/4KWad6tbdxUmAs3MvjxlWSWD4deYytcRfoZ9nhKyFl1kj5tBvidbw== + dependencies: + color-name "^1.0.0" + simple-swizzle "^0.2.2" + +color@3.0.x: + version "3.0.0" + resolved "https://registry.yarnpkg.com/color/-/color-3.0.0.tgz#d920b4328d534a3ac8295d68f7bd4ba6c427be9a" + integrity sha512-jCpd5+s0s0t7p3pHQKpnJ0TpQKKdleP71LWcA0aqiljpiuAkOSUFN/dyH8ZwF0hRmFlrIuRhufds1QyEP9EB+w== + dependencies: + color-convert "^1.9.1" + color-string "^1.5.2" + +colors@^1.2.1, colors@^1.3.3: version "1.4.0" resolved "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78" integrity sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA== +colorspace@1.1.x: + version "1.1.2" + resolved "https://registry.yarnpkg.com/colorspace/-/colorspace-1.1.2.tgz#e0128950d082b86a2168580796a0aa5d6c68d8c5" + integrity sha512-vt+OoIP2d76xLhjwbBaucYlNSpPsrJWPlBTtwCpQKIu6/CSMutyzX93O/Do0qzpH3YoHEes8YEFXyZ797rEhzQ== + dependencies: + color "3.0.x" + text-hex "1.0.x" + combined-stream@^1.0.6, combined-stream@^1.0.8, combined-stream@~1.0.6: version "1.0.8" resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f" @@ -1492,7 +1765,7 @@ combined-stream@^1.0.6, combined-stream@^1.0.8, combined-stream@~1.0.6: dependencies: delayed-stream "~1.0.0" -commander@^2.12.1, commander@^2.19.0: +commander@^2.19.0: version "2.20.3" resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== @@ -1507,7 +1780,7 @@ component-emitter@1.2.1: resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.2.1.tgz#137918d6d78283f7df7a6b7c5a63e140e69425e6" integrity sha1-E3kY1teCg/ffemt8WmPhQOaUJeY= -component-emitter@^1.2.0, component-emitter@^1.2.1, component-emitter@~1.3.0: +component-emitter@^1.2.1, component-emitter@^1.3.0, component-emitter@~1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0" integrity sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg== @@ -1532,6 +1805,11 @@ concat-stream@^1.5.2: readable-stream "^2.2.2" typedarray "^0.0.6" +contains-path@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/contains-path/-/contains-path-0.1.0.tgz#fe8cf184ff6670b6baef01a9d4861a5cbec4120a" + integrity sha1-/ozxhP9mcLa67wGp1IYaXL7EEgo= + content-disposition@0.5.3: version "0.5.3" resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.3.tgz#e130caf7e7279087c5616c2007d0485698984fbd" @@ -1566,7 +1844,7 @@ cookie@0.4.0: resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.0.tgz#beb437e7022b3b6d49019d088665303ebe9c14ba" integrity sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg== -cookiejar@^2.1.0: +cookiejar@^2.1.2: version "2.1.2" resolved "https://registry.yarnpkg.com/cookiejar/-/cookiejar-2.1.2.tgz#dd8a235530752f988f9a0844f3fc589e3111125c" integrity sha512-Mw+adcfzPxcPeI+0WlvRrr/3lGVO0bD75SxX6811cxSh1Wbxx7xZBGK1eVtDf6si8rg2lhnUjsVLMFMfbRIuwA== @@ -1604,7 +1882,7 @@ cross-spawn@^6.0.0: shebang-command "^1.2.0" which "^1.2.9" -cross-spawn@^7.0.0: +cross-spawn@^7.0.0, cross-spawn@^7.0.2: version "7.0.3" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6" integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w== @@ -1679,6 +1957,13 @@ debug@^3.1.0, debug@^3.2.6: dependencies: ms "^2.1.1" +debug@^4.0.1: + version "4.2.0" + resolved "https://registry.yarnpkg.com/debug/-/debug-4.2.0.tgz#7f150f93920e94c58f5574c2fd01a3110effe7f1" + integrity sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg== + dependencies: + ms "2.1.2" + decamelize@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290" @@ -1694,7 +1979,7 @@ decode-uri-component@^0.2.0: resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545" integrity sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU= -deep-is@~0.1.3: +deep-is@^0.1.3, deep-is@~0.1.3: version "0.1.3" resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34" integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ= @@ -1711,6 +1996,13 @@ default-user-agent@^1.0.0: dependencies: os-name "~1.0.3" +define-properties@^1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1" + integrity sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ== + dependencies: + object-keys "^1.0.12" + define-property@^0.2.5: version "0.2.5" resolved "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz#c35b1ef918ec3c990f9a5bc57be04aacec5c8116" @@ -1747,12 +2039,12 @@ delayed-stream@~1.0.0: resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619" integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk= -denque@^1.4.1: +denque@^1.1.0, denque@^1.4.1: version "1.4.1" resolved "https://registry.yarnpkg.com/denque/-/denque-1.4.1.tgz#6744ff7641c148c3f8a69c307e51235c1f4a37cf" integrity sha512-OfzPuSZKGcgr96rf1oODnfjqBFmr1DVoc/TrItj3Ohe0Ah1C5WX5Baquw/9U9KovnQ88EqmJbD66rKYUQYN1tQ== -depd@^2.0.0: +depd@^2.0.0, depd@~2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/depd/-/depd-2.0.0.tgz#b696163cc757560d09cf22cc8fad1571b79e76df" integrity sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw== @@ -1780,15 +2072,10 @@ dicer@0.2.5: readable-stream "1.1.x" streamsearch "0.1.2" -diff-sequences@^25.2.6: - version "25.2.6" - resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-25.2.6.tgz#5f467c00edd35352b7bca46d7927d60e687a76dd" - integrity sha512-Hq8o7+6GaZeoFjtpgvRBUknSXNeJiCx7V9Fr94ZMljNiCr9n9L8H8aJqgWOQiDDGdyn29fRNcDdRVJ5fdyihfg== - -diff-sequences@^26.0.0: - version "26.0.0" - resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-26.0.0.tgz#0760059a5c287637b842bd7085311db7060e88a6" - integrity sha512-JC/eHYEC3aSS0vZGjuoc4vHA0yAQTzhQQldXMeMF+JlxLGJlCO38Gma82NV9gk1jGFz8mDzUMeaKXvjRRdJ2dg== +diff-sequences@^26.6.2: + version "26.6.2" + resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-26.6.2.tgz#48ba99157de1923412eed41db6b6d4aa9ca7c0b1" + integrity sha512-Mv/TDa3nZ9sbc5soK+OoA74BsS3mL37yixCvUAQkiuA4Wz6YtwP/K47n2rv2ovzHZvoiQeA5FTQOschKkEwB0Q== diff@^4.0.1: version "4.0.2" @@ -1809,6 +2096,28 @@ dir-glob@^2.2.2: dependencies: path-type "^3.0.0" +dir-glob@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz#56dbf73d992a4a93ba1584f4534063fd2e41717f" + integrity sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA== + dependencies: + path-type "^4.0.0" + +doctrine@1.5.0: + version "1.5.0" + resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-1.5.0.tgz#379dce730f6166f76cefa4e6707a159b02c5a6fa" + integrity sha1-N53Ocw9hZvds76TmcHoVmwLFpvo= + dependencies: + esutils "^2.0.2" + isarray "^1.0.0" + +doctrine@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-3.0.0.tgz#addebead72a6574db783639dc87a121773973961" + integrity sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w== + dependencies: + esutils "^2.0.2" + domexception@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/domexception/-/domexception-2.0.1.tgz#fb44aefba793e1574b0af6aed2801d057529f304" @@ -1849,11 +2158,26 @@ egg-logger@^2.0.3: mkdirp "^0.5.1" utility "^1.15.0" +emittery@^0.7.1: + version "0.7.2" + resolved "https://registry.yarnpkg.com/emittery/-/emittery-0.7.2.tgz#25595908e13af0f5674ab419396e2fb394cdfa82" + integrity sha512-A8OG5SR/ij3SsJdWDJdkkSYUjQdCUx6APQXem0SaEePBSRg4eymGYwBkKo1Y6DU+af/Jn2dBQqDBvjnr9Vi8nQ== + +emoji-regex@^7.0.1: + version "7.0.3" + resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156" + integrity sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA== + emoji-regex@^8.0.0: version "8.0.0" resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37" integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A== +enabled@2.0.x: + version "2.0.0" + resolved "https://registry.yarnpkg.com/enabled/-/enabled-2.0.0.tgz#f9dd92ec2d6f4bbc0d5d1e64e21d61cd4665e7c2" + integrity sha512-AKrN98kuwOzMIdAizXGI86UFBoo26CL21UM763y1h/GMSJ4/OHU9k2YlsmBpyScFo/wbLzWQJBMCW4+IO3/+OQ== + encodeurl@~1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59" @@ -1906,13 +2230,64 @@ engine.io@~3.4.0: engine.io-parser "~2.2.0" ws "^7.1.2" -error-ex@^1.3.1: +enquirer@^2.3.5: + version "2.3.6" + resolved "https://registry.yarnpkg.com/enquirer/-/enquirer-2.3.6.tgz#2a7fe5dd634a1e4125a975ec994ff5456dc3734d" + integrity sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg== + dependencies: + ansi-colors "^4.1.1" + +error-ex@^1.2.0, error-ex@^1.3.1: version "1.3.2" resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf" integrity sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g== dependencies: is-arrayish "^0.2.1" +es-abstract@^1.17.0, es-abstract@^1.17.0-next.1: + version "1.17.7" + resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.7.tgz#a4de61b2f66989fc7421676c1cb9787573ace54c" + integrity sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g== + dependencies: + es-to-primitive "^1.2.1" + function-bind "^1.1.1" + has "^1.0.3" + has-symbols "^1.0.1" + is-callable "^1.2.2" + is-regex "^1.1.1" + object-inspect "^1.8.0" + object-keys "^1.1.1" + object.assign "^4.1.1" + string.prototype.trimend "^1.0.1" + string.prototype.trimstart "^1.0.1" + +es-abstract@^1.18.0-next.1: + version "1.18.0-next.1" + resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.18.0-next.1.tgz#6e3a0a4bda717e5023ab3b8e90bec36108d22c68" + integrity sha512-I4UGspA0wpZXWENrdA0uHbnhte683t3qT/1VFH9aX2dA5PPSf6QW5HHXf5HImaqPmjXaVeVk4RGWnaylmV7uAA== + dependencies: + es-to-primitive "^1.2.1" + function-bind "^1.1.1" + has "^1.0.3" + has-symbols "^1.0.1" + is-callable "^1.2.2" + is-negative-zero "^2.0.0" + is-regex "^1.1.1" + object-inspect "^1.8.0" + object-keys "^1.1.1" + object.assign "^4.1.1" + string.prototype.trimend "^1.0.1" + string.prototype.trimstart "^1.0.1" + +es-to-primitive@^1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz#e55cd4c9cdc188bcefb03b366c736323fc5c898a" + integrity sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA== + dependencies: + is-callable "^1.1.4" + is-date-object "^1.0.1" + is-symbol "^1.0.2" + es6-promise@^4.0.3: version "4.2.8" resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.8.tgz#4eb21594c972bc40553d276e510539143db53e0a" @@ -1952,6 +2327,129 @@ escodegen@1.x.x, escodegen@^1.14.1: optionalDependencies: source-map "~0.6.1" +eslint-import-resolver-node@^0.3.4: + version "0.3.4" + resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.4.tgz#85ffa81942c25012d8231096ddf679c03042c717" + integrity sha512-ogtf+5AB/O+nM6DIeBUNr2fuT7ot9Qg/1harBfBtaP13ekEWFQEEMP94BCB7zaNW3gyY+8SHYF00rnqYwXKWOA== + dependencies: + debug "^2.6.9" + resolve "^1.13.1" + +eslint-import-resolver-typescript@^2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/eslint-import-resolver-typescript/-/eslint-import-resolver-typescript-2.3.0.tgz#0870988098bc6c6419c87705e6b42bee89425445" + integrity sha512-MHSXvmj5e0SGOOBhBbt7C+fWj1bJbtSYFAD85Xeg8nvUtuooTod2HQb8bfhE9f5QyyNxEfgzqOYFCvmdDIcCuw== + dependencies: + debug "^4.1.1" + glob "^7.1.6" + is-glob "^4.0.1" + resolve "^1.17.0" + tsconfig-paths "^3.9.0" + +eslint-module-utils@^2.6.0: + version "2.6.0" + resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.6.0.tgz#579ebd094f56af7797d19c9866c9c9486629bfa6" + integrity sha512-6j9xxegbqe8/kZY8cYpcp0xhbK0EgJlg3g9mib3/miLaExuuwc3n5UEfSnU6hWMbT0FAYVvDbL9RrRgpUeQIvA== + dependencies: + debug "^2.6.9" + pkg-dir "^2.0.0" + +eslint-plugin-import@^2.22.1: + version "2.22.1" + resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.22.1.tgz#0896c7e6a0cf44109a2d97b95903c2bb689d7702" + integrity sha512-8K7JjINHOpH64ozkAhpT3sd+FswIZTfMZTjdx052pnWrgRCVfp8op9tbjpAk3DdUeI/Ba4C8OjdC0r90erHEOw== + dependencies: + array-includes "^3.1.1" + array.prototype.flat "^1.2.3" + contains-path "^0.1.0" + debug "^2.6.9" + doctrine "1.5.0" + eslint-import-resolver-node "^0.3.4" + eslint-module-utils "^2.6.0" + has "^1.0.3" + minimatch "^3.0.4" + object.values "^1.1.1" + read-pkg-up "^2.0.0" + resolve "^1.17.0" + tsconfig-paths "^3.9.0" + +eslint-scope@^5.0.0, eslint-scope@^5.1.1: + version "5.1.1" + resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c" + integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw== + dependencies: + esrecurse "^4.3.0" + estraverse "^4.1.1" + +eslint-utils@^2.0.0, eslint-utils@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-2.1.0.tgz#d2de5e03424e707dc10c74068ddedae708741b27" + integrity sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg== + dependencies: + eslint-visitor-keys "^1.1.0" + +eslint-visitor-keys@^1.1.0, eslint-visitor-keys@^1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz#30ebd1ef7c2fdff01c3a4f151044af25fab0523e" + integrity sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ== + +eslint-visitor-keys@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz#21fdc8fbcd9c795cc0321f0563702095751511a8" + integrity sha512-QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ== + +eslint@^7.13.0: + version "7.13.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.13.0.tgz#7f180126c0dcdef327bfb54b211d7802decc08da" + integrity sha512-uCORMuOO8tUzJmsdRtrvcGq5qposf7Rw0LwkTJkoDbOycVQtQjmnhZSuLQnozLE4TmAzlMVV45eCHmQ1OpDKUQ== + dependencies: + "@babel/code-frame" "^7.0.0" + "@eslint/eslintrc" "^0.2.1" + ajv "^6.10.0" + chalk "^4.0.0" + cross-spawn "^7.0.2" + debug "^4.0.1" + doctrine "^3.0.0" + enquirer "^2.3.5" + eslint-scope "^5.1.1" + eslint-utils "^2.1.0" + eslint-visitor-keys "^2.0.0" + espree "^7.3.0" + esquery "^1.2.0" + esutils "^2.0.2" + file-entry-cache "^5.0.1" + functional-red-black-tree "^1.0.1" + glob-parent "^5.0.0" + globals "^12.1.0" + ignore "^4.0.6" + import-fresh "^3.0.0" + imurmurhash "^0.1.4" + is-glob "^4.0.0" + js-yaml "^3.13.1" + json-stable-stringify-without-jsonify "^1.0.1" + levn "^0.4.1" + lodash "^4.17.19" + minimatch "^3.0.4" + natural-compare "^1.4.0" + optionator "^0.9.1" + progress "^2.0.0" + regexpp "^3.1.0" + semver "^7.2.1" + strip-ansi "^6.0.0" + strip-json-comments "^3.1.0" + table "^5.2.3" + text-table "^0.2.0" + v8-compile-cache "^2.0.3" + +espree@^7.3.0: + version "7.3.0" + resolved "https://registry.yarnpkg.com/espree/-/espree-7.3.0.tgz#dc30437cf67947cf576121ebd780f15eeac72348" + integrity sha512-dksIWsvKCixn1yrEXO8UosNSxaDoSYpq9reEjZSbHLpT5hpaCAKTLBwq0RHtLrIr+c0ByiYzWT8KTMRzoRCNlw== + dependencies: + acorn "^7.4.0" + acorn-jsx "^5.2.0" + eslint-visitor-keys "^1.3.0" + esprima@3.x.x: version "3.1.3" resolved "https://registry.yarnpkg.com/esprima/-/esprima-3.1.3.tgz#fdca51cee6133895e3c88d535ce49dbff62a4633" @@ -1962,11 +2460,30 @@ esprima@^4.0.0, esprima@^4.0.1: resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71" integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A== -estraverse@^4.2.0: +esquery@^1.2.0: + version "1.3.1" + resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.3.1.tgz#b78b5828aa8e214e29fb74c4d5b752e1c033da57" + integrity sha512-olpvt9QG0vniUBZspVRN6lwB7hOZoTRtT+jzR+tS4ffYx2mzbw+z0XCOk44aaLYKApNX5nMm+E+P6o25ip/DHQ== + dependencies: + estraverse "^5.1.0" + +esrecurse@^4.3.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz#7ad7964d679abb28bee72cec63758b1c5d2c9921" + integrity sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag== + dependencies: + estraverse "^5.2.0" + +estraverse@^4.1.1, estraverse@^4.2.0: version "4.3.0" resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d" integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw== +estraverse@^5.1.0, estraverse@^5.2.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.2.0.tgz#307df42547e6cc7324d3cf03c155d5cdb8c53880" + integrity sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ== + esutils@^2.0.2: version "2.0.3" resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64" @@ -2028,24 +2545,24 @@ expand-brackets@^2.1.4: snapdragon "^0.8.1" to-regex "^3.0.1" -expect@^26.1.0: - version "26.1.0" - resolved "https://registry.yarnpkg.com/expect/-/expect-26.1.0.tgz#8c62e31d0f8d5a8ebb186ee81473d15dd2fbf7c8" - integrity sha512-QbH4LZXDsno9AACrN9eM0zfnby9G+OsdNgZUohjg/P0mLy1O+/bzTAJGT6VSIjVCe8yKM6SzEl/ckEOFBT7Vnw== +expect@^26.6.2: + version "26.6.2" + resolved "https://registry.yarnpkg.com/expect/-/expect-26.6.2.tgz#c6b996bf26bf3fe18b67b2d0f51fc981ba934417" + integrity sha512-9/hlOBkQl2l/PLHJx6JjoDF6xPKcJEsUlWKb23rKE7KzeDqUZKXKNMW27KIue5JMdBV9HgmoJPcc8HtO85t9IA== dependencies: - "@jest/types" "^26.1.0" + "@jest/types" "^26.6.2" ansi-styles "^4.0.0" - jest-get-type "^26.0.0" - jest-matcher-utils "^26.1.0" - jest-message-util "^26.1.0" + jest-get-type "^26.3.0" + jest-matcher-utils "^26.6.2" + jest-message-util "^26.6.2" jest-regex-util "^26.0.0" -express-validator@^6.6.0: - version "6.6.0" - resolved "https://registry.yarnpkg.com/express-validator/-/express-validator-6.6.0.tgz#46b8327926e9b1752f9823ee0631e534b6ac41e8" - integrity sha512-xcephfzFbUssJph/nOSKIdx+I+8GRz5by/8rOIKL6gJikKKKJjnwYH5TG1nIDB6kEalUtZMbOFuSNOp/HHY84Q== +express-validator@^6.6.1: + version "6.6.1" + resolved "https://registry.yarnpkg.com/express-validator/-/express-validator-6.6.1.tgz#c53046f615d27fcb78be786e018dcd60bd9c6c5c" + integrity sha512-+MrZKJ3eGYXkNF9p9Zf7MS7NkPJFg9MDYATU5c80Cf4F62JdLBIjWxy6481tRC0y1NnC9cgOw8FuN364bWaGhA== dependencies: - lodash "^4.17.15" + lodash "^4.17.19" validator "^13.1.1" express@^4.17.1: @@ -2099,7 +2616,7 @@ extend-shallow@^3.0.0, extend-shallow@^3.0.2: assign-symbols "^1.0.0" is-extendable "^1.0.1" -extend@^3.0.0, extend@~3.0.2: +extend@~3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa" integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g== @@ -2145,16 +2662,40 @@ fast-glob@^2.2.6: merge2 "^1.2.3" micromatch "^3.1.10" +fast-glob@^3.1.1: + version "3.2.4" + resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.4.tgz#d20aefbf99579383e7f3cc66529158c9b98554d3" + integrity sha512-kr/Oo6PX51265qeuCYsyGypiO5uJFgBS0jksyG7FUeCyQzNwYnzrNIMR1NXfkZXsMYXYLRAHgISHBz8gQcxKHQ== + dependencies: + "@nodelib/fs.stat" "^2.0.2" + "@nodelib/fs.walk" "^1.2.3" + glob-parent "^5.1.0" + merge2 "^1.3.0" + micromatch "^4.0.2" + picomatch "^2.2.1" + fast-json-stable-stringify@2.x, fast-json-stable-stringify@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633" integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw== -fast-levenshtein@~2.0.6: +fast-levenshtein@^2.0.6, fast-levenshtein@~2.0.6: version "2.0.6" resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917" integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc= +fast-safe-stringify@^2.0.4, fast-safe-stringify@^2.0.7: + version "2.0.7" + resolved "https://registry.yarnpkg.com/fast-safe-stringify/-/fast-safe-stringify-2.0.7.tgz#124aa885899261f68aedb42a7c080de9da608743" + integrity sha512-Utm6CdzT+6xsDk2m8S6uL8VHxNwI6Jub+e9NYTcAms28T84pTa25GJQV9j0CY0N1rM8hK4x6grpF2BQf+2qwVA== + +fastq@^1.6.0: + version "1.9.0" + resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.9.0.tgz#e16a72f338eaca48e91b5c23593bcc2ef66b7947" + integrity sha512-i7FVWL8HhVY+CTkwFxkN2mk3h+787ixS5S63eb78diVRc1MCssarHq3W5cj0av7YDSwmaV928RNag+U1etRQ7w== + dependencies: + reusify "^1.0.4" + fb-watchman@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/fb-watchman/-/fb-watchman-2.0.1.tgz#fc84fb39d2709cf3ff6d743706157bb5708a8a85" @@ -2162,6 +2703,18 @@ fb-watchman@^2.0.0: dependencies: bser "2.1.1" +fecha@^4.2.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/fecha/-/fecha-4.2.0.tgz#3ffb6395453e3f3efff850404f0a59b6747f5f41" + integrity sha512-aN3pcx/DSmtyoovUudctc8+6Hl4T+hI9GBBHLjA76jdZl7+b1sgh5g4k+u/GL3dTy1/pnYzKp69FpJ0OicE3Wg== + +file-entry-cache@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-5.0.1.tgz#ca0f6efa6dd3d561333fb14515065c2fafdf439c" + integrity sha512-bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g== + dependencies: + flat-cache "^2.0.1" + file-uri-to-path@1: version "1.0.0" resolved "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz#553a7b8446ff6f684359c445f1e37a05dacc33dd" @@ -2197,6 +2750,13 @@ finalhandler@~1.1.2: statuses "~1.5.0" unpipe "~1.0.0" +find-up@^2.0.0, find-up@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7" + integrity sha1-RdG35QbHF93UgndaK3eSCjwMV6c= + dependencies: + locate-path "^2.0.0" + find-up@^4.0.0, find-up@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19" @@ -2205,6 +2765,25 @@ find-up@^4.0.0, find-up@^4.1.0: locate-path "^5.0.0" path-exists "^4.0.0" +flat-cache@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-2.0.1.tgz#5d296d6f04bda44a4630a301413bdbc2ec085ec0" + integrity sha512-LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA== + dependencies: + flatted "^2.0.0" + rimraf "2.6.3" + write "1.0.3" + +flatted@^2.0.0: + version "2.0.2" + resolved "https://registry.yarnpkg.com/flatted/-/flatted-2.0.2.tgz#4575b21e2bcee7434aa9be662f4b7b5f9c2b5138" + integrity sha512-r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA== + +fn.name@1.x.x: + version "1.1.0" + resolved "https://registry.yarnpkg.com/fn.name/-/fn.name-1.1.0.tgz#26cad8017967aea8731bc42961d04a3d5988accc" + integrity sha512-GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw== + for-in@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80" @@ -2215,15 +2794,6 @@ forever-agent@~0.6.1: resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91" integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE= -form-data@^2.3.1: - version "2.5.1" - resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.5.1.tgz#f2cbec57b5e59e23716e128fe44d4e5dd23895f4" - integrity sha512-m21N3WOmEEURgk6B9GLOE4RuWOFf28Lhh9qGYeNlGq4VDXUlJy2th2slBNU8Gp8EzloYZOibZJ7t5ecIrFSjVA== - dependencies: - asynckit "^0.4.0" - combined-stream "^1.0.6" - mime-types "^2.1.12" - form-data@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/form-data/-/form-data-3.0.0.tgz#31b7e39c85f1355b7139ee0c647cf0de7f83c682" @@ -2242,7 +2812,7 @@ form-data@~2.3.2: combined-stream "^1.0.6" mime-types "^2.1.12" -formidable@^1.2.0: +formidable@^1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/formidable/-/formidable-1.2.2.tgz#bf69aea2972982675f00865342b982986f6b8dd9" integrity sha512-V8gLm+41I/8kguQ4/o1D3RIHRmhYFG4pnNyonvua+40rqcEmT4+V71yaZ3B457xbbgCsCfjSPi65u/W6vK1U5Q== @@ -2291,6 +2861,16 @@ ftp@~0.3.10: readable-stream "1.1.x" xregexp "2.0.0" +function-bind@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d" + integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A== + +functional-red-black-tree@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327" + integrity sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc= + gensync@^1.0.0-beta.1: version "1.0.0-beta.1" resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.1.tgz#58f4361ff987e5ff6e1e7a210827aa371eaac269" @@ -2301,6 +2881,15 @@ get-caller-file@^2.0.1: resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e" integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg== +get-intrinsic@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.0.1.tgz#94a9768fcbdd0595a1c9273aacf4c89d075631be" + integrity sha512-ZnWP+AmS1VUaLgTRy47+zKtjTxz+0xMpx3I52i+aalBK1QP19ggLF3Db89KJX7kjfOfP2eoa01qc++GwPgufPg== + dependencies: + function-bind "^1.1.1" + has "^1.0.3" + has-symbols "^1.0.1" + get-package-type@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/get-package-type/-/get-package-type-0.1.0.tgz#8de2d803cff44df3bc6c456e6668b36c3926e11a" @@ -2352,7 +2941,7 @@ glob-parent@^3.1.0: is-glob "^3.1.0" path-dirname "^1.0.0" -glob-parent@~5.1.0: +glob-parent@^5.0.0, glob-parent@^5.1.0, glob-parent@~5.1.0: version "5.1.1" resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.1.tgz#b6c1ef417c4e5663ea498f1c45afac6916bbc229" integrity sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ== @@ -2364,7 +2953,7 @@ glob-to-regexp@^0.3.0: resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz#8c5a1494d2066c570cc3bfe4496175acc4d502ab" integrity sha1-jFoUlNIGbFcMw7/kSWF1rMTVAqs= -glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4: +glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6: version "7.1.6" resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6" integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA== @@ -2381,6 +2970,25 @@ globals@^11.1.0: resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e" integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA== +globals@^12.1.0: + version "12.4.0" + resolved "https://registry.yarnpkg.com/globals/-/globals-12.4.0.tgz#a18813576a41b00a24a97e7f815918c2e19925f8" + integrity sha512-BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg== + dependencies: + type-fest "^0.8.1" + +globby@^11.0.1: + version "11.0.1" + resolved "https://registry.yarnpkg.com/globby/-/globby-11.0.1.tgz#9a2bf107a068f3ffeabc49ad702c79ede8cfd357" + integrity sha512-iH9RmgwCmUJHi2z5o2l3eTtGBtXek1OYlHrbcxOYugyHLmAsZrPj43OtHThd62Buh/Vv6VyCBD2bdyWcGNQqoQ== + dependencies: + array-union "^2.1.0" + dir-glob "^3.0.1" + fast-glob "^3.1.1" + ignore "^5.1.4" + merge2 "^1.3.0" + slash "^3.0.0" + globby@^9.2.0: version "9.2.0" resolved "https://registry.yarnpkg.com/globby/-/globby-9.2.0.tgz#fd029a706c703d29bdd170f4b6db3a3f7a7cb63d" @@ -2395,7 +3003,7 @@ globby@^9.2.0: pify "^4.0.1" slash "^2.0.0" -graceful-fs@^4.2.4: +graceful-fs@^4.1.2, graceful-fs@^4.2.4: version "4.2.4" resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz#2256bde14d3632958c465ebc96dc467ca07a29fb" integrity sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw== @@ -2440,6 +3048,11 @@ has-flag@^4.0.0: resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b" integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ== +has-symbols@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.1.tgz#9f5214758a44196c406d9bd76cebf81ec2dd31e8" + integrity sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg== + has-value@^0.3.1: version "0.3.1" resolved "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f" @@ -2471,6 +3084,13 @@ has-values@^1.0.0: is-number "^3.0.0" kind-of "^4.0.0" +has@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796" + integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw== + dependencies: + function-bind "^1.1.1" + hosted-git-info@^2.1.4: version "2.8.8" resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.8.tgz#7539bd4bc1e0e0a895815a2e0262420b12858488" @@ -2554,11 +3174,24 @@ iconv-lite@0.4.24, iconv-lite@^0.4.15, iconv-lite@^0.4.24, iconv-lite@~0.4.11: dependencies: safer-buffer ">= 2.1.2 < 3" -ignore@^4.0.3: +ignore@^4.0.3, ignore@^4.0.6: version "4.0.6" resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc" integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg== +ignore@^5.1.4: + version "5.1.8" + resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.8.tgz#f150a8b50a34289b33e22f5889abd4d8016f0e57" + integrity sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw== + +import-fresh@^3.0.0, import-fresh@^3.2.1: + version "3.2.2" + resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.2.2.tgz#fc129c160c5d68235507f4331a6baad186bdbc3e" + integrity sha512-cTPNrlvJT6twpYy+YmKUKrTSjWFs3bjYjAhCwm+z4EOCubZxAuO+hHpRN64TqjEaYSHs7tJAE0w1CKMGmsG/lw== + dependencies: + parent-module "^1.0.0" + resolve-from "^4.0.0" + import-local@^3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/import-local/-/import-local-3.0.2.tgz#a8cfd0431d1de4a2199703d003e3e62364fa6db6" @@ -2595,6 +3228,22 @@ inherits@2.0.3: resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4= +ioredis@^4.19.2: + version "4.19.2" + resolved "https://registry.yarnpkg.com/ioredis/-/ioredis-4.19.2.tgz#e3eab394c653cea5aea07c0c784d8c772dce8801" + integrity sha512-SZSIwMrbd96b7rJvJwyTWSP6XQ0m1kAIIqBnwglJKrIJ6na7TeY4F2EV2vDY0xm/fLrUY8cEg81dR7kVFt2sKA== + dependencies: + cluster-key-slot "^1.1.0" + debug "^4.1.1" + denque "^1.1.0" + lodash.defaults "^4.2.0" + lodash.flatten "^4.4.0" + p-map "^2.1.0" + redis-commands "1.6.0" + redis-errors "^1.2.0" + redis-parser "^3.0.0" + standard-as-callback "^2.0.1" + ip-regex@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/ip-regex/-/ip-regex-2.1.0.tgz#fa78bf5d2e6913c911ce9f819ee5146bb6d844e9" @@ -2629,6 +3278,11 @@ is-arrayish@^0.2.1: resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d" integrity sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0= +is-arrayish@^0.3.1: + version "0.3.2" + resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.3.2.tgz#4574a2ae56f7ab206896fb431eaeed066fdf8f03" + integrity sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ== + is-binary-path@~2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz#ea1f7f3b80f064236e83470f86c09c254fb45b09" @@ -2641,6 +3295,11 @@ is-buffer@^1.1.5: resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be" integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w== +is-callable@^1.1.4, is-callable@^1.2.2: + version "1.2.2" + resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.2.tgz#c7c6715cd22d4ddb48d3e19970223aceabb080d9" + integrity sha512-dnMqspv5nU3LoewK2N/y7KLtxtakvTuaCsU9FU50/QDmdbHNy/4/JuRtMHqRU22o3q+W89YQndQEeCVwK+3qrA== + is-ci@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-2.0.0.tgz#6bc6334181810e04b5c22b3d589fdca55026404c" @@ -2653,6 +3312,13 @@ is-class-hotfix@~0.0.6: resolved "https://registry.yarnpkg.com/is-class-hotfix/-/is-class-hotfix-0.0.6.tgz#a527d31fb23279281dde5f385c77b5de70a72435" integrity sha512-0n+pzCC6ICtVr/WXnN2f03TK/3BfXY7me4cjCAqT8TYXEl0+JBRoqBo94JJHXcyDSLUeWbNX8Fvy5g5RJdAstQ== +is-core-module@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.1.0.tgz#a4cc031d9b1aca63eecbd18a650e13cb4eeab946" + integrity sha512-YcV7BgVMRFRua2FqQzKtTDMz8iCuLEyGKjr70q8Zm1yy2qKcurbFEd79PAdHV77oL3NrAaOVQIbMmiHQCHB7ZA== + dependencies: + has "^1.0.3" + is-data-descriptor@^0.1.4: version "0.1.4" resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56" @@ -2667,6 +3333,11 @@ is-data-descriptor@^1.0.0: dependencies: kind-of "^6.0.0" +is-date-object@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.2.tgz#bda736f2cd8fd06d32844e7743bfa7494c3bfd7e" + integrity sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g== + is-descriptor@^0.1.0: version "0.1.6" resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.6.tgz#366d8240dde487ca51823b1ab9f07a10a78251ca" @@ -2707,6 +3378,11 @@ is-extglob@^2.1.0, is-extglob@^2.1.1: resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI= +is-fullwidth-code-point@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f" + integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8= + is-fullwidth-code-point@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d" @@ -2731,6 +3407,11 @@ is-glob@^4.0.0, is-glob@^4.0.1, is-glob@~4.0.1: dependencies: is-extglob "^2.1.1" +is-negative-zero@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.0.tgz#9553b121b0fac28869da9ed459e20c7543788461" + integrity sha1-lVOxIbD6wohp2p7UWeIMdUN4hGE= + is-number@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195" @@ -2755,6 +3436,13 @@ is-potential-custom-element-name@^1.0.0: resolved "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.0.tgz#0c52e54bcca391bb2c494b21e8626d7336c6e397" integrity sha1-DFLlS8yjkbssSUsh6GJtczbG45c= +is-regex@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.1.tgz#c6f98aacc546f6cec5468a07b7b153ab564a57b9" + integrity sha512-1+QkEcxiLlB7VEyFtyBg94e08OAsvq7FUBgApTq/w2ymCLyKJgDPsybBENVtA7XCQEgEXxKPonG+mvYRxh/LIg== + dependencies: + has-symbols "^1.0.1" + is-stream@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44" @@ -2765,6 +3453,18 @@ is-stream@^2.0.0: resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.0.tgz#bde9c32680d6fae04129d6ac9d921ce7815f78e3" integrity sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw== +is-string@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.5.tgz#40493ed198ef3ff477b8c7f92f644ec82a5cd3a6" + integrity sha512-buY6VNRjhQMiF1qWDouloZlQbRhDPCebwxSjxMjxgemYT46YMd2NR0/H+fBhEfWX4A/w9TBJ+ol+okqJKFE6vQ== + +is-symbol@^1.0.2: + version "1.0.3" + resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.3.tgz#38e1014b9e6329be0de9d24a414fd7441ec61937" + integrity sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ== + dependencies: + has-symbols "^1.0.1" + is-type-of@^1.0.0, is-type-of@^1.2.0, is-type-of@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/is-type-of/-/is-type-of-1.2.1.tgz#e263ec3857aceb4f28c47130ec78db09a920f8c5" @@ -2784,7 +3484,7 @@ is-windows@^1.0.2: resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d" integrity sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA== -is-wsl@^2.1.1: +is-wsl@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.2.0.tgz#74a4c76e77ca9fd3f932f290c17ea326cd157271" integrity sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww== @@ -2796,7 +3496,7 @@ isarray@0.0.1: resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf" integrity sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8= -isarray@1.0.0, isarray@~1.0.0: +isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE= @@ -2869,77 +3569,67 @@ istanbul-reports@^3.0.2: html-escaper "^2.0.0" istanbul-lib-report "^3.0.0" -jest-changed-files@^26.1.0: - version "26.1.0" - resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-26.1.0.tgz#de66b0f30453bca2aff98e9400f75905da495305" - integrity sha512-HS5MIJp3B8t0NRKGMCZkcDUZo36mVRvrDETl81aqljT1S9tqiHRSpyoOvWg9ZilzZG9TDisDNaN1IXm54fLRZw== +jest-changed-files@^26.6.2: + version "26.6.2" + resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-26.6.2.tgz#f6198479e1cc66f22f9ae1e22acaa0b429c042d0" + integrity sha512-fDS7szLcY9sCtIip8Fjry9oGf3I2ht/QT21bAHm5Dmf0mD4X3ReNUf17y+bO6fR8WgbIZTlbyG1ak/53cbRzKQ== dependencies: - "@jest/types" "^26.1.0" + "@jest/types" "^26.6.2" execa "^4.0.0" throat "^5.0.0" -jest-cli@^26.1.0: - version "26.1.0" - resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-26.1.0.tgz#eb9ec8a18cf3b6aa556d9deaa9e24be12b43ad87" - integrity sha512-Imumvjgi3rU7stq6SJ1JUEMaV5aAgJYXIs0jPqdUnF47N/Tk83EXfmtvNKQ+SnFVI6t6mDOvfM3aA9Sg6kQPSw== +jest-cli@^26.6.3: + version "26.6.3" + resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-26.6.3.tgz#43117cfef24bc4cd691a174a8796a532e135e92a" + integrity sha512-GF9noBSa9t08pSyl3CY4frMrqp+aQXFGFkf5hEPbh/pIUFYWMK6ZLTfbmadxJVcJrdRoChlWQsA2VkJcDFK8hg== dependencies: - "@jest/core" "^26.1.0" - "@jest/test-result" "^26.1.0" - "@jest/types" "^26.1.0" + "@jest/core" "^26.6.3" + "@jest/test-result" "^26.6.2" + "@jest/types" "^26.6.2" chalk "^4.0.0" exit "^0.1.2" graceful-fs "^4.2.4" import-local "^3.0.2" is-ci "^2.0.0" - jest-config "^26.1.0" - jest-util "^26.1.0" - jest-validate "^26.1.0" + jest-config "^26.6.3" + jest-util "^26.6.2" + jest-validate "^26.6.2" prompts "^2.0.1" - yargs "^15.3.1" + yargs "^15.4.1" -jest-config@^26.1.0: - version "26.1.0" - resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-26.1.0.tgz#9074f7539acc185e0113ad6d22ed589c16a37a73" - integrity sha512-ONTGeoMbAwGCdq4WuKkMcdMoyfs5CLzHEkzFOlVvcDXufZSaIWh/OXMLa2fwKXiOaFcqEw8qFr4VOKJQfn4CVw== +jest-config@^26.6.3: + version "26.6.3" + resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-26.6.3.tgz#64f41444eef9eb03dc51d5c53b75c8c71f645349" + integrity sha512-t5qdIj/bCj2j7NFVHb2nFB4aUdfucDn3JRKgrZnplb8nieAirAzRSHP8uDEd+qV6ygzg9Pz4YG7UTJf94LPSyg== dependencies: "@babel/core" "^7.1.0" - "@jest/test-sequencer" "^26.1.0" - "@jest/types" "^26.1.0" - babel-jest "^26.1.0" + "@jest/test-sequencer" "^26.6.3" + "@jest/types" "^26.6.2" + babel-jest "^26.6.3" chalk "^4.0.0" deepmerge "^4.2.2" glob "^7.1.1" graceful-fs "^4.2.4" - jest-environment-jsdom "^26.1.0" - jest-environment-node "^26.1.0" - jest-get-type "^26.0.0" - jest-jasmine2 "^26.1.0" + jest-environment-jsdom "^26.6.2" + jest-environment-node "^26.6.2" + jest-get-type "^26.3.0" + jest-jasmine2 "^26.6.3" jest-regex-util "^26.0.0" - jest-resolve "^26.1.0" - jest-util "^26.1.0" - jest-validate "^26.1.0" + jest-resolve "^26.6.2" + jest-util "^26.6.2" + jest-validate "^26.6.2" micromatch "^4.0.2" - pretty-format "^26.1.0" - -jest-diff@^25.2.1: - version "25.5.0" - resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-25.5.0.tgz#1dd26ed64f96667c068cef026b677dfa01afcfa9" - integrity sha512-z1kygetuPiREYdNIumRpAHY6RXiGmp70YHptjdaxTWGmA085W3iCnXNx0DhflK3vwrKmrRWyY1wUpkPMVxMK7A== - dependencies: - chalk "^3.0.0" - diff-sequences "^25.2.6" - jest-get-type "^25.2.6" - pretty-format "^25.5.0" + pretty-format "^26.6.2" -jest-diff@^26.1.0: - version "26.1.0" - resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-26.1.0.tgz#00a549bdc936c9691eb4dc25d1fbd78bf456abb2" - integrity sha512-GZpIcom339y0OXznsEKjtkfKxNdg7bVbEofK8Q6MnevTIiR1jNhDWKhRX6X0SDXJlwn3dy59nZ1z55fLkAqPWg== +jest-diff@^26.0.0, jest-diff@^26.6.2: + version "26.6.2" + resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-26.6.2.tgz#1aa7468b52c3a68d7d5c5fdcdfcd5e49bd164394" + integrity sha512-6m+9Z3Gv9wN0WFVasqjCL/06+EFCMTqDEUl/b87HYK2rAPTyfz4ZIuSlPhY51PIQRWx5TaxeF1qmXKe9gfN3sA== dependencies: chalk "^4.0.0" - diff-sequences "^26.0.0" - jest-get-type "^26.0.0" - pretty-format "^26.1.0" + diff-sequences "^26.6.2" + jest-get-type "^26.3.0" + pretty-format "^26.6.2" jest-docblock@^26.0.0: version "26.0.0" @@ -2948,133 +3638,134 @@ jest-docblock@^26.0.0: dependencies: detect-newline "^3.0.0" -jest-each@^26.1.0: - version "26.1.0" - resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-26.1.0.tgz#e35449875009a22d74d1bda183b306db20f286f7" - integrity sha512-lYiSo4Igr81q6QRsVQq9LIkJW0hZcKxkIkHzNeTMPENYYDw/W/Raq28iJ0sLlNFYz2qxxeLnc5K2gQoFYlu2bA== +jest-each@^26.6.2: + version "26.6.2" + resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-26.6.2.tgz#02526438a77a67401c8a6382dfe5999952c167cb" + integrity sha512-Mer/f0KaATbjl8MCJ+0GEpNdqmnVmDYqCTJYTvoo7rqmRiDllmp2AYN+06F93nXcY3ur9ShIjS+CO/uD+BbH4A== dependencies: - "@jest/types" "^26.1.0" + "@jest/types" "^26.6.2" chalk "^4.0.0" - jest-get-type "^26.0.0" - jest-util "^26.1.0" - pretty-format "^26.1.0" - -jest-environment-jsdom@^26.1.0: - version "26.1.0" - resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-26.1.0.tgz#9dc7313ffe1b59761dad1fedb76e2503e5d37c5b" - integrity sha512-dWfiJ+spunVAwzXbdVqPH1LbuJW/kDL+FyqgA5YzquisHqTi0g9hquKif9xKm7c1bKBj6wbmJuDkeMCnxZEpUw== - dependencies: - "@jest/environment" "^26.1.0" - "@jest/fake-timers" "^26.1.0" - "@jest/types" "^26.1.0" - jest-mock "^26.1.0" - jest-util "^26.1.0" - jsdom "^16.2.2" - -jest-environment-node@^26.1.0: - version "26.1.0" - resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-26.1.0.tgz#8bb387b3eefb132eab7826f9a808e4e05618960b" - integrity sha512-DNm5x1aQH0iRAe9UYAkZenuzuJ69VKzDCAYISFHQ5i9e+2Tbeu2ONGY7YStubCLH8a1wdKBgqScYw85+ySxqxg== - dependencies: - "@jest/environment" "^26.1.0" - "@jest/fake-timers" "^26.1.0" - "@jest/types" "^26.1.0" - jest-mock "^26.1.0" - jest-util "^26.1.0" + jest-get-type "^26.3.0" + jest-util "^26.6.2" + pretty-format "^26.6.2" + +jest-environment-jsdom@^26.6.2: + version "26.6.2" + resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-26.6.2.tgz#78d09fe9cf019a357009b9b7e1f101d23bd1da3e" + integrity sha512-jgPqCruTlt3Kwqg5/WVFyHIOJHsiAvhcp2qiR2QQstuG9yWox5+iHpU3ZrcBxW14T4fe5Z68jAfLRh7joCSP2Q== + dependencies: + "@jest/environment" "^26.6.2" + "@jest/fake-timers" "^26.6.2" + "@jest/types" "^26.6.2" + "@types/node" "*" + jest-mock "^26.6.2" + jest-util "^26.6.2" + jsdom "^16.4.0" + +jest-environment-node@^26.6.2: + version "26.6.2" + resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-26.6.2.tgz#824e4c7fb4944646356f11ac75b229b0035f2b0c" + integrity sha512-zhtMio3Exty18dy8ee8eJ9kjnRyZC1N4C1Nt/VShN1apyXc8rWGtJ9lI7vqiWcyyXS4BVSEn9lxAM2D+07/Tag== + dependencies: + "@jest/environment" "^26.6.2" + "@jest/fake-timers" "^26.6.2" + "@jest/types" "^26.6.2" + "@types/node" "*" + jest-mock "^26.6.2" + jest-util "^26.6.2" -jest-get-type@^25.2.6: - version "25.2.6" - resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-25.2.6.tgz#0b0a32fab8908b44d508be81681487dbabb8d877" - integrity sha512-DxjtyzOHjObRM+sM1knti6or+eOgcGU4xVSb2HNP1TqO4ahsT+rqZg+nyqHWJSvWgKC5cG3QjGFBqxLghiF/Ig== +jest-get-type@^26.3.0: + version "26.3.0" + resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-26.3.0.tgz#e97dc3c3f53c2b406ca7afaed4493b1d099199e0" + integrity sha512-TpfaviN1R2pQWkIihlfEanwOXK0zcxrKEE4MlU6Tn7keoXdN6/3gK/xl0yEh8DOunn5pOVGKf8hB4R9gVh04ig== -jest-get-type@^26.0.0: - version "26.0.0" - resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-26.0.0.tgz#381e986a718998dbfafcd5ec05934be538db4039" - integrity sha512-zRc1OAPnnws1EVfykXOj19zo2EMw5Hi6HLbFCSjpuJiXtOWAYIjNsHVSbpQ8bDX7L5BGYGI8m+HmKdjHYFF0kg== - -jest-haste-map@^26.1.0: - version "26.1.0" - resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-26.1.0.tgz#ef31209be73f09b0d9445e7d213e1b53d0d1476a" - integrity sha512-WeBS54xCIz9twzkEdm6+vJBXgRBQfdbbXD0dk8lJh7gLihopABlJmIQFdWSDDtuDe4PRiObsjZSUjbJ1uhWEpA== +jest-haste-map@^26.6.2: + version "26.6.2" + resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-26.6.2.tgz#dd7e60fe7dc0e9f911a23d79c5ff7fb5c2cafeaa" + integrity sha512-easWIJXIw71B2RdR8kgqpjQrbMRWQBgiBwXYEhtGUTaX+doCjBheluShdDMeR8IMfJiTqH4+zfhtg29apJf/8w== dependencies: - "@jest/types" "^26.1.0" + "@jest/types" "^26.6.2" "@types/graceful-fs" "^4.1.2" + "@types/node" "*" anymatch "^3.0.3" fb-watchman "^2.0.0" graceful-fs "^4.2.4" - jest-serializer "^26.1.0" - jest-util "^26.1.0" - jest-worker "^26.1.0" + jest-regex-util "^26.0.0" + jest-serializer "^26.6.2" + jest-util "^26.6.2" + jest-worker "^26.6.2" micromatch "^4.0.2" sane "^4.0.3" walker "^1.0.7" - which "^2.0.2" optionalDependencies: fsevents "^2.1.2" -jest-jasmine2@^26.1.0: - version "26.1.0" - resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-26.1.0.tgz#4dfe349b2b2d3c6b3a27c024fd4cb57ac0ed4b6f" - integrity sha512-1IPtoDKOAG+MeBrKvvuxxGPJb35MTTRSDglNdWWCndCB3TIVzbLThRBkwH9P081vXLgiJHZY8Bz3yzFS803xqQ== +jest-jasmine2@^26.6.3: + version "26.6.3" + resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-26.6.3.tgz#adc3cf915deacb5212c93b9f3547cd12958f2edd" + integrity sha512-kPKUrQtc8aYwBV7CqBg5pu+tmYXlvFlSFYn18ev4gPFtrRzB15N2gW/Roew3187q2w2eHuu0MU9TJz6w0/nPEg== dependencies: "@babel/traverse" "^7.1.0" - "@jest/environment" "^26.1.0" - "@jest/source-map" "^26.1.0" - "@jest/test-result" "^26.1.0" - "@jest/types" "^26.1.0" + "@jest/environment" "^26.6.2" + "@jest/source-map" "^26.6.2" + "@jest/test-result" "^26.6.2" + "@jest/types" "^26.6.2" + "@types/node" "*" chalk "^4.0.0" co "^4.6.0" - expect "^26.1.0" + expect "^26.6.2" is-generator-fn "^2.0.0" - jest-each "^26.1.0" - jest-matcher-utils "^26.1.0" - jest-message-util "^26.1.0" - jest-runtime "^26.1.0" - jest-snapshot "^26.1.0" - jest-util "^26.1.0" - pretty-format "^26.1.0" + jest-each "^26.6.2" + jest-matcher-utils "^26.6.2" + jest-message-util "^26.6.2" + jest-runtime "^26.6.3" + jest-snapshot "^26.6.2" + jest-util "^26.6.2" + pretty-format "^26.6.2" throat "^5.0.0" -jest-leak-detector@^26.1.0: - version "26.1.0" - resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-26.1.0.tgz#039c3a07ebcd8adfa984b6ac015752c35792e0a6" - integrity sha512-dsMnKF+4BVOZwvQDlgn3MG+Ns4JuLv8jNvXH56bgqrrboyCbI1rQg6EI5rs+8IYagVcfVP2yZFKfWNZy0rK0Hw== +jest-leak-detector@^26.6.2: + version "26.6.2" + resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-26.6.2.tgz#7717cf118b92238f2eba65054c8a0c9c653a91af" + integrity sha512-i4xlXpsVSMeKvg2cEKdfhh0H39qlJlP5Ex1yQxwF9ubahboQYMgTtz5oML35AVA3B4Eu+YsmwaiKVev9KCvLxg== dependencies: - jest-get-type "^26.0.0" - pretty-format "^26.1.0" + jest-get-type "^26.3.0" + pretty-format "^26.6.2" -jest-matcher-utils@^26.1.0: - version "26.1.0" - resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-26.1.0.tgz#cf75a41bd413dda784f022de5a65a2a5c73a5c92" - integrity sha512-PW9JtItbYvES/xLn5mYxjMd+Rk+/kIt88EfH3N7w9KeOrHWaHrdYPnVHndGbsFGRJ2d5gKtwggCvkqbFDoouQA== +jest-matcher-utils@^26.6.2: + version "26.6.2" + resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-26.6.2.tgz#8e6fd6e863c8b2d31ac6472eeb237bc595e53e7a" + integrity sha512-llnc8vQgYcNqDrqRDXWwMr9i7rS5XFiCwvh6DTP7Jqa2mqpcCBBlpCbn+trkG0KNhPu/h8rzyBkriOtBstvWhw== dependencies: chalk "^4.0.0" - jest-diff "^26.1.0" - jest-get-type "^26.0.0" - pretty-format "^26.1.0" + jest-diff "^26.6.2" + jest-get-type "^26.3.0" + pretty-format "^26.6.2" -jest-message-util@^26.1.0: - version "26.1.0" - resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-26.1.0.tgz#52573fbb8f5cea443c4d1747804d7a238a3e233c" - integrity sha512-dY0+UlldiAJwNDJ08SF0HdF32g9PkbF2NRK/+2iMPU40O6q+iSn1lgog/u0UH8ksWoPv0+gNq8cjhYO2MFtT0g== +jest-message-util@^26.6.2: + version "26.6.2" + resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-26.6.2.tgz#58173744ad6fc0506b5d21150b9be56ef001ca07" + integrity sha512-rGiLePzQ3AzwUshu2+Rn+UMFk0pHN58sOG+IaJbk5Jxuqo3NYO1U2/MIR4S1sKgsoYSXSzdtSa0TgrmtUwEbmA== dependencies: "@babel/code-frame" "^7.0.0" - "@jest/types" "^26.1.0" - "@types/stack-utils" "^1.0.1" + "@jest/types" "^26.6.2" + "@types/stack-utils" "^2.0.0" chalk "^4.0.0" graceful-fs "^4.2.4" micromatch "^4.0.2" + pretty-format "^26.6.2" slash "^3.0.0" stack-utils "^2.0.2" -jest-mock@^26.1.0: - version "26.1.0" - resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-26.1.0.tgz#80d8286da1f05a345fbad1bfd6fa49a899465d3d" - integrity sha512-1Rm8EIJ3ZFA8yCIie92UbxZWj9SuVmUGcyhLHyAhY6WI3NIct38nVcfOPWhJteqSn8V8e3xOMha9Ojfazfpovw== +jest-mock@^26.6.2: + version "26.6.2" + resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-26.6.2.tgz#d6cb712b041ed47fe0d9b6fc3474bc6543feb302" + integrity sha512-YyFjePHHp1LzpzYcmgqkJ0nm0gg/lJx2aZFzFy1S6eUqNjXsOqTK10zNRff2dNfssgokjkG65OlWNcIlgd3zew== dependencies: - "@jest/types" "^26.1.0" + "@jest/types" "^26.6.2" + "@types/node" "*" -jest-pnp-resolver@^1.2.1: +jest-pnp-resolver@^1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/jest-pnp-resolver/-/jest-pnp-resolver-1.2.2.tgz#b704ac0ae028a89108a4d040b3f919dfddc8e33c" integrity sha512-olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w== @@ -3084,112 +3775,116 @@ jest-regex-util@^26.0.0: resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-26.0.0.tgz#d25e7184b36e39fd466c3bc41be0971e821fee28" integrity sha512-Gv3ZIs/nA48/Zvjrl34bf+oD76JHiGDUxNOVgUjh3j890sblXryjY4rss71fPtD/njchl6PSE2hIhvyWa1eT0A== -jest-resolve-dependencies@^26.1.0: - version "26.1.0" - resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-26.1.0.tgz#1ce36472f864a5dadf7dc82fa158e1c77955691b" - integrity sha512-fQVEPHHQ1JjHRDxzlLU/buuQ9om+hqW6Vo928aa4b4yvq4ZHBtRSDsLdKQLuCqn5CkTVpYZ7ARh2fbA8WkRE6g== +jest-resolve-dependencies@^26.6.3: + version "26.6.3" + resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-26.6.3.tgz#6680859ee5d22ee5dcd961fe4871f59f4c784fb6" + integrity sha512-pVwUjJkxbhe4RY8QEWzN3vns2kqyuldKpxlxJlzEYfKSvY6/bMvxoFrYYzUO1Gx28yKWN37qyV7rIoIp2h8fTg== dependencies: - "@jest/types" "^26.1.0" + "@jest/types" "^26.6.2" jest-regex-util "^26.0.0" - jest-snapshot "^26.1.0" + jest-snapshot "^26.6.2" -jest-resolve@^26.1.0: - version "26.1.0" - resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-26.1.0.tgz#a530eaa302b1f6fa0479079d1561dd69abc00e68" - integrity sha512-KsY1JV9FeVgEmwIISbZZN83RNGJ1CC+XUCikf/ZWJBX/tO4a4NvA21YixokhdR9UnmPKKAC4LafVixJBrwlmfg== +jest-resolve@^26.6.2: + version "26.6.2" + resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-26.6.2.tgz#a3ab1517217f469b504f1b56603c5bb541fbb507" + integrity sha512-sOxsZOq25mT1wRsfHcbtkInS+Ek7Q8jCHUB0ZUTP0tc/c41QHriU/NunqMfCUWsL4H3MHpvQD4QR9kSYhS7UvQ== dependencies: - "@jest/types" "^26.1.0" + "@jest/types" "^26.6.2" chalk "^4.0.0" graceful-fs "^4.2.4" - jest-pnp-resolver "^1.2.1" - jest-util "^26.1.0" + jest-pnp-resolver "^1.2.2" + jest-util "^26.6.2" read-pkg-up "^7.0.1" - resolve "^1.17.0" + resolve "^1.18.1" slash "^3.0.0" -jest-runner@^26.1.0: - version "26.1.0" - resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-26.1.0.tgz#457f7fc522afe46ca6db1dccf19f87f500b3288d" - integrity sha512-elvP7y0fVDREnfqit0zAxiXkDRSw6dgCkzPCf1XvIMnSDZ8yogmSKJf192dpOgnUVykmQXwYYJnCx641uLTgcw== +jest-runner@^26.6.3: + version "26.6.3" + resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-26.6.3.tgz#2d1fed3d46e10f233fd1dbd3bfaa3fe8924be159" + integrity sha512-atgKpRHnaA2OvByG/HpGA4g6CSPS/1LK0jK3gATJAoptC1ojltpmVlYC3TYgdmGp+GLuhzpH30Gvs36szSL2JQ== dependencies: - "@jest/console" "^26.1.0" - "@jest/environment" "^26.1.0" - "@jest/test-result" "^26.1.0" - "@jest/types" "^26.1.0" + "@jest/console" "^26.6.2" + "@jest/environment" "^26.6.2" + "@jest/test-result" "^26.6.2" + "@jest/types" "^26.6.2" + "@types/node" "*" chalk "^4.0.0" + emittery "^0.7.1" exit "^0.1.2" graceful-fs "^4.2.4" - jest-config "^26.1.0" + jest-config "^26.6.3" jest-docblock "^26.0.0" - jest-haste-map "^26.1.0" - jest-jasmine2 "^26.1.0" - jest-leak-detector "^26.1.0" - jest-message-util "^26.1.0" - jest-resolve "^26.1.0" - jest-runtime "^26.1.0" - jest-util "^26.1.0" - jest-worker "^26.1.0" + jest-haste-map "^26.6.2" + jest-leak-detector "^26.6.2" + jest-message-util "^26.6.2" + jest-resolve "^26.6.2" + jest-runtime "^26.6.3" + jest-util "^26.6.2" + jest-worker "^26.6.2" source-map-support "^0.5.6" throat "^5.0.0" -jest-runtime@^26.1.0: - version "26.1.0" - resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-26.1.0.tgz#45a37af42115f123ed5c51f126c05502da2469cb" - integrity sha512-1qiYN+EZLmG1QV2wdEBRf+Ci8i3VSfIYLF02U18PiUDrMbhfpN/EAMMkJtT02jgJUoaEOpHAIXG6zS3QRMzRmA== - dependencies: - "@jest/console" "^26.1.0" - "@jest/environment" "^26.1.0" - "@jest/fake-timers" "^26.1.0" - "@jest/globals" "^26.1.0" - "@jest/source-map" "^26.1.0" - "@jest/test-result" "^26.1.0" - "@jest/transform" "^26.1.0" - "@jest/types" "^26.1.0" +jest-runtime@^26.6.3: + version "26.6.3" + resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-26.6.3.tgz#4f64efbcfac398331b74b4b3c82d27d401b8fa2b" + integrity sha512-lrzyR3N8sacTAMeonbqpnSka1dHNux2uk0qqDXVkMv2c/A3wYnvQ4EXuI013Y6+gSKSCxdaczvf4HF0mVXHRdw== + dependencies: + "@jest/console" "^26.6.2" + "@jest/environment" "^26.6.2" + "@jest/fake-timers" "^26.6.2" + "@jest/globals" "^26.6.2" + "@jest/source-map" "^26.6.2" + "@jest/test-result" "^26.6.2" + "@jest/transform" "^26.6.2" + "@jest/types" "^26.6.2" "@types/yargs" "^15.0.0" chalk "^4.0.0" + cjs-module-lexer "^0.6.0" collect-v8-coverage "^1.0.0" exit "^0.1.2" glob "^7.1.3" graceful-fs "^4.2.4" - jest-config "^26.1.0" - jest-haste-map "^26.1.0" - jest-message-util "^26.1.0" - jest-mock "^26.1.0" + jest-config "^26.6.3" + jest-haste-map "^26.6.2" + jest-message-util "^26.6.2" + jest-mock "^26.6.2" jest-regex-util "^26.0.0" - jest-resolve "^26.1.0" - jest-snapshot "^26.1.0" - jest-util "^26.1.0" - jest-validate "^26.1.0" + jest-resolve "^26.6.2" + jest-snapshot "^26.6.2" + jest-util "^26.6.2" + jest-validate "^26.6.2" slash "^3.0.0" strip-bom "^4.0.0" - yargs "^15.3.1" + yargs "^15.4.1" -jest-serializer@^26.1.0: - version "26.1.0" - resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-26.1.0.tgz#72a394531fc9b08e173dc7d297440ac610d95022" - integrity sha512-eqZOQG/0+MHmr25b2Z86g7+Kzd5dG9dhCiUoyUNJPgiqi38DqbDEOlHcNijyfZoj74soGBohKBZuJFS18YTJ5w== +jest-serializer@^26.6.2: + version "26.6.2" + resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-26.6.2.tgz#d139aafd46957d3a448f3a6cdabe2919ba0742d1" + integrity sha512-S5wqyz0DXnNJPd/xfIzZ5Xnp1HrJWBczg8mMfMpN78OJ5eDxXyf+Ygld9wX1DnUWbIbhM1YDY95NjR4CBXkb2g== dependencies: + "@types/node" "*" graceful-fs "^4.2.4" -jest-snapshot@^26.1.0: - version "26.1.0" - resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-26.1.0.tgz#c36ed1e0334bd7bd2fe5ad07e93a364ead7e1349" - integrity sha512-YhSbU7eMTVQO/iRbNs8j0mKRxGp4plo7sJ3GzOQ0IYjvsBiwg0T1o0zGQAYepza7lYHuPTrG5J2yDd0CE2YxSw== +jest-snapshot@^26.6.2: + version "26.6.2" + resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-26.6.2.tgz#f3b0af1acb223316850bd14e1beea9837fb39c84" + integrity sha512-OLhxz05EzUtsAmOMzuupt1lHYXCNib0ECyuZ/PZOx9TrZcC8vL0x+DUG3TL+GLX3yHG45e6YGjIm0XwDc3q3og== dependencies: "@babel/types" "^7.0.0" - "@jest/types" "^26.1.0" + "@jest/types" "^26.6.2" + "@types/babel__traverse" "^7.0.4" "@types/prettier" "^2.0.0" chalk "^4.0.0" - expect "^26.1.0" + expect "^26.6.2" graceful-fs "^4.2.4" - jest-diff "^26.1.0" - jest-get-type "^26.0.0" - jest-haste-map "^26.1.0" - jest-matcher-utils "^26.1.0" - jest-message-util "^26.1.0" - jest-resolve "^26.1.0" + jest-diff "^26.6.2" + jest-get-type "^26.3.0" + jest-haste-map "^26.6.2" + jest-matcher-utils "^26.6.2" + jest-message-util "^26.6.2" + jest-resolve "^26.6.2" natural-compare "^1.4.0" - pretty-format "^26.1.0" + pretty-format "^26.6.2" semver "^7.3.2" jest-util@^26.1.0: @@ -3203,46 +3898,60 @@ jest-util@^26.1.0: is-ci "^2.0.0" micromatch "^4.0.2" -jest-validate@^26.1.0: - version "26.1.0" - resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-26.1.0.tgz#942c85ad3d60f78250c488a7f85d8f11a29788e7" - integrity sha512-WPApOOnXsiwhZtmkDsxnpye+XLb/tUISP+H6cHjfUIXvlG+eKwP+isnivsxlHCPaO9Q5wvbhloIBkdF3qUn+Nw== +jest-util@^26.6.2: + version "26.6.2" + resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-26.6.2.tgz#907535dbe4d5a6cb4c47ac9b926f6af29576cbc1" + integrity sha512-MDW0fKfsn0OI7MS7Euz6h8HNDXVQ0gaM9uW6RjfDmd1DAFcaxX9OqIakHIqhbnmF08Cf2DLDG+ulq8YQQ0Lp0Q== dependencies: - "@jest/types" "^26.1.0" + "@jest/types" "^26.6.2" + "@types/node" "*" + chalk "^4.0.0" + graceful-fs "^4.2.4" + is-ci "^2.0.0" + micromatch "^4.0.2" + +jest-validate@^26.6.2: + version "26.6.2" + resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-26.6.2.tgz#23d380971587150467342911c3d7b4ac57ab20ec" + integrity sha512-NEYZ9Aeyj0i5rQqbq+tpIOom0YS1u2MVu6+euBsvpgIme+FOfRmoC4R5p0JiAUpaFvFy24xgrpMknarR/93XjQ== + dependencies: + "@jest/types" "^26.6.2" camelcase "^6.0.0" chalk "^4.0.0" - jest-get-type "^26.0.0" + jest-get-type "^26.3.0" leven "^3.1.0" - pretty-format "^26.1.0" + pretty-format "^26.6.2" -jest-watcher@^26.1.0: - version "26.1.0" - resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-26.1.0.tgz#99812a0cd931f0cb3d153180426135ab83e4d8f2" - integrity sha512-ffEOhJl2EvAIki613oPsSG11usqnGUzIiK7MMX6hE4422aXOcVEG3ySCTDFLn1+LZNXGPE8tuJxhp8OBJ1pgzQ== +jest-watcher@^26.6.2: + version "26.6.2" + resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-26.6.2.tgz#a5b683b8f9d68dbcb1d7dae32172d2cca0592975" + integrity sha512-WKJob0P/Em2csiVthsI68p6aGKTIcsfjH9Gsx1f0A3Italz43e3ho0geSAVsmj09RWOELP1AZ/DXyJgOgDKxXQ== dependencies: - "@jest/test-result" "^26.1.0" - "@jest/types" "^26.1.0" + "@jest/test-result" "^26.6.2" + "@jest/types" "^26.6.2" + "@types/node" "*" ansi-escapes "^4.2.1" chalk "^4.0.0" - jest-util "^26.1.0" + jest-util "^26.6.2" string-length "^4.0.1" -jest-worker@^26.1.0: - version "26.1.0" - resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-26.1.0.tgz#65d5641af74e08ccd561c240e7db61284f82f33d" - integrity sha512-Z9P5pZ6UC+kakMbNJn+tA2RdVdNX5WH1x+5UCBZ9MxIK24pjYtFt96fK+UwBTrjLYm232g1xz0L3eTh51OW+yQ== +jest-worker@^26.6.2: + version "26.6.2" + resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-26.6.2.tgz#7f72cbc4d643c365e27b9fd775f9d0eaa9c7a8ed" + integrity sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ== dependencies: + "@types/node" "*" merge-stream "^2.0.0" supports-color "^7.0.0" -jest@^26.1.0: - version "26.1.0" - resolved "https://registry.yarnpkg.com/jest/-/jest-26.1.0.tgz#2f3aa7bcffb9bfd025473f83bbbf46a3af026263" - integrity sha512-LIti8jppw5BcQvmNJe4w2g1N/3V68HUfAv9zDVm7v+VAtQulGhH0LnmmiVkbNE4M4I43Bj2fXPiBGKt26k9tHw== +jest@^26.6.3: + version "26.6.3" + resolved "https://registry.yarnpkg.com/jest/-/jest-26.6.3.tgz#40e8fdbe48f00dfa1f0ce8121ca74b88ac9148ef" + integrity sha512-lGS5PXGAzR4RF7V5+XObhqz2KZIDUA1yD0DG6pBVmy10eh0ZIXQImRuzocsI/N2XZ1GrLFwTS27In2i2jlpq1Q== dependencies: - "@jest/core" "^26.1.0" + "@jest/core" "^26.6.3" import-local "^3.0.2" - jest-cli "^26.1.0" + jest-cli "^26.6.3" js-tokens@^4.0.0: version "4.0.0" @@ -3262,10 +3971,10 @@ jsbn@~0.1.0: resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513" integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM= -jsdom@^16.2.2: - version "16.2.2" - resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-16.2.2.tgz#76f2f7541646beb46a938f5dc476b88705bedf2b" - integrity sha512-pDFQbcYtKBHxRaP55zGXCJWgFHkDAYbKcsXEK/3Icu9nKYZkutUXfLBwbD+09XDutkYSHcgfQLZ0qvpAAm9mvg== +jsdom@^16.4.0: + version "16.4.0" + resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-16.4.0.tgz#36005bde2d136f73eee1a830c6d45e55408edddb" + integrity sha512-lYMm3wYdgPhrl7pDcRmvzPhhrGVBeVhPIqeHjzeiHN3DFmD1RBpbExbi8vU7BJdH8VAZYovR8DMt0PNNDM7k8w== dependencies: abab "^2.0.3" acorn "^7.1.1" @@ -3287,7 +3996,7 @@ jsdom@^16.2.2: tough-cookie "^3.0.1" w3c-hr-time "^1.0.2" w3c-xmlserializer "^2.0.0" - webidl-conversions "^6.0.0" + webidl-conversions "^6.1.0" whatwg-encoding "^1.0.5" whatwg-mimetype "^2.3.0" whatwg-url "^8.0.0" @@ -3314,6 +4023,11 @@ json-schema@0.2.3: resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13" integrity sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM= +json-stable-stringify-without-jsonify@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651" + integrity sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE= + json-stringify-safe@^5.0.1, json-stringify-safe@~5.0.1: version "5.0.1" resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb" @@ -3417,11 +4131,24 @@ ko-sleep@^1.0.3: dependencies: ms "^2.0.0" +kuler@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/kuler/-/kuler-2.0.0.tgz#e2c570a3800388fb44407e851531c1d670b061b3" + integrity sha512-Xq9nH7KlWZmXAtodXDDRE7vs6DU1gTU8zYDHDiWLSip45Egwq3plLHzPn27NgvzL2r1LMPC1vdqh98sQxtqj4A== + leven@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/leven/-/leven-3.1.0.tgz#77891de834064cccba82ae7842bb6b14a13ed7f2" integrity sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A== +levn@^0.4.1: + version "0.4.1" + resolved "https://registry.yarnpkg.com/levn/-/levn-0.4.1.tgz#ae4562c007473b932a6200d403268dd2fffc6ade" + integrity sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ== + dependencies: + prelude-ls "^1.2.1" + type-check "~0.4.0" + levn@~0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee" @@ -3435,6 +4162,24 @@ lines-and-columns@^1.1.6: resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.1.6.tgz#1c00c743b433cd0a4e80758f7b64a57440d9ff00" integrity sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA= +load-json-file@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-2.0.0.tgz#7947e42149af80d696cbf797bcaabcfe1fe29ca8" + integrity sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg= + dependencies: + graceful-fs "^4.1.2" + parse-json "^2.2.0" + pify "^2.0.0" + strip-bom "^3.0.0" + +locate-path@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e" + integrity sha1-K1aLJl7slExtnA3pw9u7ygNUzY4= + dependencies: + p-locate "^2.0.0" + path-exists "^3.0.0" + locate-path@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0" @@ -3442,6 +4187,16 @@ locate-path@^5.0.0: dependencies: p-locate "^4.1.0" +lodash.defaults@^4.2.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/lodash.defaults/-/lodash.defaults-4.2.0.tgz#d09178716ffea4dde9e5fb7b37f6f0802274580c" + integrity sha1-0JF4cW/+pN3p5ft7N/bwgCJ0WAw= + +lodash.flatten@^4.4.0: + version "4.4.0" + resolved "https://registry.yarnpkg.com/lodash.flatten/-/lodash.flatten-4.4.0.tgz#f31c22225a9632d2bbf8e4addbef240aa765a61f" + integrity sha1-8xwiIlqWMtK7+OSt2+8kCqdlph8= + lodash.includes@^4.3.0: version "4.3.0" resolved "https://registry.yarnpkg.com/lodash.includes/-/lodash.includes-4.3.0.tgz#60bb98a87cb923c68ca1e51325483314849f553f" @@ -3487,11 +4242,22 @@ lodash.sortby@^4.7.0: resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438" integrity sha1-7dFMgk4sycHgsKG0K7UhBRakJDg= -lodash@^4.17.13, lodash@^4.17.15: +lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19: version "4.17.20" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.20.tgz#b44a9b6297bcb698f1c51a3545a2b3b368d59c52" integrity sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA== +logform@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/logform/-/logform-2.2.0.tgz#40f036d19161fc76b68ab50fdc7fe495544492f2" + integrity sha512-N0qPlqfypFx7UHNn4B3lzS/b0uLqt2hmuoa+PpuXNYgozdJYAyauF5Ky0BWVjrxDlMWiT3qN4zPq3vVAfZy7Yg== + dependencies: + colors "^1.2.1" + fast-safe-stringify "^2.0.4" + fecha "^4.2.0" + ms "^2.1.1" + triple-beam "^1.3.0" + long@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/long/-/long-4.0.0.tgz#9a7b71cfb7d361a194ea555241c92f7468d5bf28" @@ -3555,24 +4321,16 @@ merge-stream@^2.0.0: resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60" integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w== -merge2@^1.2.3: +merge2@^1.2.3, merge2@^1.3.0: version "1.4.1" resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae" integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg== -methods@^1.1.1, methods@^1.1.2, methods@~1.1.2: +methods@1.1.2, methods@^1.1.2, methods@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee" integrity sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4= -micromatch@4.x, micromatch@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.2.tgz#4fcb0999bf9fbc2fcbdd212f6d629b9a56c39259" - integrity sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q== - dependencies: - braces "^3.0.1" - picomatch "^2.0.5" - micromatch@^3.1.10, micromatch@^3.1.4: version "3.1.10" resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23" @@ -3592,6 +4350,14 @@ micromatch@^3.1.10, micromatch@^3.1.4: snapdragon "^0.8.1" to-regex "^3.0.2" +micromatch@^4.0.2: + version "4.0.2" + resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.2.tgz#4fcb0999bf9fbc2fcbdd212f6d629b9a56c39259" + integrity sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q== + dependencies: + braces "^3.0.1" + picomatch "^2.0.5" + mime-db@1.44.0: version "1.44.0" resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.44.0.tgz#fa11c5eb0aca1334b4233cb4d52f10c5a6272f92" @@ -3604,11 +4370,16 @@ mime-types@^2.1.12, mime-types@~2.1.19, mime-types@~2.1.24: dependencies: mime-db "1.44.0" -mime@1.6.0, mime@^1.3.4, mime@^1.4.1: +mime@1.6.0, mime@^1.3.4: version "1.6.0" resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1" integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg== +mime@^2.4.6: + version "2.4.6" + resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.6.tgz#e5b407c90db442f2beb5b162373d07b69affa4d1" + integrity sha512-RZKhC3EmpBchfTGBVb8fb+RL2cWyw/32lshnsETttkBAyAUXSGHxbEJWWRXc751DrIxG1q04b8QwMbAwkRPpUA== + mimic-fn@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b" @@ -3634,12 +4405,12 @@ mixin-deep@^1.2.0: for-in "^1.0.2" is-extendable "^1.0.1" -mkdirp@1.x, mkdirp@^1.0.4: +mkdirp@1.x: version "1.0.4" resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e" integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw== -mkdirp@^0.5.1, mkdirp@^0.5.3: +mkdirp@^0.5.1: version "0.5.5" resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def" integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ== @@ -3653,26 +4424,17 @@ moment-timezone@^0.5.x: dependencies: moment ">= 2.9.0" -"moment@>= 2.9.0", moment@>=2.14.0, moment@^2.27.0: +"moment@>= 2.9.0", moment@>=2.14.0: version "2.27.0" resolved "https://registry.yarnpkg.com/moment/-/moment-2.27.0.tgz#8bff4e3e26a236220dfe3e36de756b6ebaa0105d" integrity sha512-al0MUK7cpIcglMv3YF13qSgdAIqxHTO7brRtaz3DlSULbqfazqkc5kEjNrLDOM7fsjshoFIihnU8snrP7zUvhQ== -mongodb@3.3.2: - version "3.3.2" - resolved "https://registry.yarnpkg.com/mongodb/-/mongodb-3.3.2.tgz#ff086b5f552cf07e24ce098694210f3d42d668b2" - integrity sha512-fqJt3iywelk4yKu/lfwQg163Bjpo5zDKhXiohycvon4iQHbrfflSAz9AIlRE6496Pm/dQKQK5bMigdVo2s6gBg== - dependencies: - bson "^1.1.1" - require_optional "^1.0.1" - safe-buffer "^5.1.2" - -mongodb@^3.5.9: - version "3.5.9" - resolved "https://registry.yarnpkg.com/mongodb/-/mongodb-3.5.9.tgz#799b72be8110b7e71a882bb7ce0d84d05429f772" - integrity sha512-vXHBY1CsGYcEPoVWhwgxIBeWqP3dSu9RuRDsoLRPTITrcrgm1f0Ubu1xqF9ozMwv53agmEiZm0YGo+7WL3Nbug== +mongodb@3.6.3, mongodb@^3.6.3: + version "3.6.3" + resolved "https://registry.yarnpkg.com/mongodb/-/mongodb-3.6.3.tgz#eddaed0cc3598474d7a15f0f2a5b04848489fd05" + integrity sha512-rOZuR0QkodZiM+UbQE5kDsJykBqWi0CL4Ec2i1nrGrUI3KO11r6Fbxskqmq3JK2NH7aW4dcccBuUujAP0ERl5w== dependencies: - bl "^2.2.0" + bl "^2.2.1" bson "^1.1.4" denque "^1.4.1" require_optional "^1.0.1" @@ -3685,27 +4447,38 @@ mongoose-legacy-pluralize@1.0.2: resolved "https://registry.yarnpkg.com/mongoose-legacy-pluralize/-/mongoose-legacy-pluralize-1.0.2.tgz#3ba9f91fa507b5186d399fb40854bff18fb563e4" integrity sha512-Yo/7qQU4/EyIS8YDFSeenIvXxZN+ld7YdV9LqFVQJzTLye8unujAWPZ4NWKfFA+RNjh+wvTWKY9Z3E5XM6ZZiQ== -mongoose@5.7.5: - version "5.7.5" - resolved "https://registry.yarnpkg.com/mongoose/-/mongoose-5.7.5.tgz#b787b47216edf62036aa358c3ef0f1869c46cdc2" - integrity sha512-BZ4FxtnbTurc/wcm/hLltLdI4IDxo4nsE0D9q58YymTdZwreNzwO62CcjVtaHhmr8HmJtOInp2W/T12FZaMf8g== +mongoose@^5.10.13: + version "5.10.13" + resolved "https://registry.yarnpkg.com/mongoose/-/mongoose-5.10.13.tgz#abcc9234b735886b19a95bec99140710687b295f" + integrity sha512-lvZzTj449sVWijY76StOuTKt5oP5kyy70VdM3DMgPpKNqZfkAseHxekmqBbd9YQQDVIgrIYDar9vSlxKqc75MQ== dependencies: - bson "~1.1.1" + bson "^1.1.4" kareem "2.3.1" - mongodb "3.3.2" + mongodb "3.6.3" mongoose-legacy-pluralize "1.0.2" - mpath "0.6.0" + mpath "0.7.0" mquery "3.2.2" ms "2.1.2" regexp-clone "1.0.0" - safe-buffer "5.1.2" + safe-buffer "5.2.1" sift "7.0.1" sliced "1.0.1" -mpath@0.6.0: - version "0.6.0" - resolved "https://registry.yarnpkg.com/mpath/-/mpath-0.6.0.tgz#aa922029fca4f0f641f360e74c5c1b6a4c47078e" - integrity sha512-i75qh79MJ5Xo/sbhxrDrPSEG0H/mr1kcZXJ8dH6URU5jD/knFxCVqVC/gVSW7GIXL/9hHWlT9haLbCXWOll3qw== +morgan@^1.10.0: + version "1.10.0" + resolved "https://registry.yarnpkg.com/morgan/-/morgan-1.10.0.tgz#091778abc1fc47cd3509824653dae1faab6b17d7" + integrity sha512-AbegBVI4sh6El+1gNwvD5YIck7nSA36weD7xvIxG4in80j/UoK8AEGaWnnz8v1GxonMCltmlNs5ZKbGvl9b1XQ== + dependencies: + basic-auth "~2.0.1" + debug "2.6.9" + depd "~2.0.0" + on-finished "~2.3.0" + on-headers "~1.0.2" + +mpath@0.7.0: + version "0.7.0" + resolved "https://registry.yarnpkg.com/mpath/-/mpath-0.7.0.tgz#20e8102e276b71709d6e07e9f8d4d0f641afbfb8" + integrity sha512-Aiq04hILxhz1L+f7sjGyn7IxYzWm1zLNNXcfhDtx04kZ2Gk7uvFdgZ8ts1cWa/6d0TQmag2yR8zSGZUmp0tFNg== mquery@3.2.2: version "3.2.2" @@ -3804,7 +4577,7 @@ nice-try@^1.0.4: resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366" integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ== -node-fetch@^2.6.0: +node-fetch@^2.6.1: version "2.6.1" resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.1.tgz#045bd323631f76ed2e2b55573394416b639a0052" integrity sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw== @@ -3819,24 +4592,24 @@ node-modules-regexp@^1.0.0: resolved "https://registry.yarnpkg.com/node-modules-regexp/-/node-modules-regexp-1.0.0.tgz#8d9dbe28964a4ac5712e9131642107c71e90ec40" integrity sha1-jZ2+KJZKSsVxLpExZCEHxx6Q7EA= -node-notifier@^7.0.0: - version "7.0.1" - resolved "https://registry.yarnpkg.com/node-notifier/-/node-notifier-7.0.1.tgz#a355e33e6bebacef9bf8562689aed0f4230ca6f9" - integrity sha512-VkzhierE7DBmQEElhTGJIoiZa1oqRijOtgOlsXg32KrJRXsPy0NXFBqWGW/wTswnJlDCs5viRYaqWguqzsKcmg== +node-notifier@^8.0.0: + version "8.0.0" + resolved "https://registry.yarnpkg.com/node-notifier/-/node-notifier-8.0.0.tgz#a7eee2d51da6d0f7ff5094bc7108c911240c1620" + integrity sha512-46z7DUmcjoYdaWyXouuFNNfUo6eFa94t23c53c+lG/9Cvauk4a98rAUp9672X5dxGdQmLpPzTxzu8f/OeEPaFA== dependencies: growly "^1.3.0" - is-wsl "^2.1.1" - semver "^7.2.1" + is-wsl "^2.2.0" + semver "^7.3.2" shellwords "^0.1.1" - uuid "^7.0.3" + uuid "^8.3.0" which "^2.0.2" -nodemailer@^6.4.10: - version "6.4.10" - resolved "https://registry.yarnpkg.com/nodemailer/-/nodemailer-6.4.10.tgz#f4c8dc7991c57f41fd081bef224ef01f7065143d" - integrity sha512-j+pS9CURhPgk6r0ENr7dji+As2xZiHSvZeVnzKniLOw1eRAyM/7flP0u65tCnsapV8JFu+t0l/5VeHsCZEeh9g== +nodemailer@^6.4.15: + version "6.4.15" + resolved "https://registry.yarnpkg.com/nodemailer/-/nodemailer-6.4.15.tgz#da5dbb78b8376e34c232c6aa3d2d65cfe17440e9" + integrity sha512-2/z13dBTWdgTRlxVMAK6C13dCI22GEShET4+jFLlQsxpblxYhojnucfcTZO1QBu5CsHvABsBj2JCGO3vl0HSQA== -normalize-package-data@^2.5.0: +normalize-package-data@^2.3.2, normalize-package-data@^2.5.0: version "2.5.0" resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8" integrity sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA== @@ -3901,6 +4674,16 @@ object-copy@^0.1.0: define-property "^0.2.5" kind-of "^3.0.3" +object-inspect@^1.8.0: + version "1.8.0" + resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.8.0.tgz#df807e5ecf53a609cc6bfe93eac3cc7be5b3a9d0" + integrity sha512-jLdtEOB112fORuypAyl/50VRVIBIdVQOSUUGQHzJ4xBSbit81zRarz7GThkEFZy1RceYrWYcPcBFPQwHyAc1gA== + +object-keys@^1.0.12, object-keys@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e" + integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA== + object-visit@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/object-visit/-/object-visit-1.0.1.tgz#f79c4493af0c5377b59fe39d395e41042dd045bb" @@ -3908,6 +4691,16 @@ object-visit@^1.0.0: dependencies: isobject "^3.0.0" +object.assign@^4.1.1: + version "4.1.2" + resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.2.tgz#0ed54a342eceb37b38ff76eb831a0e788cb63940" + integrity sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ== + dependencies: + call-bind "^1.0.0" + define-properties "^1.1.3" + has-symbols "^1.0.1" + object-keys "^1.1.1" + object.pick@^1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747" @@ -3915,6 +4708,16 @@ object.pick@^1.3.0: dependencies: isobject "^3.0.1" +object.values@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.1.tgz#68a99ecde356b7e9295a3c5e0ce31dc8c953de5e" + integrity sha512-WTa54g2K8iu0kmS/us18jEmdv1a4Wi//BZ/DTVYEcH0XhLM5NYdpDHja3gt57VrZLcNAO2WGA+KpWsDBaHt6eA== + dependencies: + define-properties "^1.1.3" + es-abstract "^1.17.0-next.1" + function-bind "^1.1.1" + has "^1.0.3" + on-finished@^2.3.0, on-finished@~2.3.0: version "2.3.0" resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947" @@ -3922,6 +4725,11 @@ on-finished@^2.3.0, on-finished@~2.3.0: dependencies: ee-first "1.1.1" +on-headers@~1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.2.tgz#772b0ae6aaa525c399e489adfad90c403eb3c28f" + integrity sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA== + once@^1.3.0, once@^1.3.1, once@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" @@ -3929,6 +4737,13 @@ once@^1.3.0, once@^1.3.1, once@^1.4.0: dependencies: wrappy "1" +one-time@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/one-time/-/one-time-1.0.0.tgz#e06bc174aed214ed58edede573b433bbf827cb45" + integrity sha512-5DXOiRKwuSEcQ/l0kGCF6Q3jcADFv5tSmRaJck/OqkVFcOzutB134KRSfF0xDrL39MNnqxbHBbUUcjZIhTgb2g== + dependencies: + fn.name "1.x.x" + onetime@^5.1.0: version "5.1.0" resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.0.tgz#fff0f3c91617fe62bb50189636e99ac8a6df7be5" @@ -3948,6 +4763,18 @@ optionator@^0.8.1: type-check "~0.3.2" word-wrap "~1.2.3" +optionator@^0.9.1: + version "0.9.1" + resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.1.tgz#4f236a6373dae0566a6d43e1326674f50c291499" + integrity sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw== + dependencies: + deep-is "^0.1.3" + fast-levenshtein "^2.0.6" + levn "^0.4.1" + prelude-ls "^1.2.1" + type-check "^0.4.0" + word-wrap "^1.2.3" + os-homedir@^1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3" @@ -3991,6 +4818,13 @@ p-finally@^1.0.0: resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae" integrity sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4= +p-limit@^1.1.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.3.0.tgz#b86bd5f0c25690911c7590fcbfc2010d54b3ccb8" + integrity sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q== + dependencies: + p-try "^1.0.0" + p-limit@^2.2.0: version "2.3.0" resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1" @@ -3998,6 +4832,13 @@ p-limit@^2.2.0: dependencies: p-try "^2.0.0" +p-locate@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz#20a0103b222a70c8fd39cc2e580680f3dde5ec43" + integrity sha1-IKAQOyIqcMj9OcwuWAaA893l7EM= + dependencies: + p-limit "^1.1.0" + p-locate@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07" @@ -4005,6 +4846,16 @@ p-locate@^4.1.0: dependencies: p-limit "^2.2.0" +p-map@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/p-map/-/p-map-2.1.0.tgz#310928feef9c9ecc65b68b17693018a665cea175" + integrity sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw== + +p-try@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3" + integrity sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M= + p-try@^2.0.0: version "2.2.0" resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6" @@ -4035,6 +4886,20 @@ pac-resolver@^3.0.0: netmask "^1.0.6" thunkify "^2.1.2" +parent-module@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz#691d2709e78c79fae3a156622452d00762caaaa2" + integrity sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g== + dependencies: + callsites "^3.0.0" + +parse-json@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-2.2.0.tgz#f480f40434ef80741f8469099f8dea18f55a4dc9" + integrity sha1-9ID0BDTvgHQfhGkJn43qGPVaTck= + dependencies: + error-ex "^1.2.0" + parse-json@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.0.0.tgz#73e5114c986d143efa3712d4ea24db9a4266f60f" @@ -4079,6 +4944,11 @@ path-dirname@^1.0.0: resolved "https://registry.yarnpkg.com/path-dirname/-/path-dirname-1.0.2.tgz#cc33d24d525e099a5388c0336c6e32b9160609e0" integrity sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA= +path-exists@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515" + integrity sha1-zg6+ql94yxiSXqfYENe1mwEP1RU= + path-exists@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3" @@ -4109,6 +4979,13 @@ path-to-regexp@0.1.7: resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c" integrity sha1-32BBeABfUi8V60SQ5yR6G/qmf4w= +path-type@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/path-type/-/path-type-2.0.0.tgz#f012ccb8415b7096fc2daa1054c3d72389594c73" + integrity sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM= + dependencies: + pify "^2.0.0" + path-type@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/path-type/-/path-type-3.0.0.tgz#cef31dc8e0a1a3bb0d105c0cd97cf3bf47f4e36f" @@ -4116,6 +4993,11 @@ path-type@^3.0.0: dependencies: pify "^3.0.0" +path-type@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b" + integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw== + pause-stream@~0.0.11: version "0.0.11" resolved "https://registry.yarnpkg.com/pause-stream/-/pause-stream-0.0.11.tgz#fe5a34b0cbce12b5aa6a2b403ee2e73b602f1445" @@ -4133,6 +5015,11 @@ picomatch@^2.0.4, picomatch@^2.0.5, picomatch@^2.2.1: resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz#21f333e9b6b8eaff02468f5146ea406d345f4dad" integrity sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg== +pify@^2.0.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c" + integrity sha1-7RQaasBDqEnqWISY59yosVMw6Qw= + pify@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176" @@ -4150,6 +5037,13 @@ pirates@^4.0.1: dependencies: node-modules-regexp "^1.0.0" +pkg-dir@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-2.0.0.tgz#f6d5d1109e19d63edf428e0bd57e12777615334b" + integrity sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s= + dependencies: + find-up "^2.1.0" + pkg-dir@^4.2.0: version "4.2.0" resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz#f099133df7ede422e81d1d8448270eeb3e4261f3" @@ -4162,36 +5056,36 @@ posix-character-classes@^0.1.0: resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab" integrity sha1-AerA/jta9xoqbAL+q7jB/vfgDqs= +prelude-ls@^1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396" + integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g== + prelude-ls@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54" integrity sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ= -pretty-format@^25.2.1, pretty-format@^25.5.0: - version "25.5.0" - resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-25.5.0.tgz#7873c1d774f682c34b8d48b6743a2bf2ac55791a" - integrity sha512-kbo/kq2LQ/A/is0PQwsEHM7Ca6//bGPPvU6UnsdDRSKTWxT/ru/xb88v4BJf6a69H+uTytOEsTusT9ksd/1iWQ== - dependencies: - "@jest/types" "^25.5.0" - ansi-regex "^5.0.0" - ansi-styles "^4.0.0" - react-is "^16.12.0" - -pretty-format@^26.1.0: - version "26.1.0" - resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-26.1.0.tgz#272b9cd1f1a924ab5d443dc224899d7a65cb96ec" - integrity sha512-GmeO1PEYdM+non4BKCj+XsPJjFOJIPnsLewqhDVoqY1xo0yNmDas7tC2XwpMrRAHR3MaE2hPo37deX5OisJ2Wg== +pretty-format@^26.0.0, pretty-format@^26.6.2: + version "26.6.2" + resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-26.6.2.tgz#e35c2705f14cb7fe2fe94fa078345b444120fc93" + integrity sha512-7AeGuCYNGmycyQbCqd/3PWH4eOoX/OiCa0uphp57NVTeAGdJGaAliecxwBDHYQCIvrW7aDBZCYeNTP/WX69mkg== dependencies: - "@jest/types" "^26.1.0" + "@jest/types" "^26.6.2" ansi-regex "^5.0.0" ansi-styles "^4.0.0" - react-is "^16.12.0" + react-is "^17.0.1" process-nextick-args@~2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2" integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag== +progress@^2.0.0: + version "2.0.3" + resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8" + integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA== + prompts@^2.0.1: version "2.3.2" resolved "https://registry.yarnpkg.com/prompts/-/prompts-2.3.2.tgz#480572d89ecf39566d2bd3fe2c9fccb7c4c0b068" @@ -4250,7 +5144,7 @@ qs@6.7.0: resolved "https://registry.yarnpkg.com/qs/-/qs-6.7.0.tgz#41dc1a015e3d581f1621776be31afb2876a9b1bc" integrity sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ== -qs@^6.4.0, qs@^6.5.1: +qs@^6.4.0, qs@^6.9.4: version "6.9.4" resolved "https://registry.yarnpkg.com/qs/-/qs-6.9.4.tgz#9090b290d1f91728d3c22e54843ca44aea5ab687" integrity sha512-A1kFqHekCTM7cz0udomYUoYNWjBebHm/5wzU/XqrBRBNWectVH0QIiN+NEcZ0Dte5hvzHwbr8+XQmguPhJ6WdQ== @@ -4285,10 +5179,18 @@ raw-body@^2.2.0: iconv-lite "0.4.24" unpipe "1.0.0" -react-is@^16.12.0: - version "16.13.1" - resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4" - integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ== +react-is@^17.0.1: + version "17.0.1" + resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.1.tgz#5b3531bd76a645a4c9fb6e693ed36419e3301339" + integrity sha512-NAnt2iGDXohE5LI7uBnLnqvLQMtzhkiAOLXTmv+qnF9Ky7xAPcX8Up/xWIhxvLVGJvuLiNc4xQLtuqDRzb4fSA== + +read-pkg-up@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-2.0.0.tgz#6b72a8048984e0c41e79510fd5e9fa99b3b549be" + integrity sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4= + dependencies: + find-up "^2.0.0" + read-pkg "^2.0.0" read-pkg-up@^7.0.1: version "7.0.1" @@ -4299,6 +5201,15 @@ read-pkg-up@^7.0.1: read-pkg "^5.2.0" type-fest "^0.8.1" +read-pkg@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-2.0.0.tgz#8ef1c0623c6a6db0dc6713c4bfac46332b2368f8" + integrity sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg= + dependencies: + load-json-file "^2.0.0" + normalize-package-data "^2.3.2" + path-type "^2.0.0" + read-pkg@^5.2.0: version "5.2.0" resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-5.2.0.tgz#7bf295438ca5a33e56cd30e053b34ee7250c93cc" @@ -4319,7 +5230,7 @@ readable-stream@1.1.x: isarray "0.0.1" string_decoder "~0.10.x" -readable-stream@2, readable-stream@^2.2.2, readable-stream@^2.3.5: +readable-stream@2, readable-stream@^2.2.2, readable-stream@^2.3.5, readable-stream@^2.3.7: version "2.3.7" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57" integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw== @@ -4332,6 +5243,15 @@ readable-stream@2, readable-stream@^2.2.2, readable-stream@^2.3.5: string_decoder "~1.1.1" util-deprecate "~1.0.1" +readable-stream@^3.4.0, readable-stream@^3.6.0: + version "3.6.0" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198" + integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA== + dependencies: + inherits "^2.0.3" + string_decoder "^1.1.1" + util-deprecate "^1.0.1" + readdirp@~3.4.0: version "3.4.0" resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.4.0.tgz#9fdccdf9e9155805449221ac645e8303ab5b9ada" @@ -4339,10 +5259,10 @@ readdirp@~3.4.0: dependencies: picomatch "^2.2.1" -redis-commands@^1.5.0: - version "1.5.0" - resolved "https://registry.yarnpkg.com/redis-commands/-/redis-commands-1.5.0.tgz#80d2e20698fe688f227127ff9e5164a7dd17e785" - integrity sha512-6KxamqpZ468MeQC3bkWmCB1fp56XL64D4Kf0zJSwDZbVLLm7KFkoIcHrgRvQ+sk8dnhySs7+yBg94yIkAK7aJg== +redis-commands@1.6.0: + version "1.6.0" + resolved "https://registry.yarnpkg.com/redis-commands/-/redis-commands-1.6.0.tgz#36d4ca42ae9ed29815cdb30ad9f97982eba1ce23" + integrity sha512-2jnZ0IkjZxvguITjFTrGiLyzQZcTvaw8DAaCXxZq/dsHXz7KfMQ3OUJy7Tz9vnRtZRVz6VRCPDvruvU8Ts44wQ== redis-errors@^1.0.0, redis-errors@^1.2.0: version "1.2.0" @@ -4356,16 +5276,6 @@ redis-parser@^3.0.0: dependencies: redis-errors "^1.0.0" -redis@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/redis/-/redis-3.0.2.tgz#bd47067b8a4a3e6a2e556e57f71cc82c7360150a" - integrity sha512-PNhLCrjU6vKVuMOyFu7oSP296mwBkcE6lrAjruBYG5LgdSqtRBoVQIylrMyVZD/lkF24RSNNatzvYag6HRBHjQ== - dependencies: - denque "^1.4.1" - redis-commands "^1.5.0" - redis-errors "^1.2.0" - redis-parser "^3.0.0" - regex-not@^1.0.0, regex-not@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.2.tgz#1f4ece27e00b0b65e0247a6810e6a85d83a5752c" @@ -4379,6 +5289,11 @@ regexp-clone@1.0.0, regexp-clone@^1.0.0: resolved "https://registry.yarnpkg.com/regexp-clone/-/regexp-clone-1.0.0.tgz#222db967623277056260b992626354a04ce9bf63" integrity sha512-TuAasHQNamyyJ2hb97IuBEif4qBHGjPHBS64sZwytpLEqtBQ1gPJTnOaQ6qmpET16cK14kkjbazl6+p0RRv0yw== +regexpp@^3.0.0, regexpp@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.1.0.tgz#206d0ad0a5648cffbdb8ae46438f3dc51c9f78e2" + integrity sha512-ZOIzd8yVsQQA7j8GCSlPGXwg5PfmA1mrq0JP4nGhh54LaKN3xdai/vHUDu74pKwV8OxseMS65u2NImosQcSD0Q== + remove-trailing-separator@^1.0.1: version "1.1.0" resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef" @@ -4466,6 +5381,11 @@ resolve-from@^2.0.0: resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-2.0.0.tgz#9480ab20e94ffa1d9e80a804c7ea147611966b57" integrity sha1-lICrIOlP+h2egKgEx+oUdhGWa1c= +resolve-from@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6" + integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g== + resolve-from@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69" @@ -4483,11 +5403,31 @@ resolve@^1.10.0, resolve@^1.17.0, resolve@^1.3.2: dependencies: path-parse "^1.0.6" +resolve@^1.13.1, resolve@^1.18.1: + version "1.18.1" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.18.1.tgz#018fcb2c5b207d2a6424aee361c5a266da8f4130" + integrity sha512-lDfCPaMKfOJXjy0dPayzPdF1phampNWr3qFCjAu+rw/qbQmr5jWH5xN2hwh9QKfw9E5v4hwV7A+jrCmL8yjjqA== + dependencies: + is-core-module "^2.0.0" + path-parse "^1.0.6" + ret@~0.1.10: version "0.1.15" resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc" integrity sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg== +reusify@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76" + integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw== + +rimraf@2.6.3: + version "2.6.3" + resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab" + integrity sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA== + dependencies: + glob "^7.1.3" + rimraf@^2.6.1: version "2.7.1" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec" @@ -4507,12 +5447,17 @@ rsvp@^4.8.4: resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-4.8.5.tgz#c8f155311d167f68f21e168df71ec5b083113734" integrity sha512-nfMOlASu9OnRJo1mbEk2cz0D56a1MBNrJ7orjRZQG10XDyuvwksKbuXNp6qa+kbn839HwjwhBzhFmdsaEAfauA== +run-parallel@^1.1.9: + version "1.1.10" + resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.1.10.tgz#60a51b2ae836636c81377df16cb107351bcd13ef" + integrity sha512-zb/1OuZ6flOlH6tQyMPUrE3x3Ulxjlo9WIVXR4yVYi4H9UXQaeIsPbLn2R3O3vQCnDKkAl2qHiuocKKX4Tz/Sw== + safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1: version "5.1.2" resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g== -safe-buffer@^5.0.1, safe-buffer@^5.1.1, safe-buffer@^5.1.2: +safe-buffer@5.2.1, safe-buffer@^5.0.1, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@~5.2.0: version "5.2.1" resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== @@ -4568,7 +5513,7 @@ sdk-base@^3.1.1, sdk-base@^3.5.0, sdk-base@^3.5.1: co "^4.6.0" is-type-of "^1.2.1" -"semver@2 || 3 || 4 || 5", semver@^5.0.1, semver@^5.1.0, semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.6.0: +"semver@2 || 3 || 4 || 5", semver@^5.0.1, semver@^5.1.0, semver@^5.4.1, semver@^5.5.0, semver@^5.6.0: version "5.7.1" resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== @@ -4680,6 +5625,13 @@ signal-exit@^3.0.0, signal-exit@^3.0.2: resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz#a1410c2edd8f077b08b4e253c8eacfcaf057461c" integrity sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA== +simple-swizzle@^0.2.2: + version "0.2.2" + resolved "https://registry.yarnpkg.com/simple-swizzle/-/simple-swizzle-0.2.2.tgz#a4da6b635ffcccca33f70d17cb92592de95e557a" + integrity sha1-pNprY1/8zMoz9w0Xy5JZLeleVXo= + dependencies: + is-arrayish "^0.3.1" + sisteransi@^1.0.4: version "1.0.5" resolved "https://registry.yarnpkg.com/sisteransi/-/sisteransi-1.0.5.tgz#134d681297756437cc05ca01370d3a7a571075ed" @@ -4695,6 +5647,15 @@ slash@^3.0.0: resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634" integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q== +slice-ansi@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-2.1.0.tgz#cacd7693461a637a5788d92a7dd4fba068e81636" + integrity sha512-Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ== + dependencies: + ansi-styles "^3.2.0" + astral-regex "^1.0.0" + is-fullwidth-code-point "^2.0.0" + sliced@1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/sliced/-/sliced-1.0.1.tgz#0b3a662b5d04c3177b1926bea82b03f837a2ef41" @@ -4905,6 +5866,11 @@ sshpk@^1.7.0: safer-buffer "^2.0.2" tweetnacl "~0.14.0" +stack-trace@0.0.x: + version "0.0.10" + resolved "https://registry.yarnpkg.com/stack-trace/-/stack-trace-0.0.10.tgz#547c70b347e8d32b4e108ea1a2a159e5fdde19c0" + integrity sha1-VHxws0fo0ytOEI6hoqFZ5f3eGcA= + stack-utils@^2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-2.0.2.tgz#5cf48b4557becb4638d0bc4f21d23f5d19586593" @@ -4912,6 +5878,11 @@ stack-utils@^2.0.2: dependencies: escape-string-regexp "^2.0.0" +standard-as-callback@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/standard-as-callback/-/standard-as-callback-2.0.1.tgz#ed8bb25648e15831759b6023bdb87e6b60b38126" + integrity sha512-NQOxSeB8gOI5WjSaxjBgog2QFw55FV8TkS6Y07BiB3VJ8xNTvUYm0wl0s8ObgQ5NhdpnNfigMIKjgPESzgr4tg== + static-extend@^0.1.1: version "0.1.2" resolved "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6" @@ -4943,6 +5914,15 @@ string-length@^4.0.1: char-regex "^1.0.2" strip-ansi "^6.0.0" +string-width@^3.0.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz#22767be21b62af1081574306f69ac51b62203961" + integrity sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w== + dependencies: + emoji-regex "^7.0.1" + is-fullwidth-code-point "^2.0.0" + strip-ansi "^5.1.0" + string-width@^4.1.0, string-width@^4.2.0: version "4.2.0" resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.0.tgz#952182c46cc7b2c313d1596e623992bd163b72b5" @@ -4952,6 +5932,29 @@ string-width@^4.1.0, string-width@^4.2.0: is-fullwidth-code-point "^3.0.0" strip-ansi "^6.0.0" +string.prototype.trimend@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.2.tgz#6ddd9a8796bc714b489a3ae22246a208f37bfa46" + integrity sha512-8oAG/hi14Z4nOVP0z6mdiVZ/wqjDtWSLygMigTzAb+7aPEDTleeFf+WrF+alzecxIRkckkJVn+dTlwzJXORATw== + dependencies: + define-properties "^1.1.3" + es-abstract "^1.18.0-next.1" + +string.prototype.trimstart@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.2.tgz#22d45da81015309cd0cdd79787e8919fc5c613e7" + integrity sha512-7F6CdBTl5zyu30BJFdzSTlSlLPwODC23Od+iLoVH8X6+3fvDPPuBVVj9iaB1GOsSTSIgVfsfm27R2FGrAPznWg== + dependencies: + define-properties "^1.1.3" + es-abstract "^1.18.0-next.1" + +string_decoder@^1.1.1: + version "1.3.0" + resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e" + integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA== + dependencies: + safe-buffer "~5.2.0" + string_decoder@~0.10.x: version "0.10.31" resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94" @@ -4964,6 +5967,13 @@ string_decoder@~1.1.1: dependencies: safe-buffer "~5.1.0" +strip-ansi@^5.1.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae" + integrity sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA== + dependencies: + ansi-regex "^4.1.0" + strip-ansi@^6.0.0: version "6.0.0" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.0.tgz#0b1571dd7669ccd4f3e06e14ef1eed26225ae532" @@ -4991,29 +6001,35 @@ strip-final-newline@^2.0.0: resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad" integrity sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA== -superagent@^3.8.3: - version "3.8.3" - resolved "https://registry.yarnpkg.com/superagent/-/superagent-3.8.3.tgz#460ea0dbdb7d5b11bc4f78deba565f86a178e128" - integrity sha512-GLQtLMCoEIK4eDv6OGtkOoSMt3D+oq0y3dsxMuYuDvaNUvuT8eFBuLmfR0iYYzHC1e8hpzC6ZsxbuP6DIalMFA== - dependencies: - component-emitter "^1.2.0" - cookiejar "^2.1.0" - debug "^3.1.0" - extend "^3.0.0" - form-data "^2.3.1" - formidable "^1.2.0" - methods "^1.1.1" - mime "^1.4.1" - qs "^6.5.1" - readable-stream "^2.3.5" +strip-json-comments@^3.1.0, strip-json-comments@^3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006" + integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig== -supertest@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/supertest/-/supertest-4.0.2.tgz#c2234dbdd6dc79b6f15b99c8d6577b90e4ce3f36" - integrity sha512-1BAbvrOZsGA3YTCWqbmh14L0YEq0EGICX/nBnfkfVJn7SrxQV1I3pMYjSzG9y/7ZU2V9dWqyqk2POwxlb09duQ== +superagent@6.1.0: + version "6.1.0" + resolved "https://registry.yarnpkg.com/superagent/-/superagent-6.1.0.tgz#09f08807bc41108ef164cfb4be293cebd480f4a6" + integrity sha512-OUDHEssirmplo3F+1HWKUrUjvnQuA+nZI6i/JJBdXb5eq9IyEQwPyPpqND+SSsxf6TygpBEkUjISVRN4/VOpeg== dependencies: + component-emitter "^1.3.0" + cookiejar "^2.1.2" + debug "^4.1.1" + fast-safe-stringify "^2.0.7" + form-data "^3.0.0" + formidable "^1.2.2" methods "^1.1.2" - superagent "^3.8.3" + mime "^2.4.6" + qs "^6.9.4" + readable-stream "^3.6.0" + semver "^7.3.2" + +supertest@^6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/supertest/-/supertest-6.0.1.tgz#f6b54370de85c45d6557192c8d7df604ca2c9e18" + integrity sha512-8yDNdm+bbAN/jeDdXsRipbq9qMpVF7wRsbwLgsANHqdjPsCoecmlTuqEcLQMGpmojFBhxayZ0ckXmLXYq7e+0g== + dependencies: + methods "1.1.2" + superagent "6.1.0" supports-color@^5.3.0: version "5.5.0" @@ -5042,6 +6058,16 @@ symbol-tree@^3.2.4: resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz#430637d248ba77e078883951fb9aa0eed7c63fa2" integrity sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw== +table@^5.2.3: + version "5.4.6" + resolved "https://registry.yarnpkg.com/table/-/table-5.4.6.tgz#1292d19500ce3f86053b05f0e8e7e4a3bb21079e" + integrity sha512-wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug== + dependencies: + ajv "^6.10.2" + lodash "^4.17.14" + slice-ansi "^2.1.0" + string-width "^3.0.0" + tcp-base@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/tcp-base/-/tcp-base-3.1.0.tgz#35458bf8c0a21a0cacf5092b4c758a53b39317c1" @@ -5067,6 +6093,16 @@ test-exclude@^6.0.0: glob "^7.1.4" minimatch "^3.0.4" +text-hex@1.0.x: + version "1.0.0" + resolved "https://registry.yarnpkg.com/text-hex/-/text-hex-1.0.0.tgz#69dc9c1b17446ee79a92bf5b884bb4b9127506f5" + integrity sha512-uuVGNWzgJ4yhRaNSiubPY7OjISw4sw4E5Uv0wbjp+OzcbmVU/rsT8ujgcXJhn9ypzsgr5vlzpPqP+MBBKcGvbg== + +text-table@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4" + integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ= + thenify-all@^1.0.0: version "1.6.0" resolved "https://registry.yarnpkg.com/thenify-all/-/thenify-all-1.6.0.tgz#1a1918d402d8fc3f98fbf234db0bcc8cc10e9726" @@ -5172,26 +6208,33 @@ tr46@^2.0.2: dependencies: punycode "^2.1.1" -ts-jest@^26.1.1: - version "26.1.1" - resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-26.1.1.tgz#b98569b8a4d4025d966b3d40c81986dd1c510f8d" - integrity sha512-Lk/357quLg5jJFyBQLnSbhycnB3FPe+e9i7ahxokyXxAYoB0q1pPmqxxRPYr4smJic1Rjcf7MXDBhZWgxlli0A== +triple-beam@^1.2.0, triple-beam@^1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/triple-beam/-/triple-beam-1.3.0.tgz#a595214c7298db8339eeeee083e4d10bd8cb8dd9" + integrity sha512-XrHUvV5HpdLmIj4uVMxHggLbFSZYIn7HEWsqePZcI50pco+MPqJ50wMGY794X7AOOhxOBAjbkqfAbEe/QMp2Lw== + +ts-jest@^26.4.3: + version "26.4.3" + resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-26.4.3.tgz#d153a616033e7ec8544b97ddbe2638cbe38d53db" + integrity sha512-pFDkOKFGY+nL9v5pkhm+BIFpoAuno96ff7GMnIYr/3L6slFOS365SI0fGEVYx2RKGji5M2elxhWjDMPVcOCdSw== dependencies: + "@jest/create-cache-key-function" "^26.5.0" + "@types/jest" "26.x" bs-logger "0.x" buffer-from "1.x" fast-json-stable-stringify "2.x" + jest-util "^26.1.0" json5 "2.x" lodash.memoize "4.x" make-error "1.x" - micromatch "4.x" mkdirp "1.x" semver "7.x" - yargs-parser "18.x" + yargs-parser "20.x" -ts-node@^8.10.2: - version "8.10.2" - resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-8.10.2.tgz#eee03764633b1234ddd37f8db9ec10b75ec7fb8d" - integrity sha512-ISJJGgkIpDdBhWVu3jufsWpK3Rzo7bdiIXJjQc0ynKxVOVcg2oIrf2H2cejminGrptVc6q6/uynAHNCuWGbpVA== +ts-node@^9.0.0: + version "9.0.0" + resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-9.0.0.tgz#e7699d2a110cc8c0d3b831715e417688683460b3" + integrity sha512-/TqB4SnererCDR/vb4S/QvSZvzQMJN8daAslg7MeaiHvD8rDZsSfXmNeNumyZZzMned72Xoq/isQljYSt8Ynfg== dependencies: arg "^4.1.0" diff "^4.0.1" @@ -5221,34 +6264,15 @@ tsconfig-paths@^3.9.0: minimist "^1.2.0" strip-bom "^3.0.0" -tslib@^1.10.0, tslib@^1.8.1: - version "1.13.0" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.13.0.tgz#c881e13cc7015894ed914862d276436fa9a47043" - integrity sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q== - -tslint@^6.1.2: - version "6.1.2" - resolved "https://registry.yarnpkg.com/tslint/-/tslint-6.1.2.tgz#2433c248512cc5a7b2ab88ad44a6b1b34c6911cf" - integrity sha512-UyNrLdK3E0fQG/xWNqAFAC5ugtFyPO4JJR1KyyfQAyzR8W0fTRrC91A8Wej4BntFzcvETdCSDa/4PnNYJQLYiA== - dependencies: - "@babel/code-frame" "^7.0.0" - builtin-modules "^1.1.1" - chalk "^2.3.0" - commander "^2.12.1" - diff "^4.0.1" - glob "^7.1.1" - js-yaml "^3.13.1" - minimatch "^3.0.4" - mkdirp "^0.5.3" - resolve "^1.3.2" - semver "^5.3.0" - tslib "^1.10.0" - tsutils "^2.29.0" +tslib@^1.8.1: + version "1.14.1" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00" + integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg== -tsutils@^2.29.0: - version "2.29.0" - resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-2.29.0.tgz#32b488501467acbedd4b85498673a0812aca0b99" - integrity sha512-g5JVHCIJwzfISaXpXE1qvNalca5Jwob6FjI4AoPlqMusJ6ftFE7IkkFoMhVLRgK+4Kx3gkzb8UZK5t5yTTvEmA== +tsutils@^3.17.1: + version "3.17.1" + resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.17.1.tgz#ed719917f11ca0dee586272b2ac49e015a2dd759" + integrity sha512-kzeQ5B8H3w60nFY2g8cJIuH7JDpsALXySGtwGJ0p2LSjLgay3NdIpqq5SoOBe46bKDW2iq25irHCr8wjomUS2g== dependencies: tslib "^1.8.1" @@ -5264,6 +6288,13 @@ tweetnacl@^0.14.3, tweetnacl@~0.14.0: resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64" integrity sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q= +type-check@^0.4.0, type-check@~0.4.0: + version "0.4.0" + resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz#07b8203bfa7056c0657050e3ccd2c37730bab8f1" + integrity sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew== + dependencies: + prelude-ls "^1.2.1" + type-check@~0.3.2: version "0.3.2" resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72" @@ -5311,10 +6342,10 @@ typedarray@^0.0.6: resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c= -typescript@^3.9.5: - version "3.9.5" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.9.5.tgz#586f0dba300cde8be52dd1ac4f7e1009c1b13f36" - integrity sha512-hSAifV3k+i6lEoCJ2k6R2Z/rp/H3+8sdmcn5NrS3/3kE7+RyZXm9aqvxWqjEXHAd8b0pShatpcdMTvEdvAJltQ== +typescript@^4.0.5: + version "4.0.5" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.0.5.tgz#ae9dddfd1069f1cb5beb3ef3b2170dd7c1332389" + integrity sha512-ywmr/VrTVCmNTJ6iV2LwIrfG1P+lv6luD8sUJs+2eI9NLGigaN+nUQc13iHqisq7bra9lnmUSYqbJvegraBOPQ== unescape@^1.0.1: version "1.0.1" @@ -5391,7 +6422,7 @@ use@^3.1.0: resolved "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f" integrity sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ== -util-deprecate@~1.0.1: +util-deprecate@^1.0.1, util-deprecate@~1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8= @@ -5424,15 +6455,20 @@ uuid@^3.3.2: resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee" integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A== -uuid@^7.0.3: - version "7.0.3" - resolved "https://registry.yarnpkg.com/uuid/-/uuid-7.0.3.tgz#c5c9f2c8cf25dc0a372c4df1441c41f5bd0c680b" - integrity sha512-DPSke0pXhTZgoF/d+WSt2QaKMCFSfx7QegxEWT+JOuHF5aWrKEn0G+ztjuJg/gG8/ItK+rbPCD/yNv8yyih6Cg== +uuid@^8.3.0: + version "8.3.1" + resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.1.tgz#2ba2e6ca000da60fce5a196954ab241131e05a31" + integrity sha512-FOmRr+FmWEIG8uhZv6C2bTgEVXsHk08kE7mPlrBbEe+c3r9pjceVPgupIfNIhc4yx55H69OXANrUaSuu9eInKg== -v8-to-istanbul@^4.1.3: - version "4.1.4" - resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-4.1.4.tgz#b97936f21c0e2d9996d4985e5c5156e9d4e49cd6" - integrity sha512-Rw6vJHj1mbdK8edjR7+zuJrpDtKIgNdAvTSAcpYfgMIw+u2dPDntD3dgN4XQFLU2/fvFQdzj+EeSGfd/jnY5fQ== +v8-compile-cache@^2.0.3: + version "2.2.0" + resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.2.0.tgz#9471efa3ef9128d2f7c6a7ca39c4dd6b5055b132" + integrity sha512-gTpR5XQNKFwOd4clxfnhaqvfqMpqEwr4tOtCyz4MtYZX2JYhfr1JvBFKdS+7K/9rfpZR3VLX+YWBbKoxCgS43Q== + +v8-to-istanbul@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-7.0.0.tgz#b4fe00e35649ef7785a9b7fcebcea05f37c332fc" + integrity sha512-fLL2rFuQpMtm9r8hrAV2apXX/WqHJ6+IC4/eQVdMDGBUgH/YMV4Gv3duk3kjmyg6uiQWBAA9nJwue4iJUOkHeA== dependencies: "@types/istanbul-lib-coverage" "^2.0.1" convert-source-map "^1.6.0" @@ -5491,7 +6527,7 @@ webidl-conversions@^5.0.0: resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-5.0.0.tgz#ae59c8a00b121543a2acc65c0434f57b0fc11aff" integrity sha512-VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA== -webidl-conversions@^6.0.0: +webidl-conversions@^6.1.0: version "6.1.0" resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-6.1.0.tgz#9111b4d7ea80acd40f5270d666621afa78b69514" integrity sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w== @@ -5543,7 +6579,30 @@ win-release@^1.0.0: dependencies: semver "^5.0.1" -word-wrap@~1.2.3: +winston-transport@^4.4.0: + version "4.4.0" + resolved "https://registry.yarnpkg.com/winston-transport/-/winston-transport-4.4.0.tgz#17af518daa690d5b2ecccaa7acf7b20ca7925e59" + integrity sha512-Lc7/p3GtqtqPBYYtS6KCN3c77/2QCev51DvcJKbkFPQNoj1sinkGwLGFDxkXY9J6p9+EPnYs+D90uwbnaiURTw== + dependencies: + readable-stream "^2.3.7" + triple-beam "^1.2.0" + +winston@^3.3.3: + version "3.3.3" + resolved "https://registry.yarnpkg.com/winston/-/winston-3.3.3.tgz#ae6172042cafb29786afa3d09c8ff833ab7c9170" + integrity sha512-oEXTISQnC8VlSAKf1KYSSd7J6IWuRPQqDdo8eoRNaYKLvwSb5+79Z3Yi1lrl6KDpU6/VWaxpakDAtb1oQ4n9aw== + dependencies: + "@dabh/diagnostics" "^2.0.2" + async "^3.1.0" + is-stream "^2.0.0" + logform "^2.2.0" + one-time "^1.0.0" + readable-stream "^3.4.0" + stack-trace "0.0.x" + triple-beam "^1.3.0" + winston-transport "^4.4.0" + +word-wrap@^1.2.3, word-wrap@~1.2.3: version "1.2.3" resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c" integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ== @@ -5572,6 +6631,13 @@ write-file-atomic@^3.0.0: signal-exit "^3.0.2" typedarray-to-buffer "^3.1.5" +write@1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/write/-/write-1.0.3.tgz#0800e14523b923a387e415123c865616aae0f5c3" + integrity sha512-/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig== + dependencies: + mkdirp "^0.5.1" + ws@^7.1.2, ws@^7.2.3: version "7.3.0" resolved "https://registry.yarnpkg.com/ws/-/ws-7.3.0.tgz#4b2f7f219b3d3737bc1a2fbf145d825b94d38ffd" @@ -5619,7 +6685,12 @@ yallist@^3.0.2: resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd" integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g== -yargs-parser@18.x, yargs-parser@^18.1.1: +yargs-parser@20.x: + version "20.2.3" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.3.tgz#92419ba867b858c868acf8bae9bf74af0dd0ce26" + integrity sha512-emOFRT9WVHw03QSvN5qor9QQT9+sw5vwxfYweivSMHTcAXPefwVae2FjO7JJjj8hCE4CzPOPeFM83VwT29HCww== + +yargs-parser@^18.1.2: version "18.1.3" resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-18.1.3.tgz#be68c4975c6b2abf469236b0c870362fab09a7b0" integrity sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ== @@ -5627,10 +6698,10 @@ yargs-parser@18.x, yargs-parser@^18.1.1: camelcase "^5.0.0" decamelize "^1.2.0" -yargs@^15.3.1: - version "15.3.1" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-15.3.1.tgz#9505b472763963e54afe60148ad27a330818e98b" - integrity sha512-92O1HWEjw27sBfgmXiixJWT5hRBp2eobqXicLtPBIDBhYB+1HpwZlXmbW2luivBJHBzki+7VyCLRtAkScbTBQA== +yargs@^15.4.1: + version "15.4.1" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-15.4.1.tgz#0d87a16de01aee9d8bec2bfbf74f67851730f4f8" + integrity sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A== dependencies: cliui "^6.0.0" decamelize "^1.2.0" @@ -5642,7 +6713,7 @@ yargs@^15.3.1: string-width "^4.2.0" which-module "^2.0.0" y18n "^4.0.0" - yargs-parser "^18.1.1" + yargs-parser "^18.1.2" yeast@0.1.2: version "0.1.2"